revert to biblatex 3.7, since 3.8 (and companion biber) was apparently not ready

git-svn-id: svn://tug.org/texlive/trunk@45702 c570f23f-e606-0410-a88d-b1316a301751

179 files changed, 3001 insertions, 6614 deletions

diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index 6ee883631be..1f498b29225 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -159,7 +159,7 @@ ENTRY {
     verbc
   }
   { skipbib skiplos skiplab useauthor useeditor usetranslator useprefix singletitle }
-  { entryoptions labelhash namehash fullhash dateyear dateendyear extradate labelalpha extraalpha 
+  { entryoptions labelhash namehash fullhash dateyear dateendyear extrayear labelalpha extraalpha 
     sortinit label.name label.year sortkey.nosort sortkey.name sortkey.year
     sortkey.title sortkey.alpha sort.year sort.alph warningmsg }
 
@@ -175,7 +175,7 @@ STRINGS  { ctrl.alphaothers ctrl.sortstr
            last.name last.hash last.year last.extra }
 
 FUNCTION {initialize} {
-  "$Revision: 3.8 $"
+  "$Revision: 3.3 $"
   #12 entry.max$ substring$
   #-3 entry.max$ substring$
   "Biblatex version: " swap$ * top$
@@ -1430,21 +1430,22 @@ FUNCTION {output:specials} {
   ctrl:labeldate
   dateyear empty$ not
   and
-    { "labelyear" dateyear output:write:field
+    { "labelyear"
+      dateyear
       dateendyear empty$
         'skip$
         { dateyear dateendyear =
             'skip$
             { dateendyear open.ended =
                 'skip$
-                { "labelendyear" dateendyear output:write:field }
+                { "\bibdatedash " * dateendyear * }
               if$
             }
           if$
         }
       if$
-      "extradate"   extradate       output:write:field
-      "labeldatesource" "year"      output:write:field
+      output:write:field
+      "extrayear"   extrayear       output:write:field
     }
     'skip$
   if$
@@ -1482,7 +1483,6 @@ FUNCTION {output:names} {
 FUNCTION {output:lists} {
   "language"        language        output:write:list
   "organization"    organization    output:write:list
-  "origlanguage"    origlanguage    output:write:list
   "origlocation"    origlocation    output:write:list
   "origpublisher"   origpublisher   output:write:list
   "publisher"       publisher       output:write:list
@@ -1526,6 +1526,7 @@ FUNCTION {output:fields.2} {
   "nameaddon"       nameaddon       output:write:field
   "note"            note            output:write:field
   "number"          number          output:write:field
+  "origlanguage"    origlanguage    output:write:field
   "origtitle"       origtitle       output:write:field
   "pages"           pages           output:write:range
   "pagetotal"       pagetotal       output:write:range
@@ -1887,7 +1888,7 @@ FUNCTION {input:control:options} {
 % This version corresponds to the .bbl version, *not* the biblatex version!
 FUNCTION {input:control:version} {
   input:control:parse
-  "$Revision: 2.9 $"
+  "$Revision: 2.8 $"
   #12 entry.max$ substring$
   #-3 entry.max$ substring$
   'tempstrga :=
@@ -2279,11 +2280,7 @@ FUNCTION {makelabel:ctrl:alpha} {
         { label makelabel:alpha:year * }
       if$
     }
-    { shorthand empty$
-        { "" }
-        { shorthand }
-      if$
-    }
+    { "" }
   if$
 }
 
@@ -2552,10 +2549,10 @@ FUNCTION {labelsort:main:year:iterate} {
       'label.year :=
       label.year last.year =
         { last.extra.num #1 + 'last.extra.num :=
-          last.extra.num int.to.str$ 'extradate :=
+          last.extra.num int.to.str$ 'extrayear :=
         }
         { #1 'last.extra.num :=
-          "" 'extradate :=
+          "" 'extrayear :=
           label.year 'last.year :=
         }
       if$
@@ -2567,10 +2564,10 @@ FUNCTION {labelsort:main:year:iterate} {
 FUNCTION {labelsort:main:year:reverse} {
   ctrl:labeldate
     { last.extra "2" =
-        { "1" 'extradate := }
+        { "1" 'extrayear := }
         'skip$
       if$
-      extradate 'last.extra :=
+      extrayear 'last.extra :=
     }
     'skip$
   if$
@@ -2705,7 +2702,7 @@ SORT
 % This version corresponds to the .bbl version, *not* the biblatex version!
 FUNCTION {output:main:begin} {
   "% $ biblatex auxiliary file $"                               write$ newline$
-  "% $ biblatex bbl format version " "$Revision: 2.9 $"
+  "% $ biblatex bbl format version " "$Revision: 2.8 $"
   #12 entry.max$ substring$ #-3 entry.max$ substring$ * " $" *  write$ newline$
   "% Do not modify the above lines!"                            write$ newline$
   "%"                                                           write$ newline$
@@ -2723,7 +2720,7 @@ FUNCTION {output:main:begin} {
   "  {}"                                                        write$ newline$
   "\endgroup"                                                   write$ newline$
   newline$
-  "\datalist[entry]{" ctrl.sortstr * "/global//global/global}" *              write$
+  "\sortlist[entry]{" ctrl.sortstr * "/global/}" *              write$
 }
 
 FUNCTION {output:main:preamble} {
@@ -2738,7 +2735,7 @@ FUNCTION {output:main:preamble} {
 }
 
 FUNCTION {output:main:end} {
-  "\enddatalist" write$ newline$
+  "\endsortlist" write$ newline$
   "\endinput"    write$ newline$
 }
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/CHANGES.org b/Master/texmf-dist/doc/latex/biblatex/CHANGES.org
index e573657f311..0ea70f42fee 100644
--- a/Master/texmf-dist/doc/latex/biblatex/CHANGES.org
+++ b/Master/texmf-dist/doc/latex/biblatex/CHANGES.org
@@ -1,157 +1,3 @@
-* RELEASE NOTES FOR VERSION 3.8
-** Requirements
-Biber version 2.8 is required for biblatex 3.8
-
-** In order to standardise terminology, some commands and options have dropped the "scheme" naming convention and switched to "template"
-- ~\DeclareSortingScheme~ is now ~\DeclareSortingTemplate~
-- ~\DeclareSortingNamekeyScheme~ is now ~\DeclareSortingNamekeyTemplate~
-- The "sortingnamekeyscheme" option is now "sortingnamekeytemplate"
-
-** ~\DeclareLabelalphaNameTemplate~ no longer has entrytype scope
-- *INCOMPATIBLE CHANGE* The optional first argument to
-  ~\DeclareLabelalphaNameTemplate~ was previously an entrytype but is now an
-  arbitrary template name, as with ~\DeclareUniquenameTemplate~. This is to
-  allow multiple definitions which can be referred to at different scopes.
-  It is unlikely that anyone used this with entrytype scope anyway.
-
-** ~origlanguage~ is now a list instead of a field.
-- *INCOMPATIBLE CHANGE* Since this is mostly used to generate localisation strings like
-  'Translated from the <language>' via the internal macros ~lbx@lfromlang~
-  and ~\lbx@sfromlang~, users and style authors should not see any
-  differences. However, if your style prints ~origlanguage~ directly using
-  ~\printfield~, this will need to be changed to ~\printlist~.
-
-** Name handling enhancements
-- Name handling is now fully generalised to cover arbitrary name parts.
-  The final few pieces have been completed to allow fully customisable
-  name handling, allowing for better internationalisation. The code for
-  name uniqueness calculation and label generation for names is now fully
-  abstracted: templates created with ~\DeclareUniquenameTemplate~ and
-  ~\DeclareLabelalphaNameTemplate~ may now be specified at per-refcontext,
-  per-entry, per-namelist and per-name scope, which allows complete
-  control over all aspects of name usage. See the comments in the enhanced
-  ~93-nameparts.tex~ example file.
-
-** ~extrayear~ is now ~extradate~ and the information used to track this can be customised
-- ~extrayear~ is called ~extradate~ now. Limited backwards compatibility is
-  in place to allow a smooth transition, but style developers should use the new name.
-- The new \DeclareExtradate command allows users to track authoryear
-  disambiguation in arbitrary ways now, for example allowing disambiguation
-  at month or day level instead of just year. See the PDF doc for details.
-- Some bibmacros from the ~authoryear~ style family were renamed,
-  ~cite:labelyear+extrayear~ becomes ~cite:labeldate+extradate~,
-  ~cite:extrayear~ is ~cite:extradate~ now, and ~date+extrayear~
-  is ~date+extradate~. Some backwards compatibility code is present,
-  but developers should make sure their code works as expected.
-
-** Date formatting
-- The ~mergedate~ output has been restored to its earlier form,
-  it has also been extended to cover all EDTF date parts.
-  In order to facilitate this, a few date-related tests were introduced
-  ~\iflabeldateisdate~, ~\ifdatehasyearonlyprecision~, ~\ifdatehastime~
-  and ~\ifdateshavedifferentprecision~.
-- The ~authoryear~ citation styles now use ~\printlabeldateextra~
-  instead of ~\printfield{labelyear}\printfield{extrayear}~.
-  This should have no consequences for end users (except that
-  dates in citations and bibliography don't differ any more -
-  previously there were subtle differences when many EDTF features
-  were used), but style developers should check if they assume
-  anything about the bibmacros that have now changed.
-  Style developers are invited to have a look at the changes and
-  to get inspired to offer full EDTF format for their styles as well.
-
-** Set handling
-- Static entry sets used to have the behaviour that when citing a member of
-  a set, the data for the citation came from the set parent which was in
-  turn taken from the first member of the set. In most use cases, the only
-  part of the set parent data that was actually used was the labels but in
-  certain edge cases, other data was used which results in confusing
-  citations for set members. This has been refactored so that when citing
-  set members, the member data is used along with some labelling data
-  injected from the set parent. This means that things like
-  ~\citeauthor{somesetmember}~ now give the expected results.
-  *PLEASE NOTE* that this means that citing sets directly in default styles *not*
-  based on labels (~authoryear~, ~authortitle~, ~verbose~ etc.) will result
-  in blank citations as it is not envisaged that sets are useful in such
-  styles.
-- The members of a set can now be sorted according to the active
-  sorting scheme, this is enabled via the ~sortsets~ option.
-  By default the option is set to false and set members appear
-  in the order given in the data source.
-- The ~alphabetic~ style family now also supports the ~subentry~
-  option.
-
-** Localisation and styles
-- Styles which supply their own location strings in .lbx files typically
-  use \DeclareLanguageMapping to map a document language to the supplied
-  language files. This is not ideal because the mapping has to be done by
-  the user depending on the specific language. For example, for the APA
-  style, in a document using American english, this line is necessary in
-  every document:
-
-  \DeclareLanguageMapping{american}{american-apa}
-
-  so that the style supplied america-apa.lbx file is loaded. In a document
-  using the german language, the user would have to use:
-
-  \DeclareLanguageMapping{german}{german-apa}
-
-  A new macro \DeclareLanguageMappingSuffix is now supplied which allows
-  styles to register a global localisation file suffix which is appended to
-  any document language automatically. This removes the need for
-  \DeclareLanguageMapping in user documents as it ensures that the correct
-  localisation file will be read nomatter what the document language. For
-  example, the APA style (from version v7.5) now has this in apa.bbx:
-
-  \DeclareLanguageMappingSuffix{-apa}
-
-  which means that for a given document language <lang>, the localisation file:
-
-  <lang>-apa.lbx
-
-  will be loaded. \DeclareLanguageMapping, if present, will override
-  \DeclareLanguageMappingSuffix.
-
-** Context-sensitive delimiters
-- Several delimiter macros now use the context-sensitive delimiter interface
-  introduced in version 3.4 (~\DeclareDelimFormat~). This change is fully
-  backwards compatible, but style developers should feel encouraged to use the
-  new commands ~\DeclareDelimFormat~ and ~\printdelim~.
-- Three new delimiters are introduced. ~authortypedelim~, ~editortypedelim~,
-  and ~translatortypedelim~ control the delimiter between the respective name
-  and the following ~<name>~ bibstring.
-  This together with ~\DeclareFieldFormat{<name>type}~ allows one to go from
-  'E. Ditor, ed.' to 'E. Ditor (ed.)' more easily without the need
-  to redefine entire bibmacros.
-- ~\DeclareDelimAlias~ allows one to alias one delimiter to another.
-  E.g. ~\DeclareDelimAlias{finalnamedelim}{multinamedelim}~
-  will make ~finalnamedelim~ an alias for ~multinamedelim~.
-  The starred version ~\DeclareDelimAlias*~ is local to the
-  specified contexts.
-
-** Misc changes
-- The initialisation code for ~\usedriver~ can now be modified via
-  ~\AtUsedriver~, the code can be executed with ~\UseUsedriverHook~.
-  The default settings retain backwards compatibility with earlier
-  versions.
-- The field ~urlraw~ contains the unencoded, raw version of the URL.
-  If the URL includes Unicode characters, ~urlraw~ will show them
-  unencoded while the standard ~url~ field will contain them in
-  percent-encoded form.
-- ~\mkpagetotal~ now has its own bibstrings ~<pagination>total(s)~
-  Previously it relied on the ~<pagination>(s)~ bibstrings.
-- ~sortyear~ is now a literal field and not an integer.
-- The ~etextools~ package is now officially incompatible.
-- ~bidi~-support for footnotes was improved.
-- ~\ifentryseen~, ~\ifentryinbib~, ~\ifentrycategory~
-  and ~\ifentrykeyword~ can now be used outside of
-  ~biblatex~ macros directly in the document.
-- ~\letbibmacro~ can be used to create bibmacro aliases as if
-  using ~\let~.
-- ~\DeprecateFieldWithReplacement~, ~\DeprecateListWithReplacement~
-  and ~\DeprecateNameWithReplacement~ can be used to deprecate a field,
-  name or list and replace it with a new one.
-
 * RELEASE NOTES FOR VERSION 3.7
 ** Requirements
 Biber version 2.7 is required for biblatex 3.7
diff --git a/Master/texmf-dist/doc/latex/biblatex/README b/Master/texmf-dist/doc/latex/biblatex/README
index 0f98620216e..d5859160015 100644
--- a/Master/texmf-dist/doc/latex/biblatex/README
+++ b/Master/texmf-dist/doc/latex/biblatex/README
@@ -43,7 +43,7 @@ FEEDBACK
 Please use the biblatex project page on github to report bugs
 or submit feature requests:
 
-   https://github.com/plk/biblatex
+   http://github.com/plk/biblatex
 
 REQUIREMENTS
 
@@ -65,7 +65,7 @@ Strongly recommended:
 
 Biber is available from CTAN, via TeXLive or from 
 
-https://sourceforge.net/projects/biblatex-biber/
+http://sourceforge.net/projects/biblatex-biber/
 
 AUTOMATIC INSTALLATION
 
@@ -81,7 +81,7 @@ SEMI-AUTOMATIC INSTALLATION
 
 1. Get the file biblatex-<version>.tds.zip from
 
-   https://sourceforge.net/projects/biblatex/files/
+   http://sourceforge.net/projects/biblatex/files/
 
 2. Unpack the archive in the root directory of the local TeX
    installation tree, for example
@@ -104,11 +104,11 @@ MANUAL INSTALLATION
 
 1. Get the file biblatex-<version>.tar.gz from
 
-   https://sourceforge.net/projects/biblatex/files/
+   http://sourceforge.net/projects/biblatex/files/
 
    or download the file
 
-   https://mirror.ctan.org/macros/latex/contrib/biblatex.zip
+   http://mirror.ctan.org/macros/latex/contrib/biblatex.zip
 
 2. Unpack the archive in a temporary working directory.
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index 25663c8cf7e..d694067ea94 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
index ce8eb5e7e23..25adb732d7f 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -60,7 +60,7 @@
   url={\biblatexhome},
   author={Philipp Lehman \\(with Philip Kime, Audrey Boruvka and Joseph Wright)},
   email={},
-  revision={3.8},
+  revision={3.7},
   date={\today}}
 
 \hypersetup{%
@@ -158,7 +158,7 @@
 \section{Introduction}
 \label{int}
 
-This document is a systematic reference manual for the \biblatex package. Look at the sample documents which come with \biblatex to get a first impression.\fnurl{\biblatexctan doc/examples}
+This document is a systematic reference manual for the \biblatex package. Look at the sample documents which ship with \biblatex to get a first impression.\fnurl{\biblatexctan doc/examples}
 For a quick start guide, browse \secref{int:abt, bib:typ, bib:fld, bib:use, use:opt, use:xbx, use:bib, use:cit, use:use}.
 
 \subsection[About]{About \biblatex}
@@ -178,15 +178,13 @@ Please use the \biblatex project page on GitHub to report bugs and submit featur
 \subsection{Acknowledgements}
 
 The language modules of this package are made possible thanks to the following contributors:
-Augusto Ritter Stoffel, Mateus Araújo, Gustavo Barros (Brazilian);
-Kaloyan Ganev (Bulgarian);
+Augusto Ritter Stoffel, Mateus Araújo (Brazilian);
 Sebastià Vila-Marta (Catalan);
 Ivo Pletikosić (Croatian);
 Michal Hoftich (Czech);
 Jonas Nyrup (Danish);
 Johannes Wilm (Danish\slash Norwegian);
 Alexander van Loon, Pieter Belmans, Hendrik Maryns (Dutch);
-Benson Muite (Estonian);
 Hannu Väisänen, Janne Kujanpää (Finnish);
 Denis Bitouzé (French);
 Apostolos Syropoulos, Prokopis (Greek);
@@ -196,13 +194,12 @@ Håkon Malmedal (Norwegian);
 Anastasia Kandulina, Yuriy Chernyshov (Polish);
 José Carlos Santos (Portuguese);
 Oleg Domanov (Russian);
-Martin Vrábel, Dávid Lupták (Slovak);
 Tea Tušar and Bogdan Filipič (Slovene);
 Ignacio Fernández Galván (Spanish);
 Per Starbäck, Carl-Gustav Werner, Filip Åsblom (Swedish);
-Sergiy M. Ponomarenko (Ukrainian);
-Hans Fredrik Nordhaug (Norwegian)
-
+Martin Vrábel, Dávid Lupták (Slovak);
+Benson Muite (Estonian);
+ 
 \subsection{Prerequisites}
 \label{int:pre}
 
@@ -216,7 +213,7 @@ The resources listed in this section are strictly required for \biblatex to func
 \begin{marglist}
 
 \item[\etex]
-The \biblatex package requires \etex. \tex distributions have been providing \etex binaries for quite some time, the popular distributions use them by default these days. The \biblatex package checks if it is running under \etex. Simply try compiling your documents as you usually do, the chances are that it just works. If you get an error message, try compiling the document with \bin{elatex} instead of \bin{latex} or \bin{pdfelatex} instead of \bin{pdflatex}, respectively.
+The \biblatex package requires \etex. \tex distributions have been shipping \etex binaries for quite some time, the popular distributions use them by default these days. The \biblatex package checks if it is running under \etex. Simply try compiling your documents as you usually do, the chances are that it just works. If you get an error message, try compiling the document with \bin{elatex} instead of \bin{latex} or \bin{pdfelatex} instead of \bin{pdflatex}, respectively.
 
 \item[\biber]
 \biber is the backend of \biblatex used to transfer data from source files to the \latex code. \biber comes with TeX Live and is also available from SourceForge.\fnurl{http://biblatex-biber.sourceforge.net/}. \biber uses the \texttt{btparse} C library for \bibtex format file parsing which aimed to be compatible with \bibtex's parsing rules but also aimed at correcting some of the common problems. For details, see the manual page for the Perl \texttt{Text::BibTeX} module\fnurl{http://search.cpan.org/~ambs/Text-BibTeX}.
@@ -331,10 +328,6 @@ The \sty{titlesec} package redefines user-level document division commands such
 \item[ucs]
 The \sty{ucs} package provides support for \utf encoded input. Either use \sty{inputenc}'s standard \file{utf8} module or a Unicode enabled engine such as \xetex or \luatex instead.
 
-\item[etextools]
-The \sty{etextools} package provides enhancements to list macros defined by \sty{etoolbox} and a few other tools for command definitions.
-The package redefines list handling macros in a way incompatible with \biblatex.
-
 \end{marglist}
 
 \subsubsection{Compatibility Matrix for \biber}
@@ -353,8 +346,6 @@ compatibility matrix for the recent versions.
 \sffamily\bfseries\spotcolor Biber version
   & \sffamily\bfseries\spotcolor \biblatex\ version\\
 \midrule
-2.8 & 3.8\\
-2.7 & 3.7\\
 2.6 & 3.5, 3.6\\
 2.5 & 3.4\\
 2.4 & 3.3\\
@@ -401,7 +392,7 @@ This section gives an overview of the entry types supported by the default \bibl
 \subsubsection{Regular Types}
 \label{bib:typ:blx}
 
-The lists below indicate the fields supported by each entry type. Note that the mapping of fields to an entry type is ultimately at the discretion of the bibliography style. The lists below therefore serve two purposes. They indicate the fields supported by the standard styles which come with this package and they also serve as a model for custom styles. Note that the <required> fields are not strictly required in all cases, see \secref{bib:use:key} for details. The fields marked as <optional> are optional in a technical sense. Bibliographical formatting rules usually require more than just the <required> fields. The default data model defined a few constraints for the format of date fields, ISBNs and some special fields like \bibfield{gender} but the constraints are only used if validating against the data model with \biber's \opt{--validate-datamodel} option. Generic fields like \bibfield{abstract} and \bibfield{annotation} or \bibfield{label} and \bibfield{shorthand} are not included in the lists below because they are independent of the entry type. The special fields discussed in \secref{bib:fld:spc}, which are also independent of the entry type, are not included in the lists either. See the default data model specification in the file \file{blx-dm.def} which comes with \biblatex for a complete specification.
+The lists below indicate the fields supported by each entry type. Note that the mapping of fields to an entry type is ultimately at the discretion of the bibliography style. The lists below therefore serve two purposes. They indicate the fields supported by the standard styles which ship with this package and they also serve as a model for custom styles. Note that the <required> fields are not strictly required in all cases, see \secref{bib:use:key} for details. The fields marked as <optional> are optional in a technical sense. Bibliographical formatting rules usually require more than just the <required> fields. The default data model defined a few constraints for the format of date fields, ISBNs and some special fields like \bibfield{gender} but the constraints are only used if validating against the data model with \biber's \opt{--validate-datamodel} option. Generic fields like \bibfield{abstract} and \bibfield{annotation} or \bibfield{label} and \bibfield{shorthand} are not included in the lists below because they are independent of the entry type. The special fields discussed in \secref{bib:fld:spc}, which are also independent of the entry type, are not included in the lists either. See the default data model specification in the file \file{blx-dm.def} which comes with \biblatex for a complete specification.
 
 \begin{typelist}
 
@@ -722,9 +713,9 @@ The supported list of name parts is defined as a constant list in the default da
 
 \item[Range fields] consist of one or more ranges where all dashes are normalized and replaced by the command \cmd{bibrangedash}. A range is something optionally followed by one or more dashes optionally followed by some non-dash (e.g. \texttt{5--7}). Any number of consecutive dashes will only yield a single range dash. A typical example of a range field is the \bibfield{pages} field. See also the \cmd{bibrangessep} command which can be used to customise the separator between multiple ranges. Range fields will be skipped and will generate a warning if they do not consist of one or more ranges. You can normalise messy range fields before they are parsed using \cmd{DeclareSourcemap} (see \secref{aut:ctm:map}).
 
-\item[Integer fields] hold integers which may be converted to ordinals or strings as they are printed. A typical example is the \bibfield{extradate} or \bibfield{volume} field. Such fields are sorted as integers. \biber makes a (quite serious) effort to map non-arabic representations (roman numerals for example) to integers for sorting purposes. 
+\item[Integer fields] hold integers which may be converted to ordinals or strings as they are printed. A typical example is the \bibfield{extrayear} or \bibfield{volume} field. Such fields are sorted as integers. \biber makes a (quite serious) effort to map non-arabic representations (roman numerals for example) to integers for sorting purposes. 
 
-\item[Datepart fields] hold unformatted integers which may be converted to ordinals or strings as they are printed. A typical example is the \bibfield{month} field. For every field of datatype \bibfield{date} in the datamodel, datepart fields are automatically created with the following names: \bibfield{$<$datetype$>$year}, \bibfield{$<$datetype$>$endyear}, \bibfield{$<$datetype$>$month}, \bibfield{$<$datetype$>$endmonth}, \bibfield{$<$datetype$>$day}, \bibfield{$<$datetype$>$endday}, \bibfield{$<$datetype$>$hour}, \bibfield{$<$datetype$>$endhour}, \bibfield{$<$datetype$>$minute}, \bibfield{$<$datetype$>$endminute}, \bibfield{$<$datetype$>$second}, \bibfield{$<$datetype$>$endsecond}, \bibfield{$<$datetype$>$timezone}, \bibfield{$<$datetype$>$endtimezone}. $<$datetype$>$ is the string preceding <date> for any datamodel field of \kvopt{datatype}{date}. For example, in the default datamodel, <event>, <orig>, <url> and the empty string <> for the date field \bibfield{date}.
+\item[Datepart fields] hold unformatted integers which may be converted to ordinals or strings as they are printed. A typical example is the \bibfield{month} field. For every field X of datatype \bibfield{date} in the datamodel, datepart fields are automatically created with the following names: \bibfield{$<$datetype$>$year}, \bibfield{$<$datetype$>$endyear}, \bibfield{$<$datetype$>$month}, \bibfield{$<$datetype$>$endmonth}, \bibfield{$<$datetype$>$day}, \bibfield{$<$datetype$>$endday}, \bibfield{$<$datetype$>$hour}, \bibfield{$<$datetype$>$endhour}, \bibfield{$<$datetype$>$minute}, \bibfield{$<$datetype$>$endminute}, \bibfield{$<$datetype$>$second}, \bibfield{$<$datetype$>$endsecond}, \bibfield{$<$datetype$>$timezone}, \bibfield{$<$datetype$>$endtimezone}. $<$datetype$>$ is the string preceding <date> for any datamodel field of \kvopt{datatype}{date}. For example, in the default datamodel, <event>, <orig>, <url> and the empty string <> for the date field \bibfield{date}.
 
 \item[Date fields] hold a date specification in \texttt{yyyy-mm-ddThh:nn[+|-][hh[:nn]|Z]} format or a date range in \texttt{yyyy-mm-ddThh:nn[+|-][hh[:nn]|Z]/yyyy-mm-ddThh:nn[+|-][hh[:nn]|Z]} format and other formats permitted by EDTF level 1, see \secref{bib:use:dat}. Date fields are special in that the date is parsed and split up into its datepart type components. The \bibfield{datepart} components (see above) are automatically defined and recognised when a field of datatype \bibfield{date} is defined in the datamodel. A typical example is the \bibfield{date} field.
 
@@ -838,7 +829,7 @@ Another secondary editor performing a different role. Use the \bibfield{editorct
 
 \fielditem{editortype}{key}
 
-The type of editorial role performed by the \bibfield{editor}. Roles supported by default are \texttt{editor}, \texttt{compiler}, \texttt{founder}, \texttt{continuator}, \texttt{redactor}, \texttt{reviser}, \texttt{collaborator}, \texttt{organizer}. The role <\texttt{editor}> is the default. In this case, the field is omissible. See \secref{bib:use:edr} for further hints.
+The type of editorial role performed by the \bibfield{editor}. Roles supported by default are \texttt{editor}, \texttt{compiler}, \texttt{founder}, \texttt{continuator}, \texttt{redactor}, \texttt{reviser}, \texttt{collaborator}. The role <\texttt{editor}> is the default. In this case, the field is omissible. See \secref{bib:use:edr} for further hints.
 
 \fielditem{editoratype}{key}
 
@@ -984,11 +975,9 @@ The main title of a multi"=volume book, such as \emph{Collected Works}. If the \
 
 An annex to the \bibfield{maintitle}, to be printed in a different font.
 
-\fielditem{month}{literal}
+\fielditem{month}{datepart}
 
-The publication month. This must be an integer, not an ordinal or a string. Don't say |month={January}| but |month={1}|. The bibliography style converts this to a language dependent string or ordinal where required. This field is a literal field only when given
-explicitly in the data (for plain \bibtex compatibility for example). It is
-however better to use the \bibfield{date} field as this supports many more features. See \secref{bib:use:dat}.
+The publication month. This must be an integer, not an ordinal or a string. Don't say |month={January}| but |month={1}|. The bibliography style converts this to a language dependent string or ordinal where required. See also \bibfield{date} as well as \secref{bib:use:iss, bib:use:dat}.
 
 \fielditem{nameaddon}{literal}
 
@@ -1010,9 +999,9 @@ The organization(s) that published a \bibtype{manual} or an \bibtype{online} res
 
 If the work is a translation, a reprint, or something similar, the publication date of the original edition. Not used by the standard bibliography styles. See also \bibfield{date}.
 
-\listitem{origlanguage}{key}
+\fielditem{origlanguage}{key}
 
-If the work is a translation, the language(s) of the original work. See also \bibfield{language}.
+If the work is a translation, the language of the original work. See also \bibfield{language}.
 
 \listitem{origlocation}{literal}
 
@@ -1132,10 +1121,7 @@ The total number of volumes of a multi"=volume work. Depending on the entry type
 
 \fielditem{year}{literal}
 
-The year of publication. This field is a literal field only when given
-explicitly in the data (for plain \bibtex compatibility for example). It is
-however better to use the \bibfield{date} field as this is compatible with
-plain years too and supports many more features. See \secref{bib:use:dat}.
+The year of publication. It is better to use the \bibfield{date} field as this is compatible with plain years too. See \secref{bib:use:dat}.
 
 \end{fieldlist}
 
@@ -1170,7 +1156,6 @@ The gender of the author or the gender of the editor, if there is no author. The
 \multicolumn{1}{@{}H}{Region/Dialect} &
 \multicolumn{1}{@{}H}{Identifiers} \\
 \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule{3-3}
-Bulgarian    & Bulgaria       & \opt{bulgarian} \\
 Catalan      & Spain, France, Andorra, Italy & \opt{catalan} \\
 Croatian     & Croatia, Bosnia and Herzegovina, Serbia & \opt{croatian} \\
 Czech        & Czech Republic & \opt{czech} \\
@@ -1192,16 +1177,15 @@ German (new) & Germany        & \opt{ngerman} \\
              & Switzerland    & \opt{nswissgerman} \\
 Greek        & Greece         & \opt{greek} \\
 Italian      & Italy          & \opt{italian} \\
-Norwegian    & Norway         & \opt{norsk}, \opt{nynorsk} \\
+Norwegian    & Norway         & \opt{norwegian}, \opt{norsk}, \opt{nynorsk} \\
 Polish       & Poland         & \opt{polish} \\
 Portuguese   & Brazil         & \opt{brazil} \\
              & Portugal       & \opt{portuguese}, \opt{portuges} \\
 Russian      & Russia         & \opt{russian} \\
 Slovak       & Slovakia       & \opt{slovak} \\
-Slovene      & Slovenia       & \opt{slovene}, \opt{slovenian} \\
+Slovene      & Slovenia       & \opt{slovene} \\
 Spanish      & Spain          & \opt{spanish} \\
 Swedish      & Sweden         & \opt{swedish} \\
-Ukrainian    & Ukraine        & \opt{ukrainian} \\
 \bottomrule
 \end{tabularx}
 \caption{Supported Languages}
@@ -1292,9 +1276,9 @@ Similar to \bibfield{sortkey} but used in the list of shorthands. If present, \b
 
 A field used to modify the sorting order of the bibliography. If present, this field is used instead of the \bibfield{title} field when sorting the bibliography. The \bibfield{sorttitle} field may come in handy if you have an entry with a title like «An Introduction to\dots» and want that alphabetized under <I> rather than <A>. In this case, you could put «Introduction to\dots» in the \bibfield{sorttitle} field. Please refer to \secref{use:srt} for further details. This field is consumed by the backend processing and does not appear in the \path{.bbl}.
 
-\fielditem{sortyear}{literal}
+\fielditem{sortyear}{integer}
 
-A field used to modify the sorting order of the bibliography. If present, this field is used instead of the \bibfield{year} field when sorting the bibliography. Please refer to \secref{use:srt} for further details. This field is consumed by the backend processing and does not appear in the \path{.bbl}. Note that this is not an integer but rather a literal field as sometimes things like «1984-1» are used to modify temporal sorting.
+A field used to modify the sorting order of the bibliography. If present, this field is used instead of the \bibfield{year} field when sorting the bibliography. Please refer to \secref{use:srt} for further details. This field is consumed by the backend processing and does not appear in the \path{.bbl}.
 
 \fielditem{xdata}{separated list of entrykeys}
 
@@ -1403,7 +1387,7 @@ Use the \bibtype{inbook} entry type for a self"=contained part of a book with it
 \subsubsection{Missing and Omissible Data}
 \label{bib:use:key}
 
-The fields marked as <required> in \secref{bib:typ:blx} are not strictly required in all cases. The bibliography styles which come with this package can get by with as little as a \bibfield{title} field for most entry types. A book published anonymously, a periodical without an explicit editor, or a software manual without an explicit author should pose no problem as far as the bibliography is concerned. Citation styles, however, may have different requirements. For example, an author"=year citation scheme obviously requires an \bibfield{author}\slash \bibfield{editor} and a \bibfield{year} field.
+The fields marked as <required> in \secref{bib:typ:blx} are not strictly required in all cases. The bibliography styles which ship with this package can get by with as little as a \bibfield{title} field for most entry types. A book published anonymously, a periodical without an explicit editor, or a software manual without an explicit author should pose no problem as far as the bibliography is concerned. Citation styles, however, may have different requirements. For example, an author"=year citation scheme obviously requires an \bibfield{author}\slash \bibfield{editor} and a \bibfield{year} field.
 
 You may generally use the \bibfield{label} field to provide a substitute for any missing data required for citations. How the \bibfield{label} field is employed depends on the citation style. The author"=year citation styles which come with this package use the \bibfield{label} field as a fallback if either the \bibfield{author}\slash \bibfield{editor} or the \bibfield{year} is missing. The numeric styles, on the other hand, do not use it at all since the numeric scheme is independent of the available data. The author"=title styles ignore it as well, because the bare \bibfield{title} is usually sufficient to form a unique citation and a title is expected to be available in any case. The \bibfield{label} field may also be used to override the non"=numeric portion of the automatically generated \bibfield{labelalpha} field used by alphabetic citation styles. See \secref{aut:bbx:fld} for details.
 
@@ -1533,7 +1517,6 @@ The type of editorial role performed by an editor in one of the \bibfield{editor
 \item[redactor] A secondary editor whose task is redacting the work.
 \item[reviser] A secondary editor whose task is revising the work.
 \item[collaborator] A secondary editor or a consultant to the editor.
-\item[organizer] Similar to \texttt{editor} but used if the task of the editor is mainly organizing.
 \end{marglist}
 %
 For example, if the task of the editor is compiling, you may indicate that in the corresponding \bibfield{editortype} field:
@@ -1657,7 +1640,7 @@ open/1997		& --1997			& --1997 \\
 
 Date fields such as the default data model dates \bibfield{date}, \bibfield{origdate}, \bibfield{eventdate}, and \bibfield{urldate} adhere to  \acr{EDTF}\footnote{\url{https://www.loc.gov/standards/datetime/pre-submission.html}} (Extended Date/Time Format) specification levels 0 and 1. Also supported are the open-ended range specifications in section 4.5 of the current working draft of ISO8601-2\footnote{\url{http://www.loc.gov/standards/datetime/iso-tc154-wg5_n0039_iso_wd_8601-2_2016-02-16.pdf}}. \acr{EDTF} is a stricter subset of the somewhat messy formats allowed by \acr{ISO8601v2004} and is better suited to bibliographic data. In addition to the \acr{EDTF} empty date range markers, you may also specify an open ended/start date range by giving the range separator and omitting the end/start date (\eg \texttt{YYYY/}, \texttt{/YYYY}). See \tabref{bib:use:tab1} for some examples of valid date specifications and the formatted dates automatically generated by \biblatex. The formatted date is language specific and will be adapted automatically. If there is no \bibfield{date} field in an entry, \biblatex will also consider the fields \bibfield{year} and \bibfield{month} for backwards compatibility with traditional \bibtex but this is not encouraged as explicit \bibfield{year} and \bibfield{month} are not parsed for date meta-information markers or times and are used as-is. Style authors should note that date fields like \bibfield{date} or \bibfield{origdate} are only available in the \file{bib} file. All dates are parsed and dissected into their components as the \file{bib} file is processed. The date and time components are made available to styles by way of the special fields discussed in \secref{aut:bbx:fld:dat}. See this section and \tabref{aut:bbx:fld:tab1} on page~\pageref{aut:bbx:fld:tab1} for further information.
 
-\acr{EDTF} dates are astronomical dates in which year <0> exists. When outputting dates in BCE or BC era (see the \opt{dateera} option below), note that they will typically be one year earlier since BCE/BC era do not have a year 0 (year 0 is 1 BCE/BC). This conversion is automatic. See examples in \tabref{bib:use:tab2}.
+\acr{EDTF} dates are astronomical dates in which year <0> exists. When outputting dates in BCE or BC era (see the \opt{dateera} option below), note that they will typically be one year earlier since BCE/BC era do not have a year 0 (year 0 is 1 BCE/BC). This conversion is automatic. See examples in table \tabref{bib:use:tab2}.
 
 Date field names \emph{must} end with the string <date>, as with the default date fields. Bear this in mind when adding new date fields to the datamodel (see \secref{aut:ctm:dm}). \biblatex will check all date fields after reading the date model and will exit with an error if it finds a date field which does not adhere to this naming convention.
 
@@ -2006,10 +1989,10 @@ The sorting order of the bibliography. Unless stated otherwise, the entries are
 \item[ydnt] Sort by year (descending), name, title.
 \item[none] Do not sort at all. All entries are processed in citation order.
 \item[debug] Sort by entry key. This is intended for debugging only.
-\item[\prm{name}] Use \prm{name}, as defined with \cmd{DeclareSortingTemplate} (\secref{aut:ctm:srt})
+\item[\prm{name}] Use \prm{name}, as defined with \cmd{DeclareSortingScheme} (\secref{aut:ctm:srt})
 \end{valuelist}
 
-Using any of the <alphabetic> sorting templates only makes sense in conjunction with a bibliography style which prints the corresponding labels. Note that some bibliography styles initialize this package option to a value different from the package default (\opt{nty}). See \secref{use:xbx:bbx} for details. Please refer to \secref{use:srt} for an in"=depth explanation of the above sorting options as well as the fields considered in the sorting process. See also \secref{aut:ctm:srt} on how to adapt the predefined templates or define new ones.
+Using any of the <alphabetic> sorting schemes only makes sense in conjunction with a bibliography style which prints the corresponding labels. Note that some bibliography styles initialize this package option to a value different from the package default (\opt{nty}). See \secref{use:xbx:bbx} for details. Please refer to \secref{use:srt} for an in"=depth explanation of the above sorting options as well as the fields considered in the sorting process. See also \secref{aut:ctm:srt} on how to adapt the predefined schemes or define new ones.
 
 \boolitem[true]{sortcase}
 
@@ -2021,7 +2004,7 @@ This option corresponds to \biber's \opt{--sortupper} command-line option. If en
 
 \optitem{sortlocale}{\opt{auto}, \prm{locale}}
 
-This option sets the global sorting locale. Every sorting template inherits this locale if none is specified using the \prm{locale} option to \cmd{printbibliography}. Setting this to \opt{auto} requests that it be set to the \sty{babel}/\sty{polyglossia} main document language identifier, if these packages are used and \texttt{en\_US} otherwise. \biber will map \sty{babel}/\sty{polyglossia} language identifiers into sensible locale identifiers (see the \biber documentation). You can therefore specify either a normal locale identifier like \texttt{de\_DE\_phonebook}, \texttt{es\_ES} or one of the supported \sty{babel}/\sty{polyglossia} language identifiers if the mapping \biber makes of this is fine for you.
+This option sets the global sorting locale. Every sorting scheme inherits this locale if none is specified using the \prm{locale} option to \cmd{printbibliography}. Setting this to \opt{auto} requests that it be set to the \sty{babel}/\sty{polyglossia} main document language identifier, if these packages are used and \texttt{en\_US} otherwise. \biber will map \sty{babel}/\sty{polyglossia} language identifiers into sensible locale identifiers (see the \biber documentation). You can therefore specify either a normal locale identifier like \texttt{de\_DE\_phonebook}, \texttt{es\_ES} or one of the supported \sty{babel}/\sty{polyglossia} language identifiers if the mapping \biber makes of this is fine for you.
 
 \boolitem[true]{related}
 
@@ -2029,11 +2012,7 @@ Whether or not to use information from related entries or not. See \secref{use:r
 
 \boolitem[false]{sortcites}
 
-Whether or not to sort citations if multiple entry keys are passed to a citation command. If this option is enabled, citations are sorted according to the current bibliography context sorting template (see \secref{use:bib:context}). This feature works with all citation styles.
-
-\boolitem[false]{sortsets}
-
-Whether or not to sort set members according to the active reference context sorting scheme. By default this is false and set members appear in the order given in the data source.
+Whether or not to sort citations if multiple entry keys are passed to a citation command. If this option is enabled, citations are sorted according to the current bibliography context sorting scheme (see \secref{use:bib:context}). This feature works with all citation styles.
 
 \intitem[3]{maxnames}
 
@@ -2093,7 +2072,7 @@ This option controls which \sty{babel} language environment\footnote{\sty{polygl
 Disable this feature, \ie do not use any language environment at all.
 
 \item[hyphen]
-Enclose the entry in a \env{hyphenrules} environment. This will load hyphenation patterns for the language specified in the \bibfield{langid} field of the entry, if available.
+Enclose the entry in a \env{hyphenrules} environment. This will load hyphenation patterns for the language specified in the \env{hyphenation} field of the entry, if available.
 
 \item[other]
 Enclose the entry in an \env{otherlanguage} environment. This will load hyphenation patterns for the specified language, enable all extra definitions which \sty{babel}/\sty{polyglossia} and \biblatex provide for the respective language, and translate key terms such as <editor> and <volume>. The extra definitions include localisations of the date format, of ordinals, and similar things.
@@ -2136,13 +2115,13 @@ This option controls the behavior of \cmd{mkbibfootnote}, \cmd{mkbibendnote}, an
 \item[endonly] Force endnotes, \ie make \cmd{mkbibfootnote} generate endnotes.
 \end{valuelist}
 
-\optitem[auto]{hyperref}{\opt{true}, \opt{false}, \opt{auto}, \opt{manual}}
+\optitem[auto]{hyperref}{\opt{true}, \opt{false}, \opt{auto}}
 
-Whether or not to transform citations and back references into clickable hyperlinks. This feature requires the \sty{hyperref} package. It also requires support by the selected citation style. All standard styles which ship with this package support hyperlinks. \kvopt{hyperref}{auto} automatically detects if the \sty{hyperref} package has been loaded. This is the default setting. \kvopt{hyperref}{false} explicitly disables links even if \sty{hyperref} is loaded. \kvopt{hyperref}{true} enables links when \sty{hyperref} is loaded, it cannot explicitly enable links if \sty{hyperref} is not loaded, as such it works exactly like \kvopt{hyperref}{auto} except that it will issue a warning if \sty{hyperref} is not loaded. \kvopt{hyperref}{manual} gives full manual control over \sty{hyperref} interaction, it should only be needed by package authors in very special circumstances. With the \kvopt{hyperref}{manual} setting you are responsible to enable or disable \sty{hyperref} support manually with \cmd{BiblatexManualHyperrefOn} or \cmd{BiblatexManualHyperrefOff} yourself. One of the two commands must be called exactly once; \cmd{BiblatexManualHyperrefOn} can only be called after \sty{hyperref} is loaded.
+Whether or not to transform citations and back references into clickable hyperlinks. This feature requires the \sty{hyperref} package. It also requires support by the selected citation style. All standard styles which ship with this package support hyperlinks. \kvopt{hyperref}{auto} automatically detects if the \sty{hyperref} package has been loaded.
 
 \boolitem[false]{backref}
 
-Whether or not to print back references in the bibliography. The back references are a list of page numbers indicating the pages on which the respective bibliography entry is cited. If there are \env{refsection} environments in the document, the back references are local to the reference sections. Strictly speaking, this option only controls whether the \biblatex package collects the data required to print such references. This feature still has to be supported by the selected bibliography style. All standard styles which come with this package do so.
+Whether or not to print back references in the bibliography. The back references are a list of page numbers indicating the pages on which the respective bibliography entry is cited. If there are \env{refsection} environments in the document, the back references are local to the reference sections. Strictly speaking, this option only controls whether the \biblatex package collects the data required to print such references. This feature still has to be supported by the selected bibliography style. All standard styles which ship with this package do so.
 
 \optitem[three]{backrefstyle}{\opt{none}, \opt{three}, \opt{two}, \opt{two+}, \opt{three+}, \opt{all+}}
 
@@ -2197,7 +2176,7 @@ This option controls indexing in citations and in the bibliography. More precise
 \item[bib] Enable indexing in the bibliography only.
 \end{valuelist}
 
-This feature requires support by the selected citation style. All standard styles which come with this package support indexing of both citations and entries in the bibliography. Note that you still need to enable indexing globally with \cmd{makeindex} to get an index.
+This feature requires support by the selected citation style. All standard styles which ship with this package support indexing of both citations and entries in the bibliography. Note that you still need to enable indexing globally with \cmd{makeindex} to get an index.
 
 \boolitem[false]{loadfiles}
 
@@ -2383,7 +2362,7 @@ Sets \opt{labeldateusetime} and the \opt{$<$datetype$>$dateusetime} option for a
 
 \boolitem[false]{defernumbers}
 
-In contrast to standard \latex, the numeric labels generated by this package are normally assigned to the full list of references at the beginning of the document body. If this option is enabled, numeric labels (\ie the \bibfield{labelnumber} field discussed in \secref{aut:bbx:fld}) are assigned the first time an entry is printed in any bibliography. See \secref{use:cav:lab} for further explanation.  This option requires two \latex runs after the data has been exported to the \file{bbl} file by the backend (in addition to any other runs required by page breaks changing etc.). An important thing to note is that if you are using this option, then changes to options, the \file{bib} file or certain commands like \cmd{printbibliography} will usually require that you delete your current \file{aux} file and re-run \latex to obtain the correct numbering. See \secref{aut:int}.
+In contrast to standard \latex, the numeric labels generated by this package are normally assigned to the full list of references at the beginning of the document body. If this option is enabled, numeric labels (\ie the \bibfield{labelnumber} field discussed in \secref{aut:bbx:fld}) are assigned the first time an entry is printed in any bibliography. See \secref{use:cav:lab} for further explanation.  This option requires two \latex runs after the data has been exported to the \file{bbl} file by the backend (in addition to any other runs required by page breaks changing etc.). An important thing to note is that if you change the value of this option in your document (or the value of options which depend on this like some of the options to the \cmd{printbibliography} macro, see \secref{use:bib:bib}), then it is likely that you will need to delete your current \file{aux} file and re-run \latex to obtain the correct numbering. See \secref{aut:int}.
 
 \boolitem[false]{punctfont}
 
@@ -2617,7 +2596,7 @@ Whether or not to provide the special field \bibfield{extratitleyear}, see \secr
 
 \boolitem[false]{labeldateparts}
 
-Whether or not to provide the special fields \bibfield{labelyear}, \bibfield{labelmonth}, \bibfield{labelday}, \bibfield{labelendyear}, \bibfield{labelendmonth}, \bibfield{labelendday}, \bibfield{labelhour}, \bibfield{labelendhour}, \bibfield{labelminute}, \bibfield{labelendminute}, \bibfield{labelsecond}, \bibfield{labelendsecond}, \bibfield{labelseason}, \bibfield{labelendseason}, \bibfield{labeltimezone}, \bibfield{labelendtimeone} and \bibfield{extradate}, see \secref{aut:bbx:fld} for details. 
+Whether or not to provide the special fields \bibfield{labelyear}, \bibfield{labelmonth}, \bibfield{labelday}, \bibfield{labelendyear}, \bibfield{labelendmonth}, \bibfield{labelendday}, \bibfield{labelhour}, \bibfield{labelendhour}, \bibfield{labelminute}, \bibfield{labelendminute}, \bibfield{labelsecond}, \bibfield{labelendsecond}, \bibfield{labelseason}, \bibfield{labelendseason}, \bibfield{labeltimezone}, \bibfield{labelendtimeone} and \bibfield{extrayear}, see \secref{aut:bbx:fld} for details. 
 This option is also settable on a per-type basis. Table \ref{use:opt:tab1} summarises the various \opt{extra*} disambiguation counters and what they track.
 
 \begin{table}
@@ -2676,11 +2655,11 @@ Whether or not to update the \cnt{uniquename} counter, see \secref{aut:aux:tst}
 \item[full] Disambiguate using initials or full names, as required.
 \item[allinit] Similar to \opt{init} but disambiguates all names in the \bibfield{labelname} list, beyond \opt{maxnames}\slash \opt{minnames}\slash \opt{uniquelist}.
 \item[allfull] Similar to \opt{full} but disambiguates all names in the \bibfield{labelname} list, beyond \opt{maxnames}\slash \opt{minnames}\slash \opt{uniquelist}.
-\item[mininit] A variant of \texttt{init} which only disambiguates names in identical lists of base nameparts (by default, lists of family names).
-\item[minfull] A variant of \texttt{full} which only disambiguates names in identical lists of base nameparts (by default, lists of family names).
+\item[mininit] A variant of \texttt{init} which only disambiguates names in lists with identical last names.
+\item[minfull] A variant of \texttt{full} which only disambiguates names in lists with identical last names.
 \end{valuelist}
 %
-Note that the \opt{uniquename} option will also affect \opt{uniquelist}, the \cmd{ifsingletitle} test, and the \bibfield{extradate} field. See \secref{aut:cav:amb} for further details and practical examples.
+Note that the \opt{uniquename} option will also affect \opt{uniquelist}, the \cmd{ifsingletitle} test, and the \bibfield{extrayear} field. See \secref{aut:cav:amb} for further details and practical examples.
 
 \optitem[false]{uniquelist}{\opt{true}, \opt{false}, \opt{minyear}}
 
@@ -2692,7 +2671,7 @@ Whether or not to update the \cnt{uniquelist} counter, see \secref{aut:aux:tst}
 \item[minyear] Disambiguate the \bibfield{labelname} list only if the truncated list is identical to another one with the same \bibfield{labelyear}. This mode of operation is useful for author-year styles and requires \kvopt{labeldateparts}{true}.
 \end{valuelist}
 %
-Note that the \opt{uniquelist} option will also affect the \cmd{ifsingletitle} test and the \bibfield{extradate} field. See \secref{aut:cav:amb} for further details and practical examples.
+Note that the \opt{uniquelist} option will also affect the \cmd{ifsingletitle} test and the \bibfield{extrayear} field. See \secref{aut:cav:amb} for further details and practical examples.
 
 \end{optionlist}
 
@@ -2708,7 +2687,7 @@ Note that the \opt{uniquelist} option will also affect the \cmd{ifsingletitle} t
 \multicolumn{1}{@{}H}{Counter tracks} \\
 \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4}
 labelalpha     & labelalpha       & extraalpha     &  label\\
-labeldateparts & labelyear        & extradate      &  labelname+\\
+labeldateparts & labelyear        & extrayear      &  labelname+\\
                & labelmonth       &                &  labelyear\\
                & labelday         &                &  \\
                & labelendyear     &                &  \\
@@ -2779,14 +2758,14 @@ defined. Global, per-type and per-entry options called <use$<$name$>$>are automa
 Whether the default date model name part <prefix> (von, van, of, da, de, della, etc.) is considered when:
 
 \begin{itemize}
-\item Printing the family name in citations
+\item Printing the last name in citations
 \item Sorting
 \item Generation of certain types of labels
 \item Generating name uniqueness information
 \item Formatting aspects of the bibliography
 \end{itemize}
 %
-For example, if this option is enabled, \biblatex precedes the family name with the prefix---Ludwig van Beethoven would be cited as «van Beethoven» and alphabetized as «Van Beethoven, Ludwig». If this option is disabled (the default), he is cited as «Beethoven» and alphabetized as «Beethoven, Ludwig van» instead.
+For example, if this option is enabled, \biblatex precedes the last name with the prefix---Ludwig van Beethoven would be cited as «van Beethoven» and alphabetized as «Van Beethoven, Ludwig». If this option is disabled (the default), he is cited as «Beethoven» and alphabetized as «Beethoven, Ludwig van» instead.
 This option is also settable on a per-type scope. With \biblatexml datasources and the \bibtex extended name format supported by \biber, this is also settable on per-namelist and per-name scopes.
 
 \optitem{indexing}{\opt{true}, \opt{false}, \opt{cite}, \opt{bib}}
@@ -2850,7 +2829,7 @@ The following legacy option may be used globally in the optional argument to \cm
 \subsection{Global Customization}
 \label{use:cfg}
 
-Apart from writing new citation and bibliography styles, there are numerous ways to customize the styles which come with this package. Customization will usually take place in the preamble, but there is also a configuration file for permanent adaptions. The configuration file may also be used to initialize the package options to a value different from the package default.
+Apart from writing new citation and bibliography styles, there are numerous ways to customize the styles which ship with this package. Customization will usually take place in the preamble, but there is also a configuration file for permanent adaptions. The configuration file may also be used to initialize the package options to a value different from the package default.
 
 \subsubsection{Configuration File}
 \label{use:cfg:cfg}
@@ -2873,7 +2852,7 @@ This command may also be used in the configuration file to modify the default se
 \subsection{Standard Styles}
 \label{use:xbx}
 
-This section provides a short description of all bibliography and citation styles which come with the \biblatex package. If you want to write your own styles, see \secref{aut}.
+This section provides a short description of all bibliography and citation styles which ship with the \biblatex package. If you want to write your own styles, see \secref{aut}.
 
 \subsubsection{Citation Styles}
 \label{use:xbx:cbx}
@@ -2892,10 +2871,10 @@ A compact variant of the \texttt{numeric} style which prints a list of more than
 A verbose variant of the \texttt{numeric} style. The difference affects the handling of a list of citations and is only apparent when multiple entry keys are passed to a single citation command. For example, instead of «[2, 5, 6]» this style would print «[2]; [5]; [6]». It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelnumber}{true}. It also provides the \opt{subentry} option.
 
 \item[alphabetic]
-This style implements an alphabetic citation scheme similar to the \path{alpha.bst} style of traditional \bibtex. The alphabetic labels resemble a compact author"=year style to some extent, but the way they are employed is similar to a numeric citation scheme. For example, instead of «Jones 1995» this style would use the label «[Jon95]». «Jones and Williams 1986» would be rendered as «[JW86]». This style should be employed in conjunction with an alphabetic bibliography style which prints the corresponding labels in the bibliography. It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelalpha}{true}. This style also provides an additional preamble option called \opt{subentry} which affects the handling of entry sets. If this option is disabled, citations referring to a member of a set will point to the entire set. If it is enabled, the style supports citations like «[SGW(c)]» which point to a subentry in a set (the third one in this example). See the style example for details.
+This style implements an alphabetic citation scheme similar to the \path{alpha.bst} style of traditional \bibtex. The alphabetic labels resemble a compact author"=year style to some extent, but the way they are employed is similar to a numeric citation scheme. For example, instead of «Jones 1995» this style would use the label «[Jon95]». «Jones and Williams 1986» would be rendered as «[JW86]». This style should be employed in conjunction with an alphabetic bibliography style which prints the corresponding labels in the bibliography. It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelalpha}{true}.
 
 \item[alphabetic-verb]
-A verbose variant of the \texttt{alphabetic} style. The difference affects the handling of a list of citations and is only apparent when multiple entry keys are passed to a single citation command. For example, instead of «[Doe92; Doe95; Jon98]» this style would print «[Doe92]; [Doe95]; [Jon98]». It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelalpha}{true}. It also provides the subentry option.
+A verbose variant of the \texttt{alphabetic} style. The difference affects the handling of a list of citations and is only apparent when multiple entry keys are passed to a single citation command. For example, instead of «[Doe92; Doe95; Jon98]» this style would print «[Doe92]; [Doe95]; [Jon98]». It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelalpha}{true}.
 
 \item[authoryear]
 This style implements an author"=year citation scheme. If the bibliography contains two or more works by the same author which were all published in the same year, a letter is appended to the year. For example, this style would print citations such as «Doe 1995a; Doe 1995b; Jones 1998». This style should be employed in conjunction with an author"=year bibliography style which prints the corresponding labels in the bibliography. It is primarily intended for in-text citations, but it could also be used with citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labeldateparts}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}.
@@ -3083,11 +3062,11 @@ You can use the \bibfield{relatedoptions} to set options on the related entry da
 \subsection{Sorting Options}
 \label{use:srt}
 
-This package supports fully customisable sorting templates for the bibliography. The default global sorting template is selected with the \opt{sorting} package option from \secref{use:opt:pre:gen}. Apart from the regular data fields there are also some special fields which may be used to optimize the sorting of the bibliography. \Apxref{apx:srt:a1, apx:srt:a2} give an outline of the default alphabetic sorting templates supported by \biblatex. Chronological sorting templates are listed in \apxref{apx:srt:chr}. A few explanations concerning the default templates are in order.
+This package supports various sorting schemes for the bibliography. The sorting scheme is selected with the \opt{sorting} package option from \secref{use:opt:pre:gen}. Apart from the regular data fields there are also some special fields which may be used to optimize the sorting of the bibliography. \Apxref{apx:srt:a1, apx:srt:a2} give an outline of the alphabetic sorting schemes supported by \biblatex. Chronological sorting schemes are listed in \apxref{apx:srt:chr}. A few explanations concerning these schemes are in order.
 
-The first item considered in the sorting process is always the \bibfield{presort} field of the entry. If this field is undefined, \biblatex will use the default value <\texttt{mm}> as a presort string. The next item considered is the \bibfield{sortkey} field. If this field is defined, it serves as the master sort key. Apart from the \bibfield{presort} field, no further data is considered in this case. If the \bibfield{sortkey} field is undefined, sorting continues with the name. The package will try using the \bibfield{sortname}, \bibfield{author}, \bibfield{editor}, and \bibfield{translator} fields, in this order. Which fields are considered also depends on the setting of the \opt{use$<$name$>$} options. If all such options are disabled, the \bibfield{sortname} field is ignored as well. Note that all name fields are responsive to \opt{maxnames} and \opt{minnames}. If no name field is available, either because all of them are undefined or because all \opt{use$<$name$>$} options are disabled, \biblatex will fall back to the \bibfield{sorttitle} and \bibfield{title} fields as a last resort. The remaining items are, in various order: the \bibfield{sortyear} field, if defined, or the first four digits of the \bibfield{year} field otherwise; the \bibfield{sorttitle} field, if defined, or the \bibfield{title} field otherwise; the \bibfield{volume} field. Note that the sorting templates shown in \apxref{apx:srt:a2} include an additional item: \bibfield{labelalpha} is the label used by <alphabetic> bibliography styles. Strictly speaking, the string used for sorting is \bibfield{labelalpha}~+ \bibfield{extraalpha}. The sorting templates in \apxref{apx:srt:a2} are intended to be used in conjunction with alphabetic styles only.
+The first item considered in the sorting process is always the \bibfield{presort} field of the entry. If this field is undefined, \biblatex will use the default value <\texttt{mm}> as a presort string. The next item considered is the \bibfield{sortkey} field. If this field is defined, it serves as the master sort key. Apart from the \bibfield{presort} field, no further data is considered in this case. If the \bibfield{sortkey} field is undefined, sorting continues with the name. The package will try using the \bibfield{sortname}, \bibfield{author}, \bibfield{editor}, and \bibfield{translator} fields, in this order. Which fields are considered also depends on the setting of the \opt{use$<$name$>$} options. If all such options are disabled, the \bibfield{sortname} field is ignored as well. Note that all name fields are responsive to \opt{maxnames} and \opt{minnames}. If no name field is available, either because all of them are undefined or because all \opt{use$<$name$>$} options are disabled, \biblatex will fall back to the \bibfield{sorttitle} and \bibfield{title} fields as a last resort. The remaining items are, in various order: the \bibfield{sortyear} field, if defined, or the first four digits of the \bibfield{year} field otherwise; the \bibfield{sorttitle} field, if defined, or the \bibfield{title} field otherwise; the \bibfield{volume} field. Note that the sorting schemes shown in \apxref{apx:srt:a2} include an additional item: \bibfield{labelalpha} is the label used by <alphabetic> bibliography styles. Strictly speaking, the string used for sorting is \bibfield{labelalpha}~+ \bibfield{extraalpha}. The sorting schemes in \apxref{apx:srt:a2} are intended to be used in conjunction with alphabetic styles only.
 
-The chronological sorting templates presented in \apxref{apx:srt:chr} also make use of the \bibfield{presort} and \bibfield{sortkey} fields, if defined. The next item considered is the \bibfield{sortyear} or the \bibfield{year} field, depending on availability. The \opt{ynt} template extracts the first four Arabic figures from the field. If both fields are undefined, the string \texttt{9999} is used as a fallback value. This means that all entries without a year will be moved to the end of the list. The \opt{ydnt} template is similar in concept but sorts the year in descending order. As with the \opt{ynt} template, the string \texttt{9999} is used as a fallback value. The remaining items are similar to the alphabetic sorting templates discussed above. Note that the \opt{ydnt} sorting template will only sort the date in descending order. All other items are sorted in ascending order as usual.
+The chronological sorting schemes presented in \apxref{apx:srt:chr} also make use of the \bibfield{presort} and \bibfield{sortkey} fields, if defined. The next item considered is the \bibfield{sortyear} or the \bibfield{year} field, depending on availability. The \opt{ynt} scheme extracts the first four Arabic figures from the field. If both fields are undefined, the string \texttt{9999} is used as a fallback value. This means that all entries without a year will be moved to the end of the list. The \opt{ydnt} scheme is similar in concept but sorts the year in descending order. As with the \opt{ynt} scheme, the string \texttt{9999} is used as a fallback value. The remaining items are similar to the alphabetic sorting schemes discussed above. Note that the \opt{ydnt} sorting scheme will only sort the date in descending order. All other items are sorted in ascending order as usual.
 
 Using special fields such as \bibfield{sortkey}, \bibfield{sortname}, or \bibfield{sorttitle} is usually not required. The \biblatex package is quite capable of working out the desired sorting order by using the data found in the regular fields of an entry. You will only need them if you want to manually modify the sorting order of the bibliography or if any data required for sorting is missing. Please refer to the field descriptions in \secref{bib:fld:spc} for details on possible uses of the special fields.
 
@@ -3218,7 +3197,7 @@ To put the given and family names of name list items annotated as «correspondin
 
 \cmditem{addbibresource}[options]{resource}
 
-Adds a \prm{resource}, such as a \file{.bib} file, to the default resource list. This command is only available in the preamble. It replaces the \cmd{bibliography} legacy command. Note that files must be specified with their full name, including the extension. Do not omit the \file{.bib} extension from the filename. Also note that the \prm{resource} is a single resource. If the resources contain duplicate entries (that is, duplicate \bibfield{entrykey}s), it is backend dependent what then happens. For example, by default \biber will ignore further occurrence of \bibfield{entrykey}s unless its \opt{--noskipduplicates} options is used. Invoke \cmd{addbibresource} multiple times to add more resources, for example:
+Adds a \prm{resource}, such as a \file{.bib} file, to the default resource list. This command is only available in the preamble. It replaces the \cmd{bibliography} legacy command. Note that files must be specified with their full name, including the extension. Do not omit the \file{.bib} extension from the filename. Also note that the \prm{resource} is a single resource. Invoke \cmd{addbibresource} multiple times to add more resources, for example:
 
 \begin{ltxexample}
 \addbibresource{bibfile1.bib}
@@ -3265,7 +3244,7 @@ This command differs from \cmd{addbibresource} in that the \prm{resource} is add
 
 This command differs from \cmd{addbibresource} in that the resource \prm{options} are registered but the \prm{resource} not added to any resource list. This is only required for resources which 1) are given exclusively in the optional argument of \env{refsection} (\secref{use:bib:sec}) and 2) require options different from the default settings. In this case, \cmd{addsectionbib} is employed to qualify the \prm{resource} prior to using it by setting the appropriate \prm{options} in the preamble. The \opt{label} option may be useful to assign a short name to the resource.
 
-\cmditem{bibliography}{bibfile, \dots}\DeprecatedMark
+\cmditem{bibliography}{bibfile, \dots}|\DeprecatedMark|
 
 The legacy command for adding bibliographic resources, supported for backwards compatibility. Like \cmd{addbibresource}, this command is only available in the preamble and adds resources to the default resource list. Its argument is a comma"=separated list of \file{bib} files. The \file{.bib} extension may be omitted from the filename. Invoking this command multiple times to add more files is permissible. This command is deprecated. Please consider using \cmd{addbibresource} instead.
 
@@ -3362,15 +3341,15 @@ This option applies to numerical citation\slash bibliography styles only and req
 
 \cmditem{bibbysection}[key=value, \dots]
 
-This command automatically loops over all reference sections. This is equivalent to giving one \cmd{printbibliography} command for every section but has the additional benefit of automatically skipping sections without references. Note that \cmd{bibbysection} starts looking for references in section \texttt{1}. It will ignore references given outside of \env{refsection} environments since they are assigned to section~0. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{heading}, \opt{prenote}, \opt{postnote}. The current bibliography context sorting template is used for all sections (see \secref{use:bib:context}).
+This command automatically loops over all reference sections. This is equivalent to giving one \cmd{printbibliography} command for every section but has the additional benefit of automatically skipping sections without references. Note that \cmd{bibbysection} starts looking for references in section \texttt{1}. It will ignore references given outside of \env{refsection} environments since they are assigned to section~0. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{heading}, \opt{prenote}, \opt{postnote}. The current bibliography context sorting scheme is used for all sections (see \secref{use:bib:context}).
 
 \cmditem{bibbysegment}[key=value, \dots]
 
-This command automatically loops over all reference segments. This is equivalent to giving one \cmd{printbibliography} command for every segment in the current \env{refsection} but has the additional benefit of automatically skipping segments without references. Note that \cmd{bibbysegment} starts looking for references in segment \texttt{1}. It will ignore references given outside of \env{refsegment} environments since they are assigned to segment~0. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{heading}, \opt{prenote}, \opt{postnote}. The current bibliography context sorting template is used for all segments (see \secref{use:bib:context}).
+This command automatically loops over all reference segments. This is equivalent to giving one \cmd{printbibliography} command for every segment in the current \env{refsection} but has the additional benefit of automatically skipping segments without references. Note that \cmd{bibbysegment} starts looking for references in segment \texttt{1}. It will ignore references given outside of \env{refsegment} environments since they are assigned to segment~0. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{heading}, \opt{prenote}, \opt{postnote}. The current bibliography context sorting scheme is used for all segments (see \secref{use:bib:context}).
 
 \cmditem{bibbycategory}[key=value, \dots]
 
-This command loops over all bibliography categories. This is equivalent to giving one \cmd{printbibliography} command for every category but has the additional benefit of automatically skipping empty categories. The categories are processed in the order in which they were declared. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{prenote}, \opt{postnote}, \opt{section}. Note that \opt{heading} is not available with this command. The name of the current category is automatically used as the heading name. This is equivalent to passing \texttt{heading=\prm{category}} to \cmd{printbibliography} and implies that there must be a matching heading definition for every category. The current bibliography context sorting template is used for all categories (see \secref{use:bib:context}).
+This command loops over all bibliography categories. This is equivalent to giving one \cmd{printbibliography} command for every category but has the additional benefit of automatically skipping empty categories. The categories are processed in the order in which they were declared. See \secref{use:use:mlt} for usage examples. The options are a subset of those supported by \cmd{printbibliography}. Valid options are \opt{env}, \opt{prenote}, \opt{postnote}, \opt{section}. Note that \opt{heading} is not available with this command. The name of the current category is automatically used as the heading name. This is equivalent to passing \texttt{heading=\prm{category}} to \cmd{printbibliography} and implies that there must be a matching heading definition for every category. The current bibliography context sorting scheme is used for all categories (see \secref{use:bib:context}).
 
 \cmditem{printbibheading}[key=value, \dots]
 
@@ -3378,7 +3357,7 @@ This command prints a bibliography heading defined with \cmd{defbibheading}. It
 
 \end{ltxsyntax}
 %
-To print a bibliography with a different sorting template than the global sorting template, use the bibliography context switching commands from \secref{use:bib:context}.
+To print a bibliography with a different sorting scheme than the global sorting scheme, use the bibliography context switching commands from \secref{use:bib:context}.
 
 \subsubsection{Bibliography Lists}
 \label{use:bib:biblist}
@@ -3399,10 +3378,10 @@ The \prm{biblistname} is a mandatory argument which names the bibliography list.
 \item A default filter declared with \cmd{DeclareBiblistFilter} (see \secref{aut:ctm:bibfilt}) used to filter the entries returned from \biber
 \item A default check declared with \cmd{defbibcheck} (see \secref{use:bib:flt}) used to post-process the list entries
 \item The default bib environment to use
-\item The default sorting template to use
+\item The default sorting scheme name to use
 \end{itemize}
 
-In terms of sorting the list, the default is to sort use the sorting template named after the bibliography list (if it exists) and only then to fall back to the current context sorting template is this is not defined (see \secref{use:bib:context}).
+In terms of sorting the list, the default is to sort use the sorting scheme named after the bibliography list (if it exists) and only then to fall back to the current context sorting scheme is this is not defined (see \secref{use:bib:context}).
 
 The most common bibliography list is a list of shorthand abbreviations for certain entries and so this has a convenience alias \cmd{printshorthands[\dots]} for backwards compatibility which is defined as:
 
@@ -3437,13 +3416,13 @@ Since \bibfield{shortjournal} is defined in the default data model as a <Label f
 \item Uses the automatically created <shortjournal> bibliography list filter to return only entries with a \bibfield{shortjournal} field in the \file{.bbl}
 \item Uses the defined <shortjournal> bibliography driver to print the entries
 \item Uses the default <biblist> heading but overrides the title with <Journal Shorthands>
-\item Uses the current bibliography context sorting template if no template exists with the name \bibfield{shortjournal}
+\item Uses the current bibliography context sorting scheme if no scheme exists with the name \bibfield{shortjournal}
 \end{itemize}
 %
-Often, you will want to sort on the label field of the list and since a sorting template is automatically picked up if it is named after the list, in this case you could simply do:
+Often, you will want to sort on the label field of the list and since a sorting scheme is automatically picked up if it is named after the list, in this case you could simply do:
 
 \begin{ltxexample}
-\DeclareSortingTemplate{shortjournal}{
+\DeclareSortingScheme{shortjournal}{
   \sort{
         \field{shortjournal}
   }
@@ -3459,11 +3438,11 @@ Bibliography lists are often used to print lists of various kinds of shorthands
 \defbibcheck{shortjournal}{%
    \iffieldundef{shortjournal}
      {\skipentry}
-     {\iffieldundef{journaltitle}
+     {\iffieldundef{journal}
        {\skipentry}
-       {\ifcsdef{\strfield{shortjournal}=\strfield{journaltitle}}
+       {\ifcsdef{\strfield{shortjournal}=\strfield{journal}}
          {\skipentry}
-         {\savefieldcs{journaltitle}{\strfield{shortjournal}=\strfield{journaltitle}}}}}}
+         {\savefieldcs{journal}{\strfield{shortjournal}=\strfield{journal}}}}}}
 \end{ltxexample}
 
 \subsubsection{Bibliography Sections}
@@ -3693,17 +3672,16 @@ See the author guide, in particular \secref{aut:aux:tst,aut:aux:ife}, for furthe
 \subsubsection{Reference Contexts}
 \label{use:bib:context}
 
-References in a bibliography are cited and printed in a <context>. The context determines the data which is actually used to cite or provide bibliographic data for an entry. A context consists of the following information:
+References in a bibliography are cited and printed in a <context>. The context determines the data which is actually used to cite or provide bibliographic data for an entry. A context consists of the following information (the <context> concept is designed for future extensibility):
 
 \begin{itemize}
- \item A sorting template
- \item A template for constructing the sorting keys for names
- \item A string prefix for citation schemes which use alphabetic or numeric labels
- \item A template for calculating name uniqueness information
- \item A template for constructing alphabetic labels for names
+ \item A sorting scheme
+ \item A scheme for constructing the sorting keys for names
+ \item A string prefix for citation schemes which use alphabetic or numeric
+   labels
 \end{itemize}
 %
-The purpose of bibliography contexts is twofold. Firstly, they are used to set options which influence a printed bibliography and secondly to influence the data printed by citation commands.
+The point of bibliography contexts is twofold. Firstly, they are used to set options which influence a printed bibliography and secondly to influence the data printed by citation commands.
 The former use is the most common when one needs to print more than one bibliography list with different, for example, sorting.
 
 \begin{ltxexample}
@@ -3716,13 +3694,13 @@ The former use is the most common when one needs to print more than one bibliogr
 \printbibliography
 \end{ltxexample}
 %
-Here we print two bibliographies, one with the default <nyt> sorting template and one with the <ydnt> sorting template.
+Here we print two bibliographies, one with the default <nyt> sorting scheme and one with the <ydnt> sorting scheme.
 
-To demonstrate the second type of use of bibliography contexts, we have to understand that the actual data for an entry can vary depending on the context. This is most obvious in the case of the \bibfield{extra*} fields like \bibfield{extradate} which are generated by the backend according to the order of entries \emph{after} sorting so that they come out in the expected <a, b, c> order. This clearly shows that the \emph{data} in an entry can be different between sorting templates. If a document contains more than one bibliography list with different sorting templates, it can happen then that the \file{.bbl} contains sorting lists with the same entry but containing different data (a different value for \bibfield{extradate}, for example). The purpose of bibliography contexts is to encapsulate things inside a context so that \biblatex can use the correct entry data. An example is printing a bibliography list with a different sorting order to the global sorting order where the \opt{extra*} fields are different for the same entry between sorting lists:
+To demonstrate the second type of use of bibliography contexts, we have to understand that the actual data for an entry can vary depending on the context. This is most obvious in the case of the \opt{extra*} fields like \opt{extrayear} which are generated by the backend according to the order of entries \emph{after} sorting so that they come out in the expected <a, b, c> order. This clearly shows that the \emph{data} in an entry can be different between sorting schemes. If a document contains more than one bibliography list with different sorting schemes, it can happen then that the \file{.bbl} contains sorting lists with the same entry but containing different data (a different value for \bibfield{extrayear}, for example). The purpose of bibliography contexts is to encapsulate things inside a context so that \biblatex can use the correct entry data. An example is printing a bibliography list with a different sorting order to the global sorting order where the \opt{extra*} fields are different for the same entry between sorting lists:
 
 \begin{ltxexample}
 \usepackage[sorting=nyt,style=authoryear]{biblatex}
-\DeclareSortingTemplate{yntd}{
+\DeclareSortingScheme{yntd}{
   \sort{
     \field[strside=left,strwidth=4]{sortyear}
     \field[strside=left,strwidth=4]{year}
@@ -3748,7 +3726,7 @@ To demonstrate the second type of use of bibliography contexts, we have to under
 \printbibliography
 \end{ltxexample}
 %
-Here, the second use of the citations, along with the \cmd{printbibliography} command will use data from the context of the custom <yntd> sorting template which may well be different from the data associated with the default <nyt> template. That is, the citation labels (in an authoryear style which uses \opt{extradate}) may be different \emph{for the exact same entries} between different bibliography contexts and so the citations themselves may look different.
+Here, the second use of the citations, along with the \cmd{printbibliography} command will use data from the context of the custom <yntd> sorting scheme which may well be different from the data associated with the default <nyt> scheme. That is, the citation labels (in an authoryear style which uses \opt{extrayear}) may be different \emph{for the exact same entries} between different bibliography contexts and so the citations themselves may look different.
 
 Reference contexts can be declared with \cmd{DeclareRefcontext} and referred to by name, see below.
 
@@ -3791,23 +3769,11 @@ Declares a named reference context with name \prm{name}. The \prm{key=value} opt
 
 \valitem{sorting}{name}
 
-Specify a sorting template defined previously with \cmd{DeclareSortingTemplate}. This template is used to determine which data to retrieve and/or print for an entry in the commands inside the context. 
-
-\valitem{sortingnamekeytemplatename}{name}
-
-Specify a sorting name key template defined previously with \cmd{DeclareSortingNamekeyTemplate}. This template is used to construct sorting keys for names inside the context. The template name can also be specified (in increasing order of preference) per"=entry, per"=name list and per"=name. See \secref{apx:opt} for information on setting per"=option, per"=namelist and per"=name options.
+Specify a sorting scheme defined previously with \cmd{DeclareSortingScheme}. This scheme is used to determine which data to retrieve and/or print for an entry in the commands inside the context. 
 
-\valitem{uniquenametemplatename}{name}
+\valitem{sortingnamekeyscheme}{name}
 
-Specify a uniquename template defined previously with \cmd{DeclareUniquenameTemplate} (see \secref{aut:cav:amb}). This template is used to calculate uniqueness information for names inside the context. The template name can also be specified (in increasing order of preference) per"=entry, per"=name list and per"=name. See \secref{apx:opt} for information on setting per"=option, per"=namelist and per"=name options.
-
-\valitem{labelalphanametemplatename}{name}
-
-Specify a template defined previously with \cmd{DeclareLabelalphaNameTemplate} (see \secref{aut:ctm:lab}). This template is used to construct name parts of alphabetic labels for names inside the context. The template name can also be specified (in increasing order of preference) per"=entry, per"=name list and per"=name. See \secref{apx:opt} for information on setting per"=option, per"=namelist and per"=name options.
-
-\valitem{nametemplates}{name}
-
-A convenience meta-option which sets \opt{sortingnamekeytemplate}, \opt{uniquenametemplate} and \opt{labelalphanametemplate} to the same template name. This option can also be specified (in increasing order of preference) per"=entry, per"=name list and per"=name. See \secref{apx:opt} for information on setting per"=option, per"=namelist and per"=name options.
+Specify a sorting name key scheme defined previously with \cmd{DeclareSortingNamekeyScheme}. This scheme is used to construct sorting keys for names inside the context.
 
 \valitem{labelprefix}{string}
 
@@ -3836,7 +3802,7 @@ At the beginning of the document, there is always a global context containing gl
 
 % Global reference context:
 %   sorting=nty
-%   sortingnamekeytemplate=global
+%   sortingnamekeyscheme=global
 %   labelprefix=
 
 \begin{document}
@@ -3844,35 +3810,35 @@ At the beginning of the document, there is always a global context containing gl
 \begin{refcontext}{testrc}
 % reference context:
 %   sorting=nyt
-%   sortingnamekeytemplate=global
+%   sortingnamekeyscheme=global
 %   labelprefix=
 \end{refcontext}
 
 \begin{refcontext}[labelprefix=A]{testrc}
 % reference context:
 %   sorting=nyt
-%   sortingnamekeytemplate=global
+%   sortingnamekeyscheme=global
 %   labelprefix=A
 \end{refcontext}
 
 \begin{refcontext}[sorting=ydnt,labelprefix=A]
 % reference context:
 %   sorting=ydnt
-%   sortingnamekeytemplate=global
+%   sortingnamekeyscheme=global
 %   labelprefix=A
 \end{refcontext}
 
 \newrefcontext}[labelprefix=B]
 % reference context:
 %   sorting=nty
-%   sortingnamekeytemplate=global
+%   sortingnamekeyscheme=global
 %   labelprefix=B
 \endrefcontext
 
 \newrefcontext}[sorting=ynt,labelprefix=C]{testrc}
 % reference context:
 %   sorting=ynt
-%   sortingnamekeytemplate=global
+%   sortingnamekeyscheme=global
 %   labelprefix=C
 \endrefcontext
 \end{ltxexample}
@@ -3889,7 +3855,7 @@ At the beginning of the document, there is always a global context containing gl
 \cmditem{assignrefcontextentries*}[key=value, \dots]{*}
 
 \end{ltxsyntax}
-These commands automate putting citations into refcontexts when the default behaviour is not sufficient. The \prm{key=value} options are as for \cmd{DeclareRefcontext}. The default behaviour is that the data for a citation is drawn from the refcontext of the last bibliography in which it was printed. For citations that are used in some way but not printed in a bibliography or bibliography list, they default to drawing their data from the global refcontext established at the beginning of the document. To override this behaviour, instead of manually wrapping citation commands in \env{refcontext} environments, which might be error-prone and tedious, you can register a comma"=separated list of \prm{keywords}, \prm{categories} or \prm{entrykeys} which, respectively, make the entries with any of the specified keywords, entries in any of the specified categories (see \secref{use:use:div}) or entries with any of the specified citation keys draw their data from a particular refcontext specified by the \prm{refcontext key/values} which are parsed as the per the corresponding \env{refcontext} options. Such refcontext auto-assignments are specific to the current refsection. You may specify the same citation key in any of these commands but be aware that assignment is done in the order \prm{keywords}, \prm{categories}, \prm{entrykeys} with the later specifications overriding the earlier. \cmd{assignrefcontextentries} accepts a single asterisk instead of a list of entrykeys which allows the assignment of all keys in a refsection to a refcontext with having to explicitly list them. An example:
+These commands automate putting citations into refcontexts when the default behaviour is not sufficient. The default behaviour is that the data for a citation is drawn from the refcontext of the last bibliography in which it was printed. For citations that are used in some way but not printed in a bibliography or bibliography list, they default to drawing their data from the global refcontext established at the beginning of the document. To override this behaviour, instead of manually wrapping citation commands in \env{refcontext} environments, which might be error-prone and tedious, you can register a comma"=separated list of \prm{keywords}, \prm{categories} or \prm{entrykeys} which, respectively, make the entries with any of the specified keywords, entries in any of the specified categories (see \secref{use:use:div}) or entries with any of the specified citation keys draw their data from a particular refcontext specified by the \prm{refcontext key/values} which are parsed as the per the corresponding \env{refcontext} options. Such refcontext auto-assignments are specific to the current refsection. You may specify the same citation key in any of these commands but be aware that assignment is done in the order \prm{keywords}, \prm{categories}, \prm{entrykeys} with the later specifications overriding the earlier. \cmd{assignrefcontextentries} accepts a single asterisk instead of a list of entrykeys which allows the assignment of all keys in a refsection to a refcontext with having to explicitly list them. An example:
 
 \begin{ltxexample}[style=latex]{}
 \assignrefcontextentries[labelprefix=A]{key2}
@@ -3965,14 +3931,14 @@ These command use a format similar to \cmd{cite} but put the entire citation in
 \subsubsection{Style-specific Commands}
 \label{use:cit:cbx}
 
-The following additional citation commands are only provided by some of the citation styles which come with this package.
+The following additional citation commands are only provided by some of the citation styles which ship with this package.
 
 \begin{ltxsyntax}
 
 \cmditem{textcite}[prenote][postnote]{key}
 \cmditem{Textcite}[prenote][postnote]{key}
 
-These citation commands are provided by all styles that come with this package. They are intended for use in the flow of text, replacing the subject of a sentence. They print the authors or editors followed by a citation label which is enclosed in parentheses. Depending on the citation style, the label may be a number, the year of publication, an abridged version of the title, or something else. The numeric and alphabetic styles use square brackets instead of parentheses. In the verbose styles, the label is provided in a footnote. Trailing punctuation is moved between the author or editor names and the footnote mark. \cmd{Textcite} is similar to \cmd{textcite} but capitalizes the name prefix of the first name in the citation if the \opt{useprefix} option is enabled, provided that there is a name prefix.
+These citation commands are provided by all styles that ship with this package. They are intended for use in the flow of text, replacing the subject of a sentence. They print the authors or editors followed by a citation label which is enclosed in parentheses. Depending on the citation style, the label may be a number, the year of publication, an abridged version of the title, or something else. The numeric and alphabetic styles use square brackets instead of parentheses. In the verbose styles, the label is provided in a footnote. Trailing punctuation is moved between the author or editor names and the footnote mark. \cmd{Textcite} is similar to \cmd{textcite} but capitalizes the name prefix of the first name in the citation if the \opt{useprefix} option is enabled, provided that there is a name prefix.
 
 \cmditem{smartcite}[prenote][postnote]{key}
 \cmditem{Smartcite}[prenote][postnote]{key}
@@ -4105,12 +4071,12 @@ This command prints the title. It will use the abridged title in the \bibfield{s
 \cmditem{citeyear}[prenote][postnote]{key}
 \cmditem*{citeyear*}[prenote][postnote]{key}
 
-This command prints the year (\bibfield{year} field or year component of \bibfield{date}). The starred variant includes the \bibfield{extradate} information, if any.
+This command prints the year (\bibfield{year} field or year component of \bibfield{date}). The starred variant includes the \bibfield{extrayear} information, if any.
 
 \cmditem{citedate}[prenote][postnote]{key}
 \cmditem*{citedate*}[prenote][postnote]{key}
 
-This command prints the full date (\bibfield{date} or \bibfield{year}). The starred variant includes the \bibfield{extradate} information, if any.
+This command prints the full date (\bibfield{date} or \bibfield{year}). The starred variant includes the \bibfield{extrayear} information, if any.
 
 \cmditem{citeurl}[prenote][postnote]{key}
 
@@ -4363,11 +4329,11 @@ consists of three entries and the entry key of the first one also serves as iden
 \mcite{<<set1>>,*glashow,*salam,*weinberg}
 \end{ltxexample}
 %
-Once defined, an entry set is handled like any regular entry in a \file{bib} file. When using one of the \texttt{numeric} styles which come with \texttt{biblatex} and activating its \opt{subentry} option, it is even possible to refer to set members. See \tabref{use:cit:mct:tab2} for some examples. Restating the original definition of the set is redundant, but permissible. In contrast to \sty{mciteplus}, however, restating a part of the original definition is invalid. Use the entry key of the set instead.
+Once defined, an entry set is handled like any regular entry in a \file{bib} file. When using one of the \texttt{numeric} styles which ship with \texttt{biblatex} and activating its \opt{subentry} option, it is even possible to refer to set members. See \tabref{use:cit:mct:tab2} for some examples. Restating the original definition of the set is redundant, but permissible. In contrast to \sty{mciteplus}, however, restating a part of the original definition is invalid. Use the entry key of the set instead.
 
 \begin{table}
 \tablesetup
-\begin{tabular}{@{}V{0.6\textwidth}@{}V{0.1\textwidth}@{}p{0.3\textwidth}@{}}
+\begin{tabular}{@{}V{0.5\textwidth}@{}V{0.1\textwidth}@{}p{0.4\textwidth}@{}}
 \toprule
 \multicolumn{1}{@{}H}{Input} &
 \multicolumn{1}{@{}H}{Output} &
@@ -4435,17 +4401,6 @@ list of key names. The keys listed in \secref{aut:lng:key} are defined by defaul
 
 \end{ltxsyntax}
 
-\subsection{Entry Querying Commands}
-\label{use:eq}
-The commands in this section are user-facing equivalents of the identically-named commands in section \secref{aut:aux:tst}. They can be used to test for the presence and attributes of specific bibliography entries. See section \secref{aut:aux:tst} for usage.
-
-\begin{ltxsyntax}
-\cmditem{ifentryseen}{entrykey}{true}{false}
-\cmditem{ifentryinbib}{entrykey}{true}{false}
-\cmditem{ifentrycategory}{entrykey}{category}{true}{false}
-\cmditem{ifentrykeyword}{entrykey}{keyword}{true}{false}
-\end{ltxsyntax}
-
 \subsection{Formatting Commands}
 \label{use:fmt}
 
@@ -4486,7 +4441,7 @@ This delimiter controls the spacing between the elements which make up a name pa
 This delimiter is inserted between the elements which make up a name part where \cmd{bibnamedelima} does not apply. The default definition is an interword space penalized by the value of the \cnt{lownamepenalty} counter (\secref{use:fmt:len}). Please refer to \secref{use:cav:nam} for further details.
 
 \csitem{bibnamedelimc}
-This delimiter controls the spacing between name parts. It is inserted between the name prefix and the family name if \kvopt{useprefix}{true}. The default definition is an interword space penalized by the value of the \cnt{highnamepenalty} counter (\secref{use:fmt:len}). Please refer to \secref{use:cav:nam} for further details.
+This delimiter controls the spacing between name parts. It is inserted between the name prefix and the last name if \kvopt{useprefix}{true}. The default definition is an interword space penalized by the value of the \cnt{highnamepenalty} counter (\secref{use:fmt:len}). Please refer to \secref{use:cav:nam} for further details.
 
 \csitem{bibnamedelimd}
 This delimiter is inserted between all name parts where \cmd{bibnamedelimc} does not apply. The default definition is an interword space penalized by the value of the \cnt{lownamepenalty} counter (\secref{use:fmt:len}). Please refer to \secref{use:cav:nam} for further details.
@@ -4528,7 +4483,7 @@ Replaces \cmd{bibinitdelim} in the index.
 Replaces \cmd{bibinithyphendelim} in the index.
 
 \csitem{revsdnamepunct}
-The punctuation to be printed between the first and family name parts when a name is reversed. Here is an example showing a name with the default comma as \cmd{revsdnamedelim}:
+The punctuation to be printed between the first and last name parts when a name is reversed. Here is an example showing a name with the default comma as \cmd{revsdnamedelim}:
 
 \begin{ltxexample}
 Jones<<,>> Edward
@@ -4540,7 +4495,7 @@ This command should be used with \cmd{bibnamedelimd} as a reversed-name separato
 The dash to be used as a replacement for recurrent authors or editors in the bibliography. The default is an <em> or an <en> dash, depending on the indentation of the list of references.
 
 \csitem{labelnamepunct}
-The separator printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined). With the default styles, this separator replaces \cmd{newunitpunct} at this location. The default definition is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation. See also \cmd{nametitledelim} \secref{use:fmt:csd}.
+The separator printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined). With the default styles, this separator replaces \cmd{newunitpunct} at this location. The default definition is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation.
 
 \csitem{subtitlepunct}
 The separator printed between the fields \bibfield{title} and \bibfield{subtitle}, \bibfield{booktitle} and \bibfield{booksubtitle}, as well as \bibfield{maintitle} and \bibfield{mainsubtitle}. With the default styles, this separator replaces \cmd{newunitpunct} at this location. The default definition is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation.
@@ -4554,10 +4509,10 @@ The separator printed before the \bibfield{pages} field. The default is a comma
 \csitem{bibpagerefpunct}
 The separator printed before the \bibfield{pageref} field. The default is an interword space.
 
-\csitem{multinamedelim}\CSdelimMark
+\csitem{multinamedelim}
 The delimiter printed between multiple items in a name list like \bibfield{author} or \bibfield{editor} if there are more than two names in the list. The default is a comma plus an interword space. See \cmd{finalnamedelim} for an example.\footnote{Note that \cmd{multinamedelim} is not used at all if there are only two names in the list. In this case, the default styles use the \cmd{finalnamedelim}.}
 
-\csitem{finalnamedelim}\CSdelimMark
+\csitem{finalnamedelim}
 The delimiter printed instead of \cmd{multinamedelim} before the final name in a name list. The default is the localised term <and>, separated by interword spaces. Here is an example:
 
 \begin{ltxexample}
@@ -4567,7 +4522,7 @@ Edward Jones <<and>> Joe Williams
 %
 The comma in the first example is the \cmd{multinamedelim} whereas the string <and> in both examples is the \cmd{finalnamedelim}. See also \cmd{finalandcomma} in \secref{use:fmt:lng}.
 
-\csitem{revsdnamedelim}\CSdelimMark
+\csitem{revsdnamedelim}
 An extra delimiter printed after the first name in a name list if the first name is reversed (only in lists with two names). The default is an empty string, \ie no extra delimiter will be printed. Here is an example showing a name list with a comma as \cmd{revsdnamedelim}:
 
 \begin{ltxexample}
@@ -4576,16 +4531,16 @@ Jones, Edward<<, and>> Joe Williams
 %
 In this example, the comma after <Edward> is the \cmd{revsdnamedelim} whereas the string <and> is the \cmd{finalnamedelim}, printed in addition to the former.
 
-\csitem{andothersdelim}\CSdelimMark
+\csitem{andothersdelim}
 The delimiter printed before the localisation string <\texttt{andothers}> if a name list like \bibfield{author} or \bibfield{editor} is truncated. The default is an interword space.
 
-\csitem{multilistdelim}\CSdelimMark
+\csitem{multilistdelim}
 The delimiter printed between multiple items in a literal list like \bibfield{publisher} or \bibfield{location} if there are more than two items in the list. The default is a comma plus an interword space. See \cmd{multinamedelim} for further explanation.
 
-\csitem{finallistdelim}\CSdelimMark
+\csitem{finallistdelim}
 The delimiter printed instead of \cmd{multilistdelim} before the final item in a literal list. The default is the localised term <and>, separated by interword spaces. See \cmd{finalnamedelim} for further explanation.
 
-\csitem{andmoredelim}\CSdelimMark
+\csitem{andmoredelim}
 The delimiter printed before the localisation string <\texttt{andmore}> if a literal list like \bibfield{publisher} or \bibfield{location} is truncated. The default is an interword space.
 
 \csitem{multicitedelim}
@@ -4642,15 +4597,6 @@ The delimiter printed between the name\slash title and the label by alphabetic a
 \csitem{nonameyeardelim}\CSdelimMark
 The delimiter printed between the substitute for the labelname when it does not exist (usually the label or title in standard styles) and the year in author-year citation styles. This is only used when there is no labelname since when the labelname exists, \cmd{nameyeardelim} is used. The default definition is an interword space.
 
-\csitem{authortypedelim}\CSdelimMark
-The delimiter printed between the author and the \texttt{authortype}.
-
-\csitem{editortypedelim}\CSdelimMark
-The delimiter printed between the editor and the \texttt{editor} or \texttt{editortype} string.
-
-\csitem{translatortypedelim}\CSdelimMark
-The delimiter printed between the translator and the \texttt{translator} string.
-
 \csitem{labelalphaothers}
 A string to be appended to the non"=numeric portion of the \bibfield{labelalpha} field (\ie the field holding the citation label used by alphabetic citation styles) if the number of authors\slash editors exceeds the \opt{maxalphanames} threshold or the \bibfield{author}\slash \bibfield{editor} list was truncated in the \file{bib} file with the keyword <\texttt{and others}>. This will typically be a single character such as a plus sign or an asterisk. The default is a plus sign. This command may also be redefined to an empty string to disable this feature. In any case, it must be redefined in the preamble.
 
@@ -4727,12 +4673,6 @@ The delimiters described in \secref{use:fmt:fmt} are globally defined. That is,
 
 Declares the delimiter macros in the comma"=separated list \prm{names} with the replacement test \prm{code}. If the optional comma"=separated list of \prm{contexts} is given, declare the \prm{names} only for those contexts. \prm{names} defined without any \prm{contexts} behave just like the global delimiter definitions which \cmd{newcommand} gives---just a plain macro with a replacement which can be used as \cmd{name}. However, you can also call delimiter macros defined in this way by using \cmd{printdelim}, which is context-aware. The starred version clears all \prm{context} specific declarations for all \prm{names} first.
 
-\cmditem{DeclareDelimAlias}{alias}{delim}
-\cmditem*{DeclareDelimAlias}*[context, \dots]{alias}{delim}
-
-Declares \prm{alias} to be an alias for the delimiter \prm{delim}. The assigment is valid for all existing contexts of \prm{alias}.
-The starred version assigns the alias for the given \opt{contexts} only---if the optional argument is empty, assigment is for the global/empty context.
-
 \cmditem{printdelim}[context]{name}
 
 Prints a delimiter with name \prm{name}, locally establishing a optional \prm{context} first. Without the optional \prm{context}, \cmd{printdelim} uses the currently active delimiter context.
@@ -4992,7 +4932,7 @@ Similar to \cmd{nohyphenation} but restricted to the \prm{text} argument.
 
 \cmditem{mknumalph}{integer}
 
-Takes an integer in the range 1--702 as its argument and converts it to a string as follows: 1=a, \textellipsis, 26=z, 27=aa, \textellipsis, 702=zz. This is intended for use in formatting directives for the \bibfield{extradate} and \bibfield{extraalpha} fields.
+Takes an integer in the range 1--702 as its argument and converts it to a string as follows: 1=a, \textellipsis, 26=z, 27=aa, \textellipsis, 702=zz. This is intended for use in formatting directives for the \bibfield{extrayear} and \bibfield{extraalpha} fields.
 
 \cmditem{mkbibacro}{text}
 
@@ -5027,11 +4967,6 @@ This will yield <Œuvres> or <œuvres>.
 
 The facilities discussed in this section are specific to certain localisation modules.
 
-\subsubsection{Bulgarian}
-\label{use:loc:bul}
-
-Like the Greek localisation module, the Bulgarian module also requires \utf support. It will not work with any other encoding. 
-
 \subsubsection{American}
 \label{use:loc:us}
 
@@ -5330,7 +5265,7 @@ The handling of the headings is different from \cmd{bibbysection} and \cmd{bibby
 \subsubsection{Entry Sets}
 \label{use:use:set}
 
-An entry set is a group of entries which are cited as a single reference and listed as a single item in the bibliography. The individual entries in the set are separated by \cmd{entrysetpunct} (\secref{aut:fmt:fmt}). The \biblatex package supports two types of entry sets. Static entry sets are defined in the \file{bib} file like any other entry. Dynamic entry sets are defined with \cmd{defbibentryset} (\secref{use:bib:set}) on a per-document\slash per-refsection basis in the document preamble or the document body. This section deals with the definition of entry sets; style authors should also see \secref{aut:cav:set} for further information. Please note that entry sets only make sense for styles which refer to entries by labels such as the provided \texttt{numeric} and \texttt{alphabetic} styles. Styles which refer to entries via names, titles etc. (\texttt{authoryear}, \texttt{authortitle}, \texttt{verbose} etc.) rarely employ sets and do not support them by default when they are cited directly. Custom styles may of course choose to implement some manner of set citation support in any manner they choose.
+An entry set is a group of entries which are cited as a single reference and listed as a single item in the bibliography. The individual entries in the set are separated by \cmd{entrysetpunct} (\secref{aut:fmt:fmt}). The \biblatex package supports two types of entry sets. Static entry sets are defined in the \file{bib} file like any other entry. Dynamic entry sets are defined with \cmd{defbibentryset} (\secref{use:bib:set}) on a per-document\slash per-refsection basis in the document preamble or the document body. This section deals with the definition of entry sets; style authors should also see \secref{aut:cav:set} for further information.
 
 \paragraph{Static entry sets}
 
@@ -5342,7 +5277,7 @@ Static entry sets are defined in the \file{bib} file like any other entry. Defin
 }
 \end{lstlisting}
 %
-Entries may be part of a set in one document\slash refsection and stand-alone references in another one, depending on the presence of the \bibtype{set} entry. If the \bibtype{set} entry is cited, the set members are grouped automatically. If not, they will work like any regular entry. Note that with \bibtex as the backend, there must also be an \bibfield{entryset} field in the set members which point to the set parent. With \biber, this is not necessary.
+Entries may be part of a set in one document\slash refsection and stand-alone references in another one, depending on the presence of the \bibtype{set} entry. If the \bibtype{set} entry is cited, the set members are grouped automatically. If not, they will work like any regular entry.
 
 \paragraph[Dynamic entry sets]{Dynamic entry sets}
 
@@ -5483,9 +5418,9 @@ Styles which print the fields \bibfield{abstract} and\slash or \bibfield{annotat
 \begin{ltxexample}[style=bibtex]
 @Article{key1,
   ...
-  abstract = {This is an abstract of entry `key1'.}
+  abstract	  = {This is an abstract of entry `key1'.}
 }
-\end{ltxexample}
+\end{lstlisting}
 %
 in the \file{bib} file, you may create a file named \path{bibabstract-key1.tex} and put the abstract in this file:
 
@@ -6052,24 +5987,13 @@ Names depend on the datamodel constant <nameparts> which has the default definit
 %
 This can be customised to add more name parts to deal with things like patronymics (see the example file \file{93-nameparts.tex}). Naturally this needs an extended name format for data sources. \biblatexml (\secref{apx:biblatexml}) handles this natively and there is an extended name format which can handle custom nameparts available when using \biber (see \biber documentation).
 
-Inside name formats, the nameparts constant declaration makes available two or three macros for each name part defined in the datamodel:
+Inside name formats, the nameparts constant declaration makes available two macros for each name part defined in the datamodel:
 
 \begin{ltxexample}
-\namepart<namepart>   \% The full <namepart>
-\namepart<namepart>i  \% The initials of the <namepart>
-\namepart<namepart>un \% Numeric value indicating uniqueness level for <namepart>
+\namepart<namepart>
+\namepart<namepart>i
 \end{ltxexample}
 %
-\cmd{namepart<namepart>un} only exists if the package option \opt{uniquename} is not set to <false> and can take the following values.
-
-\begin{argumentlist}{00}
-\item[0] <namepart> was not used in disambiguating the name (because \opt{disambiguation=none} was set in \cmd{DeclareUniquenameTemplate}, see \secref{aut:cav:amb}). In this case the style should decide what to print for this <namepart>
-\item[1] Initials only should be printed for <namepart> to ensure uniqueness according to the \opt{uniquename} package option setting
-\item[2] The full <namepart> should be printed to ensure uniqueness according to the \opt{uniquename} package option setting
-\end{argumentlist}
-
-Note these per-namepart uniqueness macros are essentially an override of the \opt{uniquename} value (see \secref{aut:aux:tst}) for the name as a whole. Styles can choose to use either the less granular \opt{uniquename} value or the more detailed per-namepart values. Usually the general \opt{uniquename} value is enough for ordinary Western names but the more granular information per-namepart is provided to allow sophisticated name uniqueness processing for more complex name schemata.
-
 The name formatting directive is executed once for each name in the name list. Here is an example:
 
 \begin{ltxexample}
@@ -6084,7 +6008,7 @@ The name formatting directive is executed once for each name in the name list. H
     {}}
 \end{ltxexample}
 %
-The above directive reverses the name of the first author («Family, Given») and prints the remaining names in their regular sequence («Given Family»). Note that the only component which is guaranteed to be available is the family name, hence we have to check which parts of the name are actually present. If a certain name part is not available, the corresponding macro will be empty. As with directives for literal lists, the separator to be inserted between the individual items in the name list is also handled by the formatting directive, hence we have to check whether we are in the middle of the list or at the end when inserting it. This is what the second \cmd{ifthenelse} test does.
+The above directive reverses the name of the first author («Last, First») and prints the remaining names in their regular sequence («First Last»). Note that the only component which is guaranteed to be available is the last name, hence we have to check which parts of the name are actually present. If a certain name part is not available, the corresponding macro will be empty. As with directives for literal lists, the separator to be inserted between the individual items in the name list is also handled by the formatting directive, hence we have to check whether we are in the middle of the list or at the end when inserting it. This is what the second \cmd{ifthenelse} test does.
 
 \subsubsection{Special Fields}
 \label{aut:bbx:fld}
@@ -6121,11 +6045,9 @@ but would additionally have the field \bibfield{dateunspecified} set to <yearinc
 
 The entry key of an item in the \file{bib} file. This is the string used by \biblatex and the backend to identify an entry in the \file{bib} file. 
 
-\fielditem{childentrykey}{string}\DeprecatedMark
+\fielditem{childentrykey}{string}
 
-This field is no longer necessary or recommended. For backwards
-compatibility, it is merely a copy of the \bibfield{entrykey} field in any
-set children.
+When citing a subentry of an entry set, \biblatex provides the data of the parent \bibtype{set} entry to citation commands. This implies that the \bibfield{entrykey} field holds the entry key of the parent. The entry key of the child entry being cited is provided in the \bibfield{childentrykey} field. This field is only available when citing a subentry of an entry set.
 
 \fielditem{labelnamesource}{literal}
 
@@ -6170,11 +6092,9 @@ Normally holds the prefix coming before <date> of the date field name chosen by
 
 The entry type (\bibtype{book}, \bibtype{inbook}, etc.), given in lowercase letters.
 
-\fielditem{childentrytype}{string}\DeprecatedMark
+\fielditem{childentrytype}{string}
 
-This field is no longer necessary or recommended. For backwards
-compatibility, it is merely a copy of the \bibfield{entrytype} field in any
-set children.
+When citing a subentry of an entry set, \biblatex provides the data of the parent \bibtype{set} entry to citation commands. This implies that the \bibfield{entrytype} field holds the entry type of the parent. The entry type of the child entry being cited is provided in the \bibfield{childentrytype} field. This field is only available when citing a subentry of an entry set.
 
 \fielditem{entrysetcount}{integer}
 
@@ -6186,23 +6106,12 @@ This field is special in that it is only available locally in name formatting di
 
 \fielditem{namehash}{string}
 
-A hash string which uniquely identifies the \bibfield{labelname} list. This is useful for recurrence checks. For example, a citation style which replaces recurrent authors or editors with a string like <idem> could save the \bibfield{namehash} field with \cmd{savefield} and use it in a comparison with \cmd{iffieldequals} later (see \secref{aut:aux:dat, aut:aux:tst}). The \bibfield{namehash} is derived from the truncated \bibfield{labelname} list, \ie it is responsive to \opt{maxcitenames} and \opt{mincitenames}. See also \bibfield{hash} and \bibfield{fullhash}.
-
-\fielditem{bibnamehash}{string}
-
-As \bibfield{namehash} but responsive to \opt{maxbibnames} and
-\opt{minbibnames}. This is not used in standard styles but may be used to
-make tests in bibliography lists (such as those used to determine whether
-dashes should replace repeated authors) behave differently.
+A hash string which uniquely identifies the \bibfield{labelname} list. This is useful for recurrence checks. For example, a citation style which replaces recurrent authors or editors with a string like <idem> could save the \bibfield{namehash} field with \cmd{savefield} and use it in a comparison with \cmd{iffieldequals} later (see \secref{aut:aux:dat, aut:aux:tst}). The \bibfield{namehash} is derived from the truncated \bibfield{labelname} list, \ie it is responsive to \opt{maxnames} and \opt{minnames}. See also \bibfield{hash} and \bibfield{fullhash}.
 
 \fielditem{$<$namelist$>$namehash}{string}
 
 As \bibfield{namehash} for the name list called <namelist>.
 
-\fielditem{$<$namelist$>$bibnamehash}{string}
-
-As \bibfield{bibnamehash} for the name list called <namelist>.
-
 \fielditem{fullhash}{string}
 
 A hash string which uniquely identifies the \bibfield{labelname} list. This fields differs from \bibfield{namehash} in two details: 1) The \bibfield{shortauthor} and \bibfield{shorteditor} lists are ignored when generating the hash. 2) The hash always refers to the full list, ignoring \opt{maxnames} and \opt{minnames}. See also \bibfield{hash} and \bibfield{namehash}.
@@ -6228,9 +6137,6 @@ This field holds a hash of the (locale-specific) Unicode Collation Algorithm pri
 This field holds the entry key of the entry from which an entry was cloned. Clones are created for 
 entries which are mentioned in \bibfield{related} fields as part of related entry processing, for example.
 
-\fielditem{urlraw}{verbatim}
-
-This is the unencoded, raw version of any \bibfield{url}. This is intended for use when the display version and clickable link version of a URL are different. This can be the case when the URL contains special or Unicode characters. In the case where no such characters occur, may be identical to the \bibfield{url}.
 \end{fieldlist}
 
 \paragraph{Fields for Use in Citation Labels}
@@ -6244,7 +6150,7 @@ A label similar to the labels generated by the \path{alpha.bst} style of traditi
 
 \fielditem{extraalpha}{integer}
 
-The <alphabetic> citation scheme usually requires a letter to be appended to the label if the bibliography contains two or more works by the same author which were all published in the same year. In this case, the \bibfield{extraalpha} field holds an integer which may be converted to a letter with \cmd{mknumalph} or formatted in some other way. This field is similar to the role of \bibfield{extradate} in the author"=year scheme. A complete <alphabetic> label consists of the fields \bibfield{labelalpha} plus \bibfield{extraalpha}. Note that the \bibfield{labelalpha} and \bibfield{extraalpha} fields need to be requested with the package option \opt{labelalpha}, see \secref{use:opt:pre:int} for details. See also \bibfield{labelalpha} as well as \cmd{labelalphaothers} in \secref{use:fmt:fmt}. Table \ref{use:opt:tab1} summarises the various \opt{extra*} disambiguation counters and what they track.
+The <alphabetic> citation scheme usually requires a letter to be appended to the label if the bibliography contains two or more works by the same author which were all published in the same year. In this case, the \bibfield{extraalpha} field holds an integer which may be converted to a letter with \cmd{mknumalph} or formatted in some other way. This field is similar to the role of \bibfield{extrayear} in the author"=year scheme. A complete <alphabetic> label consists of the fields \bibfield{labelalpha} plus \bibfield{extraalpha}. Note that the \bibfield{labelalpha} and \bibfield{extraalpha} fields need to be requested with the package option \opt{labelalpha}, see \secref{use:opt:pre:int} for details. See also \bibfield{labelalpha} as well as \cmd{labelalphaothers} in \secref{use:fmt:fmt}. Table \ref{use:opt:tab1} summarises the various \opt{extra*} disambiguation counters and what they track.
 
 \listitem{labelname}{name}
 
@@ -6273,7 +6179,7 @@ It is sometimes useful, for example in author"=title citation schemes, to be abl
 
 \fielditem{labelyear}{literal}
 
-The year of the date field selected by \cmd{DeclareLabeldate} (\secref{aut:ctm:fld}) or the \bibfield{year} field, for use in author-year labels. A complete author-year label consists of the fields \bibfield{labelyear} plus \bibfield{extradate}. Note that the \bibfield{labelyear} and \bibfield{extradate} fields need to be requested with the package option \opt{labeldateparts}, see \secref{use:opt:pre:int} for details. See also \bibfield{extradate}.
+The year of the date field selected by \cmd{DeclareLabeldate} (\secref{aut:ctm:fld}) or the \bibfield{year} field, for use in author-year labels. A complete author-year label consists of the fields \bibfield{labelyear} plus \bibfield{extrayear}. Note that the \bibfield{labelyear} and \bibfield{extrayear} fields need to be requested with the package option \opt{labeldateparts}, see \secref{use:opt:pre:int} for details. See also \bibfield{extrayear}.
 
 \fielditem{labelendyear}{literal}
 
@@ -6295,13 +6201,9 @@ The month of the date field selected by \cmd{DeclareLabeldate} (\secref{aut:ctm:
 
 The end day of the date field selected by \cmd{DeclareLabeldate} (\secref{aut:ctm:fld}) if the selected date is a range.
 
-\fielditem{extradate}{integer}
+\fielditem{extrayear}{integer}
 
-The author"=year citation scheme usually requires a letter to be appended to the year if the bibliography contains two or more works by the same author which were all published in the same year. In this case, the \bibfield{extradate} field holds an integer which may be converted to a letter with \cmd{mknumalph} or formatted in some other way. This field is undefined if there is only one work by the author in the bibliography or if all works by the author have different publication years. A complete author-year label consists of the fields \bibfield{labelyear} plus \bibfield{extradate}. Note that the \bibfield{labelyear} and \bibfield{extradate} fields need to be requested with the package option \opt{labeldateparts}, see \secref{use:opt:pre:int} for details. See also \bibfield{labelyear}. Table \ref{use:opt:tab1} summarises the various \opt{extra*} disambiguation counters and what they track.
-
-\fielditem{extradatescope}{literal}
-
-This field contains the name of the most specific field which determined the value of \bibfield{extradate}. It is not used by the standard styles but may be useful in controlling the placement of the \bibfield{extradate} field value.
+The author"=year citation scheme usually requires a letter to be appended to the year if the bibliography contains two or more works by the same author which were all published in the same year. In this case, the \bibfield{extrayear} field holds an integer which may be converted to a letter with \cmd{mknumalph} or formatted in some other way. This field is undefined if there is only one work by the author in the bibliography or if all works by the author have different publication years. A complete author-year label consists of the fields \bibfield{labelyear} plus \bibfield{extrayear}. Note that the \bibfield{labelyear} and \bibfield{extrayear} fields need to be requested with the package option \opt{labeldateparts}, see \secref{use:opt:pre:int} for details. See also \bibfield{labelyear}. Table \ref{use:opt:tab1} summarises the various \opt{extra*} disambiguation counters and what they track.
 
 \end{fieldlist}
 
@@ -6861,23 +6763,6 @@ deprecated item must no longer be defined in the datamodel for this work;
 \prm{field}, \prm{list} or \prm{name} cannot be listed anywhere as an
 argument to \cmd{DeclareDatamodelFields}.
 
-\cmditem{DeprecateFieldWithReplacement}{field}{replacement}
-\cmditem{DeprecateListWithReplacement}{list}{replacement}
-\cmditem{DeprecateNameWithReplacement}{name}{replacement}
-
-Similar to \cmd{DeprecateField}, \cmd{DeprecateList} and \cmd{DeprecateName}.
-The commands do not only issue a deprecation warning,
-they try to define a replacement for the deprecated field
-that is printed in its stead.
-The \cmd{replacement} must be of the same type as the deprecated
-\prm{field}, \prm{list} or \prm{name}.
-If the formatting of \prm{replacement} should be applied when printing
-the deprecated field, that needs to be requested with \cmd{DeclareFieldAlias}
-(see \secref{aut:bib:fmt}).
-Note that the deprecated item must no longer be defined in the datamodel
-for this work; \prm{field}, \prm{list} or \prm{name} cannot be listed
-anywhere as an argument to \cmd{DeclareDatamodelFields}.
-
 \cmditem{printfield}[format]{field}
 
 This command prints a \prm{field} using the formatting directive \prm{format}, as defined with \cmd{DeclareFieldFormat}. If a type"=specific \prm{format} has been declared, the type"=specific formatting directive takes precedence over the generic one. If the \prm{field} is undefined, nothing is printed. If the \prm{format} is omitted, \cmd{printfield} tries using the name of the field as a format name. For example, if the \bibfield{title} field is to be printed and the \prm{format} is not specified, it will try to use the field format \texttt{title}.\footnote{In other words, \texttt{\textbackslash printfield\{title\}} is equivalent to \texttt{\textbackslash printfield[title]\{title\}}.} In this case, any type"=specific formatting directive will also take precedence over the generic one. If all of these formats are undefined, it falls back to \texttt{default} as a last resort. Note that \cmd{printfield} provides the name of the field currently being processed in \cmd{currentfield} for use in field formatting directives.
@@ -6924,7 +6809,7 @@ This command prints the date of the entry, as specified in the fields \bibfield{
 
 \csitem{printdateextra}
 
-Similar to \cmd{printdate} but incorporates the \bibfield{extradate} field in the date specification. This is useful for bibliography styles designed for author-year citations.
+Similar to \cmd{printdate} but incorporates the \bibfield{extrayear} field in the date specification. This is useful for bibliography styles designed for author-year citations.
 
 \csitem{printlabeldate}
 
@@ -6932,7 +6817,7 @@ Similar to \cmd{printdate} but prints the date field determined by \cmd{DeclareL
 
 \csitem{printlabeldateextra}
 
-Similar to \cmd{printlabeldate} but incorporates the \bibfield{extradate} field in the date specification. This is useful for bibliography styles designed for author-year citations.
+Similar to \cmd{printlabeldate} but incorporates the \bibfield{extrayear} field in the date specification. This is useful for bibliography styles designed for author-year citations.
 
 \csitem{print$<$datetype$>$date}
 
@@ -6999,13 +6884,12 @@ This section introduces the commands used to define the formatting directives re
 \cmditem{DeclareFieldFormat}[entrytype, \dots]{format}{code}
 \cmditem*{DeclareFieldFormat}*{format}{code}
 
-Defines the field format \prm{format}. This formatting directive is arbitrary \prm{code} to be executed by \cmd{printfield}. The value of the field will be passed to the \prm{code} as its first and only argument. The name of the field currently being processed is available to the \prm{code} as \cmd{currentfield}. If an \prm{entrytype} is specified, the format is specific to that type. The \prm{entrytype} argument may be a comma"=separated list of values. The starred variant of this command is similar to the regular version, except that all type-specific formats are cleared. \emph{Do not put any whitespace between the arguments to this macro as the definitions are quite complex and you will get unexpected results}.
+Defines the field format \prm{format}. This formatting directive is arbitrary \prm{code} to be executed by \cmd{printfield}. The value of the field will be passed to the \prm{code} as its first and only argument. The name of the field currently being processed is available to the \prm{code} as \cmd{currentfield}. If an \prm{entrytype} is specified, the format is specific to that type. The \prm{entrytype} argument may be a comma"=separated list of values. The starred variant of this command is similar to the regular version, except that all type-specific formats are cleared.
 
 \cmditem{DeclareListFormat}[entrytype, \dots]{format}{code}
 \cmditem*{DeclareListFormat}*{format}{code}
 
-Defines the literal list format \prm{format}. This formatting directive is arbitrary \prm{code} to be executed for every item in a list processed by \cmd{printlist}. The current item will be passed to the \prm{code} as its first and only argument. The name of the literal list currently being processed is available to the \prm{code} as \cmd{currentlist}. If an \prm{entrytype} is specified, the format is specific to that type. The \prm{entrytype} argument may be a comma"=separated list of values. Note that the formatting directive also handles the punctuation to be inserted between the individual items in the list. You need to check whether you are in the middle of or at the end of the list, \ie whether \cnt{listcount} is smaller than or equal to \cnt{liststop}. The starred variant of this command is similar to the regular version, except that all type-specific formats are cleared. \emph{Do not put any whitespace between the arguments to this macro as the definitions are quite complex and you will get unexpected results}.
-
+Defines the literal list format \prm{format}. This formatting directive is arbitrary \prm{code} to be executed for every item in a list processed by \cmd{printlist}. The current item will be passed to the \prm{code} as its first and only argument. The name of the literal list currently being processed is available to the \prm{code} as \cmd{currentlist}. If an \prm{entrytype} is specified, the format is specific to that type. The \prm{entrytype} argument may be a comma"=separated list of values. Note that the formatting directive also handles the punctuation to be inserted between the individual items in the list. You need to check whether you are in the middle of or at the end of the list, \ie whether \cnt{listcount} is smaller than or equal to \cnt{liststop}. The starred variant of this command is similar to the regular version, except that all type-specific formats are cleared.
 
 \cmditem{DeclareNameFormat}[entrytype, \dots]{format}{code}
 \cmditem*{DeclareNameFormat}*{format}{code}
@@ -7032,7 +6916,7 @@ The value of the datamodel <nameparts> constant (see \secref{aut:bbx:drv}) creat
 \namepartgiveni
 \end{ltxexample}
 %
-If a certain part of a name is not available, the corresponding macro will be empty, hence you may use, for example, the \sty{etoolbox} tests like \cmd{ifdefvoid} to check for the individual parts of a name. The name of the name list currently being processed is available to the \prm{code} as \cmd{currentname}. Note that the formatting directive also handles the punctuation to be inserted between separate names and between the individual parts of a name. You need to check whether you are in the middle of or at the end of the list, \ie whether \cnt{listcount} is smaller than or equal to \cnt{liststop}. See also \secref{use:cav:nam}. The starred variant of this command is similar to the regular version, except that all type-specific formats are cleared. \emph{Do not put any whitespace between the arguments to this macro as the definitions are quite complex and you will get unexpected results}.
+If a certain part of a name is not available, the corresponding macro will be empty, hence you may use, for example, the \sty{etoolbox} tests like \cmd{ifdefvoid} to check for the individual parts of a name. The name of the name list currently being processed is available to the \prm{code} as \cmd{currentname}. Note that the formatting directive also handles the punctuation to be inserted between separate names and between the individual parts of a name. You need to check whether you are in the middle of or at the end of the list, \ie whether \cnt{listcount} is smaller than or equal to \cnt{liststop}. See also \secref{use:cav:nam}. The starred variant of this command is similar to the regular version, except that all type-specific formats are cleared.
 
 \cmditem{DeclareIndexFieldFormat}[entrytype, \dots]{format}{code}
 \cmditem*{DeclareIndexFieldFormat}*{format}{code}
@@ -7651,7 +7535,7 @@ Any entry which is not a \bibtype{book} or \bibtype{article} will be ignored.
 }
 \end{ltxexample}
 %
-Here, a clone of an entry from the specified data source will be created. The entry key of the clone will be the same as the original but prefixed by the value of the \texttt{entryclone} parameter. The cloned entry would still need to be cited in the document using its new entry key. This type of mapping step should be used with care as it may produce labelling problems in authoryear styles which use, for example, \opt{extradate}. One use case is for numeric styles which contain multiple bibliographies containing the same entry. In this case, you may need different bibliography number labeld for the same entry and this is very tricky when there is only one entry which needs different labels. Creating clones with different entry keys solves this problem.
+Here, a clone of an entry from the specified data source will be created. The entry key of the clone will be the same as the original but prefixed by the value of the \texttt{entryclone} parameter. The cloned entry would still need to be cited in the document using its new entry key. This type of mapping step should be used with care as it may produce labelling problems in authoryear styles which use, for example, \opt{extrayear}. One use case is for numeric styles which contain multiple bibliographies containing the same entry. In this case, you may need different bibliography number labeld for the same entry and this is very tricky when there is only one entry which needs different labels. Creating clones with different entry keys solves this problem.
 
 \biblatexml\ datasources are more structured than \bibtex\ since they are XML. Sourcemapping is possible with \biblatexml\ too but the specifications of source and target fields etc. also support XPath 1.0 paths in order to be able to work with the structured data. Fields can be specified as per the \bibtex\ examples above and these are converted into XPath 1.0 queries internally as necessary. For example:
 
@@ -7939,7 +7823,7 @@ Alphabetic styles use a label to identify bibliography entries. This label is co
 
 \begin{ltxsyntax}
 
-\cmditem{DeclareLabelalphaTemplate}[]{specification}
+\cmditem{DeclareLabelalphaTemplate}[entrytype, \dots]{specification}
 
 Defines the alphabetic label template for the given entrytypes. If no entrytypes are specified in the first argument, then the global label template is defined. The \prm{specification} is an undelimited list of \cmd{labelelement} directives which specify the elements used to build the label. Spaces, tabs, and line endings may be used freely to visually arrange the \prm{specification}. Blank lines are not permissible. This command may only be used in the preamble.
 
@@ -8044,15 +7928,13 @@ When a name list \cmd{field} is specified, the method of extracting the string i
 
 \begin{ltxsyntax}
 
-\cmditem{DeclareLabelalphaNameTemplate}[name]{specification}
-
-Defines the \opt{labelalphaname} template \prm{name}. The \prm{name} is optional and defaults to \prm{<global>}.
+\cmditem{DeclareLabelalphaNameTemplate}[entrytype, \dots]{specification}
 
-Such templates specify how to extract a label string from a name list when a \cmd{field} specification in \cmd{DeclareLabelalphaTemplate} contains a name list.
+Specifies the template to use to extract a label string from a name list when a \cmd{field} specification in \cmd{DeclareLabelalphaTemplate} contains a name list. The template can be specified per"=entrytype.
 
 \cmditem{namepart}[options]{namepart}
 
-\prm{namepart} is one of the datamodel nameparts defined with the \cmd{DeclareDatamodelConstant} command (see \secref{aut:bbx:drv}). The \prm{options} are:
+\prm{namepart} is one of the datamodel nameparts defined with the \cmd{DeclareDatamodelConstant} command (see \secref{aut:bbx:drv}). The \opt{options} are:
 
 \begin{optionlist*}
 
@@ -8320,19 +8202,19 @@ this setting is only taken into account when using fixed-width substrings
 \subsubsection{Sorting}
 \label{aut:ctm:srt}
 
-In addition to the predefined sorting templates discussed in \secref{use:srt}, it is possible to define new ones or modify the default definitions. The sorting process may be customized further by excluding certain fields from sorting on a per-type basis and by automatically populating the \bibfield{presort} field on a per-type basis.
+In addition to the predefined sorting schemes discussed in \secref{use:srt}, it is possible to define new ones or modify the default definitions. The sorting process may be customized further by excluding certain fields from sorting on a per-type basis and by automatically populating the \bibfield{presort} field on a per-type basis.
 
 \begin{ltxsyntax}
 
-\cmditem{DeclareSortingTemplate}[options]{name}{specification}
+\cmditem{DeclareSortingScheme}[options]{name}{specification}
 
-Defines the sorting template \prm{name}. The \prm{name} is the identifier passed to the \opt{sorting} option (\secref{use:opt:pre:gen}) when selecting the sorting template. The \cmd{DeclareSortingTemplate} command supports the following optional arguments:
+Defines the sorting scheme \prm{name}. The \prm{name} is the identifier passed to the \opt{sorting} option (\secref{use:opt:pre:gen}) when selecting the sorting scheme. The \cmd{DeclareSortingScheme} command supports the following optional arguments:
 
 \begin{optionlist*}
 
 \choitem{locale}{\prm{locale}}
 
-The locale for the sorting template which then overrides the global sorting locale in the \opt{sortlocale} option discussed in \secref{use:opt:pre:gen}. 
+The locale for the sorting scheme which then overrides the global sorting locale in the \opt{sortlocale} option discussed in \secref{use:opt:pre:gen}. 
 
 \end{optionlist*}
 
@@ -8346,7 +8228,7 @@ Specifies the elements considered in the sorting process. The \prm{elements} are
 
 \choitem{locale}{\prm{locale}}
 
-Override the locale used for sorting at the level of a particular set of sorting elements. If specified, the locale overrides the locale set at the level of \cmd{DeclareSortingTemplate} and also the global setting. See also the discussion of the global sorting locale option \opt{sortlocale} in \secref{use:opt:pre:gen}.
+Override the locale used for sorting at the level of a particular set of sorting elements. If specified, the locale overrides the locale set at the level of \cmd{DeclareSortingScheme} and also the global setting. See also the discussion of the global sorting locale option \opt{sortlocale} in \secref{use:opt:pre:gen}.
 
 \choitem[ascending]{direction}{ascending, descending}
 
@@ -8406,10 +8288,10 @@ The \cmd{citeorder} element has a special meaning. It requests a sort based on t
 \cite{one,two}
 \end{ltxexample}
 %
-there is a distinction between the lexical order and the semantic order. Here «one» and «two» have the same semantic order but a unique lexical order. The semantic order only matters if you specify further sorting to disambiguate entries with the same semantic order. For example, this is the definition of the \opt{none} sorting template:
+there is a distinction between the lexical order and the semantic order. Here «one» and «two» have the same semantic order but a unique lexical order. The semantic order only matters if you specify further sorting to disambiguate entries with the same semantic order. For example, this is the definition of the \opt{none} sorting scheme:
 
 \begin{ltxexample}
-\DeclareSortingTemplate{none}{
+\DeclareSortingScheme{none}{
   \sort{\citeorder}
 }
 \end{ltxexample}
@@ -8417,30 +8299,30 @@ there is a distinction between the lexical order and the semantic order. Here «
 This sorts the bibliography purely lexically by the order of the keys in the citation commands. In the example above, it sorts «one» before «two». However, suppose that you consider «one» and «two» to have the same order (semantic order) since they are cited at the same time and want to further sort these by year. Suppose «two» has an earlier \bibfield{year} than «one»:
 
 \begin{ltxexample}
-\DeclareSortingTemplate{noneyear}{
+\DeclareSortingScheme{noneyear}{
   \sort{\citeorder}
   \sort{<<year>>}
 }
 \end{ltxexample}
 %
-This sorts «two» before «one», even though lexically, «one» would sort before «two». This is possible because the semantic order can be disambiguated by the further sorting on year. With the standard \opt{none} sorting template, the lexical order and semantic order are identical because there is nothing further to disambiguate them. This means that you can use \cmd{citeorder} just like any other sorting specification element, choosing how to further sort entries cited at the same time (in the same citation command).
+This sorts «two» before «one», even though lexically, «one» would sort before «two». This is possible because the semantic order can be disambiguated by the further sorting on year. With the standard \opt{none} sorting scheme, the lexical order and semantic order are identical because there is nothing further to disambiguate them. This means that you can use \cmd{citeorder} just like any other sorting specification element, choosing how to further sort entries cited at the same time (in the same citation command).
 
-\cmditem{DeclareSortingNamekeyTemplate}[name]{specification}
+\cmditem{DeclareSortingNamekeyScheme}[schemename]{specification}
 
-Defines how the sorting keys for names are constructed. This can change the sorting order of names arbitrarily because you can choose how to put together the name parts when constructing the string to compare when sorting. The sorting key construction template so defined is called \prm{name} which defaults to «global» if this optional parameter is absent. When constructing the sorting key for a name, a sorting key for each name part is constructed and the key for each name is formed into an ordered key list with a special internal separator. The point of this option is to accommodate languages or situations where sorting of names needs to be customised (for example, Icelandic names are sometimes sorted by given names rather than by family names). This macro may be used multiple times to define templates with different names which can then be referred to later. Sorting name key templates can be specified at the following scopes, in order of increasing precedence:
+Defines how the sorting keys for names are constructed. This can change the sorting order of names arbitrarily because you can choose how to put together the name parts when constructing the string to compare when sorting. The sorting key construction scheme so defined is called \prm{schemename} which defaults to «global» if this optional parameter is absent. When constructing the sorting key for a name, a sorting key for each name part is constructed and the key for each name is formed into an ordered key list with a special internal separator. The point of this option is to accommodate languages or situations where sorting of names needs to be customised (for example, Icelandic names are sometimes sorted by given names rather than by family names). This macro may be used multiple times to define schemes with different names which can then be referred to later. Sorting name key schemes can have the following scopes, in order of increasing precedence:
 
 \begin{itemize}
-\item The default template defined without the optional name argument
-\item Given as the \opt{sortingnamekeytemplate} option to a reference context (see \secref{use:bib:context})
-\item Given as a per-entry option \opt{sortnamekeytemplate} in a bibliography data source entry
-\item Given as a per-namelist option \opt{sortnamekeytemplate}
-\item Given as a per-name option \opt{sortnamekeytemplate}
+\item The default scheme defined without the optional name argument
+\item Given as the \opt{sortingnamekeyscheme} option to a reference context (see \secref{use:bib:context})
+\item Given as a per-entry option \opt{sortnamekeyscheme} in a bibliography data source entry
+\item Given as a per-namelist option \opt{sortnamekeyscheme}
+\item Given as a per-name option \opt{sortnamekeyscheme}
 \end{itemize}
 
-By default there is only a global template which has the following \prm{specification}:
+By default there is only a global scheme which has the following \prm{specification}:
 
 \begin{ltxexample}
-\DeclareSortingNamekeyTemplate{
+\DeclareSortingNamekeyScheme{
   \keypart{
     \namepart[use=true]{<<prefix>>}
   }
@@ -8488,10 +8370,10 @@ constructing the sorting specification.
 
 \end{ltxsyntax}
 
-As an example, suppose you wanted to be able to sort names by given name rather than family name, you could define a sorting name key template like this:
+As an example, suppose you wanted to be able to sort names by given name rather than family name, you could define a sorting name key scheme like this:
 
 \begin{ltxexample}
-\DeclareSortingNamekeyTemplate[givenfirst]{
+\DeclareSortingNamekeyScheme[givenfirst]{
   \keypart{
     \namepart{<<given>>}
   }
@@ -8507,10 +8389,10 @@ As an example, suppose you wanted to be able to sort names by given name rather
 }
 \end{ltxexample}
 %
-You can then use the name \opt{givenfirst} at the appropriate scope in order to make \biber use this template when constructing sorting name keys. For example, you could enable this for one bibliography list like this:
+You can then use the name \opt{givenfirst} at the appropriate scope in order to make \biber use this scheme when constructing sorting name keys. For example, you could enable this for one bibliography list like this:
 
 \begin{ltxexample}
-\begin{refcontext}[sortnamekeytemplate=givenfirst]
+\begin{refcontext}[sortnamekeyscheme=givenfirst]
 \printbibliography
 \end{refcontext}
 \end{ltxexample}
@@ -8519,7 +8401,7 @@ or perhaps you only want to do this for a particular entry:
 
 \begin{lstlisting}[style=bibtex]{}
 @BOOK{key,
-  OPTIONS = {sortnamekeytemplate=givenfirst},
+  OPTIONS = {sortnamekeyscheme=givenfirst},
   AUTHOR = {Arnar Vigfusson}
 }
 \end{lstlisting}
@@ -8528,7 +8410,7 @@ or just a name list by using the option as a pseudo-name which will be ignored:
 
 \begin{lstlisting}[style=bibtex]{}
 @BOOK{key,
-  AUTHOR = {sortnamekeytemplate=givenfirst and Arnar Vigfusson}
+  AUTHOR = {sortnamekeyscheme=givenfirst and Arnar Vigfusson}
 }
 \end{lstlisting}
 %
@@ -8537,14 +8419,14 @@ format which \biber supports (see \biber doc):
 
 \begin{lstlisting}[style=bibtex]{}
 @BOOK{key,
-  AUTHOR = {given=Arnar, family=Vigfusson, sortnamekeytemplate=givenfirst}
+  AUTHOR = {given=Arnar, family=Vigfusson, sortnamekeyscheme=givenfirst}
 }
 \end{lstlisting}
 %
-Now we give some examples of sorting templates. In the first example, we define a simple name\slash title\slash year template. The name element may be either the \bibfield{author}, the \bibfield{editor}, or the \bibfield{translator}. Given this specification, the sorting routine will use the first element which is available and continue with the \bibfield{title}. Note that the options \opt{use$<$name$>$} options are considered automatically in the sorting process:
+Now we give some examples of sorting schemes. In the first example, we define a simple name\slash title\slash year scheme. The name element may be either the \bibfield{author}, the \bibfield{editor}, or the \bibfield{translator}. Given this specification, the sorting routine will use the first element which is available and continue with the \bibfield{title}. Note that the options \opt{use$<$name$>$} options are considered automatically in the sorting process:
 
 \begin{ltxexample}
-\DeclareSortingTemplate{sample}{
+\DeclareSortingScheme{sample}{
   \sort{
     \field{<<author>>}
     \field{<<editor>>}
@@ -8559,10 +8441,10 @@ Now we give some examples of sorting templates. In the first example, we define
 }
 \end{ltxexample}
 %
-In the next example, we define the same template in a more elaborate way, considering special fields such as \bibfield{presort}, \bibfield{sortkey}, \bibfield{sortname}, etc. Since the \bibfield{sortkey} field specifies the master sort key, it needs to override all other elements except for \bibfield{presort}. This is indicated by the \opt{final} option. If the \bibfield{sortkey} field is available, processing will stop at this point. If not, the sorting routine continues with the next \cmd{sort} directive. This setup corresponds to the default definition of the \texttt{nty} template:
+In the next example, we define the same scheme in a more elaborate way, considering special fields such as \bibfield{presort}, \bibfield{sortkey}, \bibfield{sortname}, etc. Since the \bibfield{sortkey} field specifies the master sort key, it needs to override all other elements except for \bibfield{presort}. This is indicated by the \opt{final} option. If the \bibfield{sortkey} field is available, processing will stop at this point. If not, the sorting routine continues with the next \cmd{sort} directive. This setup corresponds to the default definition of the \texttt{nty} scheme:
 
 \begin{ltxexample}
-\DeclareSortingTemplate{nty}{
+\DeclareSortingScheme{nty}{
   \sort{
     \field{<<presort>>}
   }
@@ -8588,10 +8470,10 @@ In the next example, we define the same template in a more elaborate way, consid
 }
 \end{ltxexample}
 %
-Finally, here is an example of a sorting template which overrides the global sorting locale and additionally overrides again when sorting by the \bibfield{origtitle} field. Note the use in the template-level override of a babel/polyglossia language name instead of a real locale identifier. \biber will map this to a suitable, real locale identifier (in this case, \texttt{sv\_SE}):
+Finally, here is an example of a sorting scheme which overrides the global sorting locale and additionally overrides again when sorting by the \bibfield{origtitle} field. Note the use in the scheme-level override of a babel/polyglossia language name instead of a real locale identifier. \biber will map this to a suitable, real locale identifier (in this case, \texttt{sv\_SE}):
 
 \begin{ltxexample}
-\DeclareSortingTemplate[locale=swedish]{custom}{
+\DeclareSortingScheme[locale=swedish]{custom}{
   \sort{
     \field{<<sortname>>}
     \field{<<author>>}
@@ -8628,7 +8510,7 @@ Specifies a string to be used to automatically populate the \bibfield{presort} f
 \cmditem{DeclareSortTranslit}[entrytype]{specification}
 
 Languages which can be written in different scripts or alphabets often only have CLDR sorting tailoring for one script and it is expected that you transliterate into the supported script for sorting purposes. A common example is Sanskrit which is often written in academic contexts in IAST 
-romanised script but which needs to be sorted in the <sa> locale which expects the Devanāgarī script. Another common case is transliteration of Russian Cyrillic into Latin as defined by the ALA-LC standard. Such requirement means that it is necessary to transliterate into the sorting script internally. \cmd{DeclareSortTranslit} declares which parts of an entry you would like to transliterate for sorting purposes. Without the \prm{entrytype} parameter, the \prm{specification} applies to all entrytypes. The \prm{specification} is one or more \cmd{translit} commands:
+romanised script but which needs to be sorted in the <sa> locale which expects the Devanāgarī script. This means that it is necessary to transliterate into the sorting script internally. \cmd{DeclareSortTranslit} declares which parts of an entry you would like to transliterate for sorting purposes. Without the \prm{entrytype} parameter, the \prm{specification} applies to all entrytypes. The \prm{specification} is one or more \cmd{translit} commands:
 
 \cmditem{translit}{field or fieldset}{from}{to}
 
@@ -8663,9 +8545,7 @@ An example of transliterating titles so that they sort correctly in Sanskrit:
   & Description\\
 \midrule
 iast & devanagari & Sanskrit IAST\footnote{International Alphabet of Sanskrit Transliteration} to Devanāgarī\\
-russian & ala-lc & ALA-LC\footnote{American Library Association---Library of Congress} romanisation for Russian\\
-russian & bgn/pcgn-standard & BGN/PCGN:1947 (Standard Variant), Cyrillic to Latin, Russian\\
- \bottomrule
+\bottomrule
 \end{tabular}
 \caption{Valid transliteration pairs}
 \label{tab:translit}
@@ -8862,121 +8742,6 @@ Defines the date components to consider when generating \bibfield{labelyear}, \b
 Note that the \bibfield{date} field is split by the backend into \bibfield{year}, \bibfield{month} which are also valid fields in the default data model. In order to support legacy data which directly sets \bibfield{year} and/or \bibfield{month}, the specification <\bibfield{date}> in \cmd{DeclareLabeldate} will also match \bibfield{year} and \bibfield{month} fields, if present.
 The \bibfield{label*} fields may be customized globally or on a per-type basis. If the optional \prm{entrytype} argument is given, the specification applies to the respective entry type. If not, it is applied globally. The \prm{entrytype} argument may be a comma"=separated list of values. This command may only be used in the preamble. See also \secref{aut:bbx:fld:dat}.
 
-\cmditem{DeclareExtradate}{specification}
-
-Defines how \biber tracks information used to construct the \bibfield{extradate} field. This field (see \secref{aut:bbx:fld:lab}) is printed to disambiguate works by the same author which occur in the same date scope. By default, the date scope is the year and so two works by the same author within the same year will have different \bibfield{extradate} values which are used to disambiguate the works in the bibliography in the usual manner seen in many authoryear type styles. The \prm{specification} is one or more \cmd{scope} specifications which can contain one or more \cmd{field} specifications. Within a \cmd{scope}, the existence of each \cmd{field} will be checked and if found, the first \cmd{field} is used and the rest are ignored. This allows a fallback in case certain fields are not available in all entries. All \cmd{scope}s are used to track information and \cmd{scope}s should be specified in decreasing order of generality (e.g. year then month then day etc) The default definition is:
-
-\begin{ltxexample}
-\DeclareExtradate{%
-  \scope{
-    \field{labelyear}
-    \field{year}
-  }
-}
-\end{ltxexample}
-%
-This means that the \bibfield{labelyear} field only (or \bibfield{year} if this does not exist) will be used to track works by the same author. With the following datasource entries:
-
-\begin{lstlisting}[style=bibtex]{}
-@BOOK{extra1,
-  AUTHOR = {John Doe},
-  DATE   = {2001-01}
-}
-
-@BOOK{extra2,
-  AUTHOR = {John Doe},
-  DATE   = {2001-02}
-}
-\end{lstlisting}
-%
-The default definition would result in:
-
-\begin{lstlisting}{}
-Doe 2001a
-Doe 2001b
-\end{lstlisting}
-%
-Here, \bibfield{extradate} only considers the \bibfield((label)year) information and since this is identical, disambiguation is required. However, consider the following definition:
-\begin{ltxexample}
-\DeclareExtradate{%
-  \scope{
-    \field{labelyear}
-    \field{year}
-  }
-  \scope{
-    \field{labelmonth}
-  }
-}
-\end{ltxexample}
-%
-The result would be:
-\begin{lstlisting}{}
-Doe 2001
-Doe 2001
-\end{lstlisting}
-%
-If only years were printed, this would be ambiguous because \bibfield{extradate} now considers \bibfield{labelmonth} and since this differs, no disambiguation is necessary. Care should therefore be taken to synchronise the printed information with the \bibfield{extradate} disambiguation settings. Notice that the second definition is <month-in-year> disambiguation and quite different from:
-\begin{ltxexample}
-\DeclareExtradate{%
-  \scope{
-    \field{labelmonth}
-  }
-}
-\end{ltxexample}
-%
-which is just plain <month> disambiguation which is very unlikely to be what you ever want to do since this disambiguation only based on month and ignores the year entirely. \bibfield{extradate} calculation should almost always be based on all information down to the resolution you require. For example, if you wish to disambiguate right down to the hour level (perhaps useful in large bibliographies of rapidly changing online material), you would specify something like this:
-\begin{ltxexample}
-\DeclareExtradate{%
-  \scope{
-    \field{labelyear}
-    \field{year}
-  }
-  \scope{
-    \field{labelmonth}
-  }
-  \scope{
-    \field{labelday}
-  }
-  \scope{
-    \field{labelhour}
-  }
-}
-\end{ltxexample}
-% 
-Entries without the specified granularity of information will disambiguate at the lowest granularity they contain, so, for example, with:
-\begin{ltxexample}
-\DeclareExtradate{%
-  \scope{
-    \field{labelyear}
-    \field{year}
-  }
-  \scope{
-    \field{labelmonth}
-  }
-}
-\end{ltxexample}
-%
-\begin{lstlisting}[style=bibtex]{}
-@BOOK{extra1,
-  AUTHOR = {John Doe},
-  DATE   = {2001}
-}
-
-@BOOK{extra2,
-  AUTHOR = {John Doe},
-  DATE   = {2001}
-}
-\end{lstlisting}
-%
-The result would still be:
-
-\begin{lstlisting}{}
-Doe 2001a
-Doe 2001b
-\end{lstlisting}
-%
-This command may only be used in the preamble.
-
 \cmditem{DeclareLabeltitle}[entrytype, \dots]{specification}
 
 Defines the fields to consider when generating the \bibfield{labeltitle} field (see \secref{aut:bbx:fld:lab}). The \prm{specification} is an ordered list of \cmd{field} commands. The fields are checked in the order listed and the first field which is available will be used as \bibfield{labeltitle}. This is the default definition:
@@ -9293,8 +9058,8 @@ As \cmd{if$<$datetype$>$julian} but for use in \cmd{mkbibdate*} formatting comma
 Expands to \prm{true} if the date <datetype>date (\opt{date}, \opt{urldate}, \opt{eventdate} etc.) has an era specification equal to \prm{era} and \prm{false} otherwise.  The supported \prm{era} strings which \biber determines and passes in the \file{.bbl} are:
 
 \begin{description}
-\item[bce]~BCE/BC era
-\item[ce]~CE/AD era
+\item[bce] BCE/BC era
+\item[ce] CE/AD era
 \end{description}
 
 This command is useful for determining whether to print the location
@@ -9324,23 +9089,6 @@ As \cmd{if$<$datetype$>$dateuncertain} but for use in \cmd{mkbibdate*} formattin
 
 As \cmd{ifend$<$datetype$>$dateuncertain} but for use in \cmd{mkbibdate*} formatting commands (\secref{aut:fmt:lng}) inside which the appropriate \cmd{ifend$<$datetype$>$dateuncertain} command is aliased to this command.
 
-\cmditem{iflabeldateisdate}{true}{false}
-
-Expands to \prm{true} if labeldate is defined and was obtained from date, and to \prm{false} otherwise.
-
-\cmditem{ifdatehasyearonlyprecision}{datetype}{true}{false}
-
-Expands to \prm{true} if the \prm{datetype}date is defined and would be shown with year precision \cmd{print$<$datetype$>$date}, and to false otherwise.
-
-\cmditem{ifdatehastime}{datetype}{true}{false}
-
-Expands to \prm{true} if the \prm{datetype}date is defined, has a time component and \opt{$<$datetype$>$dateusetime} is true, and to false otherwise.
-
-\cmditem{ifdateshavedifferentprecision}{datetype1}{datetype2}{true}{false}
-
-Expands to \prm{true} if the two dates \prm{datetype1} and \prm{datetype2} would show in different precision when printed with \cmd{print$<$datetype1$>$date} and \cmd{print$<$datetype2$>$date} respectively, and to \prm{false} otherwise.
-
-
 \cmditem{ifcaselang}[language]{true}{false}
 
 Expands to \prm{true} if the the optional \prm{language} is one of those
@@ -9348,17 +9096,9 @@ declared by \cmd{DeclareCaseLangs} (see \secref{aut:aux:msc}) and to
 \prm{false} otherwise. Without the optional argument, checks the current
 value of \cmd{currentlang}.
 
-\cmditem{ifsortingnamekeytemplatename}{string}{true}{false}
-
-Expands to \prm{true} if the \prm{string} is equal to the current in scope sorting name key template name (see \ref{aut:ctm:srt}), and to \prm{false} otherwise.
-
-\cmditem{ifuniquenametemplatename}{string}{true}{false}
-
-Expands to \prm{true} if the \prm{string} is equal to the current in scope uniqueness name key template name (see \ref{aut:ctm:srt}), and to \prm{false} otherwise.
+\cmditem{ifsortnamekeyscheme}{string}{true}{false}
 
-\cmditem{iflabelalphanametemplatename}{string}{true}{false}
-
-Expands to \prm{true} if the \prm{string} is equal to the current in scope alphabetic label name template name (see \ref{aut:ctm:srt}), and to \prm{false} otherwise.
+Expands to \prm{true} if the \prm{string} is equal to the current in scope sorting name key scheme name (see \ref{aut:ctm:srt}), and to \prm{false} otherwise.
 
 \cmditem{iffieldundef}{field}{true}{false}
 
@@ -9481,8 +9221,9 @@ Expands to \prm{true} if \bibfield{labelname} is empty and there is only one wor
 Expands to \prm{true} if there is only one work by the \opt{labelname} name with the \opt{labeltitle} title in the bibliography, and to \prm{false} otherwise. If neither \opt{labelname} nor \opt{labeltitle} are set for an entry, this will always expand to \prm{false}. Note that this feature needs to be enabled explicitly with the package option \opt{uniquework}. If both \bibfield{singletitle} and \bibfield{uniquetitle} are false for the same entry, this could be because another entry has the same \bibfield{labdlname} and yet another, different, entry has the same \bibfield{labeltitle}. \bibfield{uniquework} would let you know that there is another entry that has \emph{both} the same \bibfield{labelname} \emph{and} the same \bibfield{labeltitle}. This could be helpful in cases where multiple people maintain bibliography datasources and there is a risk of adding the same work with different keys without other parties realising this. This test could help to find such duplicates.
 
 \cmditem{ifuniqueprimaryauthor}{true}{false}
-
-Expands to \prm{true} if there is only one work by the the primary (first) author name of \opt{labelname} and to \prm{false} otherwise. Only the base name parts of the author name are considered, as defined by \cmd{DeclareUniquenameTemplate} see \secref{aut:cav:amb}. If \opt{labelname} is not set for an entry, this will always expand to \prm{false}. Note that this feature needs to be enabled explicitly with the package option \opt{uniqueprimaryauthor}. 
+x
+Expands to \prm{true} if there is only one work by the primary (first) author family
+name of \opt{labelname} and to \prm{false} otherwise. If \opt{labelname} is not set for an entry, this will always expand to \prm{false}. Note that this feature needs to be enabled explicitly with the package option \opt{uniqueprimaryauthor}. 
 
 \cmditem{ifandothers}{list}{true}{false}
 
@@ -9514,7 +9255,7 @@ Executes \prm{true} if the \prm{keyword} is found in the \bibfield{keywords} fie
 
 \cmditem{ifentrykeyword}{entrykey}{keyword}{true}{false}
 
-A variant of \cmd{ifkeyword} which takes an entry key as its first argument. This is useful for testing an entry other than the one currently processed. A user-facing version of this command is available for use in documents see \secref{use:eq}.
+A variant of \cmd{ifkeyword} which takes an entry key as its first argument. This is useful for testing an entry other than the one currently processed.
 
 \cmditem{ifcategory}{category}{true}{false}
 
@@ -9522,7 +9263,7 @@ Executes \prm{true} if the entry currently being processed has been assigned to
 
 \cmditem{ifentrycategory}{entrykey}{category}{true}{false}
 
-A variant of \cmd{ifcategory} which takes an entry key as its first argument. This is useful for testing an entry other than the one currently processed. A user-facing version of this command is available for use in documents see \secref{use:eq}
+A variant of \cmd{ifcategory} which takes an entry key as its first argument. This is useful for testing an entry other than the one currently processed.
 
 \cmditem{ifciteseen}{true}{false}
 
@@ -9536,11 +9277,11 @@ A variant of \cmd{ifciteseen} which takes an entry key as its first argument. Si
 \ifentryseen{<<\thefield{xref}>>}{true}{false}
 \end{ltxexample}
 %
-Apart from the additional argument, \cmd{ifentryseen} behaves like \cmd{ifciteseen}. A user-facing version of this command is available for use in documents see \secref{use:eq}.
+Apart from the additional argument, \cmd{ifentryseen} behaves like \cmd{ifciteseen}.
 
 \cmditem{ifentryinbib}{entrykey}{true}{false}
 
-Executes \prm{true} if the entry \prm{entrykey} appears in the current bibliography, and \prm{false} otherwise. A user-facing version of this command is available for use in documents see \secref{use:eq}.
+Executes \prm{true} if the entry \prm{entrykey} appears in the current bibliography, and \prm{false} otherwise. This command is intended for use in bibliography styles.
 
 \cmditem{iffirstcitekey}{true}{false}
 
@@ -9661,7 +9402,7 @@ Expands to \prm{true} when located in a footnote, and to \prm{false} otherwise.
 This counter indicates how many times the entry currently being processed is cited in the current reference section. Note that this feature needs to be enabled explicitly with the package option \opt{citecounter}. If the option is set to \texttt{context}, citations in the body text and in footnotes are counted separately. In this case, \cnt{citecounter} will hold the value of the context it is used in.
 
 \cntitem{uniquename}
-This counter refers to the \bibfield{labelname} list. It is set on a per-name basis. Its value is \texttt{0} if the base parts of the name (by default just the <family> part of the name) are unique, \texttt{1} if adding the other non-base parts of the name (as specified in the uniquename template defined by \cmd{DeclareUniquenameTemplate}) as initials will make it unique, and \texttt{2} if adding the full form of the non-base parts of the name are required to disambiguate the name. This information is required by author-year and author-title citation schemes which add additional parts of the name when citing different authors with the same family name. For example, (given the default \cmd{DeclareUniquenameTemplate} definition) if there is one <John Doe> and one <Edward Doe> in the list of references, this counter will be set to \texttt{1}. If there is one <John Doe> and one <Jane Doe>, the value of the counter will be \texttt{2}. If the option is set to \texttt{init}\slash \texttt{allinit}\slash \texttt{mininit}, the counter will be limited to \texttt{1}. This is useful for citations styles which use initials to disambiguate names but never print the full name in citations. If adding the initials is not sufficient to disambiguate the name, \cnt{uniquename} will also be set to \texttt{0} for that name. This feature needs to be enabled explicitly with the package option \opt{uniquename}. Note that the \cnt{uniquename} counter is local to \cmd{printnames} and that it is only set for the \bibfield{labelname} list and for the name list that \bibfield{labelname} has been derived from (typically \bibfield{author} or \bibfield{editor}). Its value is zero in any other context, i.e., it must be evaluated in the name formatting directives handling name lists. See \secref{aut:cav:amb} for further details and practical examples. This counter can be overridden on a per-namepart basis by consulting the \cmd{namepart<namepart>un} macros during name formatting, see \secref{aut:bbx:drv}.
+This counter refers to the \bibfield{labelname} list. It is set on a per-name basis. Its value is \texttt{0} if the base name (by default the <family> part of the name) is unique, \texttt{1} if adding the other parts of the name (as specified in the uniquename template defined by \cmd{DeclareUniquenameTemplate})as initials will make it unique, and \texttt{2} if the full name is required to disambiguate the name. This information is required by author-year and author-title citation schemes which add additional parts of the name when citing different authors with the same last name. For example, (given the default \cmd{DeclareUniquenameTemplate} definition) if there is one <John Doe> and one <Edward Doe> in the list of references, this counter will be set to \texttt{1}. If there is one <John Doe> and one <Jane Doe>, the value of the counter will be \texttt{2}. If the option is set to \texttt{init}\slash \texttt{allinit}\slash \texttt{mininit}, the counter will be limited to \texttt{1}. This is useful for citations styles which use initials to disambiguate names but never print the full name in citations. If adding the initials is not sufficient to disambiguate the name, \cnt{uniquename} will also be set to \texttt{0} for that name. This feature needs to be enabled explicitly with the package option \opt{uniquename}. Note that the \cnt{uniquename} counter is local to \cmd{printnames} and that it is only set for the \bibfield{labelname} list and to the name list \bibfield{labelname} has been derived from (typically \bibfield{author} or \bibfield{editor}). Its value is zero in any other context, i.e., it must be evaluated in the name formatting directives handling name lists. See \secref{aut:cav:amb} for further details and practical examples.
 
 \cntitem{uniquelist}
 This counter refers to the \bibfield{labelname} list. It is set on a per-field basis. Its value indicates the number of names required to disambiguate the name list if automatic \cnt{maxnames}\slash \cnt{minnames} truncation would lead to ambiguous citations. For example, if there is one work by <Doe\slash Smith\slash Johnson> and another one by <Doe\slash Edwards\slash Williams>, setting \kvopt{maxnames}{1} would lead to <Doe et al.> in both cases. In this case, \cnt{uniquelist} would be set to \texttt{2} on the \bibfield{labelname} lists of both entries because at least the first two names are required to disambiguate them. Note that the \cnt{uniquelist} counter is local to \cmd{printnames} and that it is only set for the \bibfield{labelname} list and to the name list \bibfield{labelname} has been derived from (typically \bibfield{author} or \bibfield{editor}). Its value is zero in any other context. If available, the \cnt{uniquelist} value will be used automatically by \cmd{printnames} when processing the name list, \ie it will automatically override \cnt{maxnames}\slash \cnt{minnames}. This feature needs to be enabled explicitly with the package option \opt{uniquelist}. See \secref{aut:cav:amb} for further details and practical examples.
@@ -9737,13 +9478,6 @@ Similar to \cmd{newbibmacro} but redefines \prm{name}. In contrast to \cmd{renew
 
 Similar to \cmd{newbibmacro} but only defines \prm{name} if it is undefined. This command is similar in concept to \cmd{providecommand}.
 
-\cmditem{letbibmacro}{alias}{name}
-\cmditem*{letbibmacro*}{alias}{name}
-
-This command defines the macro \prm{alias} to be an alias of the macro \prm{name}. The definition is perfomed by \cmd{csletcs}.
-An error is issued if \prm{name} is undefined.
-The regular variant of this command sanitizes \prm{name} while the starred variant does not.
-
 \cmditem{usebibmacro}{name}
 \cmditem*{usebibmacro*}{name}
 
@@ -9788,7 +9522,7 @@ otherwise.
 
 \cmditem{usedriver}{code}{entrytype}
 
-Executes the bibliography driver for an \prm{entrytype}. Calling this command in the \prm{loopcode} of a citation command defined with \cmd{DeclareCiteCommand} is a simple way to print full citations similar to a bibliography entry. Commands such as \cmd{newblock}, which are not applicable in a citation, are disabled automatically by default. The global initialization can be changed with \cmd{AtUsedriver}, see \secref{aut:fmt:hok}. Additional local initialization commands may be passed as the \prm{code} argument. This argument is executed inside the group in which \cmd{usedriver} runs the respective driver. Note that it is mandatory in terms of the syntax but may be left empty. Also note that this command will automatically switch languages if the \opt{autolang} package option is enabled.
+Executes the bibliography driver for an \prm{entrytype}. Calling this command in the \prm{loopcode} of a citation command defined with \cmd{DeclareCiteCommand} is a simple way to print full citations similar to a bibliography entry. Commands such as \cmd{newblock}, which are not applicable in a citation, are disabled automatically. Additional initialization commands may be passed as the \prm{code} argument. This argument is executed inside the group in which \cmd{usedriver} runs the respective driver. Note that it is mandatory in terms of the syntax but may be left empty. Also note that this command will automatically switch languages if the \opt{autolang} package option is enabled.
 
 \cmditem{bibhypertarget}{name}{text}
 
@@ -9863,7 +9597,6 @@ This command is similar to \cmd{mkpageprefix} except that it is intended for the
 \end{ltxexample}
 %
 The optional argument \bibfield{bookpagination} is omissible in this case.
-The pagination strings are taken from \texttt{$<$pagination$>$total} and \texttt{$<$pagination$>$totals}.
 
 \begin{table}
 \tablesetup\lnstyle
@@ -9904,7 +9637,7 @@ The pagination strings are taken from \texttt{$<$pagination$>$total} and \texttt
 \cmditem{mkcomprange}[postpro]{text}
 \cmditem*{mkcomprange*}[postpro]{text}
 
-This command, which is intended for use in field formatting directives, will parse its \prm{text} argument for page ranges and compress them. For example, «125--129» may be formatted as «125--9». You may configure the behavior of \cmd{mkcomprange} by adjusting the \latex counters \cnt{mincomprange}, \cnt{maxcomprange}, and \cnt{mincompwidth}, as illustrated in \tabref{aut:aux:tab1}. The default settings are \texttt{10}, \texttt{100000}, and \texttt{1}, respectively. This means that the command tries to compress as much as possible by default. Use \cmd{setcounter} to adjust the parameters. The scanner recognises \cmd{bibrangedash} and hyphens as range dashes. It will normalize the dash by replacing any number of consecutive hyphens with \cmd{bibrangedash}. Lists of ranges delimited with \cmd{bibrangessep} are also supported. The backend will normalise any comma or semi-colons surrounded by optional space by replacing them with \cmd{bibrangessep}. If you want to hide a character from the list/range scanner for some reason, wrap the character or the entire string in curly braces. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. This is important if you want to combine \cmd{mkcomprange} with other formatting macros which also need to parse their \prm{text} argument, such as \cmd{mkpageprefix}. Simply nesting these commands will not work as expected. Use the \prm{postpro} argument to set up the processing chain as follows:
+This command, which is intended for use in field formatting directives, will parse its \prm{text} argument for page ranges and compress them. For example, «125--129» may be formatted as «125--9». You may configure the behavior of \cmd{mkcomprange} by adjusting the \latex counters \cnt{mincomprange}, \cnt{maxcomprange}, and \cnt{mincompwidth}, as illustrated in \tabref{aut:aux:tab1}. The default settings are \texttt{10}, \texttt{100000}, and \texttt{1}, respectively. This means that the command tries to compress as much as possible by default. Use \cmd{setcounter} to adjust the parameters. The scanner recognizes \cmd{bibrangedash} and hyphens as range dashes. It will normalize the dash by replacing any number of consecutive hyphens with \cmd{bibrangedash}. Lists of ranges delimited with \cmd{bibrangessep} are also supported. The backend will normalise any comma or semi-colons surrounded by optional space by replacing them with \cmd{bibrangessep}. If you want to hide a character from the list/range scanner for some reason, wrap the character or the entire string in curly braces. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. This is important if you want to combine \cmd{mkcomprange} with other formatting macros which also need to parse their \prm{text} argument, such as \cmd{mkpageprefix}. Simply nesting these commands will not work as expected. Use the \prm{postpro} argument to set up the processing chain as follows:
 
 \begin{ltxexample}
 \DeclareFieldFormat{postnote}{\mkcomprange[<<{>>\mkpageprefix[pagination]<<}>>]{#1}}
@@ -10237,7 +9970,7 @@ The following commands configure various features related to punctuation and aut
 This command declares characters that are to be treated specially when testing to see if \cmd{bibnamedelimc} is to be inserted between a name prefix and a family name. If a character is in the list of \prm{characters}, \cmd{bibnamedelimc} is not inserted. It is used to allow abbreviated name prefices like <d'Argent> where no space should be inserted after the apostrophe. The default setting is:
 
 \begin{ltxexample}
-\DeclarePrefChars{'’-}
+\DeclarePrefChars{'}
 \end{ltxexample}
 
 \cmditem{DeclareAutoPunctuation}{characters}
@@ -10484,18 +10217,6 @@ Note that this feature needs to be enabled globally with the \opt{clearlang} opt
 
 This command maps a \sty{babel}/\sty{polyglossia} language identifier to an \file{lbx} file. The \prm{language} must be a language name known to the \sty{babel}/\sty{polyglossia} package, \ie one of the identifiers listed in \tabref{bib:fld:tab1}. The \prm{file} argument is the name of an alternative \file{lbx} file without the \texttt{.lbx} suffix. Declaring the same mapping more than once is possible. Subsequent declarations will simply overwrite any previous ones. This command may only be used in the preamble. See \secref{aut:cav:lng} for further details.
 
-\cmditem{DeclareLanguageMappingSuffix}{suffix}
-
-This command defines a language file suffix which will be added when looking for \file{.lbx} language string definition files. This is intended for styles which provide their own \file{.lbx} files so that they will be used automatically. For example, the APA style defines:
-
-\begin{ltxexample}
-\DeclareLanguageMappingSuffix{-apa}
-\end{ltxexample}
-%
-When the document language is <german>, \biblatex will look for the file \file{german-apa.lbx} which defines some APA specific strings and in turn loads \file{german.lbx}. If \cmd{DeclareLanguageMapping} is defined for a language, this overrides \cmd{DeclareLanguageMappingSuffix}.
-
-Note that the suffix will not be applied to language files loaded recursively by the loading of a language file. For example, given the suffix defined above, when loading <ngerman>, \biblatex will look for the file \file{ngerman-apa.lbx} and if this recursively loads <german>, then biblatex will look for \file{german.lbx} and \emph{not} \file{german-apa.lbx}.
-
 \cmditem{NewBibliographyString}{key}
 
 This command, which may be used in the preamble (including \file{cbx} and \file{bbx} files) as well as in \file{lbx} files, declares new localisation strings, \ie it initializes a new \prm{key} to be used in the \prm{definitions} of \cmd{DefineBibliographyStrings} or \cmd{DeclareBibliographyStrings}. The \prm{key} argument may also be a comma"=separated list of key names. When used in an \file{lbx}, the \prm{key} is initialized only for the language specified by the name of the \file{lbx} file. The keys listed in \secref{aut:lng:key} are defined by default.
@@ -10544,9 +10265,6 @@ The following keys refer to roles which are expressed as a function (<editor>, <
 \item[commentators] The plural form of \texttt{commentators}.
 \item[annotator] The term <annotator>, referring to the author of annotations to a work.
 \item[annotators] The plural form of \texttt{annotators}.
-\item[organizer] The term <organizer>, referring to the organizer of an
-  event or work.
-\item[organizers] The plural form of \texttt{organizer}.
 \end{keymarglist}
 
 \paragraph{Concatenated Editor Roles, Expressed as Functions}
@@ -10686,7 +10404,6 @@ The following keys refer to roles which are expressed as an action (<edited by>,
 \item[bytranslator] The expression <translated by \prm{name}> or <translated from \prm{language} by \prm{name}>.
 \item[bycommentator] The expression <commented by \prm{name}>.
 \item[byannotator] The expression <annotated by \prm{name}>.
-\item[byorganizer] The expression <[organized] by \prm{name}>.
 \end{keymarglist}
 
 \paragraph{Concatenated Editor Roles, Expressed as Actions}
@@ -10860,18 +10577,6 @@ Roles which are related to supplementary material may also be expressed as objec
 \item[verses] The plural form of \texttt{verse}.
 \item[line] The term <line> as used when referring to a work which is cited by line numbers.
 \item[lines] The plural form of \texttt{line}.
-\item[pagetotal] The term <page> as used in \cmd{mkpageprefix}.
-\item[pagetotals] The plural form of \texttt{pagetotal}.
-\item[columntotal] The term <column>, referring to a column on a page, as used in \cmd{mkpageprefix}.
-\item[columntotals] The plural form of \texttt{columntotal}.
-\item[sectiontotal] The term <section>, referring to a document division (usually abbreviated as \S),  as used in \cmd{mkpageprefix}.
-\item[sectiontotals] The plural form of \texttt{sectiontotal} (usually abbreviated as \S\S).
-\item[paragraphtotal] The term <paragraph> (\ie a block of text, not to be confused with \texttt{section}) as used in \cmd{mkpageprefix}.
-\item[paragraphtotals] The plural form of \texttt{paragraphtotal}.
-\item[versetotal] The term <verse> as used when referring to a work which is cited by verse numbers when used in \cmd{mkpageprefix}.
-\item[versetotals] The plural form of \texttt{versetotal}.
-\item[linetotal] The term <line> as used when referring to a work which is cited by line numbers when used in \cmd{mkpageprefix}.
-\item[linetotals] The plural form of \texttt{linetotal}.
 \end{keymarglist}
 
 \paragraph{Types}
@@ -10975,7 +10680,6 @@ Other expressions frequently used in citations:
 \begin{keymarglist}
 \item[langamerican] The language <American> or <American English>.
 \item[langbrazilian] The language <Brazilian> or <Brazilian Portuguese>.
-\item[langbulgarian] The language <Bulgarian>.
 \item[langcatalan] The language <Catalan>.
 \item[langcroatian] The language <Croatian>.
 \item[langczech] The language <Czech>.
@@ -10998,7 +10702,6 @@ Other expressions frequently used in citations:
 \item[langslovene] The language <Slovene>.
 \item[langspanish] The language <Spanish>.
 \item[langswedish] The language <Swedish>.
-\item[langukrainian] The language <Ukrainian>.
 \end{keymarglist}
 %
 The following strings are intended for use in phrases like <translated from [the] English by \prm{translator}>:
@@ -11006,7 +10709,6 @@ The following strings are intended for use in phrases like <translated from [the
 \begin{keymarglist}
 \item[fromamerican] The expression <from [the] American> or <from [the] American English>.
 \item[frombrazilian] The expression <from [the] Brazilian> or <from [the] Brazilian Portuguese>.
-\item[frombulgarian] The expression <from [the] Bulgarian>.
 \item[fromcatalan] The expression <from [the] Catalan>.
 \item[fromcroatian] The expression <from [the] Croatian>.
 \item[fromczech] The expression <from [the] Czech>.
@@ -11029,7 +10731,6 @@ The following strings are intended for use in phrases like <translated from [the
 \item[fromslovene] The expression <from [the] Slovene>.
 \item[fromspanish] The expression <from [the] Spanish>.
 \item[fromswedish] The expression <from [the] Swedish>.
-\item[fromukrainian] The expression <from [the] Ukrainian>.
 \end{keymarglist}
 
 \paragraph{Country Names}
@@ -11125,7 +10826,7 @@ This delimiter controls the spacing between the elements which make up a name pa
 This delimiter controls the spacing between the elements which make up a name part. It is inserted automatically by the backend between all name elements where \cmd{bibnamedelima} does not apply. The default definition is \cmd{addlowpenspace}, \ie a space penalized by the value of the \cnt{lownamepenalty} counter (\secref{use:fmt:len}). Please refer to \secref{use:cav:nam} for further details.
 
 \csitem{bibnamedelimc}
-This delimiter controls the spacing between name parts. The default name formats use it between the name prefix and the family name if \kvopt{useprefix}{true}. The default definition is \cmd{addhighpenspace}, \ie a space penalized by the value of the \cnt{highnamepenalty} counter (\secref{use:fmt:len}). Please refer to \secref{use:cav:nam} for further details.
+This delimiter controls the spacing between name parts. The default name formats use it between the name prefix and the last name if \kvopt{useprefix}{true}. The default definition is \cmd{addhighpenspace}, \ie a space penalized by the value of the \cnt{highnamepenalty} counter (\secref{use:fmt:len}). Please refer to \secref{use:cav:nam} for further details.
 
 \csitem{bibnamedelimd}
 This delimiter controls the spacing between name parts. The default name formats use it between all name parts where \cmd{bibnamedelimc} does not apply. The default definition is \cmd{addlowpenspace}, \ie a space penalized by the value of the \cnt{lownamepenalty} counter (\secref{use:fmt:len}). Please refer to \secref{use:cav:nam} for further details.
@@ -11167,13 +10868,13 @@ Replaces \cmd{bibinitdelim} in the index.
 Replaces \cmd{bibinithyphendelim} in the index.
 
 \csitem{revsdnamepunct}
-The punctuation to be printed between the given and family name parts when a name is reversed. The default is a comma. This command should be incorporated in formatting directives for name lists.  Please refer to \secref{use:cav:nam} for further details.
+The punctuation to be printed between the first and last name parts when a name is reversed. The default is a comma. This command should be incorporated in formatting directives for name lists.  Please refer to \secref{use:cav:nam} for further details.
 
 \csitem{bibnamedash}
 The dash to be used as a replacement for recurrent authors or editors in the bibliography. The default is an <em> or an <en> dash, depending on the indentation of the list of references.
 
 \csitem{labelnamepunct}
-The separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined). Use this separator instead of \cmd{newunitpunct} at this location. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration. See also \cmd{nametitledelim} \secref{use:fmt:csd}.
+The separator to be printed after the name used for alphabetizing in the bibliography (\bibfield{author} or \bibfield{editor}, if the \bibfield{author} field is undefined). Use this separator instead of \cmd{newunitpunct} at this location. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration.
 
 \csitem{subtitlepunct}
 The separator to be printed between the fields \bibfield{title} and \bibfield{subtitle}, \bibfield{booktitle} and \bibfield{booksubtitle}, as well as \bibfield{maintitle} and \bibfield{mainsubtitle}. Use this separator instead of \cmd{newunitpunct} at this location. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration.
@@ -11232,15 +10933,6 @@ The delimiter printed between the name\slash title and the label. This command s
 \csitem{nonameyeardelim}
 The delimiter printed between the substitute for the labelname when it does not exist (usually the label or title in standard styles) and the year in author-year citation styles. This is only used when there is no labelname since when the labelname exists, \cmd{nameyeardelim} is used.
 
-\csitem{authortypedelim}
-The delimiter printed between the author and the \texttt{authortype}.
-
-\csitem{editortypedelim}
-The delimiter printed between the editor and the \texttt{editor} or \texttt{editortype} string.
-
-\csitem{translatortypedelim}
-The delimiter printed between the translator and the \texttt{translator} string.
-
 \csitem{volcitedelim}
 The delimiter to be printed between the volume portion and the page/text portion of \cmd{volcite} and related commands (\secref{use:cit:spc}).
 
@@ -11620,9 +11312,9 @@ This length register indicates the width of the widest \bibfield{labelalpha}. Al
 
 This counter holds the highest number found in any \bibfield{extraalpha} field.
 
-\cntitem{maxextradate}
+\cntitem{maxextrayear}
 
-This counter holds the highest number found in any \bibfield{extradate} field.
+This counter holds the highest number found in any \bibfield{extrayear} field.
 
 \cntitem{refsection}
 
@@ -11751,20 +11443,6 @@ Appends the \prm{code} to an internal hook executed at the beginning of every it
 
 Similar to \cmd{AtBeginBibliography} but only affecting the next \cmd{printbibliography}. The internal hook is cleared after being executed once. This command may be used in the document body.
 
-\cmditem{AtUsedriver}{code}
-\cmditem*{AtUsedriver}*{code}
-
-Appends the \prm{code} to an internal hook executed when initializing \cmd{uisedriver}. The starred variant of the command clears the initialisation hook, so the defaults can be overwritten. This command may only be used in the preamble.
-The default setting is:
-
-\begin{ltxexample}
-\AtUsedriver{%
-  \let\finentry\blx@finentry@usedrv
-  \let\newblock\relax
-  \let\abx@macro@bibindex\@empty
-  \let\abx@macro@pageref\@empty}
-\end{ltxexample}
-
 \cmditem{AtEveryCite}{code}
 
 Appends the \prm{code} to an internal hook executed at the beginning of every citation command. The \prm{code} is executed immediately before the \prm{precode} of the command (see \secref{aut:cbx:cbx}). No bibliographic data is available at this point. This command may only be used in the preamble.
@@ -11795,16 +11473,12 @@ Similar to \cmd{AtEveryMultiCite} but only affecting the next multicite command.
 
 \cmditem{AtDataInput}[entrytype]{code}
 
-Appends the \prm{code} to an internal hook executed once for every entry as the bibliographic data is imported from the \file{bbl} file. The \prm{entrytype} is the entry type the \prm{code} applies to. If it applies to all entry types, omit the optional argument. The \prm{code} is executed immediately after the entry has been imported. This command may only be used in the preamble. Note that \prm{code} may be executed multiple times for an entry. This occurs when the same entry is cited in different \env{refsection} environments or the \opt{sorting} option settings incorporate more than one sorting template. The \cnt{refsection} counter holds the number of the respective reference section while the data is imported.
+Appends the \prm{code} to an internal hook executed once for every entry as the bibliographic data is imported from the \file{bbl} file. The \prm{entrytype} is the entry type the \prm{code} applies to. If it applies to all entry types, omit the optional argument. The \prm{code} is executed immediately after the entry has been imported. This command may only be used in the preamble. Note that \prm{code} may be executed multiple times for an entry. This occurs when the same entry is cited in different \env{refsection} environments or the \opt{sorting} option settings incorporate more than one sorting scheme. The \cnt{refsection} counter holds the number of the respective reference section while the data is imported.
 
 \cmditem{UseBibitemHook}
 
 Executes the internal hook corresponding to \cmd{AtEveryBibitem}.
 
-\cmditem{UseUsedriverHook}
-
-Executes the internal hook corresponding to \cmd{AtUsedriver}.
-
 \cmditem{UseEveryCiteHook}
 
 Executes the internal hook corresponding to \cmd{AtEveryCite}.
@@ -11851,7 +11525,7 @@ Entry sets have already been introduced in \secref{use:use:set}. This section di
   \finentry}
 \end{ltxexample}
 %
-You may have noticed that the \texttt{numeric} styles which come with this package support subdivided entry sets, \ie the members of the set are marked with a letter or some other marker such that citations may either refer to the entire set or to a specific set member. The markers are generated as follows by the bibliography style:
+You may have noticed that the \texttt{numeric} styles which ship with this package support subdivided entry sets, \ie the members of the set are marked with a letter or some other marker such that citations may either refer to the entire set or to a specific set member. The markers are generated as follows by the bibliography style:
 
 \begin{ltxexample}
 \DeclareBibliographyDriver{set}{%
@@ -11870,8 +11544,6 @@ The \bibfield{entrysetcount} field holds an integer indicating the position of a
 %
 Since this field is only defined when processing citations referring to a set member, there is no need to add any additional tests.
 
-Citing entry sets directly requires that a meaningful way of identifying sets is available in the style. This is obvious for styles based on numeric or alphabetic labels but not obvious (and rarely required) in styles which construct citations based on textual names/titles/dates etc. The default provided styles which no not construct citations based on labels (\texttt{authoryear}, \texttt{authortitle}, \texttt{verbose} etc.) therefore do not support citing sets directly as there is no obvious default identifier to use in such cases and such styles rarely, if ever, employ sets anyway. Custom styles may of course choose to define and print a citation identifier for directly cited sets.
-
 \subsubsection{Electronic Publishing Information}
 \label{aut:cav:epr}
 
@@ -11922,15 +11594,13 @@ Name disambiguation works by taking a <base> which is composed of one or more na
 
 \begin{ltxsyntax}
 
-\cmditem{DeclareUniquenameTemplate}[name]{specification}
+\cmditem{DeclareUniquenameTemplate}{specification}
 
-Defines the \opt{uniquename} template \prm{name}. The \prm{name} is optional and defaults to \prm{<global>}.
-
-The \prm{specification} is an ordered list of \cmd{namepart} commands which define the nameparts to use in determining the uniquename information.
+The \prm{specification} is a list of \cmd{namepart} commands which define the nameparts to use in determining the uniquename information
 
 \cmditem{namepart}[options]{namepart}
 
-\prm{namepart} is one of the datamodel nameparts defined with the \cmd{DeclareDatamodelConstant} command (see \secref{aut:bbx:drv}). The \prm{options} are:
+\prm{namepart} is one of the datamodel nameparts defined with the \cmd{DeclareDatamodelConstant} command (see \secref{aut:bbx:drv}). The \opt{options} are:
 
 \begin{optionlist*}
 
@@ -11940,19 +11610,7 @@ Only use the \prm{namepart} in constructing the uniquename information if there
 
 \boolitem[false]{base}
 
-The \prm{namepart} is part of the <base> which is the main piece of namepart(s) information which is being disambiguated by uniqueness information. For example, a family name which may be disambiguated by further given names. <base> \prm{namepart}s must occur before any non-<base> \prm{nameparts}.
-
-\choitem{disambiguation}{none, init, initorfull, full}
-
-The \prm{namepart} will be disambiguated at most by information at the given value. If this option is not present then the default is inferred from the \opt{uniquename} package option setting (see \secref{use:opt:wu}). The <disambiguation> option is ignored for \prm{namepart}s which have the <base> option set to <true> since it is these nameparts which are being disambiguated by the value of the non-base \prm{namepart}s and therefore <disambiguation> does not apply.
-
-\begin{description}
-\item[none]~Do not use the \prm{namepart} to perform any name disambiguation
-\item[init]~Use only the initials of the \prm{namepart} to perform name disambiguation
-\item[initorfull]~Use initials and if necessary the full \prm{namepart} to perform name disambiguation
-\item[full]~Use only the full \prm{namepart} to perform name
-  disambiguation even if initials would suffice
-\end{description}
+The \prm{namepart} is part of the <base> which is the main piece of namepart(s) information which is being disambiguated by uniqueness information.
 
 \end{optionlist*}
 
@@ -11968,7 +11626,7 @@ The default uniquename template is:
 }
 \end{ltxexample}
 %
-This means that the <base> to be disambiguated consists of the <family> namepart, along with any prefix, if the \opt{useprefix} option is true. The disambiguation is performed by adding anything up to the full namepart of any non <base> nameparts in the specification, here just the <given> namepart.
+This means that the <base> to be disambiguated consists of the <family> namepart, along with any prefix, if the \opt{useprefix} option is true. The disambiguation is performed by adding aspects of any non <base> nameparts in the specification, here just the <given> namepart.
 
 \paragraph{Individual Names (\opt{uniquename})}
 
@@ -12024,7 +11682,7 @@ Doe
 Smith
 \end{lstlisting}
 %
-When disambiguating names, \kvopt{uniquename}{init/full} only consider the visible names. Since all visible family names are distinct in this example, no further name parts are added. Let's compare that to the output of \kvopt{uniquename}{allinit}:
+When disambiguating names, \kvopt{uniquename}{init/full} only consider the visible names. Since all visible last names are distinct in this example, no further name parts are added. Let's compare that to the output of \kvopt{uniquename}{allinit}:
 
 \begin{lstlisting}{}
 Jones et al.
@@ -12040,7 +11698,7 @@ J. Doe
 John Smith
 \end{lstlisting}
 %
-The options \kvopt{uniquename}{mininit/minfull} are similar to \texttt{init\slash full} in that they only consider visible names, but they perform minimal disambiguation. That is, they will disambiguate individual names only if they occur in identical lists of base nameparts (for the concept of <base> nameparts, see \cmd{DeclareUniquenameTemplate in \secref{aut:cav:amb}}). Consider the following data:
+The options \kvopt{uniquename}{mininit/minfull} are similar to \texttt{init\slash full} in that they only consider visible names, but they perform minimal disambiguation. That is, they will disambiguate individual names only if they occur in identical lists of last names. Consider the following data:
 
 \begin{lstlisting}{}
 John Doe/William Jones
@@ -12067,7 +11725,7 @@ Smith and Edwards
 Smith and Johnson
 \end{lstlisting}
 %
-The <Smiths> are not disambiguated because the visible name lists are not ambiguous and the \opt{mininit/minfull} options serve to disambiguate names occurring in identical base namepart lists only. Another way of looking at this is that they globally disambiguate base namepart lists. When it comes to ambiguous lists, note that a truncated list is considered to be distinct from an untruncated one even if the visible names are identical. For example, consider the following data:
+The <Smiths> are not disambiguated because the visible name lists are not ambiguous and the \opt{mininit/minfull} options serve to disambiguate names occurring in identical last name lists only. Another way of looking at this is that they globally disambiguate family name lists. When it comes to ambiguous lists, note that a truncated list is considered to be distinct from an untruncated one even if the visible names are identical. For example, consider the following data:
 
 \begin{lstlisting}{}
 John Doe/William Jones
@@ -12512,7 +12170,7 @@ Since the alternative \file{lbx} file can inherit strings from the standard \pat
 %
 Alternative \file{lbx} files must ensure that the localisation module is complete. They should do so by inheriting data from the corresponding standard module. If the language \texttt{american} is mapped to \path{american-mla.lbx}, \biblatex will not load \path{american.lbx} unless this module is requested explicitly. In the above example, inheriting <strings> and <extras> will cause \biblatex to load \path{american.lbx} before applying the modifications in \path{american-mla.lbx}.
 
-Note that \cmd{DeclareLanguageMapping} is not intended to handle language variants (\eg American English vs. British English) or \sty{babel}/\sty{polyglossia} language aliases (\eg \texttt{USenglish} vs. \texttt{american}). For example, \sty{babel}/\sty{polyglossia} offers the \texttt{USenglish} option which is similar to \texttt{american}. Therefore, \biblatex comes with an \path{USenglish.lbx} file which simply inherits all data from \path{american.lbx} (which in turn gets the <strings> from \path{english.lbx}). In other words, the mapping of language variants and \sty{babel}/\sty{polyglossia} language aliases happens on the file level, the point being that \biblatex's language support can be extended simply by adding additional \file{lbx} files. There is no need for centralized mapping. If you need support for, say, Portuguese (babel/polyglossia: \file{portuges}), you create a file named \path{portuges.lbx}. If \sty{babel}/\sty{polyglossia} offered an alias named \texttt{brasil}, you would create \path{brasil.lbx} and inherit the data from \path{portuges.lbx}. In contrast to that, the point of \cmd{DeclareLanguageMapping} is handling \emph{stylistic} variants like <humanities vs. natural sciences> or <\acr{mla} vs. \acr{apa}> etc. which will typically be built on top of existing \file{lbx} files.
+Note that \cmd{DeclareLanguageMapping} is not intended to handle language variants (\eg American English vs. British English) or \sty{babel}/\sty{polyglossia} language aliases (\eg \texttt{USenglish} vs. \texttt{american}). For example, \sty{babel}/\sty{polyglossia} offers the \texttt{USenglish} option which is similar to \texttt{american}. Therefore, \biblatex ships with an \path{USenglish.lbx} file which simply inherits all data from \path{american.lbx} (which in turn gets the <strings> from \path{english.lbx}). In other words, the mapping of language variants and \sty{babel}/\sty{polyglossia} language aliases happens on the file level, the point being that \biblatex's language support can be extended simply by adding additional \file{lbx} files. There is no need for centralized mapping. If you need support for, say, Portuguese (babel/polyglossia: \file{portuges}), you create a file named \path{portuges.lbx}. If \sty{babel}/\sty{polyglossia} offered an alias named \texttt{brasil}, you would create \path{brasil.lbx} and inherit the data from \path{portuges.lbx}. In contrast to that, the point of \cmd{DeclareLanguageMapping} is handling \emph{stylistic} variants like <humanities vs. natural sciences> or <\acr{mla} vs. \acr{apa}> etc. which will typically be built on top of existing \file{lbx} files.
 
 \subsubsection{Grouping}
 \label{aut:cav:grp}
@@ -12695,13 +12353,13 @@ periodical &
 \end{longtable}
 \endgroup
 
-\section{Default Sorting Templates}
+\section{Default Sorting Schemes}
 \label{apx:srt}
 
-\subsection[Alphabetic 1]{Alphabetic Templates 1}
+\subsection[Alphabetic 1]{Alphabetic Schemes 1}
 \label{apx:srt:a1}
 
-The following table shows the standard alphabetic sorting templates defined by default. Please refer to \secref{use:srt} for explanation.
+The following table shows the standard alphabetic sorting schemes defined by default. Please refer to \secref{use:srt} for explanation.
 
 \begingroup
 \sorttablesetup
@@ -12713,7 +12371,7 @@ The following table shows the standard alphabetic sorting templates defined by d
 	L{0.150\textwidth}@{}%
 	L{0.300\textwidth}@{}}
 \toprule
-\multicolumn{1}{@{}H}{Option} & \multicolumn{5}{@{}H}{Template name} \\
+\multicolumn{1}{@{}H}{Option} & \multicolumn{5}{@{}H}{Sorting scheme} \\
 \cmidrule(r){1-1}\cmidrule{2-6}
 \endhead
 \bottomrule
@@ -12738,10 +12396,10 @@ nyvt &	presort\alt mm &
 \end{longtable}
 \endgroup
 
-\subsection[Alphabetic 2]{Alphabetic Templates 2}
+\subsection[Alphabetic 2]{Alphabetic Schemes 2}
 \label{apx:srt:a2}
 
-The following table shows the alphabetic sorting templates for \texttt{alphabetic} styles defined by default. Please refer to \secref{use:srt} for explanation.
+The following table shows the alphabetic sorting schemes for \texttt{alphabetic} styles defined by default. Please refer to \secref{use:srt} for explanation.
 
 \begingroup
 \sorttablesetup
@@ -12754,7 +12412,7 @@ The following table shows the alphabetic sorting templates for \texttt{alphabeti
 	L{0.150\textwidth}@{}%
 	L{0.150\textwidth}@{}}
 \toprule
-\multicolumn{1}{@{}H}{Option} & \multicolumn{6}{@{}H}{Template name} \\
+\multicolumn{1}{@{}H}{Option} & \multicolumn{6}{@{}H}{Sorting scheme} \\
 \cmidrule(r){1-1}\cmidrule{2-7}
 \endhead
 \bottomrule
@@ -12777,10 +12435,10 @@ anyvt &	presort\alt mm &
 \end{longtable}
 \endgroup
 
-\subsection[Chronological]{Chronological Templates}
+\subsection[Chronological]{Chronological Schemes}
 \label{apx:srt:chr}
 
-The following table shows the chronological sorting templates defined by default. Please refer to \secref{use:srt} for explanation.
+The following table shows the chronological sorting schemes defined by default. Please refer to \secref{use:srt} for explanation.
 
 \begingroup
 \sorttablesetup
@@ -12791,7 +12449,7 @@ The following table shows the chronological sorting templates defined by default
 	L{0.175\textwidth}@{}%
 	L{0.400\textwidth}@{}}
 \toprule
-\multicolumn{1}{@{}H}{Option} & \multicolumn{4}{@{}H}{Template name} \\
+\multicolumn{1}{@{}H}{Option} & \multicolumn{4}{@{}H}{Sorting scheme} \\
 \cmidrule(r){1-1}\cmidrule{2-5}
 \endhead
 \bottomrule
@@ -13027,176 +12685,138 @@ As per \secref{aut:ctm:rel}, the \bibfield{string} and \bibfield{options} attrib
 \section{Option Scope}
 \label{apx:opt}
 
-The following table provides an overview of the scope of various options.
-
-Per-entry, per-namelist and per-name options are set in the datasource, for
-example, in a  \file{.bib}file. See the \biber documentation for details
-but here are a few examples. Per-entry:
-
-\begin{lstlisting}[style=bibtex]{}
-@BOOK{key,
-  OPTIONS = {sortingnamekeytemplatename=template1},
-}
-\end{lstlisting}
-%
-Per-namelist and per-name options require either the \biblatexml datasource
-format or the extend \bibtex name format supported by \biber (see the
-\biber documentation for details). Per-namelist:
-
-\begin{lstlisting}[style=bibtex]{}
-@BOOK{key,
-  AUTHOR = {sortingnamekeytemplatename=template1 and Arthur Smith and Bill Brown},
-}
-\end{lstlisting}
-%
-Per-name:
-
-\begin{lstlisting}[style=bibtex]{}
-@BOOK{key,
-  AUTHOR = {sortingnamekeytemplatename=template1, family=Smith, given=Arthur and Bill Brown},
-}
-\end{lstlisting}
+The following table provides an overview of the scope (global\slash per-type\slash per-entry) of various package options.
 
 \begingroup
 \tablesetup
 \let\+\tickmarkyes
 \let\_\tickmarkno
 \begin{longtable}[l]{@{}%
-	V{0.3\textwidth}@{}%
-	C{0.1\textwidth}@{}%
-  C{0.1\textwidth}@{}%
-  C{0.1\textwidth}@{}%  
-  C{0.1\textwidth}@{}%
-  C{0.1\textwidth}@{}%
-  C{0.1\textwidth}@{}%
-  C{0.1\textwidth}@{}}
+	V{0.4\textwidth}@{}%
+	C{0.15\textwidth}@{}%
+	C{0.15\textwidth}@{}%
+	C{0.15\textwidth}@{}%
+	C{0.15\textwidth}@{}}
 \toprule
 \multicolumn{1}{@{}H}{Option} &
-\multicolumn{7}{@{}H}{Scope} \\
-\cmidrule{2-8}
+\multicolumn{4}{@{}H}{Scope} \\
+\cmidrule{2-5}
 & \multicolumn{1}{@{}H}{Load-time} &
 \multicolumn{1}{@{}H}{Global} &
-\multicolumn{1}{@{}H}{Per-refcontext} &
 \multicolumn{1}{@{}H}{Per-type} &
-\multicolumn{1}{@{}H}{Per-entry} &
-\multicolumn{1}{@{}H}{Per-namelist} &
-\multicolumn{1}{@{}H}{Per-name} \\
-\cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule(r){4-4}\cmidrule(r){5-5}\cmidrule(r){6-6}\cmidrule(r){7-7}\cmidrule(r){8-8}
+\multicolumn{1}{@{}H}{Per-entry} \\
+\cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule(r){4-4}\cmidrule{5-5}
 \endhead
 \bottomrule
 \endfoot
-abbreviate	&\+&\+&\_&\_&\_&\_&\_\\
-alldates	&\+&\+&\_&\_&\_&\_&\_\\
-alldatesusetime	&\+&\+&\_&\_&\_&\_&\_\\
-alltimes	&\+&\+&\_&\_&\_&\_&\_\\
-arxiv		&\+&\+&\_&\_&\_&\_&\_\\
-autocite	&\+&\+&\_&\_&\_&\_&\_\\
-autopunct	&\+&\+&\_&\_&\_&\_&\_\\
-autolang		&\+&\+&\_&\_&\_&\_&\_\\
-backend		&\+&\_&\_&\_&\_&\_&\_\\
-backref		&\+&\+&\_&\_&\_&\_&\_\\
-backrefsetstyle	&\+&\+&\_&\_&\_&\_&\_\\
-backrefstyle	&\+&\+&\_&\_&\_&\_&\_\\
-bibencoding	&\+&\+&\_&\_&\_&\_&\_\\
-bibstyle	&\+&\_&\_&\_&\_&\_&\_\\
-bibwarn		&\+&\+&\_&\_&\_&\_&\_\\
-block		&\+&\+&\_&\_&\_&\_&\_\\
-citecounter	&\+&\+&\_&\_&\_&\_&\_\\
-citereset	&\+&\+&\_&\_&\_&\_&\_\\
-citestyle	&\+&\_&\_&\_&\_&\_&\_\\
-citetracker	&\+&\+&\_&\_&\_&\_&\_\\
-clearlang	&\+&\+&\_&\_&\_&\_&\_\\
-datamodel &\+&\_&\_&\_&\_&\_&\_\\
-dataonly	&\_&\_&\_&\+&\+&\_&\_\\
-date		&\+&\+&\_&\_&\_&\_&\_\\
-labeldate		&\+&\+&\_&\_&\_&\_&\_\\
-$<$datetype$>$date		&\+&\+&\_&\_&\_&\_&\_\\
-dateabbrev	&\+&\+&\_&\_&\_&\_&\_\\
-datecirca &\+&\+&\_&\_&\_&\_&\_\\
-dateera &\+&\+&\_&\_&\_&\_&\_\\
-dateerauto &\+&\+&\_&\_&\_&\_&\_\\
-dateuncertain &\+&\+&\_&\_&\_&\_&\_\\
-datezeros	&\+&\+&\_&\_&\_&\_&\_\\
-defernumbers	&\+&\+&\_&\_&\_&\_&\_\\
-doi		&\+&\+&\_&\_&\_&\_&\_\\ % style
-eprint		&\+&\+&\_&\_&\_&\_&\_\\ % style
-$<$namepart$>$inits	&\+&\+&\_&\_&\_&\_&\_\\
-gregorianstart &\+&\+&\_&\_&\_&\_&\_\\
-hyperref	&\+&\+&\_&\_&\_&\_&\_\\
-ibidtracker	&\+&\+&\_&\_&\_&\_&\_\\
-idemtracker	&\+&\+&\_&\_&\_&\_&\_\\
-indexing	&\+&\+&\_&\+&\+&\_&\_\\
-isbn		&\+&\+&\_&\_&\_&\_&\_\\ % style
-julian &\+&\+&\_&\_&\_&\_&\_\\
-labelalpha	&\+&\+&\_&\+&\_&\_&\_\\
-labelalphanametemplatename	&\_&\_&\+&\_&\+&\+&\+\\
-labelnamefield  &\_&\_&\_&\_&\+&\_&\_\\
-labelnumber	&\+&\+&\_&\+&\_&\_&\_\\
-labeltitle	&\+&\+&\_&\+&\_&\_&\_\\
-labeltitlefield &\_&\_&\_&\_&\+&\_&\_\\
-labeltitleyear	&\+&\+&\_&\+&\_&\_&\_\\
-labeldateparts	&\+&\+&\_&\+&\_&\_&\_\\
-labeltime	&\+&\+&\_&\_&\_&\_&\_\\
-labeldateusetime	&\+&\+&\_&\_&\_&\_&\_\\
-labelprefix &\_&\_&\+&\_&\_&\_&\_\\
-$<$datetype$>$time	&\+&\+&\_&\_&\_&\_&\_\\
-$<$datetype$>$dateusetime	&\+&\+&\_&\_&\_&\_&\_\\
-language	&\+&\+&\_&\_&\_&\_&\_\\
-loadfiles	&\+&\+&\_&\_&\_&\_&\_\\
-loccittracker	&\+&\+&\_&\_&\_&\_&\_\\
-maxalphanames	&\+&\+&\_&\+&\+&\_&\_\\
-maxbibnames	&\+&\+&\_&\+&\+&\_&\_\\
-maxcitenames	&\+&\+&\_&\+&\+&\_&\_\\
-maxitems	&\+&\+&\_&\+&\+&\_&\_\\
-maxnames	&\+&\+&\_&\+&\+&\_&\_\\
-maxparens	&\+&\+&\_&\_&\_&\_&\_\\
-mcite		&\+&\_&\_&\_&\_&\_&\_\\
-minalphanames	&\+&\+&\_&\+&\+&\_&\_\\
-minbibnames	&\+&\+&\_&\+&\+&\_&\_\\
-mincitenames	&\+&\+&\_&\+&\+&\_&\_\\
-mincrossrefs	&\+&\+&\_&\_&\_&\_&\_\\
-minxrefs	&\+&\+&\_&\_&\_&\_&\_\\
-minitems	&\+&\+&\_&\+&\+&\_&\_\\
-minnames	&\+&\+&\_&\+&\+&\_&\_\\
-nametemplates &\_&\_&\+&\_&\+&\+&\+\\
-natbib		&\+&\_&\_&\_&\_&\_&\_\\
-noinherit		&\_&\_&\_&\_&\+&\_&\_\\
-notetype	&\+&\+&\_&\_&\_&\_&\_\\
-opcittracker	&\+&\+&\_&\_&\_&\_&\_\\
-openbib		&\+&\+&\_&\_&\_&\_&\_\\
-pagetracker	&\+&\+&\_&\_&\_&\_&\_\\
-parentracker	&\+&\+&\_&\_&\_&\_&\_\\
-punctfont	&\+&\+&\_&\_&\_&\_&\_\\
-refsection	&\+&\+&\_&\_&\_&\_&\_\\
-refsegment	&\+&\+&\_&\_&\_&\_&\_\\
-safeinputenc	&\+&\+&\_&\_&\_&\_&\_\\
-seconds	&\+&\+&\_&\_&\_&\_&\_\\
-singletitle	&\+&\+&\_&\+&\_&\_&\_\\
-skipbib		&\_&\_&\_&\+&\+&\_&\_\\
-skipbiblist	&\_&\_&\_&\+&\+&\_&\_\\
-skiplab		&\_&\_&\_&\+&\+&\_&\_\\
-sortcase	&\+&\+&\_&\_&\_&\_&\_\\
-sortcites	&\+&\+&\_&\_&\_&\_&\_\\
-sorting		&\+&\+&\_&\_&\_&\_&\_\\
-sortingnamekeytemplatename 	&\_&\_&\+&\_&\+&\+&\+\\
-sortlocale	&\+&\+&\_&\_&\_&\_&\_\\
-sortlos		&\+&\+&\_&\_&\_&\_&\_\\
-sortupper	&\+&\+&\_&\_&\_&\_&\_\\
-style		&\+&\_&\_&\_&\_&\_&\_\\
-terseinits	&\+&\+&\_&\_&\_&\_&\_\\
-texencoding	&\+&\+&\_&\_&\_&\_&\_\\
-timezeros	&\+&\+&\_&\_&\_&\_&\_\\
-timezones	&\+&\+&\_&\_&\_&\_&\_\\
-uniquelist	&\+&\+&\_&\+&\+&\_&\_\\
-uniquename	&\+&\+&\_&\+&\+&\_&\_\\
-uniquenametemplatename	&\_&\_&\+&\_&\+&\+&\+\\
-uniquetitle	&\+&\+&\_&\+&\_&\_&\_\\
-uniquebaretitle	&\+&\+&\_&\+&\_&\_&\_\\
-uniquework	&\+&\+&\_&\+&\_&\_&\_\\
-uniqueprimaryauthor	&\+&\+&\_&\_&\_&\_&\_\\
-url		&\+&\+&\_&\_&\_&\_&\_\\
-useprefix	&\+&\+&\_&\+&\+&\+&\+\\
-use$<$name$>$	&\+&\+&\_&\+&\+&\_&\_\\
+abbreviate	&\+&\+&\_&\_\\
+alldates	&\+&\+&\_&\_\\
+alldatesusetime	&\+&\+&\_&\_\\
+alltimes	&\+&\+&\_&\_\\
+arxiv		&\+&\+&\_&\_\\
+autocite	&\+&\+&\_&\_\\
+autopunct	&\+&\+&\_&\_\\
+autolang		&\+&\+&\_&\_\\
+backend		&\+&\_&\_&\_\\
+backref		&\+&\+&\_&\_\\
+backrefsetstyle	&\+&\+&\_&\_\\
+backrefstyle	&\+&\+&\_&\_\\
+bibencoding	&\+&\+&\_&\_\\
+bibstyle	&\+&\_&\_&\_\\
+bibwarn		&\+&\+&\_&\_\\
+block		&\+&\+&\_&\_\\
+citecounter	&\+&\+&\_&\_\\
+citereset	&\+&\+&\_&\_\\
+citestyle	&\+&\_&\_&\_\\
+citetracker	&\+&\+&\_&\_\\
+clearlang	&\+&\+&\_&\_\\
+datamodel &\+&\_&\_&\_\\
+dataonly	&\_&\_&\+&\+\\
+date		&\+&\+&\_&\_\\
+labeldate		&\+&\+&\_&\_\\
+$<$datetype$>$date		&\+&\+&\_&\_\\
+dateabbrev	&\+&\+&\_&\_\\
+datecirca &\+&\+&\_&\_\\
+dateera &\+&\+&\_&\_\\
+dateerauto &\+&\+&\_&\_\\
+dateuncertain &\+&\+&\_&\_\\
+datezeros	&\+&\+&\_&\_\\
+defernumbers	&\+&\+&\_&\_\\
+doi		&\+&\+&\_&\_\\ % style
+eprint		&\+&\+&\_&\_\\ % style
+$<$namepart$>$inits	&\+&\+&\_&\_\\
+gregorianstart &\+&\+&\_&\_\\
+hyperref	&\+&\+&\_&\_\\
+ibidtracker	&\+&\+&\_&\_\\
+idemtracker	&\+&\+&\_&\_\\
+indexing	&\+&\+&\+&\+\\
+isbn		&\+&\+&\_&\_\\ % style
+julian &\+&\+&\_&\_\\
+labelalpha	&\+&\+&\+&\_\\
+labelnamefield  &\_&\_&\_&\+\\
+labelnumber	&\+&\+&\+&\_\\
+labeltitle	&\+&\+&\+&\_\\
+labeltitlefield &\_&\_&\_&\+\\
+labeltitleyear	&\+&\+&\+&\_\\
+labeldateparts	&\+&\+&\+&\_\\
+labeltime	&\+&\+&\_&\_\\
+labeldateusetime	&\+&\+&\_&\_\\
+$<$datetype$>$time	&\+&\+&\_&\_\\
+$<$datetype$>$dateusetime	&\+&\+&\_&\_\\
+language	&\+&\+&\_&\_\\
+loadfiles	&\+&\+&\_&\_\\
+loccittracker	&\+&\+&\_&\_\\
+maxalphanames	&\+&\+&\+&\+\\
+maxbibnames	&\+&\+&\+&\+\\
+maxcitenames	&\+&\+&\+&\+\\
+maxitems	&\+&\+&\+&\+\\
+maxnames	&\+&\+&\+&\+\\
+maxparens	&\+&\+&\_&\_\\
+mcite		&\+&\_&\_&\_\\
+minalphanames	&\+&\+&\+&\+\\
+minbibnames	&\+&\+&\+&\+\\
+mincitenames	&\+&\+&\+&\+\\
+mincrossrefs	&\+&\+&\_&\_\\
+minxrefs	&\+&\+&\_&\_\\
+minitems	&\+&\+&\+&\+\\
+minnames	&\+&\+&\+&\+\\
+natbib		&\+&\_&\_&\_\\
+noinherit		&\_&\_&\_&\+\\
+notetype	&\+&\+&\_&\_\\
+opcittracker	&\+&\+&\_&\_\\
+openbib		&\+&\+&\_&\_\\
+pagetracker	&\+&\+&\_&\_\\
+parentracker	&\+&\+&\_&\_\\
+punctfont	&\+&\+&\_&\_\\
+refsection	&\+&\+&\_&\_\\
+refsegment	&\+&\+&\_&\_\\
+safeinputenc	&\+&\+&\_&\_\\
+seconds	&\+&\+&\_&\_\\
+singletitle	&\+&\+&\+&\_\\
+skipbib		&\_&\_&\+&\+\\
+skipbiblist	&\_&\_&\+&\+\\
+skiplab		&\_&\_&\+&\+\\
+sortcase	&\+&\+&\_&\_\\
+sortcites	&\+&\+&\_&\_\\
+sorting		&\+&\+&\_&\_\\
+sortnamekeyscheme 	&\_&\_&\_&\+\\
+sortlocale	&\+&\+&\_&\_\\
+sortlos		&\+&\+&\_&\_\\
+sortupper	&\+&\+&\_&\_\\
+style		&\+&\_&\_&\_\\
+terseinits	&\+&\+&\_&\_\\
+texencoding	&\+&\+&\_&\_\\
+timezeros	&\+&\+&\_&\_\\
+timezones	&\+&\+&\_&\_\\
+uniquelist	&\+&\+&\+&\+\\
+uniquename	&\+&\+&\+&\+\\
+uniquetitle	&\+&\+&\+&\_\\
+uniquebaretitle	&\+&\+&\+&\_\\
+uniquework	&\+&\+&\+&\_\\
+uniqueprimaryauthor	&\+&\+&\_&\_\\
+url		&\+&\+&\_&\_\\
+useprefix	&\+&\+&\+&\+\\
+use$<$name$>$	&\+&\+&\+&\+\\
 \end{longtable}
 \endgroup
 
@@ -13207,39 +12827,6 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
-\begin{release}{3.8}{2017-11-04}
-\item Added \kvopt{hyperref}{manual} option\see{use:opt:pre:gen}
-\item Added field \bibfield{extradatescope}\see{aut:bbx:fld:lab}
-\item Added \cmd{DeclareExtradate}\see{aut:ctm:fld}
-\item Added \cmd{DeprecateFieldWithReplacement}, \cmd{DeprecateListWithReplacement} and \cmd{DeprecateNameWithReplacement}\see{aut:bib:dat}
-\item Added \cmd{letbibmacro}\see{aut:aux:msc}
-\item Renamed \opt{extrayear} to \opt{extradate}\see{aut:bbx:fld:lab}
-\item Added \opt{sortsets} global option\see{use:opt:pre:gen}
-\item Added \cmd{iflabelalphanametemplatename} and \cmd{uniquenametemplatename}\see{aut:aux:tst}
-\item Renamed \cmd{ifsortingnamescheme} to \cmd{ifsortingnamekeytemplatename}\see{aut:aux:tst}
-\item Renamed \opt{sortingnamekeyscheme} to \opt{sortingnamekeytemplate}\see{use:bib:context}
-\item Renamed \cmd{DeclareSortingNamekeyScheme} to \cmd{DeclareSortingNamekeyTemplate}\see{aut:ctm:srt}
-\item Renamed \cmd{DeclareSortingScheme} to \cmd{DeclareSortingTemplate}\see{aut:ctm:srt}
-\item Changes to \cmd{DeclareUniquenameTemplate} and \cmd{DeclareLabelalphaNameTemplate} scopes\see{aut:cav:amb} and \see{aut:ctm:lab}
-\item Added new \opt{disambiguation} option to \cmd{DeclareUniquenameTemplate}\see{aut:cav:amb}
-\item Added new user-facing versions of some entry-querying commands\see{use:eq}
-\item Changed \bibfield{origlanguage} to a list in line with \bibfield{language}\see{bib:fld:dat}
-\item Deprecated \bibfield{childentrykey} and \bibfield{childentrytype}\see{aut:bbx:fld:gen}
-\item Added \bibfield{bibnamehash} and name list specific variants\see{aut:bbx:fld:gen}
-\item Added ALA-LC Russian romanisation transliteration support\see{aut:ctm:srt}
-\item Added \bibfield{urlraw}\see{aut:bbx:fld:gen}
-\item Added \cmd{AtUsedriver}\see{aut:fmt:hok}
-\item Added Bulgarian localisation (Kaloyan Ganev)
-\item \bibfield{sortyear} is now a literal, not an integer\see{bib:fld:spc}
-\item Added \cmd{DeclareLanguageMappingSuffix}\see{aut:lng:cmd}
-\item Changed default for \cmd{DeclarePrefChars}\see{aut:pct:cfg}
-\item Added \cmd{authortypedelim}, \cmd{editortypedelim} and \cmd{translatortypedelim}\see{use:fmt:fmt}
-\item Added \cmd{DeclareDelimAlias}\see{use:fmt:csd}
-\item Added \opt{slovenian} as alias for \opt{slovene} due to Polyglossia
-  name for the language\see{bib:fld:spc}
-\item Added Ukrainian localisation (Sergiy M. Ponomarenko)
-\end{release}
-
 \begin{release}{3.7}{2016-12-08}
 \item Corrected default for \cmd{bibdateeraprefix}\see{aut:fmt:lng}
 \item Added \cmd{DeclareSortInclusion}\see{aut:ctm:srt}
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-biber.pdf
index a24060b48c9..f33b20fc517 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-bibtex.pdf
index d7c6ad6b177..18ffe824e2d 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/01-introduction-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf
index b66e6106e53..a2ee199823a 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-bibtex.pdf
index 8aa01c35008..a3aa4ecf2cf 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/02-annotations-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf
index 3d56b171906..af9474c5c56 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-bibtex.pdf
index 5281c6fab18..70d1f5174f9 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex
index 76af595e3dc..91df87addfa 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex
@@ -118,7 +118,7 @@ The following strings are special because they are intended for use in headings
 \begin{keylist}
 \keyitem{bibliography} The term <bibliography>, also available as \cmd{bibname}.
 \keyitem{references} The term <references>, also available as \cmd{refname}.
-\keyitem{shorthands} The term <list of shorthands> or <list of abbreviations>, also available as \cmd{biblistname}.
+\keyitem{shorthands} The term <list of shorthands> or <list of abbreviations>, also available as \cmd{losname}.
 \end{keylist}
 
 \subsection*{Roles, Expressed as Functions}
@@ -127,145 +127,142 @@ The following keys refer to roles which are expressed as a function (<editor>, <
 
 \begin{keylist}
 \keyitem{editor} The term <editor>, referring to the main editor. This is the most generic editorial role.
-\keyitem{editors} The plural form of \texttt{editor}.
+\keyitem{editors} The plural form of \vrb{editor}.
 \keyitem{compiler} The term <compiler>, referring to an editor whose task is to compile a work.
-\keyitem{compilers} The plural form of \texttt{compiler}.
+\keyitem{compilers} The plural form of \vrb{compiler}.
 \keyitem{founder} The term <founder>, referring to a founding editor.
-\keyitem{founders} The plural form of \texttt{founder}.
+\keyitem{founders} The plural form of \vrb{founder}.
 \keyitem{continuator} An expression like <continuator>, <continuation>, or <continued>, referring to a past editor who continued the work of the founding editor but was subsequently replaced by the current editor.
-\keyitem{continuators} The plural form of \texttt{continuator}.
+\keyitem{continuators} The plural form of \vrb{continuator}.
 \keyitem{redactor} The term <redactor>, referring to a secondary editor.
-\keyitem{redactors} The plural form of \texttt{redactor}.
+\keyitem{redactors} The plural form of \vrb{redactor}.
 \keyitem{reviser} The term <reviser>, referring to a secondary editor.
-\keyitem{revisers} The plural form of \texttt{reviser}.
+\keyitem{revisers} The plural form of \vrb{reviser}.
 \keyitem{collaborator} A term like <collaborator>, <collaboration>, <cooperator>, or <cooperation>, referring to a secondary editor.
-\keyitem{collaborators} The plural form of \texttt{collaborator}.
+\keyitem{collaborators} The plural form of \vrb{collaborator}.
 \keyitem{translator} The term <translator>.
-\keyitem{translators} The plural form of \texttt{translator}.
+\keyitem{translators} The plural form of \vrb{translator}.
 \keyitem{commentator} The term <commentator>, referring to the author of a commentary to a work.
-\keyitem{commentators} The plural form of \texttt{commentators}.
+\keyitem{commentators} The plural form of \vrb{commentators}.
 \keyitem{annotator} The term <annotator>, referring to the author of annotations to a work.
-\keyitem{annotators} The plural form of \texttt{annotators}.
-\keyitem{organizer} The term <organizer>, referring to the organizer of an
-  event or work.
-\keyitem{organizers} The plural form of \texttt{organizer}.
+\keyitem{annotators} The plural form of \vrb{annotators}.
 \end{keylist}
 
 \subsection*{Concatenated Editor Roles, Expressed as Functions}
 
-The following keys are similar in function to \texttt{editor}, \texttt{translator}, etc. They are used to indicate additional roles of the editor, \eg\ <editor and translator>, <editor and foreword>.
+The following keys are similar in function to \vrb{editor}, \vrb{translator}, etc. They are used to indicate additional roles of the editor, e.g. <editor and translator>, <editor and foreword>.
 
 \begin{keylist}
-\keyitem{editortr} Used if \bibfield{editor}\slash \bibfield{translator} are identical.
-\keyitem{editorstr} The plural form of \texttt{editortr}.
-\keyitem{editorco} Used if \bibfield{editor}\slash \bibfield{commentator} are identical.
-\keyitem{editorsco} The plural form of \texttt{editorco}.
-\keyitem{editoran} Used if \bibfield{editor}\slash \bibfield{annotator} are identical.
-\keyitem{editorsan} The plural form of \texttt{editoran}.
-\keyitem{editorin} Used if \bibfield{editor}\slash \bibfield{introduction} are identical.
-\keyitem{editorsin} The plural form of \texttt{editorin}.
-\keyitem{editorfo} Used if \bibfield{editor}\slash \bibfield{foreword} are identical.
-\keyitem{editorsfo} The plural form of \texttt{editorfo}.
-\keyitem{editoraf} Used if \bibfield{editor}\slash \bibfield{afterword} are identical.
-\keyitem{editorsaf} The plural form of \texttt{editoraf}.
+\keyitem{editortr} Used if \vrb{editor}\slash \vrb{translator} are identical.
+\keyitem{editorstr} The plural form of \vrb{editortr}.
+\keyitem{editorco} Used if \vrb{editor}\slash \vrb{commentator} are identical.
+\keyitem{editorsco} The plural form of \vrb{editorco}.
+\keyitem{editoran} Used if \vrb{editor}\slash \vrb{annotator} are identical.
+\keyitem{editorsan} The plural form of \vrb{editoran}.
+\keyitem{editorin} Used if \vrb{editor}\slash \vrb{introduction} are identical.
+\keyitem{editorsin} The plural form of \vrb{editorin}.
+\keyitem{editorfo} Used if \vrb{editor}\slash \vrb{foreword} are identical.
+\keyitem{editorsfo} The plural form of \vrb{editorfo}.
+\keyitem{editoraf} Used if \vrb{editor}\slash \vrb{afterword} are identical.
+\keyitem{editorsaf} The plural form of \vrb{editoraf}.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{translator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{translator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{editortrco} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator} are identical.
-\keyitem{editorstrco} The plural form of \texttt{editortrco}.
-\keyitem{editortran} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{annotator} are identical.
-\keyitem{editorstran} The plural form of \texttt{editortran}.
-\keyitem{editortrin} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{introduction} are identical.
-\keyitem{editorstrin} The plural form of \texttt{editortrin}.
-\keyitem{editortrfo} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{foreword} are identical.
-\keyitem{editorstrfo} The plural form of \texttt{editortrfo}.
-\keyitem{editortraf} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{afterword} are identical.
-\keyitem{editorstraf} The plural form of \texttt{editortraf}.
+\keyitem{editortrco} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator} are identical.
+\keyitem{editorstrco} The plural form of \vrb{editortrco}.
+\keyitem{editortran} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator} are identical.
+\keyitem{editorstran} The plural form of \vrb{editortran}.
+\keyitem{editortrin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{introduction} are identical.
+\keyitem{editorstrin} The plural form of \vrb{editortrin}.
+\keyitem{editortrfo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{foreword} are identical.
+\keyitem{editorstrfo} The plural form of \vrb{editortrfo}.
+\keyitem{editortraf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{afterword} are identical.
+\keyitem{editorstraf} The plural form of \vrb{editortraf}.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{commentator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{commentator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{editorcoin} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical.
-\keyitem{editorscoin} The plural form of \texttt{editorcoin}.
-\keyitem{editorcofo} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical.
-\keyitem{editorscofo} The plural form of \texttt{editorcofo}.
-\keyitem{editorcoaf} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical.
-\keyitem{editorscoaf} The plural form of \texttt{editorcoaf}.
+\keyitem{editorcoin} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{editorscoin} The plural form of \vrb{editorcoin}.
+\keyitem{editorcofo} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{editorscofo} The plural form of \vrb{editorcofo}.
+\keyitem{editorcoaf} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\keyitem{editorscoaf} The plural form of \vrb{editorcoaf}.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{annotator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{annotator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{editoranin} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{introduction} are identical.
-\keyitem{editorsanin} The plural form of \texttt{editoranin}.
-\keyitem{editoranfo} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{foreword} are identical.
-\keyitem{editorsanfo} The plural form of \texttt{editoranfo}.
-\keyitem{editoranaf} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{afterword} are identical.
-\keyitem{editorsanaf} The plural form of \texttt{editoranaf}.
+\keyitem{editoranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{introduction} are identical.
+\keyitem{editorsanin} The plural form of \vrb{editoranin}.
+\keyitem{editoranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{foreword} are identical.
+\keyitem{editorsanfo} The plural form of \vrb{editoranfo}.
+\keyitem{editoranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{afterword} are identical.
+\keyitem{editorsanaf} The plural form of \vrb{editoranaf}.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{editortrcoin} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical.
-\keyitem{editorstrcoin} The plural form of \texttt{editortrcoin}.
-\keyitem{editortrcofo} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical.
-\keyitem{editorstrcofo} The plural form of \texttt{editortrcofo}.
-\keyitem{editortrcoaf} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical.
-\keyitem{editorstrcoaf} The plural form of \texttt{editortrcoaf}.
+\keyitem{editortrcoin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{editorstrcoin} The plural form of \vrb{editortrcoin}.
+\keyitem{editortrcofo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{editorstrcofo} The plural form of \vrb{editortrcofo}.
+\keyitem{editortrcoaf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\keyitem{editorstrcoaf} The plural form of \vrb{editortrcoaf}.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{editortranin} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical.
-\keyitem{editorstranin} The plural form of \texttt{editortranin}.
-\keyitem{editortranfo} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical.
-\keyitem{editorstranfo} The plural form of \texttt{editortranfo}.
-\keyitem{editortranaf} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical.
-\keyitem{editorstranaf} The plural form of \texttt{editortranaf}.
+\keyitem{editortranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{editorstranin} The plural form of \vrb{editortranin}.
+\keyitem{editortranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{editorstranfo} The plural form of \vrb{editortranfo}.
+\keyitem{editortranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\keyitem{editorstranaf} The plural form of \vrb{editortranaf}.
 \end{keylist}
 
 \subsection*{Concatenated Translator Roles, Expressed as Functions}
 
-The following keys are similar in function to \texttt{translator}. They are used to indicate additional roles of the translator, e.g. <translator and commentator>, <translator and introduction>.
+The following keys are similar in function to \vrb{translator}. They are used to indicate additional roles of the translator, e.g. <translator and commentator>, <translator and introduction>.
 
 \begin{keylist}
-\keyitem{translatorco} Used if \bibfield{translator}\slash \bibfield{commentator} are identical.
-\keyitem{translatorsco} The plural form of \texttt{translatorco}.
-\keyitem{translatoran} Used if \bibfield{translator}\slash \bibfield{annotator} are identical.
-\keyitem{translatorsan} The plural form of \texttt{translatoran}.
-\keyitem{translatorin} Used if \bibfield{translator}\slash \bibfield{introduction} are identical.
-\keyitem{translatorsin} The plural form of \texttt{translatorin}.
-\keyitem{translatorfo} Used if \bibfield{translator}\slash \bibfield{foreword} are identical.
-\keyitem{translatorsfo} The plural form of \texttt{translatorfo}.
-\keyitem{translatoraf} Used if \bibfield{translator}\slash \bibfield{afterword} are identical.
-\keyitem{translatorsaf} The plural form of \texttt{translatoraf}.
+\keyitem{translatorco} Used if \vrb{translator}\slash \vrb{commentator} are identical.
+\keyitem{translatorsco} The plural form of \vrb{translatorco}.
+\keyitem{translatoran} Used if \vrb{translator}\slash \vrb{annotator} are identical.
+\keyitem{translatorsan} The plural form of \vrb{translatoran}.
+\keyitem{translatorin} Used if \vrb{translator}\slash \vrb{introduction} are identical.
+\keyitem{translatorsin} The plural form of \vrb{translatorin}.
+\keyitem{translatorfo} Used if \vrb{translator}\slash \vrb{foreword} are identical.
+\keyitem{translatorsfo} The plural form of \vrb{translatorfo}.
+\keyitem{translatoraf} Used if \vrb{translator}\slash \vrb{afterword} are identical.
+\keyitem{translatorsaf} The plural form of \vrb{translatoraf}.
 \end{keylist}
 %
-Keys for \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations:
+Keys for \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{translatorcoin} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical.
-\keyitem{translatorscoin} The plural form of \texttt{translatorcoin}.
-\keyitem{translatorcofo} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical.
-\keyitem{translatorscofo} The plural form of \texttt{translatorcofo}.
-\keyitem{translatorcoaf} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical.
-\keyitem{translatorscoaf} The plural form of \texttt{translatorcoaf}.
+\keyitem{translatorcoin} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{translatorscoin} The plural form of \vrb{translatorcoin}.
+\keyitem{translatorcofo} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{translatorscofo} The plural form of \vrb{translatorcofo}.
+\keyitem{translatorcoaf} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\keyitem{translatorscoaf} The plural form of \vrb{translatorcoaf}.
 \end{keylist}
 %
-Keys for \bibfield{translator}\slash \bibfield{annotator}\slash \prm{role} combinations:
+Keys for \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{translatoranin} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{introduction} are identical.
-\keyitem{translatorsanin} The plural form of \texttt{translatoranin}.
-\keyitem{translatoranfo} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{foreword} are identical.
-\keyitem{translatorsanfo} The plural form of \texttt{translatoranfo}.
-\keyitem{translatoranaf} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{afterword} are identical.
-\keyitem{translatorsanaf} The plural form of \texttt{translatoranaf}.
+\keyitem{translatoranin} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{introduction} are identical.
+\keyitem{translatorsanin} The plural form of \vrb{translatoranin}.
+\keyitem{translatoranfo} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{foreword} are identical.
+\keyitem{translatorsanfo} The plural form of \vrb{translatoranfo}.
+\keyitem{translatoranaf} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{afterword} are identical.
+\keyitem{translatorsanaf} The plural form of \vrb{translatoranaf}.
 \end{keylist}
 
 \subsection*{Roles, Expressed as Actions}
@@ -282,93 +279,92 @@ The following keys refer to roles which are expressed as an action (<edited by>,
 \keyitem{byreviser} The expression <revised by \prm{name}>.
 \keyitem{byreviewer} The expression <reviewed by \prm{name}>.
 \keyitem{bycollaborator} An expression like <in collaboration with \prm{name}> or <in cooperation with \prm{name}>.
-\keyitem{bytranslator} The expression <translated by \prm{name}> or <translated from \prm{language} by \prm{name}>.
+\keyitem{bytranslator} The expression <translated by \prm{name}> or <translated from \prm{language} \prm{name}>.
 \keyitem{bycommentator} The expression <commented by \prm{name}>.
 \keyitem{byannotator} The expression <annotated by \prm{name}>.
-\keyitem{byorganizer} The expression <[organized] by \prm{name}>.
 \end{keylist}
 
 \subsection*{Concatenated Editor Roles, Expressed as Actions}
 
-The following keys are similar in function to \bibfield{byeditor}, \bibfield{bytranslator}, etc. They are used to indicate additional roles of the editor, e.g. <edited and translated by>, <edited and furnished with an introduction by>, <edited, with a foreword, by>.
+The following keys are similar in function to \vrb{byeditor}, \vrb{bytranslator}, etc. They are used to indicate additional roles of the editor, e.g. <edited and translated by>, <edited and furnished with an introduction by>, <edited, with a foreword, by>.
 
 \begin{keylist}
-\keyitem{byeditortr} Used if \bibfield{editor}\slash \bibfield{translator} are identical.
-\keyitem{byeditorco} Used if \bibfield{editor}\slash \bibfield{commentator} are identical.
-\keyitem{byeditoran} Used if \bibfield{editor}\slash \bibfield{annotator} are identical.
-\keyitem{byeditorin} Used if \bibfield{editor}\slash \bibfield{introduction} are identical.
-\keyitem{byeditorfo} Used if \bibfield{editor}\slash \bibfield{foreword} are identical.
-\keyitem{byeditoraf} Used if \bibfield{editor}\slash \bibfield{afterword} are identical.
+\keyitem{byeditortr} Used if \vrb{editor}\slash \vrb{translator} are identical.
+\keyitem{byeditorco} Used if \vrb{editor}\slash \vrb{commentator} are identical.
+\keyitem{byeditoran} Used if \vrb{editor}\slash \vrb{annotator} are identical.
+\keyitem{byeditorin} Used if \vrb{editor}\slash \vrb{introduction} are identical.
+\keyitem{byeditorfo} Used if \vrb{editor}\slash \vrb{foreword} are identical.
+\keyitem{byeditoraf} Used if \vrb{editor}\slash \vrb{afterword} are identical.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{translator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{translator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{byeditortrco} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator} are identical.
-\keyitem{byeditortran} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{annotator} are identical.
-\keyitem{byeditortrin} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{introduction} are identical.
-\keyitem{byeditortrfo} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{foreword} are identical.
-\keyitem{byeditortraf} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{afterword} are identical.
+\keyitem{byeditortrco} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator} are identical.
+\keyitem{byeditortran} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator} are identical.
+\keyitem{byeditortrin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{introduction} are identical.
+\keyitem{byeditortrfo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{foreword} are identical.
+\keyitem{byeditortraf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{afterword} are identical.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{commentator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{commentator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{byeditorcoin} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical.
-\keyitem{byeditorcofo} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical.
-\keyitem{byeditorcoaf} Used if \bibfield{editor}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical.
+\keyitem{byeditorcoin} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{byeditorcofo} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{byeditorcoaf} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{annotator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{annotator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{byeditoranin} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{introduction} are identical.
-\keyitem{byeditoranfo} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{foreword} are identical.
-\keyitem{byeditoranaf} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{afterword} are identical.
+\keyitem{byeditoranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{introduction} are identical.
+\keyitem{byeditoranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{foreword} are identical.
+\keyitem{byeditoranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{afterword} are identical.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{byeditortrcoin} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical.
-\keyitem{byeditortrcofo} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical.
-\keyitem{byeditortrcoaf} Used if \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical.
+\keyitem{byeditortrcoin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{byeditortrcofo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{byeditortrcoaf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
 \end{keylist}
 %
-Keys for \bibfield{editor}\slash \bibfield{translator}\slash \bibfield{annotator}\slash \prm{role} combinations:
+Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{byeditortranin} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical.
-\keyitem{byeditortranfo} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical.
-\keyitem{byeditortranaf} Used if \bibfield{editor}\slash \bibfield{annotator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical.
+\keyitem{byeditortranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{byeditortranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{byeditortranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
 \end{keylist}
 
 \subsection*{Concatenated Translator Roles, Expressed as Actions}
 
-The following keys are similar in function to \texttt{bytranslator}. They are used to indicate additional roles of the translator, e.g. <translated and commented by>, <translated and furnished with an introduction by>, <translated, with a foreword, by>.
+The following keys are similar in function to \vrb{bytranslator}. They are used to indicate additional roles of the translator, e.g. <translated and commented by>, <translated and furnished with an introduction by>, <translated, with a foreword, by>.
 
 \begin{keylist}
-\keyitem{bytranslatorco} Used if \bibfield{translator}\slash \bibfield{commentator} are identical.
-\keyitem{bytranslatoran} Used if \bibfield{translator}\slash \bibfield{annotator} are identical.
-\keyitem{bytranslatorin} Used if \bibfield{translator}\slash \bibfield{introduction} are identical.
-\keyitem{bytranslatorfo} Used if \bibfield{translator}\slash \bibfield{foreword} are identical.
-\keyitem{bytranslatoraf} Used if \bibfield{translator}\slash \bibfield{afterword} are identical.
+\keyitem{bytranslatorco} Used if \vrb{translator}\slash \vrb{commentator} are identical.
+\keyitem{bytranslatoran} Used if \vrb{translator}\slash \vrb{annotator} are identical.
+\keyitem{bytranslatorin} Used if \vrb{translator}\slash \vrb{introduction} are identical.
+\keyitem{bytranslatorfo} Used if \vrb{translator}\slash \vrb{foreword} are identical.
+\keyitem{bytranslatoraf} Used if \vrb{translator}\slash \vrb{afterword} are identical.
 \end{keylist}
 %
-Keys for \bibfield{translator}\slash \bibfield{commentator}\slash \prm{role} combinations:
+Keys for \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{bytranslatorcoin} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{introduction} are identical.
-\keyitem{bytranslatorcofo} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{foreword} are identical.
-\keyitem{bytranslatorcoaf} Used if \bibfield{translator}\slash \bibfield{commentator}\slash \bibfield{afterword} are identical.
+\keyitem{bytranslatorcoin} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{bytranslatorcofo} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{bytranslatorcoaf} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
 \end{keylist}
 %
-Keys for \bibfield{translator}\slash \bibfield{annotator}\slash \prm{role} combinations:
+Keys for \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations:
 
 \begin{keylist}
-\keyitem{bytranslatoranin} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{introduction} are identical.
-\keyitem{bytranslatoranfo} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{foreword} are identical.
-\keyitem{bytranslatoranaf} Used if \bibfield{translator}\slash \bibfield{annotator}\slash \bibfield{afterword} are identical.
+\keyitem{bytranslatoranin} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{introduction} are identical.
+\keyitem{bytranslatoranfo} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{foreword} are identical.
+\keyitem{bytranslatoranaf} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{afterword} are identical.
 \end{keylist}
 
 \subsection*{Roles, Expressed as Objects}
@@ -397,7 +393,7 @@ Roles which are related to supplementary material may also be expressed as objec
 
 \begin{keylist}
 \keyitem{volume} The term <volume>, referring to a book.
-\keyitem{volumes} The plural form of \texttt{volume}.
+\keyitem{volumes} The plural form of \vrb{volume}.
 \keyitem{involumes} The term <in>, as used in expressions like <in \prm{number of volumes} volumes>.
 \keyitem{jourvol} The term <volume>, referring to a journal.
 \keyitem{jourser} The term <series>, referring to a journal.
@@ -441,29 +437,17 @@ Roles which are related to supplementary material may also be expressed as objec
 
 \begin{keylist}
 \keyitem{page} The term <page>.
-\keyitem{pages} The plural form of \texttt{page}.
+\keyitem{pages} The plural form of \vrb{page}.
 \keyitem{column} The term <column>, referring to a column on a page.
-\keyitem{columns} The plural form of \texttt{column}.
+\keyitem{columns} The plural form of \vrb{column}.
 \keyitem{section} The term <section>, referring to a document division (usually abbreviated as \S).
-\keyitem{sections} The plural form of \texttt{section} (usually abbreviated as \S\S).
-\keyitem{paragraph} The term <paragraph> (\ie a block of text, not to be confused with \texttt{section}).
-\keyitem{paragraphs} The plural form of \texttt{paragraph}.
+\keyitem{sections} The plural form of \vrb{section} (usually abbreviated as \S\S).
+\keyitem{paragraph} The term <paragraph> (\ie a block of text, not to be confused with \vrb{section}).
+\keyitem{paragraphs} The plural form of \vrb{paragraph}.
 \keyitem{verse} The term <verse> as used when referring to a work which is cited by verse numbers.
-\keyitem{verses} The plural form of \texttt{verse}.
+\keyitem{verses} The plural form of \vrb{verse}.
 \keyitem{line} The term <line> as used when referring to a work which is cited by line numbers.
-\keyitem{lines} The plural form of \texttt{line}.
-\keyitem{pagetotal} The term <page> as used in \cmd{mkpageprefix}.
-\keyitem{pagetotals} The plural form of \texttt{pagetotal}.
-\keyitem{columntotal} The term <column>, referring to a column on a page, as used in \cmd{mkpageprefix}.
-\keyitem{columntotals} The plural form of \texttt{columntotal}.
-\keyitem{sectiontotal} The term <section>, referring to a document division (usually abbreviated as \S),  as used in \cmd{mkpageprefix}.
-\keyitem{sectiontotals} The plural form of \texttt{sectiontotal} (usually abbreviated as \S\S).
-\keyitem{paragraphtotal} The term <paragraph> (\ie a block of text, not to be confused with \texttt{section}) as used in \cmd{mkpageprefix}.
-\keyitem{paragraphtotals} The plural form of \texttt{paragraphtotal}.
-\keyitem{versetotal} The term <verse> as used when referring to a work which is cited by verse numbers when used in \cmd{mkpageprefix}.
-\keyitem{versetotals} The plural form of \texttt{versetotal}.
-\keyitem{linetotal} The term <line> as used when referring to a work which is cited by line numbers when used in \cmd{mkpageprefix}.
-\keyitem{linetotals} The plural form of \texttt{linetotal}.
+\keyitem{lines} The plural form of \vrb{line}.
 \end{keylist}
 
 \subsection*{Types}
@@ -502,7 +486,7 @@ The following keys are typically used in the \bibfield{type} field of \bibtype{t
 \keyitem{nodate} The term to use in place of a date when there is no date for an entry \eg\ <n.d.>
 \keyitem{and} The term <and>, as used in a list of authors or editors, for example.
 \keyitem{andothers} The expression <and others> or <et alii>, used to mark the truncation of a name list.
-\keyitem{andmore} Like \texttt{andothers} but used to mark the truncation of a literal list.
+\keyitem{andmore} Like \vrb{andothers} but used to mark the truncation of a literal list.
 \end{keylist}
 
 \subsection*{Labels}
@@ -525,13 +509,13 @@ Traditional scholarly expressions used in citations:
 
 \begin{keylist}
 \keyitem{idem} The term equivalent to the Latin <idem> (<the same [person]>).
-\keyitem{idemsf} The feminine singular form of \texttt{idem}.
-\keyitem{idemsm} The masculine singular form of \texttt{idem}.
-\keyitem{idemsn} The neuter singular form of \texttt{idem}.
-\keyitem{idempf} The feminine plural form of \texttt{idem}.
-\keyitem{idempm} The masculine plural form of \texttt{idem}.
-\keyitem{idempn} The neuter plural form of \texttt{idem}.
-\keyitem{idempp} The plural form of \texttt{idem} suitable for a mixed gender list of names.
+\keyitem{idemsf} The feminine singular form of \vrb{idem}.
+\keyitem{idemsm} The masculine singular form of \vrb{idem}.
+\keyitem{idemsn} The neuter singular form of \vrb{idem}.
+\keyitem{idempf} The feminine plural form of \vrb{idem}.
+\keyitem{idempm} The masculine plural form of \vrb{idem}.
+\keyitem{idempn} The neuter plural form of \vrb{idem}.
+\keyitem{idempp} The plural form of \vrb{idem} suitable for a mixed gender list of names.
 \keyitem{ibidem} The term equivalent to the Latin <ibidem> (<in the same place>).
 \keyitem{opcit} The term equivalent to the Latin term <opere citato> (<[in] the work [already] cited>).
 \keyitem{loccit} The term equivalent to the Latin term <loco citato> (<[at] the place [already] cited>).
@@ -548,10 +532,10 @@ Other expressions frequently used in citations:
 \keyitem{seealso} The expression <see also>.
 \keyitem{seenote} An expression like <see note \prm{footnote}> or <as in \prm{footnote}>, used to refer to a previous footnote in a citation.
 \keyitem{backrefpage} An expression like <see page \prm{page}> or <cited on page \prm{page}>, used to introduce back references in the bibliography.
-\keyitem{backrefpages} The plural form of \texttt{backrefpage}, \eg\ <see pages \prm{pages}> or <cited on pages \prm{pages}>.
+\keyitem{backrefpages} The plural form of \vrb{backrefpage}, \eg\ <see pages \prm{pages}> or <cited on pages \prm{pages}>.
 \keyitem{quotedin} An expression like <quoted in \prm{citation}>, used when quoting a passage which was already a quotation in the cited work.
 \keyitem{citedas} An expression like <henceforth cited as \prm{shorthand}>, used to introduce a shorthand in a citation.
-\keyitem{thiscite} The expression used in some verbose citation styles to differentiate between the page range of the cited item (typically an article in a journal, collection, or conference proceedings) and the page number the citation refers to. For example: \enquote{Author, Title, in: Book, pp. 45--61, \texttt{thiscite} p. 52.}
+\keyitem{thiscite} The expression used in some verbose citation styles to differentiate between the page range of the cited item (typically an article in a journal, collection, or conference proceedings) and the page number the citation refers to. For example: \enquote{Author, Title, in: Book, pp. 45--61, \vrb{thiscite} p. 52.}
 \end{keylist}
 
 \subsection*{Month Names}
@@ -576,30 +560,25 @@ Other expressions frequently used in citations:
 \begin{keylist}
 \keyitem{langamerican} The language <American> or <American English>.
 \keyitem{langbrazilian} The language <Brazilian> or <Brazilian Portuguese>.
-\keyitem{langbulgarian} The language <Bulgarian>.
 \keyitem{langcatalan} The language <Catalan>.
 \keyitem{langcroatian} The language <Croatian>.
 \keyitem{langczech} The language <Czech>.
 \keyitem{langdanish} The language <Danish>.
 \keyitem{langdutch} The language <Dutch>.
 \keyitem{langenglish} The language <English>.
-\keyitem{langestonian} The language <Estonian>.
 \keyitem{langfinnish} The language <Finnish>.
 \keyitem{langfrench} The language <French>.
 \keyitem{langgerman} The language <German>.
 \keyitem{langgreek} The language <Greek>.
 \keyitem{langitalian} The language <Italian>.
-\keyitem{langjapanese} The language <Japanese>.
 \keyitem{langlatin} The language <Latin>.
 \keyitem{langnorwegian} The language <Norwegian>.
 \keyitem{langpolish} The language <Polish>.
 \keyitem{langportuguese} The language <Portuguese>.
 \keyitem{langrussian} The language <Russian>.
-\keyitem{langslovak} The language <Slovak>.
 \keyitem{langslovene} The language <Slovene>.
 \keyitem{langspanish} The language <Spanish>.
 \keyitem{langswedish} The language <Swedish>.
-\keyitem{langukrainian} The language <Ukrainian>.
 \end{keylist}
 %
 The following strings are intended for use in phrases like <translated from [the] English by \prm{translator}>:
@@ -607,48 +586,43 @@ The following strings are intended for use in phrases like <translated from [the
 \begin{keylist}
 \keyitem{fromamerican} The expression <from [the] American> or <from [the] American English>.
 \keyitem{frombrazilian} The expression <from [the] Brazilian> or <from [the] Brazilian Portuguese>.
-\keyitem{frombulgarian} The expression <from [the] Bulgarian>.
 \keyitem{fromcatalan} The expression <from [the] Catalan>.
 \keyitem{fromcroatian} The expression <from [the] Croatian>.
 \keyitem{fromczech} The expression <from [the] Czech>.
 \keyitem{fromdanish} The expression <from [the] Danish>.
 \keyitem{fromdutch} The expression <from [the] Dutch>.
 \keyitem{fromenglish} The expression <from [the] English>.
-\keyitem{fromestonian} The expression <from [the] Estonian>.
 \keyitem{fromfinnish} The expression <from [the] Finnish>.
 \keyitem{fromfrench} The expression <from [the] French>.
 \keyitem{fromgerman} The expression <from [the] German>.
 \keyitem{fromgreek} The expression <from [the] Greek>.
 \keyitem{fromitalian} The expression <from [the] Italian>.
-\keyitem{fromjapanese} The expression <from [the] Japanese>.
 \keyitem{fromlatin} The expression <from [the] Latin>.
 \keyitem{fromnorwegian} The expression <from [the] Norwegian>.
 \keyitem{frompolish} The expression <from [the] Polish>.
 \keyitem{fromportuguese} The expression <from [the] Portuguese>.
 \keyitem{fromrussian} The expression <from [the] Russian>.
-\keyitem{fromslovak} The expression <from [the] Slovak>.
 \keyitem{fromslovene} The expression <from [the] Slovene>.
 \keyitem{fromspanish} The expression <from [the] Spanish>.
 \keyitem{fromswedish} The expression <from [the] Swedish>.
-\keyitem{fromukrainian} The expression <from [the] Ukrainian>.
 \end{keylist}
 
 \subsection*{Country Names}
 
-Country names are localised by using the string \texttt{country} plus the \acr{ISO}-3166 country code as the key. The short version of the translation should be the \acr{ISO}-3166 country code. Note that only a small number of country names is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{location} list of \bibtype{patent} entries but they may be useful for other purposes as well.
+Country names are localized by using the string \vrb{country} plus the \acr{ISO}-3166 country code as the key. The short version of the translation should be the \acr{ISO}-3166 country code. Note that only a small number of country names is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{location} list of \bibtype{patent} entries but they may be useful for other purposes as well.
 
 \begin{keylist}
-\keyitem{countryde} The name <Germany>, abbreviated as \texttt{DE}.
-\keyitem{countryeu} The name <European Union>, abbreviated as \texttt{EU}.
-\keyitem{countryep} Similar to \texttt{countryeu} but abbreviated as \texttt{EP}. This is intended for \bibfield{patent} entries.
-\keyitem{countryfr} The name <France>, abbreviated as \texttt{FR}.
-\keyitem{countryuk} The name <United Kingdom>, abbreviated (according to \acr{ISO}-3166) as \texttt{GB}.
-\keyitem{countryus} The name <United States of America>, abbreviated as \texttt{US}.
+\keyitem{countryde} The name <Germany>, abbreviated as \vrb{DE}.
+\keyitem{countryeu} The name <European Union>, abbreviated as \vrb{EU}.
+\keyitem{countryep} Similar to \vrb{countryeu} but abbreviated as \vrb{EP}. This is intended for \bibfield{patent} entries.
+\keyitem{countryfr} The name <France>, abbreviated as \vrb{FR}.
+\keyitem{countryuk} The name <United Kingdom>, abbreviated (according to \acr{ISO}-3166) as \vrb{GB}.
+\keyitem{countryus} The name <United States of America>, abbreviated as \vrb{US}.
 \end{keylist}
 
 \subsection*{Patents and Patent Requests}
 
-Strings related to patents are localised by using the term \texttt{patent} plus the \acr{ISO}-3166 country code as the key. Note that only a small number of patent keys is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{type} field of \bibtype{patent} entries.
+Strings related to patents are localized by using the term \vrb{patent} plus the \acr{ISO}-3166 country code as the key. Note that only a small number of patent keys is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{type} field of \bibtype{patent} entries.
 
 \begin{keylist}
 \keyitem{patent} The generic term <patent>.
@@ -659,7 +633,7 @@ Strings related to patents are localised by using the term \texttt{patent} plus
 \keyitem{patentus} The expression <U.S. patent>.
 \end{keylist}
 %
-Patent requests are handled in a similar way, using the string \texttt{patreq} as the base name of the key:
+Patent requests are handled in a similar way, using the string \vrb{patreq} as the base name of the key:
 
 \begin{keylist}
 \keyitem{patreq} The generic term <patent request>.
@@ -670,30 +644,5 @@ Patent requests are handled in a similar way, using the string \texttt{patreq} a
 \keyitem{patrequs} The expression <U.S. patent request>.
 \end{keylist}
 
-\subsection*{Dates and Times}
-
-\begin{keylist}
-\keyitem{commonera} The era <CE>
-\keyitem{beforecommonera} The era <BCE>
-\keyitem{annodomini} The era <AD>
-\keyitem{beforechrist} The era <BC>
-\end{keylist}
-
-\begin{keylist}
-\keyitem{circa} The string <circa>
-\end{keylist}
-
-\begin{keylist}
-\keyitem{spring} The string <spring>
-\keyitem{summer} The string <summer>
-\keyitem{autumn} The string <autumn>
-\keyitem{winter} The string <winter>
-\end{keylist}
-
-\begin{keylist}
-\keyitem{am} The string <AM>
-\keyitem{pm} The string <PM>
-\end{keylist}
-
 \printbibliography
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-biber.pdf
index 567556f01b4..c34545ee458 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-bibtex.pdf
index 65ed68d495a..47bf568a175 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/04-delimiters-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-biber.pdf
index f60de5da0ee..b84a7f35d1b 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-bibtex.pdf
index aba875fad8e..b2f9c18c6cb 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/10-references-per-section-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-biber.pdf
index 58e08456c60..712051a3947 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-bibtex.pdf
index 7a575e1fb9b..22c63c295ae 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/11-references-by-section-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-biber.pdf
index a89227c442c..0b1eab0b116 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-bibtex.pdf
index b4509ef9a19..e949353d71d 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/12-references-by-segment-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-biber.pdf
index b7d080b2e9e..64c7490b50c 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-bibtex.pdf
index 4d07934d4d7..4e3892c9bb5 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/13-references-by-keyword-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-biber.pdf
index 1e6335fe010..859740ba103 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-bibtex.pdf
index dd69e7a18f0..0d21ef4ba8a 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/14-references-by-category-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-biber.pdf
index 1abde4f8c67..1cf20da235f 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-bibtex.pdf
index ccc1ea2e8d3..c1682f3220f 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/15-references-by-type-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf
index 9157a730a2e..5bbe10ae205 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-bibtex.pdf
index e8083f8abed..9970795004c 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/16-numeric-prefixed-1-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf
index 16d6eae2c7d..8b1916a5546 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-bibtex.pdf
index 3beb20d96bb..048bd097d1f 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/17-numeric-prefixed-2-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-biber.pdf
index e909a6b8cc5..1a8596fa7f9 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-bibtex.pdf
index 4f477480363..2b542416787 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/18-numeric-hybrid-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf
index 77d7d34fa4b..cf775a28ed3 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-bibtex.pdf
index f9afb84a48b..e6ef99dcda0 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/19-alphabetic-prefixed-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf
index 5290b564ced..755939de50b 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-bibtex.pdf
index fec9b1ca679..6b1c4052838 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/20-indexing-single-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf
index 96064cf4d05..c63e6c12cb6 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-bibtex.pdf
index 02eca830dd6..8348e71851d 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/21-indexing-multiple-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-biber.pdf
index c98d881c99e..05355f6f488 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-bibtex.pdf
index 8b71f3b52ae..333ae62f7d4 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/22-indexing-subentry-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-biber.pdf
index c90678a8629..5b28d8097ea 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-bibtex.pdf
index ef5099efbb1..1f8138f6b1f 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex
index c673ffb250a..5051790f6e9 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/30-style-numeric.tex
@@ -20,23 +20,6 @@ This style prints numeric citations in square brackets. It is
 similar to the standard bibliographic facilities provided by LaTeX
 and to the \texttt{plain.bst} style of legacy BibTeX.
 
-\subsection*{Additional package options}
-
-\subsubsection*{The \texttt{subentry} option}
-
-The option \texttt{subentry} affects the handling of citations
-referring to members of a reference set. If this option is enabled,
-such citations get an extra letter which identifies the member
-(it is also printed in the bibliography):
-\cite{glashow,yoon,salam,aksin,companion}.
-
-This option is disabled by default, but it has been enabled
-in this example. If disabled, citations referring to a set member
-will point to the entire set, i.e., the above citations would
-come out as
-\cite{stdmodel,set,stdmodel,set,companion}.
-
-
 \subsection*{\cmd{cite} examples}
 
 \cite{companion}
@@ -48,8 +31,10 @@ come out as
 \cite[see][59--63]{companion}
 
 \subsection*{\cmd{parencite} examples}
-With the numeric style, \cmd{parencite} and \cmd{cite}
-behave the exactly the same.
+
+% With the numeric style, the \parencite command is similar to \cite
+% at first glance, but the placement of the prenote argument is
+% different.
 
 This is just filler text \parencite{companion}.
 
@@ -89,6 +74,26 @@ This is just filler text \autocite{companion}.
 
 \cite{companion,augustine,bertram,cotton,hammond,massa,murray}
 
+\subsection*{Reference sets}
+
+% Reference sets are cited like any other item:
+
+\cite{set,hammond,stdmodel,massa,murray}
+
+% Note that this style provides a package option called 'subentry'
+% which affects the handling of citations referring to members of
+% a reference set. If this option is enabled, such citations get an
+% extra letter which identifies the member (it is also printed in
+% the bibliography):
+
+\cite{glashow,yoon,salam,aksin}
+
+% Note that this options is disabled by default but has been enabled
+% in this example. If disabled, citations referring to a set member
+% will point to the set, i.e., the above citations would be similar
+% to this one:
+
+\cite{set,stdmodel}
 
 % The list of references
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-biber.pdf
index 15faf7de2fc..ba1b5d9ba8e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf
index 9d506479dfe..b29a5cd01f4 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex
index 95ac00b5b16..2faff053a2e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/31-style-numeric-comp.tex
@@ -22,22 +22,6 @@ consecutive numbers is formatted as a range. This style will
 implicitly enable the \texttt{sortcites} package option at load
 time.
 
-\subsection*{Additional package options}
-
-\subsubsection*{The \texttt{subentry} option}
-
-The option \texttt{subentry} affects the handling of citations
-referring to members of a reference set. If this option is enabled,
-such citations get an extra letter which identifies the member
-(it is also printed in the bibliography):
-\cite{glashow,yoon,salam,aksin,companion}.
-
-This option is disabled by default, but it has been enabled
-in this example. If disabled, citations referring to a set member
-will point to the entire set, i.e., the above citations would
-come out as
-\cite{stdmodel,set,stdmodel,set,companion}.
-
 \subsection*{Multiple citations}
 
 \cite{bertram,augustine}
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-biber.pdf
index 455ce302850..6f1c526b261 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-bibtex.pdf
index fe7b4fe04c4..f791b452b47 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex
index 269b52f786e..bee8deb900a 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/32-style-numeric-verb.tex
@@ -19,20 +19,6 @@
 This style is similar to \texttt{numeric} except that a list of
 multiple citations is printed in a slightly more verbose format.
 
-\subsubsection*{The \texttt{subentry} option}
-
-The option \texttt{subentry} affects the handling of citations
-referring to members of a reference set. If this option is enabled,
-such citations get an extra letter which identifies the member
-(it is also printed in the bibliography):
-\cite{glashow,yoon,salam,aksin,companion}.
-
-This option is disabled by default, but it has been enabled
-in this example. If disabled, citations referring to a set member
-will point to the entire set, i.e., the above citations would
-come out as
-\cite{stdmodel,set,stdmodel,set,companion}.
-
 \subsection*{Multiple citations}
 
 \cite{hammond,massa,augustine,cotton,set,murray,bertram,stdmodel}
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-biber.pdf
index 19b4070c8f9..bc1738d3a21 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-bibtex.pdf
index b01fc96c87f..f05be12f4a9 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/40-style-alphabetic-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-biber.pdf
index 9ce56a20def..0da50ed6e73 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-bibtex.pdf
index 2f5f4f46cd8..306c33ca5f4 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/41-style-alphabetic-verb-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-biber.pdf
index e7402b339a6..37c6ff50aed 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-bibtex.pdf
index 3d1cab0fff4..58d1ecec614 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/42-style-alphabetic-template-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-biber.pdf
index c3ca5c77a73..6100fda1830 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-bibtex.pdf
index 9bb1835687e..645efd0f93f 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex
index 678efc4fc2b..c022f3ae743 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/50-style-authoryear.tex
@@ -39,13 +39,11 @@ preamble will disable this feature. The default setting is
 Since this style prints the date label after the author/editor in the
 bibliography, there are effectively two dates in the bibliography:
 the full date specification (e.g., \enquote{2001}, \enquote{June
-2006}, \enquote{5th~Jan. 2008}, whose format is controlled by the
-\texttt{date} option) and the date label (e.g., \enquote{2006a},
-whose format is controlled with the \texttt{labeldate} option),
-as found in citations. The \texttt{mergedate} option controls whether
-or not date specifications are merged with the date label.
-This option is best explained by example. Note that
-it only affects the bibliography. Citations use the date label only.
+2006}, \enquote{5th~Jan. 2008}) and the date label (e.g.,
+\enquote{2006a}), as found in citations. The \texttt{mergedate}
+option controls whether or not date specifications are merged with
+the date label. This option is best explained by example. Note that
+it only affects the bibliography. Citations use the date label only:
 
 \begin{bibsample}
 \item Doe 2000
@@ -53,12 +51,10 @@ it only affects the bibliography. Citations use the date label only.
 \item Doe 2003b
 \item Doe 2006a
 \item Doe 2006b
-\item Doe 2017
 \end{bibsample}
 
 \texttt{mergedate=false} strictly separates the date specification
-(following \texttt{date}) from the date label (following \texttt{labeldate}).
-The year will always be printed twice:
+from the date label. The year will always be printed twice:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000.
@@ -68,11 +64,12 @@ The year will always be printed twice:
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
-\texttt{mergedate=minimum} omits the date whenever the full date
-and the date label have exactly the same precision (date-time granularity).
+\texttt{mergedate=minimum} merges the dates whenever the full date
+and the date label are exactly the same string. If the date is a bare
+year number and there is no \texttt{extrayear} field, the date
+specification will be omitted:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -82,12 +79,11 @@ and the date label have exactly the same precision (date-time granularity).
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
 \texttt{mergedate=basic} is similar in concept but more economical.
-It will also omit the date if it differs from the date label only by
-\texttt{extradate}.
+It will always omit the date specification if the date is a bare year
+number:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -97,13 +93,10 @@ It will also omit the date if it differs from the date label only by
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
 \texttt{mergedate=compact} merges all date specifications with the
-date labels. The merged date is printed in \texttt{date} format,
-not \texttt{labeldate}, even if it is printed in the position of
-the date label. The \texttt{issue} field is still treated specially:
+date labels. It will still treat the \texttt{issue} field specially:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -112,13 +105,10 @@ the date label. The \texttt{issue} field is still treated specially:
 \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall), pp.~5--25.
-\item Doe, John (7th Aug. 2017).\emph{Webpage}.
 \end{bibsample}
 
-\texttt{mergedate=maximum} strives for maximum compactness.
-Like \texttt{mergedate=compact} this option merges the date
-into the date label.
-Even the \texttt{issue} field is merged with the date label:
+\texttt{mergedate=maximum} strives for maximum compactness. Even the
+\texttt{issue} field is merged with the date label:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -126,7 +116,6 @@ Even the \texttt{issue} field is merged with the date label:
 \item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
 \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
 \item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25.
-\item Doe, John (7th Aug. 2017).\emph{Webpage}.
 \end{bibsample}
 
 \texttt{mergedate=true} is an alias for \texttt{mergedate=compact}.
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-biber.pdf
index 2dad4901830..f66d4cddb6e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-bibtex.pdf
index 58d95db268f..2a6c22d9523 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex
index 5d573bfe1be..c36503c1920 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/51-style-authoryear-ibid.tex
@@ -53,13 +53,11 @@ preamble will disable this feature. The default setting is
 Since this style prints the date label after the author/editor in the
 bibliography, there are effectively two dates in the bibliography:
 the full date specification (e.g., \enquote{2001}, \enquote{June
-2006}, \enquote{5th~Jan. 2008}, whose format is controlled by the
-\texttt{date} option) and the date label (e.g., \enquote{2006a},
-whose format is controlled with the \texttt{labeldate} option),
-as found in citations. The \texttt{mergedate} option controls whether
-or not date specifications are merged with the date label.
-This option is best explained by example. Note that
-it only affects the bibliography. Citations use the date label only.
+2006}, \enquote{5th~Jan. 2008}) and the date label (e.g.,
+\enquote{2006a}), as found in citations. The \texttt{mergedate}
+option controls whether or not date specifications are merged with
+the date label. This option is best explained by example. Note that
+it only affects the bibliography. Citations use the date label only:
 
 \begin{bibsample}
 \item Doe 2000
@@ -67,12 +65,10 @@ it only affects the bibliography. Citations use the date label only.
 \item Doe 2003b
 \item Doe 2006a
 \item Doe 2006b
-\item Doe 2017
 \end{bibsample}
 
 \texttt{mergedate=false} strictly separates the date specification
-(following \texttt{date}) from the date label (following \texttt{labeldate}).
-The year will always be printed twice:
+from the date label. The year will always be printed twice:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000.
@@ -82,11 +78,12 @@ The year will always be printed twice:
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
-\texttt{mergedate=minimum} omits the date whenever the full date
-and the date label have exactly the same precision (date-time granularity).
+\texttt{mergedate=minimum} merges the dates whenever the full date
+and the date label are exactly the same string. If the date is a bare
+year number and there is no \texttt{extrayear} field, the date
+specification will be omitted:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -96,12 +93,11 @@ and the date label have exactly the same precision (date-time granularity).
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
 \texttt{mergedate=basic} is similar in concept but more economical.
-It will also omit the date if it differs from the date label only by
-\texttt{extradate}.
+It will always omit the date specification if the date is a bare year
+number:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -111,13 +107,10 @@ It will also omit the date if it differs from the date label only by
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
 \texttt{mergedate=compact} merges all date specifications with the
-date labels. The merged date is printed in \texttt{date} format,
-not \texttt{labeldate}, even if it is printed in the position of
-the date label. The \texttt{issue} field is still treated specially:
+date labels. It will still treat the \texttt{issue} field specially:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -126,13 +119,10 @@ the date label. The \texttt{issue} field is still treated specially:
 \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall), pp.~5--25.
-\item Doe, John (7th Aug. 2017).\emph{Webpage}.
 \end{bibsample}
 
-\texttt{mergedate=maximum} strives for maximum compactness.
-Like \texttt{mergedate=compact} this option merges the date
-into the date label.
-Even the \texttt{issue} field is merged with the date label:
+\texttt{mergedate=maximum} strives for maximum compactness. Even the
+\texttt{issue} field is merged with the date label:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -140,7 +130,6 @@ Even the \texttt{issue} field is merged with the date label:
 \item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
 \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
 \item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25.
-\item Doe, John (7th Aug. 2017).\emph{Webpage}.
 \end{bibsample}
 
 \texttt{mergedate=true} is an alias for \texttt{mergedate=compact}.
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-biber.pdf
index ff3d1116211..89d7b2d1009 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-bibtex.pdf
index 53d12135eaa..27bdcacea62 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex
index c4f6b52c513..88c1dad39fa 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/52-style-authoryear-comp.tex
@@ -43,13 +43,11 @@ preamble will disable this feature. The default setting is
 Since this style prints the date label after the author/editor in the
 bibliography, there are effectively two dates in the bibliography:
 the full date specification (e.g., \enquote{2001}, \enquote{June
-2006}, \enquote{5th~Jan. 2008}, whose format is controlled by the
-\texttt{date} option) and the date label (e.g., \enquote{2006a},
-whose format is controlled with the \texttt{labeldate} option),
-as found in citations. The \texttt{mergedate} option controls whether
-or not date specifications are merged with the date label.
-This option is best explained by example. Note that
-it only affects the bibliography. Citations use the date label only.
+2006}, \enquote{5th~Jan. 2008}) and the date label (e.g.,
+\enquote{2006a}), as found in citations. The \texttt{mergedate}
+option controls whether or not date specifications are merged with
+the date label. This option is best explained by example. Note that
+it only affects the bibliography. Citations use the date label only:
 
 \begin{bibsample}
 \item Doe 2000
@@ -57,12 +55,10 @@ it only affects the bibliography. Citations use the date label only.
 \item Doe 2003b
 \item Doe 2006a
 \item Doe 2006b
-\item Doe 2017
 \end{bibsample}
 
 \texttt{mergedate=false} strictly separates the date specification
-(following \texttt{date}) from the date label (following \texttt{labeldate}).
-The year will always be printed twice:
+from the date label. The year will always be printed twice:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000.
@@ -72,11 +68,12 @@ The year will always be printed twice:
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
-\texttt{mergedate=minimum} omits the date whenever the full date
-and the date label have exactly the same precision (date-time granularity).
+\texttt{mergedate=minimum} merges the dates whenever the full date
+and the date label are exactly the same string. If the date is a bare
+year number and there is no \texttt{extrayear} field, the date
+specification will be omitted:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -86,12 +83,11 @@ and the date label have exactly the same precision (date-time granularity).
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
 \texttt{mergedate=basic} is similar in concept but more economical.
-It will also omit the date if it differs from the date label only by
-\texttt{extradate}.
+It will always omit the date specification if the date is a bare year
+number:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -101,13 +97,10 @@ It will also omit the date if it differs from the date label only by
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
 \texttt{mergedate=compact} merges all date specifications with the
-date labels. The merged date is printed in \texttt{date} format,
-not \texttt{labeldate}, even if it is printed in the position of
-the date label. The \texttt{issue} field is still treated specially:
+date labels. It will still treat the \texttt{issue} field specially:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -116,13 +109,10 @@ the date label. The \texttt{issue} field is still treated specially:
 \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall), pp.~5--25.
-\item Doe, John (7th Aug. 2017).\emph{Webpage}.
 \end{bibsample}
 
-\texttt{mergedate=maximum} strives for maximum compactness.
-Like \texttt{mergedate=compact} this option merges the date
-into the date label.
-Even the \texttt{issue} field is merged with the date label:
+\texttt{mergedate=maximum} strives for maximum compactness. Even the
+\texttt{issue} field is merged with the date label:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -130,7 +120,6 @@ Even the \texttt{issue} field is merged with the date label:
 \item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
 \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
 \item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25.
-\item Doe, John (7th Aug. 2017).\emph{Webpage}.
 \end{bibsample}
 
 \texttt{mergedate=true} is an alias for \texttt{mergedate=compact}.
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-biber.pdf
index 5b80e62b595..307366891af 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-bibtex.pdf
index e4ee00f4096..d2ebc2c9008 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex
index 4499b8e4e42..34826c6cabc 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/53-style-authoryear-icomp.tex
@@ -51,13 +51,11 @@ preamble will disable this feature. The default setting is
 Since this style prints the date label after the author/editor in the
 bibliography, there are effectively two dates in the bibliography:
 the full date specification (e.g., \enquote{2001}, \enquote{June
-2006}, \enquote{5th~Jan. 2008}, whose format is controlled by the
-\texttt{date} option) and the date label (e.g., \enquote{2006a},
-whose format is controlled with the \texttt{labeldate} option),
-as found in citations. The \texttt{mergedate} option controls whether
-or not date specifications are merged with the date label.
-This option is best explained by example. Note that
-it only affects the bibliography. Citations use the date label only.
+2006}, \enquote{5th~Jan. 2008}) and the date label (e.g.,
+\enquote{2006a}), as found in citations. The \texttt{mergedate}
+option controls whether or not date specifications are merged with
+the date label. This option is best explained by example. Note that
+it only affects the bibliography. Citations use the date label only:
 
 \begin{bibsample}
 \item Doe 2000
@@ -65,12 +63,10 @@ it only affects the bibliography. Citations use the date label only.
 \item Doe 2003b
 \item Doe 2006a
 \item Doe 2006b
-\item Doe 2017
 \end{bibsample}
 
 \texttt{mergedate=false} strictly separates the date specification
-(following \texttt{date}) from the date label (following \texttt{labeldate}).
-The year will always be printed twice:
+from the date label. The year will always be printed twice:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher, 2000.
@@ -80,11 +76,12 @@ The year will always be printed twice:
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
-\texttt{mergedate=minimum} omits the date whenever the full date
-and the date label have exactly the same precision (date-time granularity).
+\texttt{mergedate=minimum} merges the dates whenever the full date
+and the date label are exactly the same string. If the date is a bare
+year number and there is no \texttt{extrayear} field, the date
+specification will be omitted:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -94,12 +91,11 @@ and the date label have exactly the same precision (date-time granularity).
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
 \texttt{mergedate=basic} is similar in concept but more economical.
-It will also omit the date if it differs from the date label only by
-\texttt{extradate}.
+It will always omit the date specification if the date is a bare year
+number:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -109,13 +105,10 @@ It will also omit the date if it differs from the date label only by
 (June~2006), pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall~2006), pp.~5--25.
-\item Doe, John (2017). \emph{Webpage}. 7th Aug. 2017.
 \end{bibsample}
 
 \texttt{mergedate=compact} merges all date specifications with the
-date labels. The merged date is printed in \texttt{date} format,
-not \texttt{labeldate}, even if it is printed in the position of
-the date label. The \texttt{issue} field is still treated specially:
+date labels. It will still treat the \texttt{issue} field specially:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -124,13 +117,10 @@ the date label. The \texttt{issue} field is still treated specially:
 \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
 \item Doe, John (2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3
 (Fall), pp.~5--25.
-\item Doe, John (7th Aug. 2017).\emph{Webpage}.
 \end{bibsample}
 
-\texttt{mergedate=maximum} strives for maximum compactness.
-Like \texttt{mergedate=compact} this option merges the date
-into the date label.
-Even the \texttt{issue} field is merged with the date label:
+\texttt{mergedate=maximum} strives for maximum compactness. Even the
+\texttt{issue} field is merged with the date label:
 
 \begin{bibsample}
 \item Doe, John (2000). \emph{Book~1}. Location: Publisher.
@@ -138,7 +128,6 @@ Even the \texttt{issue} field is merged with the date label:
 \item Doe, John (2003b). \emph{Book~3}. Location: Publisher.
 \item Doe, John (June 2006a). \enquote{Article~1}. In: \emph{Monthly Journal} 25.6, pp.~70--85.
 \item Doe, John (Fall 2006b). \enquote{Article~2}. In: \emph{Quarterly Journal} 14.3, pp.~5--25.
-\item Doe, John (7th Aug. 2017).\emph{Webpage}.
 \end{bibsample}
 
 \texttt{mergedate=true} is an alias for \texttt{mergedate=compact}.
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf
index 3b3b19e7ce6..a3f36503b21 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-bibtex.pdf
index 5f15ff6eacd..7bf6339b125 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/60-style-authortitle-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-biber.pdf
index c62070ad542..65a2594e2b9 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-bibtex.pdf
index 2170ae0b7ca..e0798845c94 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/61-style-authortitle-ibid-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-biber.pdf
index 7f94f785e57..6557ae9cfe1 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-bibtex.pdf
index 451b88d0de6..901a062778e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/62-style-authortitle-comp-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-biber.pdf
index b79ee4d0fdc..a43efc0ee9d 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-bibtex.pdf
index 9f7c90a9790..29aff0eb6f7 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/63-style-authortitle-icomp-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-biber.pdf
index 53d408ef15b..989b280b2fc 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-bibtex.pdf
index 6c71c1e1320..aa5114d8f86 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/64-style-authortitle-terse-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-biber.pdf
index c0a83cb97e7..ec637c9afc7 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-bibtex.pdf
index 7175e1e0ced..da1f489a2c6 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/65-style-authortitle-tcomp-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-biber.pdf
index 274d8dcc424..86ab456544c 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-bibtex.pdf
index 8d4f6c05ded..b6200d81eca 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/66-style-authortitle-ticomp-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-biber.pdf
index 4b2f20dc4af..bd5ca665bc1 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-bibtex.pdf
index 6695b328733..4eade38f809 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/70-style-verbose-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-biber.pdf
index e2309a41aae..5143c24a127 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-bibtex.pdf
index bacca4c5d1f..b0fa7a526a2 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/71-style-verbose-ibid-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-biber.pdf
index b5089769d71..d7c54c413b9 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-bibtex.pdf
index 28f8ee1a008..c6d9a8a71f8 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/72-style-verbose-note-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-biber.pdf
index 04f844a1f9e..d3304469720 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-bibtex.pdf
index 21d1e1c6b3c..413cf5599eb 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/73-style-verbose-inote-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-biber.pdf
index 543e2adc44e..4c61296d50c 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-bibtex.pdf
index 93e71e53b05..22f24ec5d71 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/74-style-verbose-trad1-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-biber.pdf
index 6d9a4ead25c..c28ef2b88b7 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-bibtex.pdf
index 23c8cca72c2..8880bf31016 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/75-style-verbose-trad2-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-biber.pdf
index 83e5e06ebc9..6ba0616a3e6 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-bibtex.pdf
index bd75ca63e59..ea0a375cfae 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/76-style-verbose-trad3-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-biber.pdf
index 9af20803ce5..aaf8b5f40cb 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-bibtex.pdf
index 2c5c11ae0fa..f1b8cb20053 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/80-style-reading-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-biber.pdf
index d6e496abb50..c4f1194f7c1 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-bibtex.pdf
index 403a541d014..adc323850fa 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/81-style-draft-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf
index 8a6a9e26030..41965fbeded 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-bibtex.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-bibtex.pdf
index 2d15a72e611..0f13851f73c 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-bibtex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/82-style-debug-bibtex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries-biber.pdf
index e955d209d39..b45f00372bb 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes-biber.pdf
index 284d42d39a4..207edf3b6c0 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex
index 251e27dcc27..799b57f182e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex
@@ -6,12 +6,6 @@
 \usepackage{hyperref}
 \addbibresource{biblatex-examples.bib}
 \begin{document}
-% This demonstrates that the sorting of citations can be difference to the
-% bibliography. However, this is not always advisable in case of multiple
-% citations in the same year for the same author list. This is because
-% extradate (the "a", "b" etc. in "Smith 2010a" and "Smith 2010b" etc.)
-% depends on the sorting order and if the sorting order is different
-% between citations and bibliography, this can cause confusion.
 Filler text \parencite{wassenberg,cicero,companion,angenendt}.
 \newrefcontext[sorting=nyt]
 \printbibliography
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists-biber.pdf
index 72b8c43231f..6e2ac6ea7ad 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.tex b/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.tex
index d43f2b192ae..52661044fda 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.tex
@@ -14,7 +14,7 @@
 % This is optional. If no sorting scheme is specified to \printbiblist, a
 % sorting scheme with the same name as the biblist is used if found.
 % Otherwise as a last resort the global sorting scheme is used
-\DeclareSortingTemplate{shorttitle}{
+\DeclareSortingScheme{shorttitle}{
   \sort{
     \field{shorttitle}
   }
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts-biber.pdf
index 6ea4cb55391..2fd7ea16e4f 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.dbx b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.dbx
index 98bafea301b..d94fec6e122 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.dbx
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.dbx
@@ -1 +1 @@
-\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,patronymic,papponymic,cjk}
+\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,patronymic}
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex
index b5e3d6fc7dc..46b337c3dd1 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/93-nameparts.tex
@@ -1,410 +1,49 @@
 \documentclass[a4paper]{article}
 \usepackage{fontspec}
-\setmainfont{Linux Libertine O}
-\setsansfont{Linux Biolinum O}
-\usepackage[fallback]{xeCJK}
-%\setCJKmainfont{Malgun Gothic}
-\setCJKmainfont{PingFang TC}% OSX
-
-\usepackage[british]{babel}
+\setmainfont{Cambria}
+\setsansfont{Arial}
+\setmonofont{Courier New}
+\usepackage[russian]{babel}
 \usepackage{csquotes}
 \usepackage{filecontents}
 \begin{filecontents}{\jobname.bib}
 @book{tolstoy,
-  author = {given=Лев, patronymic=Николаевич, family=Толстой, nametemplates=russian},
-  title  = {Война и мир},
-  date   = {1877},
-  langid = {russian},
-}
-@book{bulgakov,
-  author = {given=Михаил, patronymic=Афанасьевич, family=Булгаков, nametemplates=russian},
-  title  = {Мастер и Маргарита},
-  date   = {1966},
-  langid = {russian},
-}
-@book{bulgakov:val,
-  author = {given=Валентин, patronymic=Фёдорович, family=Булгаков, nametemplates=russian},
-  title  = {Л. Н. Толстой в последний год его жизни},
-  date   = {1911},
-  langid = {russian},
-}
-
-@book{dosto:1,
-  author = {given=Александр , patronymic=Андреевич, family=Достоевский, nametemplates=russian},
-  title  = {О строении телец Грандри},
-  date   = {1885},
-  langid = {russian},
-}
-@book{dosto:2,
-  author = {given=Андрей , patronymic=Андреевич, family=Достоевский, nametemplates=russian},
-  title  = {П. П. Семенов-Тян-Шанский как исследователь, географ и статистик},
-  date   = {1914},
-  langid = {russian},
-}
-
-@book{demeke,
-  author  = {given=Kebede, patronymic=Daniel, papponymic=Demeke, nametemplates=ethiopian},
-  title   = {One},
-  date    = {1983}
-}
-@book{dameke,
-  author  = {given=Kebede, patronymic=Daniel, papponymic=Dameke, nametemplates=ethiopian},
-  title   = {Two},
-  date    = {1983}
-}
-@book{james,
-  author  = {given=Kebede, patronymic=James, papponymic=Demeke, nametemplates=ethiopian},
-  title   = {Three},
-  date    = {1983}
-}
-@book{jonathan,
-  author  = {given=Kebede, patronymic=Jonathan, papponymic=Kebede, nametemplates=ethiopian},
-  title   = {Four},
-  date    = {1986}
-}
-@book{william,
-  author  = {given=Kebede, patronymic=William, papponymic=Kebede, nametemplates=ethiopian},
-  title   = {Four},
-  date    = {1987}
-}
-
-@book{zhangx1,
-  title      = {Shuming},
-  titleaddon = {書名},
-  author     = {family=Zhang, cjk=章學成, given=Xuecheng, nametemplates=cjk},
-  location   = {Beijing},
-  publisher  = {Zhonghua Shuju},
-  date       = {2017},
-}
-@book{zhangx2,
-  title      = {Shuming er},
-  titleaddon = {書名二},
-  author     = {family=Zhang, cjk=張學成, given=Xuecheng, nametemplates=cjk},
-  location   = {Shanghai},
-  publisher  = {Shangwu Yinshuguan},
-  date       = {2016},
-}
-@book{zhangh,
-  title      = {Sŏmyŏng},
-  titleaddon = {書名},
-  author     = {family=Zhang, cjk=장학성, given=Haksŏng, nametemplates=cjk},
-  location   = {Shanghai},
-  publisher  = {Shangwu Yinshuguan},
-  date       = {2016},
-}
-
-@book{bronte:c,
-  author     = {Charlotte Brontë},
-  date       = {1847},
-  title      = {Jane Eyre},
-}
-@book{bronte:e,
-  author     = {Emily Brontë},
-  date       = {1847},
-  title      = {Wuthering Heights},
-}
-
-@book{austen:jane,
-  author     = {Jane Austen},
-  date       = {1813},
-  title      = {Pride and Prejudice},
-}
-@collection{austen:john,
-  editor     = {John Austen},
-  editortype = {compiler},
-  date       = {1924},
-  title      = {Rogues in Porcelain: A Miscellany of 18th Poems},
+  author       = {given=Лев, patronymic=Николаевич, family=Толстой},
+  title        = {Война и мир},
+  date         = {1877}
 }
 \end{filecontents}
-\usepackage[style=authoryear,datamodel=93-nameparts,backend=biber, autolang=hyphen]{biblatex}
-\addbibresource{biblatex-examples.bib}
+\usepackage[style=authoryear,datamodel=93-nameparts,backend=biber]{biblatex}
+\addbibresource[datatype=biblatexml]{biblatex-examples.bltxml}
 \addbibresource{\jobname.bib}
 
-
-% Use transliteration to sort Cyrillic among Latin script
-\DeclareSortTranslit{
-  \translit{russian}{bgn/pcgn-standard}
-}
-
-\makeatletter
-%% CJK names
-% the idea is to sort family -> given -> cjk (full name)
-% and disambiguate in the same manner using only full
-% forms of the name, no initials
-% the order should always be family -> given -> cjk
-% names are not reversed
-\DeclareSortingNamekeyTemplate[cjk]{
-  \keypart{
-    \namepart{family}
-  }
-  \keypart{
-    \namepart{given}
-  }
-  \keypart{
-    \namepart{cjk}
-  }
-}
-
-\DeclareUniquenameTemplate[cjk]{
-  \namepart[base=true]{family}
-  \namepart[disambiguation=full]{given}
-  \namepart[disambiguation=full]{cjk}
-}
-
-\newbibmacro*{name:cjk}[3]{%
-  \usebibmacro{name:delim}{#2#3#1}%
-  \usebibmacro{name:hook}{#2#3#1}%
-  \mkbibnamefamily{#1}%
-  \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}}%
-  \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnamecjk{#3}}}
-
-%% Ethiopian names
-% Ethiopian names are given -> patronymic -> papponymic
-% the latter two are only needed for disambiguation
-% names order is never reversed
-\DeclareSortingNamekeyTemplate[ethiopian]{
-  \keypart{
-    \namepart{given}
-  }
+% A format using the new name part
+\DeclareNameFormat{author}{%
+   \usebibmacro{name:delim}{#1}%
+   \usebibmacro{name:hook}{#1}%
+   \mkbibnamefamily{\namepartfamily}%
+   \ifdefvoid\namepartgiven
+     {}
+     {\revsdnamepunct
+      \bibnamedelimd
+      \mkbibnamegiven{\namepartgiven}%
+      \space
+      \mkbibnamepatronymic{\namepartpatronymic}\isdot}
+   \usebibmacro{name:andothers}}
+
+% We want to sort names using these name parts in this order
+\DeclareSortingNamekeyScheme{
   \keypart{
     \namepart{patronymic}
   }
   \keypart{
-    \namepart{papponymic}
-  }
-}
-
-\DeclareUniquenameTemplate[ethiopian]{
-  \namepart[base=true]{given}
-  \namepart[disambiguation=full]{patronymic}
-  \namepart[disambiguation=full]{papponymic}
-}
-
-\newbibmacro*{name:ethiopian}[3]{%
-  \usebibmacro{name:delim}{#1#2#3}%
-  \usebibmacro{name:hook}{#1#2#3}%
-  \mkbibethgiven{#1}%
-  \ifdefvoid{#2}{}{\bibnamedelimd\mkbibethpat{#2}\isdot}%
-  \ifdefvoid{#3}{}{\bibnamedelimd\mkbibethpap{#3}\isdot}}
-
-\let\mkbibethgiven\mkbibnamefamily
-\let\mkbibethpat\mkbibnamegiven
-\let\mkbibethpap\mkbibnamegiven
-
-%% Russian names
-% family -> given -> patronymic
-% we never show the given name alone, it is always accompanied
-% by the patronymic
-% (patronymic could just be treated as another given name)
-% reversed name order is 'family, given patronymic'
-\DeclareSortingNamekeyTemplate[russian]{
-  \keypart{
     \namepart{family}
   }
   \keypart{
     \namepart{given}
   }
-  \keypart{
-    \namepart{patronymic}
-  }
-}
-
-\DeclareUniquenameTemplate[russian]{
-  \namepart[base=true]{family}
-  \namepart{given}
-  \namepart{patronymic}
 }
 
-\newbibmacro*{name:russian}[3]{%
-  \usebibmacro{name:delim}{#1#2#3}%
-  \usebibmacro{name:hook}{#1#2#3}%
-  \ifdefvoid{#2}
-    {}
-    {\mkbibnamegiven{#2}\isdot\bibnamedelimd
-     \ifdefvoid{#3}
-       {}
-       {\mkbibnamepatronymic{#3}\isdot\bibnamedelimd}}%
-  \mkbibnamefamily{#1}}
-
-\newbibmacro*{name:russian-rev}[3]{%
-  \usebibmacro{name:delim}{#1#2#3}%
-  \usebibmacro{name:hook}{#1#2#3}%
-  \mkbibnamefamily{#1}%
-  \ifdefvoid{#2}
-    {}
-    {\revsdnamepunct\bibnamedelimd
-     \mkbibnamegiven{#2}\isdot
-     \ifdefvoid{#3}
-       {}
-       {\bibnamedelimd\mkbibnamepatronymic{#3}\isdot}}}
-
-%% sortname
-% helper to select the sorting template in \ifcase
-\newcommand*{\abx@sortingnamekeytemplate}{0}
-\newcommand*{\abx@getsortingnamekeytemplate}{%
-  \ifsortingnamekeytemplatename{cjk}
-     {\def\abx@sortingnamekeytemplate{1}}
-     {\ifsortingnamekeytemplatename{ethiopian}
-        {\def\abx@sortingnamekeytemplate{2}}
-        {\ifsortingnamekeytemplatename{russian}
-           {\def\abx@sortingnamekeytemplate{3}}
-           {}}}}
-
-% show fullest version of names,
-% reverse Russian and western names for sorting
-% all other names are always in the correct order for sorting
-\DeclareNameFormat{sortname}{%
-  \abx@getsortingnamekeytemplate
-  \ifcase\abx@sortingnamekeytemplate\relax
-    \usebibmacro{name:family-given}
-      {\namepartfamily}
-      {\namepartgiven}
-      {\namepartprefix}
-      {\namepartsuffix}%
-  \or
-    \usebibmacro{name:cjk}
-      {\namepartfamily}
-      {\namepartgiven}
-      {\namepartcjk}%
-  \or
-    \usebibmacro{name:ethiopian}
-      {\namepartgiven}
-      {\namepartpatronymic}
-      {\namepartpapponymic}%
-  \or
-    \usebibmacro{name:russian-rev}
-      {\namepartfamily}
-      {\namepartgiven}
-      {\namepartpatronymic}%
-  \fi
-  \usebibmacro{name:andothers}}
-
-%% labelname
-% copy of the standard definition in biblatex.def
-% uses the 'old way' of finding the disambiguating name part
-\newbibmacro{labelname:western}{%
-  \ifcase\value{uniquename}%
-    \usebibmacro{name:family}
-      {\namepartfamily}
-      {\namepartgiven}
-      {\namepartprefix}
-      {\namepartsuffix}%
-  \or
-    \ifuseprefix
-      {\usebibmacro{name:given-family}
-        {\namepartfamily}
-        {\namepartgiveni}
-        {\namepartprefix}
-        {\namepartsuffixi}}
-      {\usebibmacro{name:given-family}
-        {\namepartfamily}
-        {\namepartgiveni}
-        {\namepartprefixi}
-        {\namepartsuffixi}}%
-  \or
-    \usebibmacro{name:given-family}
-      {\namepartfamily}
-      {\namepartgiven}
-      {\namepartprefix}
-      {\namepartsuffix}%
-  \fi
-  \usebibmacro{name:andothers}}
-
-% Uses \iffieldequalstr{uniquepart} to find the disambiguating
-% name part.
-% If neither base (i.e. family) nor given name are enough,
-% go with the full name.
-% Uses \empty for suppressed name parts, so we don't have to define
-% dedicated macros for the shorter name forms.
-\newbibmacro{labelname:cjk}{%
-  \iffieldequalstr{uniquepart}{base}%
-    {\usebibmacro{name:cjk}
-       {\namepartfamily}
-       {\empty}
-       {\empty}}
-    {\iffieldequalstr{uniquepart}{given}%
-       {\usebibmacro{name:cjk}
-          {\namepartfamily}
-          {\namepartgiven}
-          {\empty}}
-       {\usebibmacro{name:cjk}
-          {\namepartfamily}
-          {\namepartgiven}
-          {\namepartcjk}}}}
-
-% similar to the CJK format
-\newbibmacro{labelname:ethiopian}{%
-  \iffieldequalstr{uniquepart}{base}%
-    {\usebibmacro{name:ethiopian}
-       {\namepartgiven}
-       {\empty}
-       {\empty}}
-    {\iffieldequalstr{uniquepart}{patronymic}%
-       {\usebibmacro{name:ethiopian}
-          {\namepartgiven}
-          {\namepartpatronymic}
-          {\empty}}
-       {\usebibmacro{name:ethiopian}
-          {\namepartgiven}
-          {\namepartpatronymic}
-          {\namepartpapponymic}}}}
-
-% Uses \iffieldequalstr{uniquepart} to get the disambiguating
-% name part.
-% We only choose between 'Given Patronymic Family' and
-% 'G. P. Family', the decision whether or not to use
-% initials is for the given name to decide.
-% If the given initial is enough to disambiguate the name,
-% the given name and patronymic become initials.
-% Even if the initial of the patronymic would make the name
-% unique we go with the full name instead.
-% There is no 'Given P. Family' format.
-% \namepart<>un=1 says initials are enough
-% 2 means the full name is required
-% 0 means not used
-\newbibmacro{labelname:russian}{%
-  \iffieldequalstr{uniquepart}{base}%
-    {\usebibmacro{name:russian}
-       {\namepartfamily}
-       {\empty}
-       {\empty}}
-    {\ifnum\namepartgivenun=1\relax
-       \usebibmacro{name:russian}
-          {\namepartfamily}
-          {\namepartgiveni}
-          {\namepartpatronymici}%
-     \else
-       \usebibmacro{name:russian}
-          {\namepartfamily}
-          {\namepartgiven}
-          {\namepartpatronymic}%
-     \fi}}
-
-% helper to select the uniquename template in \ifcase
-\newcommand*{\abx@uniquenametemplatename}{0}
-\newcommand*{\abx@getuniquenametemplatename}{%
-  \ifuniquenametemplatename{cjk}
-     {\def\abx@uniquenametemplatename{1}}
-     {\ifuniquenametemplatename{ethiopian}
-        {\def\abx@uniquenametemplatename{2}}
-        {\ifuniquenametemplatename{russian}
-           {\def\abx@uniquenametemplatename{3}}
-           {}}}}
-
-\DeclareNameFormat{labelname}{%
-  \abx@getuniquenametemplatename
-  \ifcase\abx@uniquenametemplatename\relax
-    \usebibmacro{labelname:western}%
-  \or
-    \usebibmacro{labelname:cjk}%
-  \or
-    \usebibmacro{labelname:ethiopian}%
-  \or
-    \usebibmacro{labelname:russian}%
-  \fi
-  \usebibmacro{name:andothers}}
-\makeatother
-
 \begin{document}
 % Historically, name handling in latex bibliographies has been determined by
 % the name parsing rules of bibtex. In a modern context, this name handling
@@ -414,26 +53,17 @@
 % it is possible to define arbitrary name parts since the allowable name
 % parts are defined in the data model (see accompanying file 93-nameparts.dbx).
 
-% Here we demonstrate the possibility of adding a new name parts to the
-% datamodel and then using it in formatting, sorting etc.
-% Notice that we can use the new name part types in the datasource
+% Here we demonstrate the possibility of adding a new "patronymic" name part to the
+% datamodel and then using it in formatting, sorting etc. It requires
+% the biblatexml datasource format (see accompanying file biblatex-examples.bltxml)
+
+% Notice that we can use the <patronymic> name part type in the datasource
 % which is now allowable due to the enhanced datamodel constant definition.
 % We have also defined a new name format and method of sorting names which
-% are aware of the new name parts.
+% are aware of the new name part.
 %
-\textcite{tolstoy,bulgakov,bulgakov:val}
-
-\textcite{dosto:1}
-
-\textcite{dosto:2}
-
-\textcite{demeke,dameke,james,jonathan,william}
-
-\textcite{sigfridsson,worman,geer,knuth:ct:a,cicero,companion,vangennep}
-
-\textcite{bronte:c,bronte:e,austen:jane,austen:john}
-
-\textcite{zhangx1,zhangx2,zhangh}
+\noindent\textcite{tolstoy}\\
+\textcite{bulgakov}
 
 \printbibliography
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/94-labelprefix-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/94-labelprefix-biber.pdf
index f437e48beef..d1c01285817 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/94-labelprefix-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/94-labelprefix-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists-biber.pdf
index ae391427800..097fa19b70e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists.tex b/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists.tex
index 74d0ee9c6d8..20958c1c6c6 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/95-customlists.tex
@@ -53,7 +53,7 @@
 }
 
 % Sort the biblist by coauthor name
-\DeclareSortingTemplate{coauthor}{
+\DeclareSortingScheme{coauthor}{
   \sort{
         \field{coauthor}
   }
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/96-dates-biber.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/96-dates-biber.pdf
index 9225227c647..bb1b005cc8e 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/96-dates-biber.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/96-dates-biber.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/96-dates.tex b/Master/texmf-dist/doc/latex/biblatex/examples/96-dates.tex
index 79ff773e49d..58468b152ef 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/96-dates.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/96-dates.tex
@@ -35,10 +35,10 @@
 @misc{date4,
   note      = {Times},
   author    = {Author4},
-  date      = {2004-04-25T14:34:00/2004-04-25T14:37:06},   % Date with time, floating timezone
-  origdate  = {2004-04-25T14:34:00Z/2004-04-25T14:34:05Z}, % Date with time, UTC timezone
-  eventdate = {2004-04-25T14:34:00+05:00/2004-04-25T15:34:00+05:00}, % Date with time, explicit timezone
-  urldate   = {2004-04-25T14:34:00/2004-04-25T15:00:00},   % Datetime range
+  date      = {2004-04-25T14:34:00/2004-04-05T14:37:06},   % Date with time, floating timezone
+  origdate  = {2004-04-25T14:34:00Z/2004-04-05T14:34:05Z}, % Date with time, UTC timezone
+  eventdate = {2004-04-25T14:34:00+05:00/2004-04-05T15:34:00+05:00}, % Date with time, explicit timezone
+  urldate   = {2004-04-25T14:34:00/2004-04-05T15:00:00},   % Datetime range
 }
 @misc{date5,
   note      = {Seasons},
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
index 8a41db44fa8..06d91ba6c07 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
@@ -4,16 +4,10 @@
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelalpha,sorting=anyt}
 
-\providebool{bbx:subentry}
-
-\DeclareBibliographyOption[boolean]{subentry}[true]{%
-  \setbool{bbx:subentry}{#1}}
-
 \DeclareNameAlias{author}{default}
 \DeclareNameAlias{editor}{default}
 \DeclareNameAlias{translator}{default}
 
-\DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}}
 \DeclareFieldFormat{labelalphawidth}{\mkbibbrackets{#1}}
 \DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}}
 
@@ -21,7 +15,7 @@
   {\list
      {\printtext[labelalphawidth]{%
         \printfield{labelprefix}%
-        \printfield{labelalpha}%
+	\printfield{labelalpha}%
         \printfield{extraalpha}}}
      {\setlength{\labelwidth}{\labelalphawidth}%
       \setlength{\leftmargin}{\labelwidth}%
@@ -46,15 +40,4 @@
   {\endlist}
   {\item}
 
-\DeclareBibliographyDriver{set}{%
-  \entryset
-    {\ifbool{bbx:subentry}
-       {\printfield[bibentrysetcount]{entrysetcount}%
-        \printunit*{\addnbspace}}
-       {}}
-    {}%
-  \newunit\newblock
-  \usebibmacro{setpageref}%
-  \finentry}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index cd89399bfaa..a3f26dd9fe2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -69,8 +69,8 @@
     {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{author}%
-        \setunit{\printdelim{authortypedelim}}%
-        \usebibmacro{bbx:savehash}}%
+	\setunit{\addcomma\space}%
+	\usebibmacro{bbx:savehash}}%
      \usebibmacro{authorstrg}}
     {\global\undef\bbx@lasthash}}
 
@@ -87,8 +87,8 @@
     {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{editor}%
-        \setunit{\printdelim{editortypedelim}}%
-        \usebibmacro{bbx:savehash}}%
+	\setunit{\addcomma\space}%
+	\usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{editor}}
     {\global\undef\bbx@lasthash}}
@@ -106,7 +106,7 @@
     {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{translator}%
-        \setunit{\printdelim{translatortypedelim}}%
+	\setunit{\addcomma\space}%
         \usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{translator}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index 62df365d2d7..e27b18904e2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -17,80 +17,59 @@
        {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
         'true' (=compact), and 'false'.}}}
 
-\providebibmacro*{date+extradate}{}
-\providebibmacro*{date+extrayear}{\usebibmacro{date+extradate}}
+\providebibmacro*{date+extrayear}{}
 
 \def\bbx@opt@mergedate@true{\bbx@opt@mergedate@compact}
 
 % merge date/issue with date label
 \def\bbx@opt@mergedate@maximum{%
-  \renewbibmacro*{date+extradate}{%
+  \renewbibmacro*{date+extrayear}{%
     \iffieldundef{labelyear}
       {}
       {\printtext[parens]{%
-         \iflabeldateisdate
-           {\printfield{issue}%
-            \setunit*{\addspace}%
-            \printdateextra}
-           {\printlabeldateextra}}}}%
-  \renewbibmacro*{date}{%
-    \iflabeldateisdate
-      {}
-      {\printdate}}%
-  \renewbibmacro*{issue+date}{%
-    \iflabeldateisdate
-      {}
-      {\printtext[parens]{%
          \printfield{issue}%
          \setunit*{\addspace}%
-         \printdate}}}}
+         \iffieldsequal{year}{labelyear}
+           {\printlabeldateextra}%
+           {\printfield{labelyear}%
+            \printfield{extrayear}}}}}%
+  \renewbibmacro*{date}{}%
+  \renewbibmacro*{issue+date}{}}
 
 % merge date with date label
 \def\bbx@opt@mergedate@compact{%
-  \renewbibmacro*{date+extradate}{%
+  \renewbibmacro*{date+extrayear}{%
     \iffieldundef{labelyear}
       {}
       {\printtext[parens]{%
-         \iflabeldateisdate
-           {\printdateextra}
-           {\printlabeldateextra}}}}%
-  \renewbibmacro*{date}{%
-    \iflabeldateisdate
-      {}
-      {\printdate}}%
+         \iffieldsequal{year}{labelyear}
+           {\printlabeldateextra}%
+           {\printfield{labelyear}%
+            \printfield{extrayear}}}}}%
+  \renewbibmacro*{date}{}%
   \renewbibmacro*{issue+date}{%
-    \ifboolexpr{not test {\iffieldundef{issue}}
-                or not test {\iflabeldateisdate}}
-      {\printtext[parens]{%
-         \printfield{issue}%
-         \setunit*{\addspace}%
-         \iflabeldateisdate
-           {}
-           {\printdate}}}
-      {}%
+    \iffieldundef{issue}
+      {}
+      {\printtext[parens]{\printfield{issue}}}%
     \newunit}}
 
 % merge year-only date with date label
 \def\bbx@opt@mergedate@basic{%
-  \renewbibmacro*{date+extradate}{%
+  \renewbibmacro*{date+extrayear}{%
     \iffieldundef{labelyear}
       {}
-      {\printtext[parens]{\printlabeldateextra}}}%
+      {\printtext[parens]{%
+         \printfield{labelyear}%
+         \printfield{extrayear}}}}%
   \renewbibmacro*{date}{%
-    \ifboolexpr{
-      test {\iflabeldateisdate}
-      and
-      not test {\ifdateshavedifferentprecision{label}{}}
-    }
+    \iffieldundef{month}
       {}
       {\printdate}}%
   \renewbibmacro*{issue+date}{%
     \ifboolexpr{
-      test {\iflabeldateisdate}
-      and
-      not test {\ifdateshavedifferentprecision{label}{}}
-      and
       test {\iffieldundef{issue}}
+      and
+      test {\iffieldundef{month}}
     }
       {}
       {\printtext[parens]{%
@@ -101,29 +80,27 @@
 
 % merge year-only date with year-only date label
 \def\bbx@opt@mergedate@minimum{%
-  \renewbibmacro*{date+extradate}{%
+  \renewbibmacro*{date+extrayear}{%
     \iffieldundef{labelyear}
       {}
-      {\printtext[parens]{\printlabeldateextra}}}%
+      {\printtext[parens]{%
+         \printfield{labelyear}%
+         \printfield{extrayear}}}}%
   \renewbibmacro*{date}{%
     \ifboolexpr{
-      test {\iflabeldateisdate}
+      test {\iffieldundef{month}}
       and
-      not test {\ifdateshavedifferentprecision{label}{}}
-      and
-      test {\iffieldundef{extradate}}
+      test {\iffieldundef{extrayear}}
     }
       {}
       {\printdate}}%
   \renewbibmacro*{issue+date}{%
     \ifboolexpr{
-      test {\iflabeldateisdate}
-      and
-      not test {\ifdateshavedifferentprecision{label}{}}
+      test {\iffieldundef{issue}}
       and
-      test {\iffieldundef{extradate}}
+      test {\iffieldundef{month}}
       and
-      test {\iffieldundef{issue}}
+      test {\iffieldundef{extrayear}}
     }
       {}
       {\printtext[parens]{%
@@ -134,18 +111,21 @@
 
 % don't merge date/issue with date label
 \def\bbx@opt@mergedate@false{%
-  \renewbibmacro*{date+extradate}{%
+  \renewbibmacro*{date+extrayear}{%
     \iffieldundef{labelyear}
       {}
-      {\printtext[parens]{\printlabeldateextra}}}%
+      {\printtext[parens]{%
+         \printfield{labelyear}%
+         \printfield{extrayear}}}}%
   \renewbibmacro*{date}{\printdate}%
   \renewbibmacro*{issue+date}{%
     \printtext[parens]{%
       \printfield{issue}%
       \setunit*{\addspace}%
-      \usebibmacro{date}}%
+      \printdate}%
     \newunit}}
 
+% n.b. the default labeldate=year overrides merging of months and days
 \ExecuteBibliographyOptions{labeldateparts,sorting=nyt,pagetracker,mergedate}
 
 \DeclareFieldFormat{shorthandwidth}{#1}
@@ -209,7 +189,7 @@
         \printnames{author}%
         \iffieldundef{authortype}
           {\setunit{\printdelim{nameyeardelim}}}
-          {\setunit{\printdelim{authortypedelim}}}}%
+          {\setunit{\addcomma\space}}}%
      \iffieldundef{authortype}
        {}
        {\usebibmacro{authorstrg}%
@@ -217,7 +197,7 @@
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\printdelim{nonameyeardelim}}}%
-  \usebibmacro{date+extradate}}
+  \usebibmacro{date+extrayear}}
 
 \renewbibmacro*{editor}{%
   \usebibmacro{bbx:editor}{editorstrg}}
@@ -232,7 +212,7 @@
     {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{editor}%
-        \setunit{\printdelim{editortypedelim}}%
+        \setunit{\addcomma\space}%
         \usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{editor}%
@@ -240,7 +220,7 @@
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\printdelim{nonameyeardelim}}}%
-  \usebibmacro{date+extradate}}
+  \usebibmacro{date+extrayear}}
 
 \renewbibmacro*{translator}{%
   \usebibmacro{bbx:translator}{translatorstrg}}
@@ -255,15 +235,15 @@
     {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{translator}%
-        \setunit{\printdelim{translatortypedelim}}%
+        \setunit{\addcomma\space}%
         \usebibmacro{bbx:savehash}}%
-     \usebibmacro{#1}%
+     \usebibmacro{translator+othersstrg}%
      \clearname{translator}%
      \setunit{\printdelim{nameyeardelim}}}%
     {\global\undef\bbx@lasthash
      \usebibmacro{labeltitle}%
      \setunit*{\printdelim{nonameyeardelim}}}%
-  \usebibmacro{date+extradate}}
+  \usebibmacro{date+extrayear}}
 
 \newbibmacro*{bbx:dashcheck}[2]{%
   \ifboolexpr{
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
index 1c573251577..e86e97ac041 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
@@ -18,7 +18,7 @@
       \setlength{\itemsep}{\bibitemsep}%
       \setlength{\parsep}{\bibparsep}%
       \renewcommand*{\makelabel}[1]{%
-        \hspace\labelsep\bfseries##1}}}
+	\hspace\labelsep\bfseries##1}}}
   {\endlist}
   {\item}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index 70c2134c4eb..5458f8a5957 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
@@ -20,8 +20,8 @@
 \defbibenvironment{bibliography}
   {\list
      {\printtext[labelnumberwidth]{%
-        \printfield{labelprefix}%
-        \printfield{labelnumber}}}
+	\printfield{labelprefix}%
+	\printfield{labelnumber}}}
      {\setlength{\labelwidth}{\labelnumberwidth}%
       \setlength{\leftmargin}{\labelwidth}%
       \setlength{\labelsep}{\biblabelsep}%
@@ -49,7 +49,7 @@
   \entryset
     {\ifbool{bbx:subentry}
        {\printfield[bibentrysetcount]{entrysetcount}%
-        \printunit*{\addnbspace}}
+	\printunit*{\addnbspace}}
        {}}
     {}%
   \newunit\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index 8edb549d154..d5bf3f198d1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -719,10 +719,10 @@
     {\iffieldundef{maintitle}
        {}
        {\usebibmacro{maintitle}%
-        \newunit\newblock
-        \iffieldundef{volume}
-          {}
-          {\printfield{volume}%
+	\newunit\newblock
+	\iffieldundef{volume}
+	  {}
+	  {\printfield{volume}%
            \printfield{part}%
            \setunit{\addcolon\space}}}}%
   \usebibmacro{title}%
@@ -771,7 +771,11 @@
     {\newunit
      \printfield{series}%
      \setunit{\addspace}}%
-  \usebibmacro{volume+number+eid}%
+  \printfield{volume}%
+  \setunit*{\adddot}%
+  \printfield{number}%
+  \setunit{\addcomma\space}%
+  \printfield{eid}%
   \setunit{\addspace}%
   \usebibmacro{issue+date}%
   \setunit{\addcolon\space}%
@@ -780,9 +784,11 @@
 
 \newbibmacro*{issue+date}{%
   \printtext[parens]{%
-    \printfield{issue}%
-    \setunit*{\addspace}%
-    \usebibmacro{date}}%
+    \iffieldundef{issue}
+      {\usebibmacro{date}}
+      {\printfield{issue}%
+       \setunit*{\addspace}%
+       \usebibmacro{date}}}%
   \newunit}
 
 \newbibmacro*{event+venue+date}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 2d0d142a570..653677f34e4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -19,8 +19,7 @@
 \def\do#1{%
   \csdef{mkbibname#1}##1{##1}%
   \define@key{blx@opt@namepart}{#1}{\csdef{namepart#1}{##1}}%
-  \define@key{blx@opt@namepart}{#1i}{\csdef{namepart#1i}{##1}}%
-  \define@key{blx@opt@namepart}{#1un}{\csdef{namepart#1un}{##1}}}
+  \define@key{blx@opt@namepart}{#1i}{\csdef{namepart#1i}{##1}}}
 \expandafter\docsvlist\expandafter{\blx@datamodel@constant@nameparts}
 
 % legacy aliases
@@ -33,66 +32,63 @@
   \ifdefempty\mkbibnamelast
     {\let\@mkbibnamelastsaved\mkbibnamefamily}% not redefined by user
     {\blx@warning@noline{%
-       Attempt to redefine deprecated '\string\mkbibnamelast'.\MessageBreak
-       Please use '\string\mkbibnamefamily' instead.\MessageBreak
-       Using '\string\mkbibnamefamily'}%
+       Attempt to redefine deprecated \string\mkbibnamelast\space, please
+       use \string\mkbibnamefamily\space instead. Using
+       \string\mkbibnamefamily}%
      \let\@mkbibnamelastsaved\mkbibnamelast
      \let\mkbibnamefamily\@mkbibnamelastsaved}%
   % Now redefine it in case it's used
   \def\mkbibnamelast{%
     \blx@warning@noline{%
-      '\string\mkbibnamelast' is deprecated.\MessageBreak
-       Please use '\string\mkbibnamefamily'.\MessageBreak
-       Using '\string\mkbibnamefamily'}%
+      \string\mkbibnamelast\space is deprecated, please use
+      \string\mkbibnamefamily. Using \string\mkbibnamefamily}%
     \@mkbibnamelastsaved}
 
   \ifdefempty\mkbibnamefirst
     {\let\@mkbibnamefirstsaved\mkbibnamegiven}% not redefined by user
     {\blx@warning@noline{%
-       Attempt to redefine deprecated '\string\mkbibnamefirst'.\MessageBreak
-       Please use '\string\mkbibnamegiven' instead.\MessageBreak
-       Using '\string\mkbibnamegiven'}%
+       Attempt to redefine deprecated \string\mkbibnamefirst\space, please
+       use \string\mkbibnamegiven\space instead. Using
+       \string\mkbibnamegiven}%
      \let\@mkbibnamefirstsaved\mkbibnamefirst
      \let\mkbibnamegiven\@mkbibnamefirstsaved}%
   % Now redefine it in case it's used
   \def\mkbibnamefirst{%
     \blx@warning@noline{%
-      '\string\mkbibnamefirst' is deprecated.\MessageBreak
-       Please use '\string\mkbibnamegiven'.\MessageBreak
-       Using '\string\mkbibnamegiven'}%
+      \string\mkbibnamefirst\space is deprecated, please use
+      \string\mkbibnamegiven. Using \string\mkbibnamegiven}%
     \@mkbibnamefirstsaved}
 
   \ifdefempty\mkbibnameaffix
     {\let\@mkbibnameaffixsaved\mkbibnamesuffix}% not redefined by user
     {\blx@warning@noline{%
-       Attempt to redefine deprecated '\string\mkbibnameaffix'.\MessageBreak
-       Please use '\string\mkbibnamesuffix' instead.\MessageBreak
-       Using '\string\mkbibnamesuffix'}%
+       Attempt to redefine deprecated \string\mkbibnameaffix\space, please
+       use \string\mkbibnamesuffix\space instead. Using
+       \string\mkbibnamesuffix}%
      \let\@mkbibnameaffixsaved\mkbibnameaffix
      \let\mkbibnamesuffix\@mkbibnameaffixsaved}%
   % Now redefine it in case it's used
   \def\mkbibnameaffix{%
     \blx@warning@noline{%
-      '\string\mkbibnameaffix' is deprecated.\MessageBreak
-       Please use '\string\mkbibnamesuffix'.\MessageBreak
-       Using \string\mkbibnamesuffix}%
+      \string\mkbibnameaffix\space is deprecated, please use
+      \string\mkbibnamesuffix. Using \string\mkbibnamesuffix}%
     \@mkbibnameaffixsaved}}
 
 \newcommand*{\bibellipsis}{[\textellipsis\unkern]\midsentence}
 
 % Delimiters used in citations, bibliography and bibliography lists
-\DeclareDelimFormat{multinamedelim}{\addcomma\space}
-\DeclareDelimFormat{finalnamedelim}{%
+\newcommand*{\multinamedelim}{\addcomma\space}
+\newcommand*{\finalnamedelim}{%
   \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
   \addspace\bibstring{and}\space}
-\DeclareDelimFormat{revsdnamedelim}{}
-\DeclareDelimFormat{andothersdelim}{\addspace}
+\newcommand*{\revsdnamedelim}{}
+\newcommand*{\andothersdelim}{\addspace}
 
-\DeclareDelimFormat{multilistdelim}{\addcomma\space}
-\DeclareDelimFormat{finallistdelim}{%
+\newcommand*{\multilistdelim}{\addcomma\space}
+\newcommand*{\finallistdelim}{%
   \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
   \addspace\bibstring{and}\space}
-\DeclareDelimFormat{andmoredelim}{\addspace}
+\newcommand*{\andmoredelim}{\addspace}
 
 \newcommand*{\multicitedelim}{\addsemicolon\space}
 \newcommand*{\compcitedelim}{\addcomma\space}
@@ -109,26 +105,21 @@
     {\iftextcitepunct{\addsemicolon}{\addcomma}}%
   \space}
 
-
 % context-sensitive delimiters
-% retain compatibility with \labelnamepunct et al.
-% The seemingly redundant definitions are needed because
-% hard-coded punctuation was replaced by context-sensitive
-% delimiters, changes to here need to be made explicitly
-% to avoid unwanted effects of redefining the global delimiter.
-\DeclareDelimFormat{authortypedelim}{\addcomma\space}
-\DeclareDelimFormat{editortypedelim}{\addcomma\space}
-\DeclareDelimFormat{translatortypedelim}{\addcomma\space}
+% retain compatibility with \labelnamepunct
 \DeclareDelimFormat{namelabeldelim}{\addspace}
 \DeclareDelimFormat{nametitledelim}{\addcomma\space}
-\DeclareDelimFormat[bib,biblist]{nametitledelim}{\labelnamepunct}
+\DeclareDelimFormat[bib]{nametitledelim}{\labelnamepunct}
+\DeclareDelimFormat[biblist]{nametitledelim}{\labelnamepunct}
 \DeclareDelimFormat[textcite]{nametitledelim}{\addspace}
 \DeclareDelimFormat{nameyeardelim}{\addspace}
 \DeclareDelimFormat[textcite]{nameyeardelim}{\addspace}
-\DeclareDelimFormat[bib,biblist]{nameyeardelim}{\addspace}
+\DeclareDelimFormat[bib]{nameyeardelim}{\addspace}
+\DeclareDelimFormat[biblist]{nameyeardelim}{\addspace}
 \DeclareDelimFormat{nonameyeardelim}{\addspace}
 \DeclareDelimFormat[textcite]{nonameyeardelim}{\addspace}
-\DeclareDelimFormat[bib,biblist]{nonameyeardelim}{\addspace}
+\DeclareDelimFormat[bib]{nonameyeardelim}{\addspace}
+\DeclareDelimFormat[biblist]{nonameyeardelim}{\addspace}
 \DeclareDelimFormat{dateeradelim}{\addspace}
 \DeclareDelimFormat{datecircadelim}{\addspace}
 
@@ -408,10 +399,17 @@
   \ifbibstring{#1}{\bibstring{#1}}{\mkyearzeros{#1}}}
 \DeclareFieldFormat{labelendyear}{% = the '1995' part in 'Jones 1995a'
   \ifbibstring{#1}{\bibstring{#1}}{\mkyearzeros{#1}}}
-\DeclareFieldFormat{extradate}{%
-  \iffieldnums{labelyear}
-    {\mknumalph{#1}}
-    {\mkbibparens{\mknumalph{#1}}}}
+% If labeldatesource is a defined field, they 
+% Don't check labelyear directly as it is already processed into a range with markers
+% and so is never nums due to unexpandable parts of labelyear determination
+\DeclareFieldFormat{extrayear}{%
+  \iffieldundef{\thefield{labeldatesource}}
+    {\iffieldnums{\thefield{labeldatesource}year}
+      {\mknumalph{#1}}
+      {\mkbibparens{\mknumalph{#1}}}}
+    {\iffieldnums{\thefield{labeldatesource}}
+      {\mknumalph{#1}}
+      {\mkbibparens{\mknumalph{#1}}}}}%
 \DeclareFieldFormat{labelalpha}{#1}%
 \DeclareFieldFormat{extraalpha}{\mknumalph{#1}}%
 \DeclareFieldFormat{shorthand}{#1\isdot}
@@ -471,7 +469,7 @@
        \iffieldundef{eprintclass}
          {}
          {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
-    {\nolinkurl{#1}%
+    {\nolinkurl{#1}
      \iffieldundef{eprintclass}
        {}
        {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
@@ -589,55 +587,6 @@
        {#1}}%
   \usebibmacro{list:andothers}}
 
-\DeclareListFormat{origlanguage}{%
-  \usebibmacro{list:delim}{%
-    \ifbibstring{#1}
-      {\bibxstring{#1}}
-      {\ifbibstring{lang#1}
-         {\bibxstring{lang#1}}
-         {#1}}}%
-  \ifbibstring{#1}
-    {\bibstring{#1}}
-    {\ifbibstring{lang#1}
-       {\bibstring{lang#1}}
-       {#1}}%
-  \usebibmacro{list:andothers}}
-
-
-\DeclareListFormat{lfromoriglanguage}{%
-  \begingroup
-  \blx@bibstringnormal
-  \usebibmacro{list:delim}{%
-    \ifbibstring{from#1}
-      {\bibxlstring{from#1}}
-      {\ifbibstring{lang#1}
-         {\bibxlstring{lang#1}}
-         {#1}}}%
-  \ifbibstring{from#1}
-    {\bibstring{from#1}}
-    {\ifbibstring{lang#1}
-       {\biblstring{lang#1}}
-       {#1}}%
- \usebibmacro{list:andothers}%
- \endgroup}
-
-\DeclareListFormat{sfromoriglanguage}{%
-  \begingroup
-  \blx@bibstringnormal
-  \usebibmacro{list:delim}{%
-    \ifbibstring{from#1}
-      {\bibxsstring{from#1}}
-      {\ifbibstring{lang#1}
-         {\bibxsstring{lang#1}}
-         {#1}}}%
-  \ifbibstring{from#1}
-    {\bibstring{from#1}}
-    {\ifbibstring{lang#1}
-       {\bibsstring{lang#1}}
-       {#1}}%
- \usebibmacro{list:andothers}%
- \endgroup}
-
 \DeclareListFormat{location}{%
   \usebibmacro{list:delim}{#1}%
   #1\isdot
@@ -677,13 +626,13 @@
        or
        test \ifmoreitems
      }
-       {\printdelim{multilistdelim}}
+       {\multilistdelim}
        {\lbx@finallistdelim{#1}}}
     {}}
 
 \newbibmacro*{list:plain}{%
   \ifnumgreater{\value{listcount}}{\value{liststart}}
-    {\printdelim{multilistdelim}}
+    {\multilistdelim}
     {}}
 
 \newbibmacro*{list:andothers}{%
@@ -695,7 +644,7 @@
     {\ifnumgreater{\value{liststop}}{1}
        {\finalandcomma}
        {}%
-     \printdelim{andmoredelim}\bibstring{andmore}}
+     \andmoredelim\bibstring{andmore}}
     {}}
 
 \newbibmacro*{pageref:init}{%
@@ -728,7 +677,7 @@
         \numdef\abx@range@diff{\abx@range@diff+1}}
        {\usebibmacro{pageref:dump}%
         \ifnumgreater{\abx@range@last}{-1}
-          {\printdelim{multilistdelim}}
+          {\multilistdelim}
           {}%
         \ifhyperref
           {\hyperlink{page.#1}{#1}}
@@ -736,7 +685,7 @@
      \edef\abx@range@prev{\abx@range@num}}
     {\usebibmacro{pageref:dump}%
      \ifnumgreater{\abx@range@last}{-1}
-       {\printdelim{multilistdelim}}
+       {\multilistdelim}
        {}%
      \ifhyperref
        {\hyperlink{page.#1}{#1}}
@@ -753,7 +702,7 @@
          {\abx@range@hold}%
      \or % three
        \ifnumless{\abx@range@diff}{2}
-         {\printdelim{multilistdelim}}
+         {\multilistdelim}
          {\bibrangedash}%
        \ifhyperref
          {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
@@ -937,7 +886,6 @@
 
 \DeclareFieldFormat{authortype}{#1}
 \DeclareFieldFormat{editortype}{#1}
-\DeclareFieldFormat{translatortype}{#1}
 
 % Auxiliary macros for name formatting directives
 % ------------------------------------------------------------------
@@ -1017,7 +965,7 @@
        or
        test \ifmorenames
      }
-       {\printdelim{multinamedelim}}
+       {\multinamedelim}
        {\lbx@finalnamedelim{#1}}}
     {}}
 
@@ -1031,7 +979,7 @@
     or
     test {\ifnumequal{\value{liststop}}{2}}
   }
-    {\printdelim{revsdnamedelim}}
+    {\revsdnamedelim}
     {}}
 
 \newbibmacro*{name:andothers}{%
@@ -1043,7 +991,7 @@
     {\ifnumgreater{\value{liststop}}{1}
        {\finalandcomma}
        {}%
-     \printdelim{andothersdelim}\bibstring{andothers}}
+     \andothersdelim\bibstring{andothers}}
     {}}
 
 % ------------------------------------------------------------------
@@ -1265,13 +1213,6 @@
   \literal{nodate}
 }
 
-\DeclareExtradate{%
-  \scope{
-    \field{labelyear}
-    \field{year}
-  }
-}
-
 \DeclareLabeltitle{%
   \field{shorttitle}
   \field{title}
@@ -1290,7 +1231,7 @@
     \field[strwidth=1,strside=left]{labelname}
   }
   \labelelement{
-    \field[strwidth=2,strside=right]{year}
+    \field[strwidth=2,strside=right]{year}    
   }
 }
 
@@ -1317,7 +1258,7 @@
 % SORTING
 % ------------------------------------------------------------------
 
-\DeclareSortingNamekeyTemplate{
+\DeclareSortingNamekeyScheme{
   \keypart{
     \namepart[use=true]{prefix}
   }
@@ -1337,7 +1278,7 @@
 
 \DeclarePresort{mm}
 
-\DeclareSortingTemplate{shorthand}{
+\DeclareSortingScheme{shorthand}{
   \sort[final]{
     \field{sortshorthand}
   }
@@ -1346,17 +1287,17 @@
   }
 }
 
-\DeclareSortingTemplate{none}{
+\DeclareSortingScheme{none}{
   \sort{\citeorder}
 }
 
-\DeclareSortingTemplate{debug}{
+\DeclareSortingScheme{debug}{
   \sort{
     \field{entrykey}
   }
 }
 
-\DeclareSortingTemplate{nty}{
+\DeclareSortingScheme{nty}{
   \sort{
     \field{presort}
   }
@@ -1385,7 +1326,7 @@
   }
 }
 
-\DeclareSortingTemplate{nyt}{
+\DeclareSortingScheme{nyt}{
   \sort{
     \field{presort}
   }
@@ -1414,7 +1355,7 @@
   }
 }
 
-\DeclareSortingTemplate{nyvt}{
+\DeclareSortingScheme{nyvt}{
   \sort{
     \field{presort}
   }
@@ -1443,7 +1384,7 @@
   }
 }
 
-\DeclareSortingTemplate{anyt}{
+\DeclareSortingScheme{anyt}{
   \sort{
     \field{presort}
   }
@@ -1475,7 +1416,7 @@
   }
 }
 
-\DeclareSortingTemplate{anyvt}{
+\DeclareSortingScheme{anyvt}{
   \sort{
     \field{presort}
   }
@@ -1507,7 +1448,7 @@
   }
 }
 
-\DeclareSortingTemplate{ynt}{
+\DeclareSortingScheme{ynt}{
   \sort{
     \field{presort}
   }
@@ -1533,7 +1474,7 @@
   }
 }
 
-\DeclareSortingTemplate{ydnt}{
+\DeclareSortingScheme{ydnt}{
   \sort{
     \field{presort}
   }
@@ -1666,18 +1607,18 @@
 
 \newcommand*{\lbx@initnamehook}[1]{}
 \newcommand*{\lbx@inittitlehook}[1]{}
-\newcommand*{\lbx@finalnamedelim}[1]{\printdelim{finalnamedelim}}
-\newcommand*{\lbx@finallistdelim}[1]{\printdelim{finallistdelim}}
+\newcommand*{\lbx@finalnamedelim}[1]{\finalnamedelim}
+\newcommand*{\lbx@finallistdelim}[1]{\finallistdelim}
 
 \newcommand*{\lbx@lfromlang}{%
-  \iflistundef{origlanguage}
+  \iffieldundef{origlanguage}
     {\unspace}
-    {\printlist[lfromoriglanguage]{origlanguage}}}
+    {\biblstring{from\thefield{origlanguage}}}}
 
 \newcommand*{\lbx@sfromlang}{%
-  \iflistundef{origlanguage}
+  \iffieldundef{origlanguage}
     {\unspace}
-    {\printlist[sfromoriglanguage]{origlanguage}}}
+    {\bibsstring{from\thefield{origlanguage}}}}
 
 % ------------------------------------------------------------------
 % MISCELLANEOUS
@@ -1750,56 +1691,27 @@
 
 \defbibheading{none}{}
 
-\def\abx@MakeMarkcase{\MakeUppercase}
-\AtEndPreamble{%
-  \ifcsundef{MakeMarkcase}{}{\def\abx@MakeMarkcase{\MakeMarkcase}}%
-  \providecommand*{\@mkdouble}[1]{\@mkboth{#1}{#1}}%
-  \providecommand*{\@mkright}{%
-    \begingroup
-      \ifx\@mkboth\markboth \aftergroup\markright
-      \else
-        \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
-        \else \def\@gobbletwo##1##2{}%
-          \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
-          \else
-            \PackageWarning{biblatex}{% changed for biblatex
-              package incompatibility detected!\MessageBreak
-              \string\@mkboth it neither \string\markboth nor any\MessageBreak
-              kind of two arguments gobbling,\MessageBreak
-              e.g., \string\@gobbletwo.\MessageBreak
-              So I don't known, what to do\MessageBreak
-              with \string\@mkright.\MessageBreak
-              Nevertheless, \string\markright\space will be\MessageBreak
-              used%
-            }%
-            \aftergroup\markright
-          \fi
-        \fi
-      \fi
-    \endgroup
-  }}
-
 \ifcase\abx@classtype\relax % article
   \defbibheading{bibliography}[\refname]{%
     \section*{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{biblist}[\biblistname]{%
     \section*{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibintoc}[\refname]{%
     \section*{#1}%
     \addcontentsline{toc}{section}{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{biblistintoc}[\biblistname]{%
     \section*{#1}%
     \addcontentsline{toc}{section}{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibnumbered}[\refname]{%
     \section{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\MakeUppercase{#1}}\fi}
   \defbibheading{biblistnumbered}[\biblistname]{%
     \section{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\MakeUppercase{#1}}\fi}
   \defbibheading{subbibliography}[\refname]{%
     \subsection*{#1}}
   \defbibheading{subbibintoc}[\refname]{%
@@ -1811,144 +1723,131 @@
 \or % book/report
   \defbibheading{bibliography}[\bibname]{%
     \chapter*{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{biblist}[\biblistname]{%
     \chapter*{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibintoc}[\bibname]{%
     \chapter*{#1}%
     \addcontentsline{toc}{chapter}{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{biblistintoc}[\biblistname]{%
     \chapter*{#1}%
     \addcontentsline{toc}{chapter}{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}
   \defbibheading{bibnumbered}[\bibname]{%
     \chapter{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\MakeUppercase{#1}}\fi}
   \defbibheading{biblistnumbered}[\biblistname]{%
     \chapter{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\MakeUppercase{#1}}\fi}
   \defbibheading{subbibliography}[\refname]{%
     \section*{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\MakeUppercase{#1}}\fi}
   \defbibheading{subbibintoc}[\refname]{%
     \section*{#1}%
     \addcontentsline{toc}{section}{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\MakeUppercase{#1}}\fi}
   \defbibheading{subbibnumbered}[\refname]{%
     \section{#1}}
 
 \or % scrartcl
   \defbibheading{bibliography}[\refname]{%
-    \ifcsundef{bibliography@heading}
-      {\ifkomabibtotocnumbered
-         {\section{#1}%
-          \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}}
-         {\ifkomabibtotoc
-            {\addsec{#1}}
-            {\section*{#1}}%
-          \@mkdouble{\abx@MakeMarkcase{#1}}}}
-      {\bibliography@heading{#1}}}
+    \ifkomabibtotocnumbered
+      {\section{#1}}
+      {\ifkomabibtotoc
+         {\addsec{#1}}
+         {\section*{#1}}%
+       \markboth{#1}{#1}}}
   \defbibheading{biblist}[\biblistname]{%
-    \ifcsundef{bibliography@heading}
-      {\ifkomabibtotocnumbered
-         {\section{#1}%
-          \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}}
-         {\ifkomabibtotoc
-            {\addsec{#1}}
-            {\section*{#1}}%
-          \@mkdouble{\abx@MakeMarkcase{#1}}}}
-      {\bibliography@heading{#1}}}
+    \ifkomabibtotocnumbered
+      {\section{#1}}
+      {\ifkomabibtotoc
+         {\addsec{#1}}
+         {\section*{#1}}%
+       \markboth{#1}{#1}}}
   \defbibheading{bibintoc}[\refname]{%
     \addsec{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{#1}{#1}}
   \defbibheading{biblistintoc}[\biblistname]{%
     \addsec{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{#1}{#1}}
   \defbibheading{bibnumbered}[\refname]{%
     \section{#1}%
-    \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}}
+    \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
   \defbibheading{biblistnumbered}[\biblistname]{%
     \section{#1}%
-    \@mkdouble{\abx@MakeMarkcase{\sectionmarkformat#1}}}
+    \markboth{\sectionmarkformat#1}{\sectionmarkformat#1}}
   \defbibheading{subbibliography}[\refname]{%
-    \subsection*{#1}%
-    \@mkright{\abx@MakeMarkcase{#1}}}
+    \subsection*{#1}}
   \defbibheading{subbibintoc}[\refname]{%
     \subsection*{#1}%
-    \addcontentsline{toc}{subsection}{#1}%
-    \@mkright{\abx@MakeMarkcase{#1}}}
+    \addcontentsline{toc}{subsection}{#1}}
   \defbibheading{subbibnumbered}[\refname]{%
     \subsection{#1}}
 
 \or % scrbook/scrreprt
   \defbibheading{bibliography}[\bibname]{%
-    \ifcsundef{bibliography@heading}
-      {\ifkomabibtotocnumbered
-         {\chapter{#1}%
-          \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}}
-         {\ifkomabibtotoc
-            {\addchap{#1}}
-            {\chapter*{#1}}%
-          \@mkdouble{\abx@MakeMarkcase{#1}}}}
-      {\bibliography@heading{#1}}}
+    \ifkomabibtotocnumbered
+      {\chapter{#1}}
+      {\ifkomabibtotoc
+         {\addchap{#1}}
+         {\chapter*{#1}}%
+       \markboth{#1}{#1}}}
   \defbibheading{biblist}[\biblistname]{%
-    \ifcsundef{bibliography@heading}
-      {\ifkomabibtotocnumbered
-         {\chapter{#1}%
-          \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}}
-         {\ifkomabibtotoc
-            {\addchap{#1}}
-            {\chapter*{#1}}%
-          \@mkdouble{\abx@MakeMarkcase{#1}}}}
-      {\bibliography@heading{#1}}}
+    \ifkomabibtotocnumbered
+      {\chapter{#1}}
+      {\ifkomabibtotoc
+         {\addchap{#1}}
+         {\chapter*{#1}}%
+       \markboth{#1}{#1}}}
   \defbibheading{bibintoc}[\bibname]{%
     \addchap{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{#1}{#1}}
   \defbibheading{biblistintoc}[\biblistname]{%
     \addchap{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{#1}{#1}}
   \defbibheading{bibnumbered}[\bibname]{%
     \chapter{#1}%
-    \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}}
+    \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
   \defbibheading{biblistnumbered}[\biblistname]{%
     \chapter{#1}%
-    \@mkdouble{\abx@MakeMarkcase{\chaptermarkformat#1}}}
+    \markboth{\chaptermarkformat#1}{\chaptermarkformat#1}}
   \defbibheading{subbibliography}[\refname]{%
     \section*{#1}%
-    \@mkright{\abx@MakeMarkcase{#1}}}
+    \if@twoside\markright{#1}\fi}
   \defbibheading{subbibintoc}[\refname]{%
-    \addsec{#1}}
+    \addsec{#1}%
+    \markboth{#1}{#1}}
   \defbibheading{subbibnumbered}[\refname]{%
     \section{#1}}
 
 \or % memoir (article)
-  \ifcsundef{memUChead}{}{\def\abx@MakeMarkcase{\memUChead}}%
+  \ifdef\memUChead{}{\let\memUChead\MakeUppercase}
   \defbibheading{bibliography}[\refname]{%
     \chapter*{#1}%
     \ifmemoirbibintoc
       {\phantomsection
        \addcontentsline{toc}{chapter}{#1}}
       {}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\memUChead{#1}}{\memUChead{#1}}}
   \defbibheading{biblist}[\biblistname]{%
     \chapter*{#1}%
     \ifmemoirbibintoc
       {\phantomsection
        \addcontentsline{toc}{chapter}{#1}}
       {}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\memUChead{#1}}{\memUChead{#1}}}
   \defbibheading{bibintoc}[\refname]{%
     \chapter*{#1}%
     \phantomsection
     \addcontentsline{toc}{chapter}{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\memUChead{#1}}{\memUChead{#1}}}
   \defbibheading{biblistintoc}[\biblistname]{%
     \chapter*{#1}%
     \phantomsection
     \addcontentsline{toc}{chapter}{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\memUChead{#1}}{\memUChead{#1}}}
   \defbibheading{bibnumbered}[\refname]{%
     \chapter{#1}}
   \defbibheading{biblistnumbered}[\biblistname]{%
@@ -1959,59 +1858,59 @@
       {\phantomsection
        \addcontentsline{toc}{section}{#1}}
       {}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\memUChead{#1}}\fi}
   \defbibheading{subbibintoc}[\refname]{%
     \section*{#1}%
     \phantomsection
     \addcontentsline{toc}{section}{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\memUChead{#1}}\fi}
   \defbibheading{subbibnumbered}[\refname]{%
     \section{#1}}
 
 \or % memoir (book)
-  \ifcsundef{memUChead}{}{\def\abx@MakeMarkcase{\memUChead}}%
+  \ifdef\memUChead{}{\let\memUChead\MakeUppercase}
   \defbibheading{bibliography}[\bibname]{%
     \chapter*{#1}%
     \ifmemoirbibintoc
       {\phantomsection
        \addcontentsline{toc}{chapter}{#1}}
       {}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\memUChead{#1}}{\memUChead{#1}}}
   \defbibheading{biblist}[\biblistname]{%
     \chapter*{#1}%
     \ifmemoirbibintoc
       {\phantomsection
        \addcontentsline{toc}{chapter}{#1}}
       {}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\memUChead{#1}}{\memUChead{#1}}}
   \defbibheading{bibintoc}[\bibname]{%
     \chapter*{#1}%
     \phantomsection
     \addcontentsline{toc}{chapter}{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\memUChead{#1}}{\memUChead{#1}}}
   \defbibheading{biblistintoc}[\biblistname]{%
     \chapter*{#1}%
     \phantomsection
     \addcontentsline{toc}{chapter}{#1}%
-    \@mkdouble{\abx@MakeMarkcase{#1}}}
+    \markboth{\memUChead{#1}}{\memUChead{#1}}}
   \defbibheading{bibnumbered}[\bibname]{%
     \chapter{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\memUChead{#1}}\fi}
   \defbibheading{biblistnumbered}[\biblistname]{%
     \chapter{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\memUChead{#1}}\fi}
   \defbibheading{subbibliography}[\refname]{%
     \section*{#1}%
     \ifmemoirbibintoc
       {\phantomsection
        \addcontentsline{toc}{section}{#1}}
       {}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\memUChead{#1}}\fi}
   \defbibheading{subbibintoc}[\refname]{%
     \section*{#1}%
     \phantomsection
     \addcontentsline{toc}{section}{#1}%
-    \if@twoside\markright{\abx@MakeMarkcase{#1}}\fi}
+    \if@twoside\markright{\memUChead{#1}}\fi}
   \defbibheading{subbibnumbered}[\refname]{%
     \section{#1}}
 
@@ -2093,7 +1992,7 @@
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
-  {\printfield{year}\printfield{extradate}}
+  {\printfield{year}\printfield{extrayear}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
@@ -2349,7 +2248,7 @@
     {\printnames{author}%
      \iffieldundef{authortype}
        {}
-       {\setunit{\printdelim{authortypedelim}}%
+       {\setunit{\addcomma\space}%
         \usebibmacro{authorstrg}}}
     {}}
 
@@ -2360,7 +2259,7 @@
     not test {\ifnameundef{editor}}
   }
     {\printnames{editor}%
-     \setunit{\printdelim{editortypedelim}}%
+     \setunit{\addcomma\space}%
      \usebibmacro{editorstrg}%
      \clearname{editor}}
     {}}
@@ -2372,7 +2271,7 @@
     not test {\ifnameundef{editor}}
   }
     {\printnames{editor}%
-     \setunit{\printdelim{editortypedelim}}%
+     \setunit{\addcomma\space}%
      \usebibmacro{editor+othersstrg}%
      \clearname{editor}}
     {}}
@@ -2384,7 +2283,7 @@
     not test {\ifnameundef{translator}}
   }
     {\printnames{translator}%
-     \setunit{\printdelim{translatortypedelim}}%
+     \setunit{\addcomma\space}%
      \usebibmacro{translatorstrg}%
      \clearname{translator}}
     {}}
@@ -2396,7 +2295,7 @@
     not test {\ifnameundef{translator}}
   }
     {\printnames{translator}%
-     \setunit{\printdelim{translatortypedelim}}%
+     \setunit{\addcomma\space}%
      \usebibmacro{translator+othersstrg}%
      \clearname{translator}}
     {}}
@@ -2478,14 +2377,13 @@
     {\usebibmacro{editorstrg}}}
 
 \newbibmacro*{translatorstrg}{%
-  \printtext[translatortype]{%
-    \ifboolexpr{
-      test {\ifnumgreater{\value{translator}}{1}}
-      or
-      test {\ifandothers{translator}}
-    }
-      {\bibstring{translators}}
-      {\bibstring{translator}}}}
+  \ifboolexpr{
+    test {\ifnumgreater{\value{translator}}{1}}
+    or
+    test {\ifandothers{translator}}
+  }
+    {\bibstring{translators}}
+    {\bibstring{translator}}}
 
 \newbibmacro*{translator+othersstrg}{%
   \ifboolexpr{
@@ -2512,7 +2410,7 @@
           {\appto\abx@tempa{af}%
            \clearname{afterword}}
           {}}}%
-  \printtext[translatortype]{\bibstring{\abx@tempa}}}
+  \bibstring{\abx@tempa}}
 
 \newbibmacro*{byauthor}{%
   \ifboolexpr{
@@ -2742,11 +2640,7 @@
   \printfield{maintitleaddon}}
 
 \newbibmacro*{journal}{%
-  \ifboolexpr{
-    test {\iffieldundef{journaltitle}}
-    and
-    test {\iffieldundef{journalsubtitle}}
-  }
+  \iffieldundef{journaltitle}
     {}
     {\printtext[journaltitle]{%
        \printfield[titlecase]{journaltitle}%
@@ -2754,11 +2648,7 @@
        \printfield[titlecase]{journalsubtitle}}}}
 
 \newbibmacro*{periodical}{%
-  \ifboolexpr{
-    test {\iffieldundef{title}}
-    and
-    test {\iffieldundef{subtitle}}
-  }
+  \iffieldundef{title}
     {}
     {\printtext[title]{%
        \printfield[titlecase]{title}%
@@ -2766,11 +2656,7 @@
        \printfield[titlecase]{subtitle}}}}
 
 \newbibmacro*{issue}{%
-  \ifboolexpr{
-    test {\iffieldundef{issuetitle}}
-    and
-    test {\iffieldundef{issuesubtitle}}
-  }
+  \iffieldundef{issuetitle}
     {}
     {\printtext[issuetitle]{%
        \printfield[titlecase]{issuetitle}%
@@ -2840,9 +2726,9 @@
             {}}%
        \renewbibmacro*{related:init}{}%
        \DeclareNameAlias{sortname}{default}%
-       \ifbibmacroundef{date+extradate}
+       \ifbibmacroundef{date+extrayear}
          {}
-         {\renewbibmacro*{date+extradate}{}%
+         {\renewbibmacro*{date+extrayear}{}%
           \renewbibmacro*{date}{\printdate}}%
        \renewbibmacro*{pageref}{}}
       {\thefield{entrytype}}}}
@@ -2880,7 +2766,7 @@
       test {\ifnamesequal{author}{savedauthor}}
       or
       test {\ifnameundef{author}}
-    }
+    } 
       {}
       {\usebibmacro{bytypestrg}{author}{author}%
        \setunit{\addspace}%
@@ -2890,7 +2776,7 @@
       test {\ifnamesequal{editor}{savededitor}}
       or
       test {\ifnameundef{editor}}
-    }
+    } 
       {}
       {\usebibmacro{byeditor+others}%
        \newunit\newblock}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index 4d72ad97533..8cac4f17a05 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -1,5 +1,5 @@
 % Copyright (c) 2006-2011 Philipp Lehman.
-%               2012-2017 Philip Kime, Audrey Boruvka, Joseph Wright
+%               2012-2016 Philip Kime, Audrey Boruvka, Joseph Wright
 %
 % Permission is granted to copy, distribute and/or modify this
 % software under the terms of the LaTeX Project Public License
@@ -11,8 +11,8 @@
 % particular purpose.
 
 % Set up the version strings here
-\def\abx@date{2017/11/04}
-\def\abx@version{3.8}
+\def\abx@date{2016/12/05}
+\def\abx@version{3.7}
 \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)}
 \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)}
 \def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)}
@@ -21,12 +21,12 @@
 % This is not updated by build script as the control file version
 % does not necessarily change with the package version.
 % This is used when writing the .bcf
-\def\blx@bcfversion{3.4}
+\def\blx@bcfversion{3.3}
 
 % This is not updated by build script as the bbl version
 % does not necessarily change with the package version.
 % This is used when checking the .bbl
-\def\blx@bblversion{2.9}
+\def\blx@bblversion{2.8}
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{biblatex}
@@ -52,31 +52,6 @@
       This is a fatal error. I'm aborting now.}%
    \endinput}
 
-\@ifpackagelater{xstring}{2013/10/13}
-  {}
-  {\PackageError{biblatex}
-     {Outdated 'xstring' package}
-     {Upgrade to xstring v1.7c (2013/10/13) or later.\MessageBreak
-      I found: '\csuse{xstringversion}'.\MessageBreak
-      This is a fatal error. I'm aborting now.}%
-   \endinput}
-
-% polyglossia pretends to be babel, so we need to make sure
-% we are definitely talking to babel here.
-\AtEndPreamble{%
-  \@ifpackageloaded{polyglossia}
-    {}
-    {\@ifpackageloaded{babel}
-       {\@ifpackagelater{babel}{2016/04/23}
-          {}
-          {\PackageError{biblatex}
-             {Outdated 'babel' package}
-             {Upgrade to babel 3.9r (2016/04/23) or later.\MessageBreak
-              I found: '\csuse{ver@babel.sty}'.\MessageBreak
-              This is a fatal error. I'm aborting now.}%
-            \endinput}}
-       {}}}
-
 %% Category codes
 
 \def\blx@docatcodes{%
@@ -100,26 +75,6 @@
 
 %% Compatibility
 
-\begingroup
-\catcode`\#=12
-\gdef\blx@patchbidifootnotes{%
-  \patchcmd\@footnotetext
-    {#1}
-    {\toggletrue{blx@footnote}#1}
-    {\togglefalse{blx@tempa}}
-    {}%
-  \patchcmd\@LTRfootnotetext
-    {#1}
-    {\toggletrue{blx@footnote}#1}
-    {\togglefalse{blx@tempa}}
-    {}%
-  \patchcmd\@RTLfootnotetext
-    {#1}
-    {\toggletrue{blx@footnote}#1}
-    {\togglefalse{blx@tempa}}
-    {}}
-\endgroup
-
 \AtEndPreamble{%
   \def\do#1{%
     \@ifpackageloaded{#1}
@@ -130,7 +85,7 @@
   \docsvlist{%
     amsrefs,apacite,babelbib,backref,bibtopic,bibunits,chapterbib,
     cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus,
-    mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs,etextools}%
+    mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}%
   \def\blx@langstrings{}%
   % Set up sortlocale defaults and default language if babel/polyglossia is not loaded
   \ifdefstring\blx@sortlocale{auto}
@@ -144,7 +99,7 @@
      \ifundef\xpg@loaded
        {\let\xpg@loaded\@empty
         \let\xpg@vloaded\@empty
-        \PackageWarningNoLine{biblatex}{Upgrade package 'polyglossia' to > v1.42.0 recommended}}
+        \PackageWarningNoLine{biblatex}{Upgrade package 'polyglossia' to >v1.42.0 recommended}}
        {}%
      \def\do#1{\blx@langsetup{#1}}%
      \expandafter\docsvlist\expandafter{\xpg@loaded}%
@@ -183,24 +138,21 @@
   \undef\blx@mkautolangbabel
   \undef\blx@mkautolangpoly
   \undef\blx@mknoautolang
-  \ifnum\blx@hyperref=\thr@@
+  \ifnum\blx@hyperref=\z@
+    \blx@mknohyperref
   \else
-    \ifnum\blx@hyperref=\z@
-      \blx@mknohyperref
-    \else
-      \@ifpackageloaded{hyperref}
-        {\blx@mkhyperref}
-        {\ifnum\blx@hyperref=\@ne
-           \blx@warning@noline{%
-             Missing 'hyperref' package.\MessageBreak
-             Setting 'hyperref=false'}%
-         \fi
-         \blx@mknohyperref}%
-    \fi
-    \undef\blx@mkhyperref
-    \undef\blx@mknohyperref
+    \@ifpackageloaded{hyperref}
+      {\blx@mkhyperref}
+      {\ifnum\blx@hyperref=\@ne
+         \blx@warning@noline{%
+           Missing 'hyperref' package.\MessageBreak
+           Setting hyperref=false}%
+       \fi
+       \blx@mknohyperref}%
   \fi
   \providecommand*{\nolinkurl}{\url}%
+  \undef\blx@mkhyperref
+  \undef\blx@mknohyperref
   \ifundef\TE@hook
     {\let\TE@hook\@empty
      \toggletrue{blx@tempa}%
@@ -243,9 +195,6 @@
        {\togglefalse{blx@tempa}}
        {}}
     {}%
-  \@ifpackageloaded{bidi}%    bidi
-    {\blx@patchbidifootnotes}
-    {}%
   \@ifclassloaded{memoir}
     {\def\do#1{%
        \patchcmd#1%
@@ -459,8 +408,8 @@
 \def\themaxextratitle{\the\c@maxextratitle}
 \newcounter{maxextratitleyear}
 \def\themaxextratitleyear{\the\c@maxextratitleyear}
-\newcounter{maxextradate}
-\def\themaxextradate{\the\c@maxextradate}
+\newcounter{maxextrayear}
+\def\themaxextrayear{\the\c@maxextrayear}
 \newcounter{maxextraalpha}
 \def\themaxextraalpha{\the\c@maxextraalpha}
 \newcounter{abbrvpenalty}
@@ -552,7 +501,6 @@
 \newtoggle{blx@mcite}
 \newtoggle{blx@loadfiles}
 \newtoggle{blx@singletitle}
-\newtoggle{blx@sortsets}
 \newtoggle{blx@crossrefsource}
 \newtoggle{blx@xrefsource}
 \newtoggle{blx@uniqueprimaryauthor}
@@ -573,7 +521,6 @@
 \newtoggle{blx@bibindex}
 \newtoggle{blx@localnumber}
 \newtoggle{blx@refcontext}
-\newtoggle{blx@nosuffrecurse}
 
 % Nice command from etextools which causes too many problems if you load
 % the whole package
@@ -599,29 +546,18 @@
 \listadd\blx@allrefsections{0}
 
 % Used to track sorting name key specifications
-\global\let\blx@sortingnamekeytemplates\@empty
-
-% Used to track uniquename templates
-\global\let\blx@untemplatespecs\@empty
-
-% Used to track labelalphaname templates
-\global\let\blx@lantemplatespecs\@empty
+\global\let\blx@sortingnamekeyspecs\@empty
 
 % Used to track transliterations
 \global\let\blx@translits\@empty
 
-% Use to track every entry found in .bbl
-% Used to issue defernumbers warning about missing keys because this causes
-% defernumbers labelling to fail.
-\global\let\blx@entries\@empty
-
-% Initialise some lists which track changing citations/sortingtemplates
+% Initialise some lists which track changing citations/sortschemes
 % etc. between runs
 \global\let\blx@cites\@empty
 \global\let\blx@refcontexts\@empty
 \global\let\blx@lastrefcontexts\@empty
-\global\let\blx@sortingtemplatenames\@empty
-\global\let\blx@dlistnames\@empty
+\global\let\blx@sortschemes\@empty
+\global\let\blx@lastsortschemes\@empty
 \global\let\blx@biblists\@empty
 \global\let\blx@lastbiblists\@empty
 \global\let\blx@lastcites\@empty
@@ -640,57 +576,18 @@
 % Deprecations
 \newrobustcmd*{\DeprecateField}[2]{%
   \csdef{abx@field@#1}{%
-    \ifcsundef{abx@field@legacy@warning@#1}{\blx@warning@noline{Field '#1' is deprecated. #2}}{}%
+    \ifcsundef{abx@field@legacy@warning@#1}{\blx@warning@noline{Field '#1' deprecated. #2}}{}%
     \global\csdef{abx@field@legacy@warning@#1}{}}}%
 \newrobustcmd*{\DeprecateList}[2]{%
   \csdef{abx@list@#1}{%
-    \ifcsundef{abx@list@legacy@warning@#1}{\blx@warning@noline{List '#1' is deprecated. #2}}{}%
+    \ifcsundef{abx@list@legacy@warning@#1}{\blx@warning@noline{List '#1' deprecated. #2}}{}%
     \global\csdef{abx@list@legacy@warning@#1}{}}}%
 \newrobustcmd*{\DeprecateName}[2]{%
   \csdef{abx@name@#1}{%
-    \ifcsundef{abx@name@legacy@warning@#1}{\blx@warning@noline{Name '#1' is deprecated. #2}}{}%
+    \ifcsundef{abx@name@legacy@warning@#1}{\blx@warning@noline{Name '#1' deprecated. #2}}{}%
     \global\csdef{abx@name@legacy@warning@#1}{}}}%
 
-\let\blx@aliasfields\@empty
-
-\newrobustcmd*{\DeprecateFieldWithReplacement}[2]{%
-  \appto\blx@aliasfields{%
-    \ifcsundef{abx@field@#2}
-      {}
-      {\csdef{abx@field@#1}{%
-        \csuse{abx@field@#2}%
-        \ifcsundef{abx@field@legacy@warning@#1}
-          {\blx@warning@noline{Field '#1' is deprecated.\MessageBreak
-             Please use '#2' instead.\MessageBreak
-             Using '#2' now.}}
-          {}%
-        \global\csdef{abx@field@legacy@warning@#1}{}}}}}
-
-\newrobustcmd*{\DeprecateListWithReplacement}[2]{%
-  \appto\blx@aliasfields{%
-    \ifcsundef{abx@list@#2}
-      {}
-      {\csdef{abx@list@#1}{%
-        \csuse{abx@list@#2}%
-        \ifcsundef{abx@list@legacy@warning@#1}
-          {\blx@warning@noline{List '#1' is deprecated.\MessageBreak
-             Please use '#2' instead.\MessageBreak
-             Using '#2' now.}}
-          {}%
-        \global\csdef{abx@list@legacy@warning@#1}{}}}}}
-
-\newrobustcmd*{\DeprecateNameWithReplacement}[2]{%
-  \appto\blx@aliasfields{%
-    \ifcsundef{abx@name@#2}
-      {}
-      {\csdef{abx@name@#1}{%
-        \csuse{abx@name@#2}%
-        \ifcsundef{abx@name@legacy@warning@#1}
-          {\blx@warning@noline{Name '#1' is deprecated.\MessageBreak
-             Please use '#2' instead.\MessageBreak
-             Using '#2' now.}}
-          {}%
-        \global\csdef{abx@name@legacy@warning@#1}{}}}}}
+\DeprecateField{prefixnumber}{Please use 'labelprefix' instead}
 
 %% Initialisation
 \def\blx@blxinit{%
@@ -1042,8 +939,8 @@
 
 \def\blx@err@nosort#1{%
   \blx@error
-    {Sorting template '#1' not found}
-    {The sorting template '#1' does not seem to have been defined anywhere}}
+    {Sorting scheme '#1' not found}
+    {The sorting scheme '#1' does not seem to have been defined anywhere}}
 
 \def\blx@err@secfirst{%
   \blx@error
@@ -1133,8 +1030,8 @@
 \def\blx@inf@refsec{%
   \blx@info{Reference section=\the\c@refsection}}%
 
-\def\blx@inf@delimdeclare#1#2{%
-  \blx@info{Delimiter '#1' in context '#2' already defined, overwriting}}
+\def\blx@warn@delimdeclare#1#2{%
+  \blx@warning{Delimiter '#1' in context '#2' already defined, overwriting}}
 
 \def\blx@warn@delimuse#1#2{%
   \blx@warning{Delimiter '#1' in context '#2' undefined}}
@@ -1413,7 +1310,7 @@
     {\blx@defprefchars}
     {\let\blx@prefchars\@empty
      \blx@defprefchars}}
-\DeclarePrefChars{'’-}
+\DeclarePrefChars{'}
 
 \protected\def\blx@imc@ifprefchar{%
   \ifhmode
@@ -1995,22 +1892,6 @@
 \def\blx@defbibmacro#1#2{%
   \expandafter#1\csname abx@macro@\detokenize{#2}\endcsname}
 
-% {<alias>}{<name>}
-\newrobustcmd*{\letbibmacro}{%
-  \@ifstar
-    {\blx@letbibmacro@i}
-    {\blx@letbibmacro}}
-
-\def\blx@letbibmacro#1#2{%
-  \blx@letbibmacro@i{\detokenize{#1}}{\detokenize{#2}}}
-
-\def\blx@letbibmacro@i#1#2{%
-  \ifcsundef{abx@macro@#2}
-    {\blx@error
-       {Bibliography macro '#2' undefined}
-       {Use '\string\newbibmacro' to define this macro}}
-    {\csletcs{abx@macro@#1}{abx@macro@#2}}}
-
 % {<name>}
 \newrobustcmd*{\usebibmacro}{%
   \@ifstar
@@ -2282,7 +2163,7 @@
   \begingroup
   \letcs\blx@tempa{abx@field@#2}%
   \letcs\blx@tempb{abx@field@#1}%
-  \blx@resetdata
+  \csundef{abx@field@#1}%
   \blx@getdata{\blx@tempa}%
   \blx@imc@iffieldequals{#1}\blx@tempb
     {\aftergroup\@firstoftwo}
@@ -2308,7 +2189,7 @@
   \begingroup
   \letcs\blx@tempa{abx@field@#2}%
   \letcs\blx@tempb{abx@list@#1}%
-  \blx@resetdata
+  \csundef{abx@list@#1}%
   \blx@getdata{\blx@tempa}%
   \blx@imc@iflistequals{#1}\blx@tempb
     {\aftergroup\@firstoftwo}
@@ -2327,7 +2208,7 @@
   \begingroup
   \letcs\blx@tempa{abx@field@#2}%
   \letcs\blx@tempb{abx@name@#1}%
-  \blx@resetdata
+  \csundef{abx@name@#1}%
   \blx@getdata{\blx@tempa}%
   \blx@imc@ifnameequals{#1}\blx@tempb
     {\aftergroup\@firstoftwo}
@@ -2918,15 +2799,15 @@
 % [<pagination>][<postpro>]{<string>}
 \newrobustcmd*{\blx@imc@mkpagetotal}[1][bookpagination]{%
   \begingroup
-  \def\blx@tempa{\blx@mkpagetotal{pagetotal}}%
+  \def\blx@tempa{\blx@mkpagetotal{page}}%
   \iffieldundef{#1}
     {}
     {\iffieldequalstr{#1}{none}
        {\def\blx@tempa{\blx@mkpagetotal@i}}
-       {\iffieldbibstring{#1total}
-          {\edef\blx@tempa{\blx@mkpagetotal{\thefield{#1total}}}}
+       {\iffieldbibstring{#1}
+          {\edef\blx@tempa{\blx@mkpagetotal{\thefield{#1}}}}
           {\blx@warning@entry{%
-             Unknown pagination type '\strfield{#1total}'}}}}%
+             Unknown pagination type '\strfield{#1}'}}}}%
   \@ifnextchar[%]
     {\blx@tempa}
     {\blx@tempa[\@firstofone]}}
@@ -2963,6 +2844,8 @@
     {\csuse{abx@range@#1}}
     {}}
 
+\let\frangelen\rangelen % Legacy name for \rangelen
+
 % <*>[<postpro>]{<string>}
 \newrobustcmd*{\mkcomprange}{%
   \begingroup
@@ -3210,46 +3093,19 @@
     {\blx@declaredelim@i{}{}{#2}{#3}}
     {\def\do##1{%
       \listcsgadd{blx@declaredelimcontexts@#2}{##1}%
-      \blx@declaredelim@i{blx@printdelim@##1@}{##1}{#2}{#3}}%
+      \blx@declaredelim@i{blx@printdelim@##1@}{##1}{#2}{#3}}
      \docsvlist{#1}}}%
 
 \def\blx@declaredelim@i#1#2#3#4{%
   \begingroup
   \def\do##1{%
     \ifcsdef{#1##1}
-      {\blx@inf@delimdeclare{##1}{#2}}
+      {\blx@warn@delimdeclare{##1}{#2}}
       {}%
     \csgdef{#1##1}{#4}}%
-  \docsvlist{#3}%
+  \docsvlist{#3}
   \endgroup}
 
-% *[<contextname, ...>]{<alias>}{<delim>}
-\newrobustcmd*{\DeclareDelimAlias}{%
-  \@ifstar
-    {\blx@declaredelimalias}
-    {\blx@declaredelimaliasauto}}
-
-\newrobustcmd*{\blx@declaredelimalias}[3][]{%
-  \ifblank{#1}
-    {\blx@declaredelimalias@i{}{#2}{#3}}
-    {\def\do##1{%
-      \blx@declaredelimalias@i{blx@printdelim@##1@}{#2}{#3}}%
-     \docsvlist{#1}}}
-
-\newrobustcmd*{\blx@declaredelimaliasauto}[2]{%
-  \blx@declaredelimalias@i{}{#1}{#2}%
-  \ifcsvoid{blx@declaredelimcontexts@#2}
-    {}
-    {\def\do##1{%
-       \blx@declaredelimalias@i{blx@printdelim@##1@}{#1}{#2}}%
-     \dolistcsloop{blx@declaredelimcontexts@#2}}}
-
-\def\blx@declaredelimalias@i#1#2#3{%
-  \ifcsdef{#1#2}
-    {\blx@inf@delimdeclare{#2}{#1}}
-    {}%
-  \global\csletcs{#1#2}{#1#3}}
-
 \def\blx@delimcontext{none}
 \newcommand*{\printdelim}[2][]{%
   \ifblank{#1}
@@ -3273,25 +3129,13 @@
 \newcommand*{\DeclareDelimcontextAlias}[2]{%
   \csgdef{blx@delimcontextalias@#1}{#2}}
 
-\newrobustcmd*{\AtUsedriver}{%
-  \@ifstar
-    {\global\undef\blx@hook@usedriver
-     \gappto\blx@hook@usedriver}
-    {\gappto\blx@hook@usedriver}}
-\@onlypreamble\AtUsedriver
-\def\blx@imc@UseUsedriverHook{\csuse{blx@hook@usedriver}}
-\blx@regimcs{\UseUsedriverHook}
-
-\AtUsedriver{%
-  \let\finentry\blx@finentry@usedrv
-  \let\newblock\relax
-  \let\abx@macro@bibindex\@empty
-  \let\abx@macro@pageref\@empty}
-
 % {<init>}{<entrytype>}
 \protected\def\blx@imc@usedriver#1#2{%
   \begingroup
-  \csuse{blx@hook@usedriver}%
+  \let\finentry\blx@finentry@usedrv
+  \let\newblock\relax
+  \let\abx@macro@bibindex\@empty
+  \let\abx@macro@pageref\@empty
   \csuse{blx@hook@bbxinit}#1%
   \delimcontext{bib}%
   \blx@beglangbib
@@ -3401,44 +3245,11 @@
   \blx@setunit\entrysetpunct
   \global\toggletrue{blx@block}}
 
-\def\ifentryseen{\blx@imc@ifentryseen}
-\def\ifentryinbib{\blx@imc@ifentryinbib}
-\def\ifentrycategory{\blx@imc@ifentrycategory}
-\def\ifentrykeyword{\blx@imc@ifentrykeyword}
-
-\def\blx@imc@iflabeldateisdate{%
-  \ifboolexpr{%
-    togl {blx@labeldateparts}
-    and not test {\iffieldundef{labeldatesource}}
-    and
-    (test {\iffieldequalstr{labeldatesource}{}}
-     or test {\iffieldequalstr{labeldatesource}{year}})}}
-
-\def\blx@imc@ifdatehasyearonlyprecision#1{%
-  \ifboolexpr{not test {\iffieldundef{#1year}}
-              and (test {\ifcsstring{blx@dateformat@#1date}{year}}
-                   or (test {\iffieldundef{#1month}}
-                       and test {\iffieldundef{#1season}}))}}
-
-\def\blx@imc@ifdatehastime#1{%
-  \ifboolexpr{togl {blx@#1dateusetime}
-                 and not test {\iffieldundef{#1hour}}}}
-
-\def\blx@imc@ifdateshavedifferentprecision#1#2{%
-  \ifboolexpr{   (test {\ifdatehasyearonlyprecision{#1}}
-                  and not test {\ifdatehasyearonlyprecision{#2}})
-              or (not test {\ifdatehasyearonlyprecision{#1}}
-                  and test {\ifdatehasyearonlyprecision{#2}})
-              or (test {\ifdatehastime{#1}}
-                  and not test {\ifdatehastime{#2}})
-              or (not test {\ifdatehastime{#1}}
-                  and test {\ifdatehastime{#2}})}}
-
 \blx@regimcs{%
   \ifdriver \thefield \strfield \csfield \usefield \thelist \strlist \thename \strname
   \clearfield \clearlist \clearname \restorefield \restorelist \restorename
-  \ifcategory \ifkeyword
-  \ifciteseen  \ifciteibid \ifciteidem \ifopcit \ifloccit
+  \ifcategory \ifentrycategory \ifkeyword \ifentrykeyword
+  \ifciteseen \ifentryseen \ifentryinbib \ifciteibid \ifciteidem \ifopcit \ifloccit
   \ifcurrentfield \ifcurrentlist \ifcurrentname \ifentrytype
   \iffieldequalcs \iffieldequals \iffieldequalstr \iffieldsequal
   \ifbibmacroundef \iffieldundef \iffieldxref \iflistequalcs \iflistequals
@@ -3449,8 +3260,6 @@
   \savelistcs \savename \savenamecs \usedriver
   \ifinteger \ifnumeral \ifnumerals \ifpages
   \iffieldint \iffieldnum \iffieldnums \iffieldpages
-  \iflabeldateisdate \ifdatehasyearonlyprecision \ifdatehastime
-  \ifdateshavedifferentprecision
   \mkpageprefix \mkpagetotal
   \newblock \newunit \setunit \printunit \finentry}
 
@@ -3668,15 +3477,7 @@
 
 \long\def\blx@mksc@ingroup#1&#2{%
   \if\noexpand\@let@token\relax
-    \ifx\@let@token\blx@mkcp@sgl
-      \blx@mksc@nocase{{#2}}%
-    \else
-      \ifx\@let@token\blx@mkcp@dbl
-        \blx@mksc@nocase{{#2}}%
-      \else
-        \blx@mksc@locase{{#2}}%
-      \fi
-    \fi
+    \blx@mksc@locase{{#2}}%
   \else
     \blx@mksc@nocase{{#2}}%
   \fi}
@@ -3767,7 +3568,7 @@
     {\xifinlist{#1}\blx@cmksc@lang}}
 
 %% Main formatting commands
-% They work by creating a \let alias:
+% The work by creating a \let alias:
 % \abx@<class>@<entrytype>@<formatname> -> \blx@defformat@d
 % for later use in \print*
 % Then, \blx@defformat@d is defined by calling
@@ -4033,25 +3834,16 @@
     {\setkeys{blx@opt@namelist}{#1}}%
   \def\blx@thedata{#2}}
 
-% These are options in the .bbl that biber makes explicit as they are needed in biblatex
-% for various reasons. Not all namelist/name scope options are necessary in the .bbl as
-% some are used by biber only and are not needed by biblatex after biber has finished
-% generating the .bbl
 % Per-namelist options
 \define@key{blx@opt@namelist}{uniquelist}{\c@uniquelist#1\relax}
 \define@key{blx@opt@namelist}{useprefix}{\settoggle{blx@useprefix}{#1}}
-\define@key{blx@opt@namelist}{sortingnamekeytemplatename}{\def\blx@refcontext@sortingnamekeytemplatename{#1}}
-\define@key{blx@opt@namelist}{uniquenametemplatename}{\def\blx@refcontext@uniquenametemplatename{#1}}
-\define@key{blx@opt@namelist}{labelalphanametemplatename}{\def\blx@refcontext@labelalphanametemplatename{#1}}
+\define@key{blx@opt@namelist}{sortnamekeyscheme}{\def\blx@refcontext@sortingnamekey{#1}}
 
 % Per-name options
 \define@key{blx@opt@name}{uniquename}{\c@uniquename#1\relax}
-\define@key{blx@opt@name}{uniquepart}{\def\abx@field@uniquepart{#1}}
 \define@key{blx@opt@name}{hash}{\edef\abx@field@hash{\detokenize{#1}}}
 \define@key{blx@opt@name}{useprefix}{\settoggle{blx@useprefix}{#1}}
-\define@key{blx@opt@name}{sortingnamekeytemplatename}{\def\blx@refcontext@sortingnamekeytemplatename{#1}}
-\define@key{blx@opt@name}{uniquenametemplatename}{\def\blx@refcontext@uniquenametemplatename{#1}}
-\define@key{blx@opt@name}{labelalphanametemplatename}{\def\blx@refcontext@labelalphanametemplatename{#1}}
+\define@key{blx@opt@name}{sortnamekeyscheme}{\def\blx@refcontext@sortingnamekey{#1}}
 
 \newrobustcmd*{\bibinitperiod}{\adddot}
 \newrobustcmd*{\bibinitdelim}{\addnbspace}
@@ -4236,7 +4028,6 @@
      \blx@getdata{#1}%
      \blx@setoptions@type\abx@field@entrytype
      \def\abx@field@entrysetcount{1}%
-     \blx@anchor
      \blx@entryset@precode
      \blx@driver{\blx@imc@thefield{entrytype}}%
      \blx@entryset@postcode
@@ -4254,9 +4045,8 @@
      \blx@setoptions@entry
      \addtocounter{instcount}\@ne
      \blx@execute
-     \blx@begunit
-     \blx@anchor
      \blx@beglangbib
+     \blx@begunit
      \blx@entryset@precode
      \blx@driver{\blx@imc@thefield{entrytype}}
      \blx@entryset@postcode
@@ -4281,20 +4071,12 @@
 \newrobustcmd*{\blx@imc@bibsstring}[2][\@firstofone]{%
   \blx@bibstring{#1}{abx@sstr}{#2}}
 
-\def\blx@bibstringsimple{%
-  \let\bibstring\blx@imc@bibxstring
-  \let\biblstring\blx@imc@bibxlstring
-  \let\bibsstring\blx@imc@bibxsstring}
-
-\def\blx@bibstringnormal{%
-  \let\bibstring\blx@imc@bibstring
-  \let\biblstring\blx@imc@biblstring
-  \let\bibsstring\blx@imc@bibsstring}
-
 \protected\def\blx@bibstring#1#2#3{%
   \blx@begunit
   \blx@hyphenreset
-  \blx@bibstringsimple
+  \let\bibstring\blx@imc@bibxstring
+  \let\biblstring\blx@imc@bibxlstring
+  \let\bibsstring\blx@imc@bibxsstring
   \lowercase{\edef\blx@tempa{#3}}%
   \ifcsundef{#2@\blx@tempa}
     {\blx@warn@nostring\blx@tempa
@@ -4317,7 +4099,9 @@
 \protected\def\blx@bibcpstring#1#2#3{%
   \blx@begunit
   \blx@hyphenreset
-  \blx@bibstringsimple
+  \let\bibstring\blx@imc@bibxstring
+  \let\biblstring\blx@imc@bibxlstring
+  \let\bibsstring\blx@imc@bibxsstring
   \lowercase{\edef\blx@tempa{#3}}%
   \ifcsundef{#2@\blx@tempa}
     {\blx@warn@nostring\blx@tempa
@@ -4338,7 +4122,9 @@
 \protected\def\blx@biblcstring#1#2#3{%
   \blx@begunit
   \blx@hyphenreset
-  \blx@bibstringsimple
+  \let\bibstring\blx@imc@bibxstring
+  \let\biblstring\blx@imc@bibxlstring
+  \let\bibsstring\blx@imc@bibxsstring
   \lowercase{\edef\blx@tempa{#3}}%
   \ifcsundef{#2@\blx@tempa}
     {\blx@warn@nostring\blx@tempa
@@ -4359,7 +4145,9 @@
 \protected\def\blx@bibucstring#1#2#3{%
   \blx@begunit
   \blx@hyphenreset
-  \blx@bibstringsimple
+  \let\bibstring\blx@imc@bibxstring
+  \let\biblstring\blx@imc@bibxlstring
+  \let\bibsstring\blx@imc@bibxsstring
   \lowercase{\edef\blx@tempa{#3}}%
   \ifcsundef{#2@\blx@tempa}
     {\blx@warn@nostring\blx@tempa
@@ -4589,9 +4377,6 @@
   \do{withintroduction}%
   \do{withforeword}%
   \do{withafterword}%
-  \do{organizer}%
-  \do{organizers}%
-  \do{byorganizer}%
   \do{byeditortr}%
   \do{byeditorco}%
   \do{byeditoran}%
@@ -4650,31 +4435,19 @@
   \do{origpubin}%
   \do{astitle}%
   \do{bypublisher}%
-  \do{nodate}%
   \do{page}%
   \do{pages}%
   \do{column}%
   \do{columns}%
   \do{line}%
   \do{lines}%
+  \do{nodate}%
   \do{verse}%
   \do{verses}%
   \do{section}%
   \do{sections}%
   \do{paragraph}%
   \do{paragraphs}%
-  \do{pagetotal}%
-  \do{pagetotals}%
-  \do{columntotal}%
-  \do{columntotals}%
-  \do{linetotal}%
-  \do{linetotals}%
-  \do{versetotal}%
-  \do{versetotals}%
-  \do{sectiontotal}%
-  \do{sectiontotals}%
-  \do{paragraphtotal}%
-  \do{paragraphtotals}%
   \do{in}%
   \do{inseries}%
   \do{ofseries}%
@@ -4740,7 +4513,6 @@
   \do{december}%
   \do{langamerican}%
   \do{langbrazilian}%
-  \do{langbulgarian}%
   \do{langcatalan}%
   \do{langcroatian}%
   \do{langczech}%
@@ -4750,7 +4522,6 @@
   \do{langestonian}%
   \do{langfinnish}%
   \do{langfrench}%
-  \do{langgalician}%
   \do{langgerman}%
   \do{langgreek}%
   \do{langitalian}%
@@ -4764,10 +4535,8 @@
   \do{langslovene}%
   \do{langspanish}%
   \do{langswedish}%
-  \do{langukrainian}%
   \do{fromamerican}%
   \do{frombrazilian}%
-  \do{frombulgarian}%
   \do{fromcatalan}%
   \do{fromcroatian}%
   \do{fromczech}%
@@ -4777,7 +4546,6 @@
   \do{fromestonian}%
   \do{fromfinnish}%
   \do{fromfrench}%
-  \do{fromgalician}%
   \do{fromgerman}%
   \do{fromgreek}%
   \do{fromitalian}%
@@ -4791,7 +4559,6 @@
   \do{fromslovene}%
   \do{fromspanish}%
   \do{fromswedish}%
-  \do{fromukrainian}%
   \do{countryde}%
   \do{countryep}%
   \do{countryeu}%
@@ -4840,7 +4607,6 @@
 % in *.cbx/bbx/tex: (implicit)
 % in *.lbx:         inherit = {<language>},
 \define@key{blx@lbx}{inherit}{%
-  \global\toggletrue{blx@nosuffrecurse}%
   \blx@lbxinput{#1}{}{\blx@err@nolang{#1}}%
   \csuse{abx@strings@#1}}
 
@@ -4884,7 +4650,6 @@
 
 % {<language>}{<language>}
 \def\blx@letbibextras#1#2{%
-  \global\toggletrue{blx@nosuffrecurse}%
   \blx@lbxinput{#2}{}{\blx@err@nolang{#2}}%
   \global\csletcs{abx@extras@#1}{abx@extras@#2}
   \global\csletcs{abx@noextras@#1}{abx@noextras@#2}}%
@@ -4929,7 +4694,6 @@
 
 % {<language>}{<language>}
 \def\blx@letbibstrings#1#2{%
-  \global\toggletrue{blx@nosuffrecurse}%
   \blx@lbxinput{#2}{}{\blx@err@nolang{#2}}%
   \global\csletcs{abx@strings@#1}{abx@strings@#2}}%
 
@@ -4949,30 +4713,13 @@
      \hyphenation{#2}%
      \endgroup}}
 
-% {<mapping suffix>}
-\newrobustcmd*{\DeclareLanguageMappingSuffix}[1]{%
-  \gdef\blx@lng@suff{#1}}
-\@onlypreamble\DeclareLanguageMappingSuffix
-\let\blx@lng@suff\@empty
-
 % {<language>}{<mapping>}
 \newrobustcmd*{\DeclareLanguageMapping}[2]{%
-  \csgdef{blx@lng@#1}{#2}%
-  \csgdef{blx@lng@explicit@#1}{#2}}
+  \csgdef{blx@lng@#1}{#2}}
 \@onlypreamble\DeclareLanguageMapping
 
 % {<language>}{<success>}{<failure>}
 \def\blx@lbxinput#1{%
-  \ifdefempty\blx@lng@suff
-    {}
-    {\ifcsdef{blx@lng@explicit@#1}% \DeclareLanguageMapping overrides \DeclareLanguageMappingSuffix
-      {}
-      {\nottoggle{blx@nosuffrecurse}
-        {\csgdef{blx@lng@#1}{#1\blx@lng@suff}}
-        {}}}%
-    \blx@lbxinput@0{#1}}
-
-\def\blx@lbxinput@0#1{%
   \ifcsdef{blx@lng@#1}
     {\expandafter\expandafter\expandafter\blx@lbxinput@i
      \expandafter\expandafter\expandafter{%
@@ -4984,19 +4731,12 @@
   \global\csundef{blx@lng@#2}%
   \IfFileExists{#1.lbx}
     {\blx@lbxinput@ii{#2}{#1}{language '#2' -> '#1'}}
-    {\ifcsdef{blx@suffmaptried@#2}
-      {}
-      {\blx@warning@noline{%
-          File '#1.lbx' not found!\MessageBreak
-          Ignoring mapping '#2' -> '#1'}%
-       \cslet{blx@suffmaptried@#2}\@empty}%
-     \blx@lbxinput@0{#2}}}
+    {\blx@warning@noline{%
+       File '#1.lbx' not found!\MessageBreak
+       Ignoring mapping '#2' -> '#1'}%
+     \blx@lbxinput{#2}}}
 
 % {<language>}{<lbxfile>}{<message>}
-% toggle 'blx@nosuffrecurse' is set to true at the places where recursion into here
-% can occur when loading a .lbx otherwise, when using \DeclareLanguageMappingSuffix
-% it is possible to get into infinite loops. We only want to apply the suffix to explicitly
-% loaded languages, not those loaded by recursion.
 \def\blx@lbxinput@ii#1#2#3{%
   \begingroup
   \setbox\@tempboxa=\hbox\bgroup
@@ -5007,7 +4747,7 @@
        \global\cslet{abx@noextras@#1}\@empty
        \blx@maplang{#1}{#1}%
        \def\InheritBibliographyStrings{%
-         \blx@letbibstrings{#1}}%
+       \blx@letbibstrings{#1}}%
        \def\DeclareBibliographyStrings####1{%
          \begingroup
          \let\blx@defstring\blx@lbx@defstring
@@ -5028,8 +4768,7 @@
        \csuse{blx@hook@noextras@#1}%
        \csuse{blx@hook@noextras@#2}%
        \csuse{blx@hook@hyph@#1}%
-       \csuse{blx@hook@hyph@#2}%
-       \global\togglefalse{blx@nosuffrecurse}}
+       \csuse{blx@hook@hyph@#2}}
       {\aftergroup\@firstoftwo}
       {\aftergroup\@secondoftwo}%
   \egroup}
@@ -5211,9 +4950,9 @@
        \dateuncertainprint
        \dateeraprint{#2year}%
        \iffieldundef{#2endyear}
-         {\printfield{extradate}}
+         {\printfield{extrayear}}
          {\iffieldequalstr{#2endyear}{}
-            {\printfield{extradate}%
+            {\printfield{extrayear}%
              \printtext{\mbox{\bibdaterangesep}}}
             {\printtext{%
                \bibdaterangesep
@@ -5223,7 +4962,7 @@
                   % Optionally print the time after the date
                   \blx@printtime{#2}{end}}
                  {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
-               \printfield{extradate}%
+               \printfield{extrayear}%
                \enddateuncertainprint
                \dateeraprint{#2endyear}}}}}}}
 
@@ -5246,14 +4985,14 @@
                {\dateeraprint{#2year}}}}
          {\iffieldsequal{#2year}{#2endyear}
            {\csuse{mkbibseasondate#1}{}{#2season}}
-           {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+           {\csuse{mkbibseasondate#1}{#2year}{#2season}
              \iffieldsequal{#2dateera}{#2enddateera}{}
               {\dateeraprint{#2year}}}}%
        \dateuncertainprint
        \iffieldundef{#2endyear}
-         {\printfield{extradate}}
+         {\printfield{extrayear}}
          {\iffieldequalstr{#2endyear}{}
-            {\printfield{extradate}%
+            {\printfield{extrayear}%
              \printtext{\mbox{\bibdaterangesep}}}
             {\printtext{%
                \bibdaterangesep
@@ -5261,25 +5000,17 @@
                \iffieldundef{#2season}
                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
                  {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}%
-               \printfield{extradate}%
+               \printfield{extrayear}%
                \enddateuncertainprint
                \dateeraprint{#2endyear}}}}}}}
 
 \newrobustcmd*{\mkdaterangeyear}[1]{%
-  \blx@imc@clearfield{#1season}%
   \blx@imc@clearfield{#1month}%
   \blx@imc@clearfield{#1day}%
-  \blx@imc@clearfield{#1hour}%
-  \blx@imc@clearfield{#1minute}%
-  \blx@imc@clearfield{#1second}%
-  \blx@imc@clearfield{#1timezone}%
-  \blx@imc@clearfield{#1endseason}%
+  \blx@imc@clearfield{#1season}%
   \blx@imc@clearfield{#1endmonth}%
   \blx@imc@clearfield{#1endday}%
-  \blx@imc@clearfield{#1endhour}%
-  \blx@imc@clearfield{#1endminute}%
-  \blx@imc@clearfield{#1endsecond}%
-  \blx@imc@clearfield{#1endtimezone}%
+  \blx@imc@clearfield{#1endseason}%
   \iffieldsequal{#1year}{#1endyear}
     {\blx@imc@clearfield{#1endyear}}
     {}%
@@ -5325,7 +5056,7 @@
        % Such a season component can only come from an EDTF 5.1.5 season which replaces
        % a normal month so if it exists, we know that a normal date print is ruled out
        \iffieldundef{#1season}
-         {\blx@ymddate[extradate]{#1}{}%
+         {\blx@ymddate[extrayear]{#1}{}%
           % Optionally print the time after the date
           \blx@printtime{#1}{}}
          {\csuse{mkbibseasondateshort}{#1year}{#1season}}%
@@ -5346,7 +5077,7 @@
              \enddateuncertainprint
              \dateeraprint{#1endyear}}}}}}
 
-% [extradate]{<datetype>}{''|end}
+% [extrayear]{<datetype>}{''|end}
 \newrobustcmd*{\blx@ymddate}[3][]{%
   \dateeraprintpre{#2#3year}%
   \mkyearzeros{\thefield{#2#3year}}\ifblank{#1}{}{\printfield{#1}}%
@@ -5354,20 +5085,12 @@
   \iffieldundef{#2#3day}{}{\bibdatesep\mkdayzeros{\thefield{#2#3day}}}}
 
 \newrobustcmd*{\mkdaterangeyearextra}[1]{%
-  \blx@imc@clearfield{#1season}%
   \blx@imc@clearfield{#1month}%
   \blx@imc@clearfield{#1day}%
-  \blx@imc@clearfield{#1hour}%
-  \blx@imc@clearfield{#1minute}%
-  \blx@imc@clearfield{#1second}%
-  \blx@imc@clearfield{#1timezone}%
-  \blx@imc@clearfield{#1endseason}%
+  \blx@imc@clearfield{#1season}%
   \blx@imc@clearfield{#1endmonth}%
   \blx@imc@clearfield{#1endday}%
-  \blx@imc@clearfield{#1endhour}%
-  \blx@imc@clearfield{#1endminute}%
-  \blx@imc@clearfield{#1endsecond}%
-  \blx@imc@clearfield{#1endtimezone}%
+  \blx@imc@clearfield{#1endseason}%
   \iffieldsequal{#1year}{#1endyear}
     {\blx@imc@clearfield{#1endyear}}
     {}%
@@ -5385,7 +5108,7 @@
     {}}
 
 \newrobustcmd*{\mkdaterangeedtf}[1]{%
-  \blx@metadateinfo{#1}%
+  \blx@metadateinfo{#1}%  
   \def\bibdatetimesep{T}%
   \iffieldundef{#1year}
     {}
@@ -5413,6 +5136,7 @@
             {}%
          \enddateuncertainprint
          \enddatecircaprintedtf}}}}
+\cslet{mkdaterangeiso8601}\mkdaterangeedtf% Legacy option support
 
 \newrobustcmd*{\mkdaterangeedtfextra}[1]{%
   \blx@metadateinfo{#1}%
@@ -5420,7 +5144,7 @@
   \iffieldundef{#1year}
     {}
     {\printtext[#1date]{%
-       \blx@edtfdate[extradate]{#1}{}%
+       \blx@edtfdate[extrayear]{#1}{}%
        \ifboolexpr{%
          togl {blx@#1dateusetime}
          and
@@ -5443,8 +5167,9 @@
             {}%
           \enddateuncertainprint
           \enddatecircaprintedtf}}}
+\cslet{mkdaterangeiso8601extra}\mkdaterangeedtfextra% Legacy option support
 
-% [extradate]{<datetype>}{''|end}
+% [extrayear]{<datetype>}{''|end}
 \newrobustcmd*{\blx@edtfdate}[3][]{%
   \dateeraprintpre{#2#3year}%
   \blx@imc@forcezerosy{\thefield{#2#3year}}\ifblank{#1}{}{\printfield{#1}}%
@@ -5482,6 +5207,7 @@
 \newrobustcmd*{\bibdateeraendprefix}{\,\bibdateeraprefix}
 \newrobustcmd*{\bibdatesep}{\hyphen}
 \newrobustcmd*{\bibdaterangesep}{\bibrangedash}
+\newrobustcmd*{\bibdatedash}{\bibrangedash}%LEGACY(<3.5)
 % date+times
 \newrobustcmd*{\bibdatetimesep}{\space}
 % ranges
@@ -5568,6 +5294,23 @@
 
 \blx@regimcs{\printlabeldate \printlabeltime \printlabeldateextra \stripzeros \forcezerosy \forcezerosmdt \mkyearzeros \mkmonthzeros \mkdayzeros \mktimezeros}
 
+\protected\def\mkdatezeros{%
+  \blx@warning@noline{%
+    '\string\mkdatezeros' is deprecated, please use '\string\mkyearzeros',\MessageBreak
+    '\string\mkmonthzeros' or '\string\mkdayzeros' as appropriate. \MessageBreak
+    falling back to '\string\mkmonthzeros'}%
+  \mkmonthzeros}
+
+\protected\def\printdatelabel{%
+  \blx@warning@noline{%
+    '\string\printdatelabel' is deprecated, please use '\string\printlabeldate'}%
+  \blx@imc@printlabeldate}
+
+\protected\def\printdatelabelextra{%
+  \blx@warning@noline{%
+    '\string\printdatelabelextra' is deprecated, please use '\string\printlabeldateextra'}%
+  \blx@imc@printlabeldateextra}
+
 % User macro for retrieving currrent language
 \def\currentlang{\blx@languagename}
 
@@ -5608,8 +5351,8 @@
 \gdef\blx@mkautolangbabel{%
   \ifundef\bbl@main@language
     {\blx@error
-      {No default 'babel' language defined}
-      {You must define a default language for 'babel'}}
+      {No default babel language defined}
+      {You must define a default language for babel}}
     {}%
   \pretocmd\select@language{\blx@langsetup{#1}}
     {\ifdef\blx@thelangenv
@@ -5653,10 +5396,9 @@
 \gdef\blx@mkautolangpoly{%
   \ifundef\bbl@main@language
     {\blx@error
-      {No default 'polyglossia' language defined}
-      {You must define a default language for 'polyglossia'}}
+      {No default polyglossia language defined}
+      {You must define a default language for polyglossia}}
     {}%
-  \edef\blx@saved@underscore@catcode{\the\catcode`\_}%
   \catcode`\_=11% polyglossia uses "_" as a letter
   \pretocmd\select@language{\blx@langsetup{#1}}
     {\ifdef\blx@thelangenv
@@ -5696,11 +5438,9 @@
                      {\csname\abx@field@langid\endcsname}}
                   {\csname\blx@thelangenv\expandafter\endcsname\expandafter{\abx@field@langid}}%
                 % These lines are equal to \blx@maplang
-                \ifcsstring{blx@thelangenv}{hyphenrules}
-                  {}
-                  {\blx@resetpunct
-                   \csuse{abx@extras@\abx@field@langid}%
-                   \csuse{abx@strings@\abx@field@langid}}}}
+                \blx@resetpunct
+                \csuse{abx@extras@\abx@field@langid}%
+                \csuse{abx@strings@\abx@field@langid}}}
             {}}}
        {}%
      % polyglossia needs this - it doesn't get the
@@ -5717,7 +5457,7 @@
      \blx@langsetup\bbl@main@language}
     {\blx@err@patch{'polyglossia' package}%
      \blx@mknoautolang}%
-  \catcode`\_=\blx@saved@underscore@catcode\relax}
+  \catcode`\_=8}
 \endgroup
 
 \def\blx@mknoautolang{%
@@ -5870,7 +5610,7 @@
 \abx@dodates
 % main date field has an empty prefix (''date) which can't be added to a list
 % and so do it explicity
-% This is one of the few (only?) hard-coded datamodel assumptions but it is
+% This is one of the few (only?) hard-coded datamodel assumptions but it is 
 % very unlikely that anyone would *remove* the main date field in a custom application ...
 \def\abx@dodatetypes{\do{}\dolistloop\blx@datetypes}
 
@@ -5881,22 +5621,9 @@
 \blx@collectopts{boolean}{blx@namelistopts}{useprefix}% for passing to bcf
 \blx@collectopts{boolean}{blx@nameopts}{useprefix}% for passing to the .bcf
 
-% nametemplates meta-option entry/namelist/name scope
-\blx@collectopts{string}{blx@entryopts}{nametemplates}
-\blx@collectopts{string}{blx@namelistopts}{nametemplates}% for passing to bcf
-\blx@collectopts{string}{blx@nameopts}{nametemplates}% for passing to the .bcf
-
-% sortingnamekeytemplate namelist/name scope
-\blx@collectopts{string}{blx@namelistopts}{sortingnamekeytemplatename}% for passing to bcf
-\blx@collectopts{string}{blx@nameopts}{sortingnamekeytemplatename}% for passing to the .bcf
-
-% uniquenametemplate namelist/name scope
-\blx@collectopts{string}{blx@namelistopts}{uniquenametemplatename}% for passing to bcf
-\blx@collectopts{string}{blx@nameopts}{uniquenametemplatename}% for passing to the .bcf
-
-% labelalphanametemplate namelist/name scope
-\blx@collectopts{string}{blx@namelistopts}{labelalphanametemplatename}% for passing to bcf
-\blx@collectopts{string}{blx@nameopts}{labelalphanametemplatename}% for passing to the .bcf
+% sortnamekeyscheme namelist/name scope
+\blx@collectopts{string}{blx@namelistopts}{sortnamekeyscheme}% for passing to bcf
+\blx@collectopts{string}{blx@nameopts}{sortnamekeyscheme}% for passing to the .bcf
 
 % Misc globalopts
 \blx@collectopts{xml}{blx@globalopts}{datamodel}% for passing to the .bcf
@@ -6023,8 +5750,7 @@
 
 \def\do#1{%
   \listxadd\blx@namepartmetafields{#1namehash}%
-  \listxadd\blx@namepartmetafields{#1fullhash}%
-  \listxadd\blx@namepartmetafields{#1bibnamehash}}
+  \listxadd\blx@namepartmetafields{#1fullhash}}
 \abx@donameparts
 
 \def\do#1{%
@@ -6032,6 +5758,7 @@
 \abx@dodateparts
 
 \def\abx@dointernalfields{%
+  \do{childentrykey}%
   \do{clonesourcekey}%
   \do{labeldate}%
   \do{labeldatesource}%
@@ -6044,7 +5771,7 @@
   \do{extraalpha}%
   \do{extratitle}%
   \do{extratitleyear}%
-  \do{extradate}%
+  \do{extrayear}%
   \do{fullhash}%
   \do{labelalpha}%
   \do{labelnumber}%
@@ -6052,7 +5779,6 @@
   \do{labeltitleyear}%
   \do{localnumber}%
   \do{namehash}%
-  \do{bibnamehash}%
   \do{options}%
   \do{sortinit}%
   \do{sortinithash}%
@@ -6157,76 +5883,76 @@
           {}}}%
   \iftoggle{blx@labeldateparts}
     {\def\iflabeldateera#1{% start era
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\ifcsstring{abx@field@\abx@field@labeldatesource dateera}{#1}}
-         {\@secondoftwo}}%
-     \appto\blx@TE@hook{\def\iflabeldateera#1{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\blx@TE{\ifcsstring{abx@field@\abx@field@labeldatesource dateera}{#1}}}
-         {\@secondoftwo}}}%
-     % end era
-     \def\iflabelenddateera#1{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\ifcsstring{abx@field@\abx@field@labeldatesource enddateera}{#1}}
-         {\@secondoftwo}}%
-     \appto\blx@TE@hook{\def\iflabelenddateera#1{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\blx@TE{\ifcsstring{abx@field@\abx@field@labeldatesource enddateera}{#1}}}
-         {\@secondoftwo}}}%
-     % start circa
-     \def\iflabeldatecirca{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\iftoggle{abx@bool@\abx@field@labeldatesource datecirca}}
-         {\@secondoftwo}}%
-     \appto\blx@TE@hook{\def\iflabeldatecirca{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource datecirca}}}
-         {\@secondoftwo}}}%
-     % end circa
-     \def\iflabelenddatecirca{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\iftoggle{abx@bool@\abx@field@labeldatesource enddatecirca}}
-         {\@secondoftwo}}%
-     \appto\blx@TE@hook{\def\iflabelenddatecirca{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddatecirca}}}
-         {\@secondoftwo}}}%
-     % start julian
-     \def\iflabeldatejulian{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\iftoggle{abx@bool@\abx@field@labeldatesource datejulian}}
-         {\@secondoftwo}}%
-     \appto\blx@TE@hook{\def\iflabeldatejulian{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource datejulian}}}
-         {\@secondoftwo}}}%
-     % end julian
-     \def\iflabelenddatejulian{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\iftoggle{abx@bool@\abx@field@labeldatesource enddatejulian}}
-         {\@secondoftwo}}%
-     \appto\blx@TE@hook{\def\iflabelenddatejulian{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddatejulian}}}
-         {\@secondoftwo}}}%
-     % start uncertain
-     \def\iflabeldateuncertain{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\iftoggle{abx@bool@\abx@field@labeldatesource dateuncertain}}
-         {\@secondoftwo}}%
-     \appto\blx@TE@hook{\def\iflabeldateuncertain{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource dateuncertain}}}
-         {\@secondoftwo}}}%
-     % end uncertain
-     \def\iflabelenddateuncertain{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\iftoggle{abx@bool@\abx@field@labeldatesource enddateuncertain}}
-         {\@secondoftwo}}%
-     \appto\blx@TE@hook{\def\iflabelenddateuncertain{%
-       \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
-         {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddateuncertain}}}
-         {\@secondoftwo}}}}%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\ifcsstring{abx@field@\abx@field@labeldatesource dateera}{#1}}
+       {\@secondoftwo}}%
+   \appto\blx@TE@hook{\def\iflabeldateera#1{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\blx@TE{\ifcsstring{abx@field@\abx@field@labeldatesource dateera}{#1}}}
+       {\@secondoftwo}}}%
+   % end era
+   \def\iflabelenddateera#1{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\ifcsstring{abx@field@\abx@field@labeldatesource enddateera}{#1}}
+       {\@secondoftwo}}%
+   \appto\blx@TE@hook{\def\iflabelenddateera#1{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\blx@TE{\ifcsstring{abx@field@\abx@field@labeldatesource enddateera}{#1}}}
+       {\@secondoftwo}}}%
+   % start circa
+   \def\iflabeldatecirca{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\iftoggle{abx@bool@\abx@field@labeldatesource datecirca}}
+       {\@secondoftwo}}%
+   \appto\blx@TE@hook{\def\iflabeldatecirca{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource datecirca}}}
+       {\@secondoftwo}}}%
+   % end circa
+   \def\iflabelenddatecirca{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\iftoggle{abx@bool@\abx@field@labeldatesource enddatecirca}}
+       {\@secondoftwo}}%
+   \appto\blx@TE@hook{\def\iflabelenddatecirca{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddatecirca}}}
+       {\@secondoftwo}}}%
+   % start julian
+   \def\iflabeldatejulian{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\iftoggle{abx@bool@\abx@field@labeldatesource datejulian}}
+       {\@secondoftwo}}%
+   \appto\blx@TE@hook{\def\iflabeldatejulian{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource datejulian}}}
+       {\@secondoftwo}}}%
+   % end julian
+   \def\iflabelenddatejulian{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\iftoggle{abx@bool@\abx@field@labeldatesource enddatejulian}}
+       {\@secondoftwo}}%
+   \appto\blx@TE@hook{\def\iflabelenddatejulian{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddatejulian}}}
+       {\@secondoftwo}}}%
+   % start uncertain
+   \def\iflabeldateuncertain{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\iftoggle{abx@bool@\abx@field@labeldatesource dateuncertain}}
+       {\@secondoftwo}}%
+   \appto\blx@TE@hook{\def\iflabeldateuncertain{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource dateuncertain}}}
+       {\@secondoftwo}}}%
+   % end uncertain
+   \def\iflabelenddateuncertain{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\iftoggle{abx@bool@\abx@field@labeldatesource enddateuncertain}}
+       {\@secondoftwo}}%
+   \appto\blx@TE@hook{\def\iflabelenddateuncertain{%
+     \xifinlist{\abx@field@labeldatesource date}\blx@datamodel@dates
+       {\blx@TE{\iftoggle{abx@bool@\abx@field@labeldatesource enddateuncertain}}}
+       {\@secondoftwo}}}}%
   {}}
 
 % Name toggles like \ifauthor etc. need to be dynamically created for all
@@ -6248,6 +5974,12 @@
     \settoggle{abx@bool@#1inits}{##1}}}
 \abx@donameparts
 
+%LEGACY(<3.3) legacy name for \ifgiveninits which is autogenerated now
+\def\iffirstinits{
+  \blx@warning@noline{%
+    '\string\iffirstinits' is deprecated, use '\string\ifgiveninits'}%
+  \iftoggle{abx@bool@giveninits}}
+
 \def\do#1{%
   % Define use<name> options scope for biber
   \blx@collectopts{boolean}{blx@globalopts}{use#1}%
@@ -6664,7 +6396,6 @@
   \csuse{blx@data@\the\c@refsection @\blx@refcontext@context @#1}%
   \blx@adjustyears
   \blx@getlabeldata
-  \blx@aliasfields
   \blx@setcitecounter}
 
 \def\blx@adjustyears{%
@@ -6801,39 +6532,20 @@
           {\edef\abx@field@labelendseason{\csuse{abx@field@\abx@field@labeldatesource endseason}}}
           {}}}}
 
-% This gets the entry data for a citation
 \def\blx@getdata@cite#1{%
-  \blx@getdata{#1}%
-  % Inject the relevant set parent fields like labelnumber/labelprefix into child
   \ifcsdef{blx@setc@\the\c@refsection @#1}
-    {\blx@ifdata{#1}
-       {\def\abx@field@childentrykey{#1}%LEGACY(<3.8)
-        \edef\abx@field@childentrytype{\abx@field@entrytype}%LEGACY(<3.8)
+    {\expandafter\expandafter\expandafter\blx@getdata
+     \expandafter\expandafter\expandafter{%
+       \csname blx@setc@\the\c@refsection @#1\endcsname}%
+     \blx@ifdata{#1}
+       {\def\abx@field@childentrykey{#1}%
         \begingroup
-        \expandafter\expandafter\expandafter\blx@getdata\expandafter\expandafter\expandafter{%
-          \csname blx@setc@\the\c@refsection @#1\endcsname}%
-        \let\blx@tempa\@empty
-        % Inject labelnumber if it exists
-        \ifdef\abx@field@labelnumber
-          {\appto\blx@tempa{\def\noexpand\abx@field@labelnumber{\abx@field@labelnumber}}}
-          {}%
-        % Inject labelprefix if it exists
-        \ifdef\abx@field@labelprefix
-          {\appto\blx@tempa{\def\noexpand\abx@field@labelprefix{\abx@field@labelprefix}}}
-          {}%
-        % Inject labelalpha if it exists
-        \ifdef\abx@field@labelalpha
-          {\appto\blx@tempa{\def\noexpand\abx@field@labelalpha{\abx@field@labelalpha}}}
-          {}%
-        % Inject extraalpha if it exists
-        \ifdef\abx@field@extraalpha
-          {\appto\blx@tempa{\def\noexpand\abx@field@extraalpha{\abx@field@extraalpha}}}
-          {}%
-        % Perform the injection
-        \edef\blx@tempb{\endgroup\blx@tempa}%
-        \blx@tempb}
+        \blx@getdata{#1}%
+        \edef\blx@tempa{\endgroup
+          \def\noexpand\abx@field@childentrytype{\abx@field@entrytype}}%
+        \blx@tempa}
        {}}
-    {}%
+    {\blx@getdata{#1}}%
   \ifcsdef{blx@seti@\the\c@refsection @#1}
     {\letcs\abx@field@entrysetcount{blx@seti@\the\c@refsection @#1}}
     {}}
@@ -6903,13 +6615,13 @@
   \csgdef{blx@keyalias@\the\c@refsection @#1}{\detokenize{#2}}%
   \listcsgadd{blx@keyaliases@\the\c@refsection}{#1}}
 
-% blx@dlist@list@<section>@<refcontext> - a list of list items in a refcontext in a
+% blx@slist@list@<section>@<scheme> - a list of list items in a scheme in a
 %                                     section (for tracking bibliography lists,
 %                                     obeys skipbiblist)
-% blx@dlist@entry@<section>@<list> - a list of normal entries in a list in a
+% blx@slist@entry@<section>@<scheme> - a list of normal entries in a scheme in a
 %                                      section (for tracking bibliographies,
 %                                      obeys skipbib)
-% blx@dlist@centry@<section>@<list> - a list of normal entries in a list in a
+% blx@slist@centry@<section>@<scheme> - a list of normal entries in a scheme in a
 %                                       section (for tracking citations,
 %                                       obeys skipbib). Same as @entry@ but
 %                                       with added set children
@@ -6921,10 +6633,9 @@
   \blx@setoptions@type{#2}%
   \blx@bbl@options{#3}%
   \blx@setoptions@entry
-  \edef\blx@bbl@data{blx@data@\the\c@refsection @\blx@dlist@name @\abx@field@entrykey}%
+  \edef\blx@bbl@data{blx@data@\the\c@refsection @\blx@slist@name @\abx@field@entrykey}%
   \csuse\blx@bbl@data
   \blx@bbl@addfield{entrykey}{\abx@field@entrykey}%
-  \listxadd\blx@entries{\abx@field@entrykey}%
   \blx@bbl@addfield{entrytype}{#2}%
   \blx@imc@iffieldundef{options}
     {}
@@ -6942,9 +6653,9 @@
      \toggletrue{blx@skipbiblist}%
      \toggletrue{blx@skiplab}}%
   \nottoggle{blx@skipbib}
-    {\expandafter\ifstrequal\expandafter{\blx@dlist@type}{entry}
-       {\listcsxadd{blx@dlist@entry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}%
-        \listcsxadd{blx@dlist@centry@\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}%
+    {\expandafter\ifstrequal\expandafter{\blx@slist@type}{entry}
+       {\listcsxadd{blx@slist@entry@\the\c@refsection @\blx@slist@name}{\abx@field@entrykey}%
+        \listcsxadd{blx@slist@centry@\the\c@refsection @\blx@slist@name}{\abx@field@entrykey}%
         \listcsxadd{blx@type@\the\c@refsection @\abx@field@entrytype}{\abx@field@entrykey}%
         \ifdef\abx@field@entrysubtype
           {\listcsxadd{blx@subt@\the\c@refsection @\abx@field@entrysubtype}{\abx@field@entrykey}}
@@ -6952,9 +6663,9 @@
        {}}%
     {}%
   \nottoggle{blx@skipbiblist}
-    {\expandafter\ifstrequal\expandafter{\blx@dlist@type}{list}
+    {\expandafter\ifstrequal\expandafter{\blx@slist@type}{list}
       {\blx@bbl@labelfields
-        \listcsxadd{blx@dlist@\blx@dlist@type @\the\c@refsection @\blx@dlist@name}{\abx@field@entrykey}}
+        \listcsxadd{blx@slist@\blx@slist@type @\the\c@refsection @\blx@slist@name}{\abx@field@entrykey}}
       {}}%
     {}%
   \nottoggle{blx@skiplab}
@@ -6987,15 +6698,13 @@
 % available in the current context sortlist.
 \def\blx@addset{%
   \begingroup
-  \ifcsdef{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}
-    {\letcs\blx@tempa{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}%
-     \global\cslet{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}\@empty
-     \forlistloop\blx@addset@i\blx@tempa}
-    {\PackageWarningNoLine{biblatex}{Sorting template has changed}}%
+  \letcs\blx@tempa{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}%
+  \global\cslet{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}\@empty
+  \forlistloop\blx@addset@i\blx@tempa
   \endgroup}
 
 \def\blx@addset@i#1{%
-  \listcsgadd{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}{#1}%
+  \listcsgadd{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}{#1}%
   \ifcsdef{blx@setp@\the\c@refsection @#1}
     {\expandafter\expandafter\expandafter\forcsvlist
      \expandafter\expandafter\expandafter\blx@addset@ii
@@ -7004,7 +6713,7 @@
     {}}
 
 \def\blx@addset@ii#1{%
-  \listcsgadd{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}{#1}}
+  \listcsgadd{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}{#1}}
 
 \def\blx@bbl@labelfields{%
   \def\do##1{%
@@ -7097,10 +6806,10 @@
      \fi}}
 
 \def\blx@bbl@labeldate{%
-  \ifundef\abx@field@extradate
+  \ifundef\abx@field@extrayear
     {}
-    {\ifnum\abx@field@extradate>\c@maxextradate
-       \global\c@maxextradate\abx@field@extradate\relax
+    {\ifnum\abx@field@extrayear>\c@maxextrayear
+       \global\c@maxextrayear\abx@field@extrayear\relax
      \fi}}
 
 \def\blx@bbl@titles{%
@@ -7143,8 +6852,8 @@
   \let\endentry\blx@bbl@endentry
   \let\missing\blx@bbl@missing
   \let\keyalias\blx@bbl@keyalias
-  \let\datalist\blx@bbl@dlist
-  \let\enddatalist\blx@bbl@enddlist
+  \let\sortlist\blx@bbl@slist
+  \let\endsortlist\blx@bbl@endslist
   \let\set\blx@bbl@set
   \let\inset\blx@bbl@inset
   \let\xref\blx@bbl@xref % A No-op for Biber
@@ -7163,28 +6872,25 @@
   \let\endlverb\blx@bbl@verblend
   \let\annotation\blx@bbl@annotationdef}
 
-\def\blx@bblend{%
-  % Special warning for defernumbers when a citation cannot be found
-  \iftoggle{blx@defernumbers}
-    {\def\do##1{\ifinlist{##1}\blx@entries
-                 {}
-                 {\blx@warning@noline{%
-                     citation '##1' was not found at all in the .bbl, bibliography labels cannot be generated, please correct the citation}}}%
-     \dolistloop\blx@lastcites}
-    {}}
+\def\blx@bblend{}
 
 % {<entrykey>}
 % Get the saved information on which citations were mentioned last run
 \protected\def\abx@aux@cite#1{%
   \listxadd\blx@lastcites{\detokenize{#1}}}
 
+% {<sortschemename>}
+% Get the saved information on which sorting schemes were mentioned last run
+\protected\def\abx@aux@sortscheme#1{%
+  \listgadd\blx@lastsortschemes{#1}}
+
 % {<refcontext>}
 % Get the saved information on which refcontexts were mentioned last run
 \protected\def\abx@aux@refcontext#1{%
   \listgadd\blx@lastrefcontexts{#1}}
 
-% {<sortingtemplatename>}
-% Get the saved information on which shorthand sorting templates were mentioned last run
+% {<sortschemename>}
+% Get the saved information on which shorthand sorting schemes were mentioned last run
 \protected\def\abx@aux@biblist#1{%
   \listgadd\blx@lastbiblists{#1}}
 
@@ -7203,7 +6909,7 @@
 \AtEndDocument{%
   % Here we run some tests to decide if we need to issue re-run
   % messages in certain circumstances. In general, if we add/remove
-  % any citations or add/remove any sorting templates, we need to re-run
+  % any citations or add/remove any sorting schemes, we need to re-run
   % biber. Also, if we have to re-run biber, we need to defer writing
   % the defernumbers .aux information because it will not yet be correct.
 
@@ -7215,15 +6921,15 @@
   \begingroup
   \def\do#1{\ifinlist{#1}\blx@cites{}{\blx@logreq@active{}}\relax}%
   \dolistloop\blx@lastcites
-  % Special case - if we are using sortingtemplate "none" anywhere, then changes
+  % Special case - if we are using sortscheme "none" anywhere, then changes
   % in citation order matter and we need to re-run biber. So a special test
   % to see if the cites from last run are identical in order. We have
   % already tested for more or less cites between runs by now, we are
   % testing here for exactly the same cites by treating the cite and
   % lastcite lists as strings and comparing them. This doesn't apply
-  % to biblist sortingtemplates as nobody wants to sort biblists with
+  % to biblist sortschemes as nobody wants to sort biblists with
   % "none", since it makes no sense
-  \ifinlist{none}\blx@sortingtemplatenames
+  \ifinlist{none}\blx@sortschemes
     {\ifdefstrequal{\blx@cites}{\blx@lastcites}
       {}
       {\blx@logreq@active{}}}
@@ -7296,31 +7002,29 @@
           % regenerates localnumber requiring another run but then
           % the pagebreaks change back again ... etc.
           \ifcsundef{blx@defer@\the\c@refsection @\blx@refcontext@context @\abx@field@entrykey}
-            {\ifundef\abx@field@localnumber
-               {}
-                {\listxadd\blx@localnumaux{%
-                   \string\abx@aux@number%
-                     {\the\c@instcount}%
-                     {\abx@field@entrykey}%
-                     {\the\c@refsection}%
-                     {\blx@refcontext@context}%
-                     {\abx@field@localnumber}}%
-                   % record that we have already generated and output localnum
-                   % for this key in this refsection/refcontext
-                   \csgdef{blx@defer@\the\c@refsection @\blx@refcontext@context @\abx@field@entrykey}{}}}
+            {\listxadd\blx@localnumaux{%
+               \string\abx@aux@number%
+                 {\the\c@instcount}%
+                 {\abx@field@entrykey}%
+                 {\the\c@refsection}%
+                 {\blx@refcontext@context}%
+                 {\abx@field@localnumber}}%
+               % record that we have already generated and output localnum
+               % for this key in this refsection/refcontext
+               \csgdef{blx@defer@\the\c@refsection @\blx@refcontext@context @\abx@field@entrykey}{}}
            {}}
          {}}%
        {}}
     {}%
   \endgroup}
 
-% {<datalistname>}
-\def\blx@bbl@dlist[#1]#2{%
+% {<sortlistname>}
+\def\blx@bbl@slist[#1]#2{%
   \begingroup
-  \def\blx@dlist@type{#1}%
-  \def\blx@dlist@name{#2}}
+  \def\blx@slist@type{#1}%
+  \def\blx@slist@name{#2}}
 
-\def\blx@bbl@enddlist{%
+\def\blx@bbl@endslist{%
   \csnumgdef{blx@labelnumber@\the\c@refsection}{0}%
   \endgroup}
 
@@ -7490,8 +7194,9 @@
 \define@key{blx@bib1}{prenote}{}
 \define@key{blx@bib1}{postnote}{}
 \define@key{blx@bib1}{omitnumbers}[]{}
+\define@key{blx@bib1}{prefixnumbers}{}%LEGACY(<3.4) legacy name for labelprefix
 % Here we are using the first pass to see if there is an explicit setting for resetnumbers
-% If there isn't we will use the default behaviour where if there is a labelprefix,
+% If there isn't we will use the default behaviour where if there is a labelprefix, 
 % resetnumbers will default to "true"
 \define@key{blx@bib1}{resetnumbers}[true]{%
   \toggletrue{blx@resetnumsexplicit}}
@@ -7519,6 +7224,10 @@
 \define@key{blx@biblist2}{section}{}
 \define@key{blx@biblist2}{sorting}{}
 
+\define@key{blx@bib1}{sorting}{%
+  \blx@warning@noline{%
+    sorting option to \string\printbibliography\space is no longer supported, use 'sorting' option to \string\newrefcontext}}
+
 \define@key{blx@bib1}{section}{%
   \ifcsundef{blx@sections@#1}
     {\blx@err@nosec{#1}}
@@ -7531,6 +7240,10 @@
     {\c@refsection#1\relax
      \def\blx@tempe{#1}}}
 
+\define@key{blx@biblist1}{sorting}{%
+  \blx@warning@noline{%
+    sorting option to \string\printbiblist\space is no longer supported, use 'sorting' option to \string\newrefcontext}}
+
 \define@key{blx@bbg}{section}{%
   \ifcsundef{blx@sections@#1}
     {\blx@err@nosec{#1}}
@@ -7749,6 +7462,10 @@
           Ignoring 'omitnumbers=true'}}}
     {}}
 
+\define@key{blx@bib2}{prefixnumbers}{%
+  \blx@warning@noline{%
+    prefixnumbers option to \string\printbibliography\space is no longer supported, use 'labelprefix' option to \string\newrefcontext}}
+
 % [<options>]
 \newrobustcmd*{\printbibheading}{%
   \begingroup
@@ -7791,8 +7508,21 @@
   \let\blx@thetitle\@empty
   % defaults
   \let\blx@tempa\@empty% before there is a .bbl, this must not be undef
+  \edef\blx@tempd{%
+    \blx@xml@sorting{%
+      \ifcsdef{blx@sortdef@locale@\blx@refcontext@sorting}
+        { locale="\csuse{blx@sortdef@locale@\blx@refcontext@sorting}"}
+        {}}{%
+      \csuse{blx@sorting@\blx@refcontext@sorting}}}% default to context
   \edef\blx@tempe{\the\c@refsection}% default refsection is current
   \blx@safe@actives
+  \edef\blx@tempd{%
+    \blx@xml@sorting{%
+      \ifcsdef{blx@sortdef@locale@\blx@refcontext@sorting}
+        { locale="\csuse{blx@sortdef@locale@\blx@refcontext@sorting}"}
+        {}}{%
+       \csuse{blx@sorting@\blx@refcontext@sorting}}}%
+  % 
   \togglefalse{blx@resetnumsexplicit}%
   \setkeys{blx@bib1}{#1}% First pass options keys - section and resetnumbers
   % Is there a user-specified option for resetnumbers? If so, this overrides the default
@@ -7803,9 +7533,9 @@
       {}
       {\setkeys{blx@bib2}{resetnumbers}}}%
   \blx@rest@actives
-  \ifcsvoid{blx@dlist@entry@\blx@tempe @\blx@refcontext@context}
+  \ifcsvoid{blx@slist@entry@\blx@tempe @\blx@refcontext@context}
     {}
-    {\letcs\blx@tempa{blx@dlist@entry@\blx@tempe @\blx@refcontext@context}}%
+    {\letcs\blx@tempa{blx@slist@entry@\blx@tempe @\blx@refcontext@context}}%
   \blx@safe@actives
   % Must reset omitnumbers as it's a global macro and if we don't, any
   % \printbibliography following one with this set will inherit any
@@ -7813,12 +7543,8 @@
   \togglefalse{blx@omitnumbers}%
   \setkeys{blx@bib2}{#1}% ... now we have correct \blx@tempa, set rest of options
   \blx@rest@actives
-  % Add datalist to list of seen datalists to prevent duplicates
-  \xifinlist{\blx@refcontext@context @entry}\blx@dlistnames
-    {}
-    {\listxadd\blx@dlistnames{\blx@refcontext@context @entry}%
-     \csxappto{blx@dlists}{%
-       \blx@xml@dlist{\blx@refcontext@context}{entry}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@refcontext@sortingtemplatename}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{}}}%
+  \csxappto{blx@slists}{%
+    \blx@xml@slist{\blx@refcontext@context}{entry}{\blx@tempe}{\blx@refcontext@sorting}{\blx@refcontext@sortingnamekey}{\blx@refcontext@labelprefix}{\blx@tempd}{}}%
   \ifdefvoid\blx@tempa
     {\blx@warn@bibempty\endgroup}
     {\blx@bibliography\blx@tempa}}
@@ -7849,11 +7575,11 @@
   \blx@refsections}
 
 \def\blx@refsections{%
-  \ifcsvoid{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}
+  \ifcsvoid{blx@slist@entry@\the\c@refsection @\blx@refcontext@context}
     {}
     {\toggletrue{blx@tempa}%
      \begingroup
-     \expandafter\blx@bibliography\csname blx@dlist@entry@\the\c@refsection @\blx@refcontext@context\endcsname}%
+     \expandafter\blx@bibliography\csname blx@slist@entry@\the\c@refsection @\blx@refcontext@context\endcsname}%
   \ifnum\c@refsection<\blx@maxsection
     \advance\c@refsection\@ne
     \expandafter\blx@refsections
@@ -7893,9 +7619,9 @@
     {\toggletrue{blx@tempa}%
      \begingroup
      \let\blx@tempa\@empty
-     \ifcsvoid{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}
+     \ifcsvoid{blx@slist@entry@\the\c@refsection @\blx@refcontext@context}
        {}
-       {\letcs\blx@tempa{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}}%
+       {\letcs\blx@tempa{blx@slist@entry@\the\c@refsection @\blx@refcontext@context}}%
      \blx@filter\blx@tempa{blx@segm@\the\c@refsection @\the\c@refsegment}%
      \blx@bibliography\blx@tempa}%
   \ifnum\c@refsegment<\csname blx@maxsegment@\the\c@refsection\endcsname
@@ -7939,9 +7665,9 @@
      \begingroup
      \blx@key@heading{#1}%
      \let\blx@tempa\@empty
-     \ifcsvoid{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}
+     \ifcsvoid{blx@slist@entry@\the\c@refsection @\blx@refcontext@context}
        {}
-       {\letcs\blx@tempa{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}}%
+       {\letcs\blx@tempa{blx@slist@entry@\the\c@refsection @\blx@refcontext@context}}%
      \blx@filter\blx@tempa{blx@catg@#1}%
      \blx@bibliography\blx@tempa}}%
 
@@ -8175,6 +7901,14 @@
 
 \appto\blx@mknohyperref{\let\blx@anchor\relax}
 
+% Legacy alias for \printshorthands
+\def\printshorthands{%
+  \@ifnextchar[%]
+    {\blx@printshorthands}
+    {\blx@printshorthands[]}}
+
+\def\blx@printshorthands[#1]{\printbiblist[#1]{shorthand}}
+
 % Custom bibliography list
 % [<otions>]{biblistname}
 \newrobustcmd*{\printbiblist}[2][]{%
@@ -8191,33 +7925,42 @@
   \let\blx@thetitle\@empty
   % defaults
   \let\blx@tempa\@empty% before there is a .bbl, this must not be undef
-  % default sorting template and template name for list is same name as list
+  % default sorting scheme and scheme name for list is same name as list
   % name, then current context if not found
   \edef\blx@tempc{%
-    \ifcsdef{blx@sortingtemplate@#2}
+    \ifcsdef{blx@sorting@#2}
       {#2}
-      {\blx@refcontext@sortingtemplatename}}%
-  % locally define this since we want to fetch data from the datalist named
+      {\blx@refcontext@sorting}}%
+  % locally define this since we want to fetch data from the slist named
   % after the list we are printing rather than the data in refcontext list
-  \edef\blx@refcontext@context{\blx@tempc/\blx@refcontext@sortingnamekeytemplatename/\blx@refcontext@labelprefix/\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}%
-  \xifinlist\blx@tempc\blx@sortingtemplatenames
-    {}
-    {\listxadd\blx@sortingtemplatenames\blx@tempc}%
+  \edef\blx@refcontext@context{\blx@tempc/\blx@refcontext@sortingnamekey/\blx@refcontext@labelprefix}%
+  \edef\blx@tempd{%
+    \blx@xml@sorting
+      {\ifcsdef{blx@sortdef@locale@#2}
+        { locale="\csuse{blx@sortdef@locale@#2}"}
+        {}}
+      {\csuse{blx@sorting@\blx@tempc}}}%
   \let\blx@printbibchecks\relax
   \edef\blx@tempe{\the\c@refsection}% default refsection is current
   \blx@safe@actives
   \blx@printbibchecks
-  % Add the sortingtemplate to the list of sortingtemplates for this biblist
+  % Add the sortscheme to the list of sortschemes for this biblist
   % so we can compare on next run
   \xifinlist\blx@tempc\blx@biblists
     {}
     {\listxadd\blx@biblists\blx@tempc
      \blx@auxwrite\@mainaux{}{\string\abx@aux@biblist{\blx@tempc}}}%
+  \edef\blx@tempd{%
+    \blx@xml@sorting{%
+      \ifcsdef{blx@sortdef@locale@\blx@tempc}
+        { locale="\csuse{blx@sortdef@locale@\blx@tempc}"}
+        {}}{%
+      \csuse{blx@sorting@\blx@tempc}}}%
   \setkeys{blx@biblist1}{#1}% Set section only, if present ...
   \blx@rest@actives
-  \ifcsvoid{blx@dlist@list@\blx@tempe @\blx@refcontext@context}
+  \ifcsvoid{blx@slist@list@\blx@tempe @\blx@refcontext@context}
     {}
-    {\letcs\blx@tempa{blx@dlist@list@\blx@tempe @\blx@refcontext@context}}%
+    {\letcs\blx@tempa{blx@slist@list@\blx@tempe @\blx@refcontext@context}}%
   \blx@safe@actives
   \setkeys{blx@biblist2}{#1}% ... now we have correct \blx@tempa, set rest of options
   \ifundef\blx@bibcheck
@@ -8226,12 +7969,8 @@
       {}}
     {}%
   \blx@rest@actives
-  % Add datalist to list of seen datalists to prevent duplicates
-  \xifinlist{\blx@refcontext@context @list}\blx@dlistnames
-    {}
-    {\listxadd\blx@dlistnames{\blx@refcontext@context @list}%
-     \csxappto{blx@dlists}{%
-       \blx@xml@dlist{\blx@refcontext@context}{list}{\blx@tempe}{\blx@xml@dlist@refcontext{\blx@tempc}{\blx@refcontext@sortingnamekeytemplatename}{\blx@refcontext@labelprefix}{\blx@refcontext@uniquenametemplatename}{\blx@refcontext@labelalphanametemplatename}}{\csuse{blx@biblistfilters@#2}}}}%
+  \csxappto{blx@slists}{%
+    \blx@xml@slist{\blx@refcontext@context}{list}{\blx@tempe}{\blx@tempc}{\blx@refcontext@sortingnamekey}{\blx@refcontext@labelprefix}{\blx@tempd}{\csuse{blx@biblistfilters@#2}}}%
   \ifdefvoid\blx@tempa
     {\blx@warn@biblistempty{#2}\endgroup}
     {\blx@biblist\blx@tempa}}
@@ -8272,6 +8011,12 @@
   \endgroup
   \if@restonecol\twocolumn\fi}
 
+% Legacy aliases
+\def\AtBeginShorthands{\AtBeginBiblist{shorthand}}
+\def\AtEveryLositem{\AtEveryBiblistitem{shorthand}}
+\@onlypreamble\AtBeginShorthands
+\@onlypreamble\AtEveryLositem
+
 % {<biblistname>}
 \newrobustcmd*{\AtBeginBiblist}[1]{\csgappto{blx@hook@biblistinit@#1}}
 \newrobustcmd*{\AtEveryBiblistitem}[1]{\csgappto{blx@hook@biblistitem@#1}}
@@ -8341,50 +8086,35 @@
        {\edef\z{\noexpand\setkeys{blx@refcontext}{\csuse{blx@refcontext@name@#2}}}\z}%
      % Override with explicit refcontext keyvals, if given
      \setkeys{blx@refcontext}{#1}%
-     % Add the sortingtemplate to the list of sortingtemplates so we can track
+     % Add the sortscheme to the list of sortschemes so we can track
      % special cases like sorting=none which need cite order change detection
-     \xifinlist\blx@refcontext@sortingtemplatename\blx@sortingtemplatenames
+     \xifinlist\blx@refcontext@sorting\blx@sortschemes
        {}
-       {\listxadd\blx@sortingtemplatenames\blx@refcontext@sortingtemplatename}%
-     \xdef\blx@refcontext@context{\blx@refcontext@sortingtemplatename/\blx@refcontext@sortingnamekeytemplatename/\blx@refcontext@labelprefix/\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}%
+       {\listxadd\blx@sortschemes\blx@refcontext@sorting
+        \blx@auxwrite\@mainaux{}{\string\abx@aux@sortscheme{\blx@refcontext@sorting}}}%
+     \xdef\blx@refcontext@context{\blx@refcontext@sorting/\blx@refcontext@sortingnamekey/\blx@refcontext@labelprefix}%
      % Add the refcontext to the list of refcontexts so we can compare on next run
      \xifinlist\blx@refcontext@context\blx@refcontexts
        {}
        {\listxadd\blx@refcontexts\blx@refcontext@context
         \blx@auxwrite\@mainaux{}{\string\abx@aux@refcontext{\blx@refcontext@context}}}%
-     \ifcsundef{blx@sortingtemplate@\blx@refcontext@sortingtemplatename}
-       {\blx@err@invopt{sorting=\blx@refcontext@sortingtemplatename}{}}
-       {}%
-     \ifcsundef{blx@sortingnamekeytemplate@\blx@refcontext@sortingnamekeytemplatename}
-       {\blx@err@invopt{sortingnamekeytemplate=\blx@refcontext@sortingnamekeytemplatename}{}}
+     \ifcsundef{blx@sorting@\blx@refcontext@sorting}
+       {\blx@err@invopt{sorting=\blx@refcontext@sorting}{}}
        {}%
-     \ifcsundef{blx@uniquenametemplate@\blx@refcontext@uniquenametemplatename}
-       {\blx@err@invopt{uniquenametemplate=\blx@refcontext@uniquenametemplatename}{}}
-       {}%
-     \ifcsundef{blx@labelalphanametemplate@\blx@refcontext@labelalphanametemplatename}
-       {\blx@err@invopt{labelalphanametemplate=\blx@refcontext@labelalphanametemplatename}{}}
+     \ifcsundef{blx@sortingnamekey@\blx@refcontext@sortingnamekey}
+       {\blx@err@invopt{sortingnamekeyscheme=\blx@refcontext@sortingnamekey}{}}
        {}}}
 
 % Reset to global sorting etc. when we leave a ref context (since they can't be nested)
 \protected\def\endrefcontext{%
   \togglefalse{blx@refcontext}%
   \global\let\blx@refcontext@labelprefix\@empty
-  \xdef\blx@refcontext@sortingtemplatename{\blx@sorting}%
-  \gdef\blx@refcontext@sortingnamekeytemplatename{global}%
-  \gdef\blx@refcontext@uniquenametemplatename{global}%
-  \gdef\blx@refcontext@labelalphanametemplatename{global}%
-  \xdef\blx@refcontext@context{\blx@refcontext@sortingtemplatename/\blx@refcontext@sortingnamekeytemplatename//\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}}
-
-% Meta option to set all name template options
-\define@key{blx@refcontext}{nametemplates}{%
-  \gdef\blx@refcontext@sortingnamekeytemplatename{#1}%
-  \gdef\blx@refcontext@uniquenametemplatename{#1}%
-  \gdef\blx@refcontext@labelalphanametemplatename{#1}}
-
-\define@key{blx@refcontext}{sorting}{\gdef\blx@refcontext@sortingtemplatename{#1}}
-\define@key{blx@refcontext}{sortingnamekeytemplatename}{\gdef\blx@refcontext@sortingnamekeytemplatename{#1}}
-\define@key{blx@refcontext}{uniquenametemplatename}{\gdef\blx@refcontext@uniquenametemplatename{#1}}
-\define@key{blx@refcontext}{labelalphanametemplatename}{\gdef\blx@refcontext@labelalphanametemplatename{#1}}
+  \xdef\blx@refcontext@sorting{\blx@sorting}%
+  \gdef\blx@refcontext@sortingnamekey{global}%
+  \xdef\blx@refcontext@context{\blx@refcontext@sorting/\blx@refcontext@sortingnamekey/}}
+
+\define@key{blx@refcontext}{sorting}{\gdef\blx@refcontext@sorting{#1}}
+\define@key{blx@refcontext}{sortingnamekeyscheme}{\gdef\blx@refcontext@sortingnamekey{#1}}
 \define@key{blx@refcontext}{labelprefix}{%
   \gdef\blx@refcontext@labelprefix{#1}%
   \iftoggle{blx@defernumbers}
@@ -8394,6 +8124,11 @@
           Option 'labelprefix' requires global\MessageBreak
           'defernumbers=true'}}
        {}}}
+\define@key{blx@refcontext}{prefixnumbers}{%LEGACY(<3.3)
+  \blx@warning@noline{%
+    prefixnumbers option to \string\newrefcontext\space has been renamed,
+    use 'labelprefix' option instead}%
+  \setkeys{blx@refcontext}{labelprefix=#1}}
 
 % [refcontext keys]{<keyword1>,<keyword2>,...}
 \newcommand*{\assignrefcontextkeyws}{%
@@ -8405,12 +8140,10 @@
   \edef\blx@tempa{\blx@sorting}%
   \def\blx@tempb{global}%
   \let\blx@tempc\@empty%
-  \def\blx@tempd{global}%
-  \def\blx@tempe{global}%
   \setkeys{blx@assignrefcontext}{#2}%
   \def\do##1{%
     \listxadd\blx@assignedrefcontextkeywlist{##1}%
-    \csxdef{blx@assignedrefcontextkeyws#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc/\blx@tempd/\blx@tempe}}
+    \csxdef{blx@assignedrefcontextkeyws#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc}}
   \docsvlist{#3}}
 
 % [refcontext keys]{<category1>,<category2>,...}
@@ -8423,12 +8156,10 @@
   \edef\blx@tempa{\blx@sorting}%
   \def\blx@tempb{global}%
   \let\blx@tempc\@empty%
-  \def\blx@tempd{global}%
-  \def\blx@tempe{global}%
   \setkeys{blx@assignrefcontext}{#2}%
   \def\do##1{%
     \listxadd\blx@assignedrefcontextcatlist{##1}%
-    \csxdef{blx@assignedrefcontextcats#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc/\blx@tempd/\blx@tempe}}
+    \csxdef{blx@assignedrefcontextcats#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc}}
   \docsvlist{#3}}
 
 % [refcontext keys]{<entrykey1>,<entrykey2>,...}
@@ -8441,24 +8172,14 @@
   \edef\blx@tempa{\blx@sorting}%
   \def\blx@tempb{global}%
   \let\blx@tempc\@empty%
-  \def\blx@tempd{global}%
-  \def\blx@tempe{global}%
   \setkeys{blx@assignrefcontext}{#2}%
   \def\do##1{%
-    \csxdef{blx@assignedrefcontextkeys#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc/\blx@tempd/\blx@tempe}}%
+    \csxdef{blx@assignedrefcontextkeys#1@\the\c@refsection @##1}{\blx@tempa/\blx@tempb/\blx@tempc}}%
   \docsvlist{#3}}
 
-% Meta option to set all name template options
-\define@key{blx@assignrefcontext}{nametemplates}{%
-  \def\blx@tempb{#1}%
-  \def\blx@tempd{#1}%
-  \def\blx@tempe{#1}}
-
 \define@key{blx@assignrefcontext}{sorting}{\def\blx@tempa{#1}}
-\define@key{blx@assignrefcontext}{sortingnamekeytemplatename}{\def\blx@tempb{#1}}
+\define@key{blx@assignrefcontext}{sortingnamekeyscheme}{\def\blx@tempb{#1}}
 \define@key{blx@assignrefcontext}{labelprefix}{\def\blx@tempc{#1}}
-\define@key{blx@assignrefcontext}{uniquenametemplatename}{\def\blx@tempd{#1}}
-\define@key{blx@assignrefcontext}{labelalphanametemplatename}{\def\blx@tempe{#1}}
 
 % Reference sections
 \newrobustcmd*{\newrefsection}{%
@@ -8923,13 +8644,33 @@
 \protected\def\abx@aux@segm#1#2#3{%
   \listcsxadd{blx@segm@#1@#2}{\detokenize{#3}}}
 
+\def\blx@citation@set#1#2{%
+  \blx@citation@entry{#1}{#2}%
+  \begingroup
+  \def\do##1{\blx@citation@entry{##1}\blx@msg@cundef}%
+  \expandafter\expandafter\expandafter\docsvlist
+  \expandafter\expandafter\expandafter{%
+    \csname blx@setp@\the\c@refsection @#1\endcsname}%
+  \endgroup}
+
+\def\blx@citation@inset#1#2{%
+  \blx@citation@entry{#1}{#2}%
+  \expandafter\expandafter\expandafter\blx@citation@inset@i
+  \expandafter\expandafter\expandafter{%
+    \csname blx@setc@\the\c@refsection @#1\endcsname}\blx@msg@cundef}
+
+\def\blx@citation@inset@i#1{%
+  \ifcsdef{blx@setp@\the\c@refsection @#1}
+    {\blx@citation@set{#1}}
+    {\blx@citation@entry{#1}}}
+
 \def\blx@citation@all{%
   \ifbool{citerequest}
     {\blx@bibreq{*}%
      \global\csletcs
        {blx@segm@\the\c@refsection @\the\c@refsegment}
-       {blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}%
-      \ifcsvoid{blx@dlist@entry@\the\c@refsection @\blx@refcontext@context}
+       {blx@slist@entry@\the\c@refsection @\blx@refcontext@context}%
+      \ifcsvoid{blx@slist@entry@\the\c@refsection @\blx@refcontext@context}
        {\blx@logreq@active{}}
        {}}
     {}}
@@ -8986,8 +8727,6 @@
 % {<entrykey>,...}
 \protected\def\blx@citeloop#1{%
   \begingroup
-  % This must be here and not after \blx@citeadd as this changes the refcontext
-  \letcs\blx@tempb{blx@dlist@centry@\the\c@refsection @\blx@refcontext@context}%
   % Make sure this counter exists. Sometimes it might not when using, e.g:
   % refsection=chapter and \includeonly to put in the chapters or when
   % inserting citations into table of contents
@@ -9004,9 +8743,8 @@
     \ifnum\blx@tempcntb>\z@
       \multicitedelim
     \fi
-  \else
-    \blx@postpunct@saved
   \fi
+  \letcs\blx@tempb{blx@slist@centry@\the\c@refsection @\blx@refcontext@context}%
   % \blx@tempb is a sorted list of all cites, \blx@tempa is the list of cites to
   % sort using this list
   \blx@thecitesort
@@ -9061,7 +8799,7 @@
   % refcontext defined
   \ifcsdef{blx@assignedrefcontextbib@\the\c@refsection @#1}
     {\letcs\blx@refcontext@context{blx@assignedrefcontextbib@\the\c@refsection @#1}}
-    {\edef\blx@refcontext@context{\blx@sorting/global//global/global}}%
+    {\edef\blx@refcontext@context{\blx@sorting/global/}}%
   % assignment via keyword list
   \ifdef\blx@assignedrefcontextkeywlist
     {\def\do##1{%
@@ -9149,7 +8887,6 @@
   \ifnum\c@citecount=\c@citetotal
     \def\blx@thecheckpunct{\blx@err@nestcite\@gobble}%
     \blx@postcode
-    \blx@postpunct@saved
   \fi
   \blx@endlangcite
   \endgroup
@@ -9807,8 +9544,7 @@
     \def\blx@precode{\delimcontext{#1}#2}%
     \def\blx@loopcode{#3}%
     \def\blx@dlimcode{#4}%
-    \def\blx@postcode{#5}%
-    \def\blx@postpunct@saved{##4}%
+    \def\blx@postcode{#5##4}%
     \blx@citeloop{##3}%
     \endgroup}}
 
@@ -10070,10 +9806,9 @@
        \abx@missing{#5}}
       {\printnames[#4]{#5}}}%
   \def\blx@dlimcode{\multicitedelim}%
-  \def\blx@postpunct@saved{#6}%
   \ifblank{#2}
-    {\let\blx@postcode\@empty}
-    {\def\blx@postcode{\usebibmacro{postnote}}}%
+    {\def\blx@postcode{#6}}
+    {\def\blx@postcode{\usebibmacro{postnote}#6}}%
   \boolfalse{citetracker}%
   \boolfalse{pagetracker}%
   \blx@citeloop{#3}%
@@ -10098,10 +9833,9 @@
        \abx@missing{#5}}
       {\printlist[#4]{#5}}}%
   \def\blx@dlimcode{\multicitedelim}%
-  \def\blx@postpunct@saved{#6}%
   \ifblank{#2}
-    {\let\blx@postcode\@empty}
-    {\def\blx@postcode{\usebibmacro{postnote}}}%
+    {\def\blx@postcode{#6}}
+    {\def\blx@postcode{\usebibmacro{postnote}#6}}%
   \boolfalse{citetracker}%
   \boolfalse{pagetracker}%
   \blx@citeloop{#3}%
@@ -10127,10 +9861,9 @@
        \abx@missing{#5}}
       {\printfield[#4]{#5}}}%
   \def\blx@dlimcode{\multicitedelim}%
-  \def\blx@postpunct@saved{#6}%
   \ifblank{#2}
-    {\let\blx@postcode\@empty}
-    {\def\blx@postcode{\usebibmacro{postnote}}}%
+    {\def\blx@postcode{#6}}
+    {\def\blx@postcode{\usebibmacro{postnote}#6}}%
   \boolfalse{citetracker}%
   \boolfalse{pagetracker}%
   \blx@citeloop{#3}%
@@ -10224,13 +9957,7 @@
     \def\ifuniquebaretitle{\blx@TE{\iftoggle{abx@bool@uniquebaretitle}}}%
     \def\ifuniquework{\blx@TE{\iftoggle{abx@bool@uniquework}}}%
     \def\ifuniqueprimaryauthor{\blx@TE{\iftoggle{abx@bool@uniqueprimaryauthor}}}%
-    \def\ifandothers#1{\blx@TE{\iftoggle{abx@bool@more#1}}}%
-    \def\iflabeldateisdate{\blx@TE\blx@imc@iflabeldateisdate}%
-    \def\ifdatehasyearonlyprecision#1{%
-      \blx@TE{\blx@imc@ifdatehasyearonlyprecision{#1}}}%
-    \def\ifdatehastime#1{\blx@TE{\blx@imc@ifdatehastime{#1}}}%
-    \def\ifdateshavedifferentprecision#1#2{%
-      \blx@TE{\blx@imc@ifdateshavedifferentprecision{#1}{#2}}}}}
+    \def\ifandothers#1{\blx@TE{\iftoggle{abx@bool@more#1}}}}}
 
 % {<listmacro>}{<filtercsname>} => matches in <listmacro>
 \protected\def\blx@bibfilter#1#2{%
@@ -10649,7 +10376,7 @@
   ~~~~~~~~<bcf:map\string_step#1/>\blx@nl}
 
 \xdef\blx@xml@labelalphanametemplate#1#2{%
-  ~~<bcf:labelalphanametemplate name="#1">\blx@nl
+  ~~<bcf:labelalphanametemplate type="#1">\blx@nl
   #2%
   ~~</bcf:labelalphanametemplate>\blx@nl}
 \xdef\blx@xml@labelalphanametemplatenamepart#1#2#3{%
@@ -10666,17 +10393,6 @@
 \xdef\blx@xml@labelalpha@part#1#2{%
   ~~~~~~<bcf:labelpart#1>#2</bcf:labelpart>\blx@nl}
 
-\xdef\blx@xml@extradate#1{%
-  ~~<bcf:extradatespec>\blx@nl
-  #1%
-  ~~</bcf:extradatespec>\blx@nl}
-\xdef\blx@xml@extradatescope#1{%
-  ~~~~<bcf:scope>\blx@nl
-  #1%
-  ~~~~</bcf:scope>\blx@nl}
-\xdef\blx@xml@edordered#1#2{%
-  ~~~~~~<bcf:field order="#1">#2</bcf:field>\blx@nl}
-
 \xdef\blx@xml@inheritance#1{%
   ~~<bcf:inheritance>\blx@nl
   #1%
@@ -10724,18 +10440,18 @@
 \xdef\blx@xml@nolabelwidthcount#1{%
   ~~~~<bcf:nolabelwidthcount value="#1"/>\blx@nl}
 
-\xdef\blx@xml@uniquenametemplate#1#2{%
-  ~~<bcf:uniquenametemplate name="#1">\blx@nl%
-  #2%
+\xdef\blx@xml@uniquenametemplate#1{%
+  ~~<bcf:uniquenametemplate>\blx@nl%
+  #1%
   ~~</bcf:uniquenametemplate>\blx@nl}
 
 \xdef\blx@xml@uniquenametemplatenamepart#1#2#3{%
   ~~~~<bcf:namepart #1#2>#3</bcf:namepart>\blx@nl}
 
-\xdef\blx@xml@sortingnamekeytemplate#1#2{%
-  ~~<bcf:sortingnamekeytemplate name="#1">\blx@nl%
+\xdef\blx@xml@sortingnamekey#1#2{%
+  ~~<bcf:sortingnamekey keyscheme="#1">\blx@nl%
   #2%
-  ~~</bcf:sortingnamekeytemplate>\blx@nl}
+  ~~</bcf:sortingnamekey>\blx@nl}
 
 \xdef\blx@xml@sortingnamekeykeypart#1#2{%
   ~~~~<bcf:keypart#1>\blx@nl
@@ -10748,26 +10464,26 @@
 \xdef\blx@xml@sortingnamekeyliteral#1#2{%
   ~~~~~~<bcf:part type="literal"#1>#2</bcf:part>\blx@nl}
 
-\xdef\blx@xml@sortingtemplate#1#2#3{%
-  ~~<bcf:sortingtemplate name="#1"#2>\blx@nl%
-  #3%
-  ~~</bcf:sortingtemplate>\blx@nl}
+\xdef\blx@xml@sorting#1#2{%
+  ~~<bcf:sorting#1>\blx@nl%
+  #2%
+  ~~</bcf:sorting>\blx@nl}
 \xdef\blx@xml@presort#1#2{%
-  ~~<bcf:presort\noexpand\ifblank{#1}{}{ type="#1"}>%
+  ~~~~<bcf:presort\noexpand\ifblank{#1}{}{ type="#1"}>%
   #2</bcf:presort>\blx@nl}
 
 \xdef\blx@xml@sortexclude#1#2{%
-  ~~<bcf:sortexclusion\noexpand\ifblank{#1}{}{ type="#1"}>\blx@nl
+  ~~~~<bcf:sortexclusion\noexpand\ifblank{#1}{}{ type="#1"}>\blx@nl
   #2%
-  ~~</bcf:sortexclusion>\blx@nl}
+  ~~~~</bcf:sortexclusion>\blx@nl}
 \xdef\blx@xml@exclude#1{%
-  ~~~~<bcf:exclusion>#1</bcf:exclusion>\blx@nl}
+  ~~~~~~<bcf:exclusion>#1</bcf:exclusion>\blx@nl}
 \xdef\blx@xml@sortinclude#1#2{%
-  ~~<bcf:sortinclusion\noexpand\ifblank{#1}{}{ type="#1"}>\blx@nl
+  ~~~~<bcf:sortinclusion\noexpand\ifblank{#1}{}{ type="#1"}>\blx@nl
   #2%
-  ~~</bcf:sortinclusion>\blx@nl}
+  ~~~~</bcf:sortinclusion>\blx@nl}
 \xdef\blx@xml@include#1{%
-  ~~~~<bcf:inclusion>#1</bcf:inclusion>\blx@nl}
+  ~~~~~~<bcf:inclusion>#1</bcf:inclusion>\blx@nl}
 \xdef\blx@xml@sort#1#2{%
   ~~~~<bcf:sort #1>\blx@nl
   #2%
@@ -10779,24 +10495,17 @@
 \xdef\blx@xml@endsection{%
   ~~</bcf:section>}
 
-\xdef\blx@xml@dlist@refcontext#1#2#3#4#5{%
-  ~~~~~~~~~~~~~~~~sortingtemplatename="#1"\blx@nl
-  ~~~~~~~~~~~~~~~~sortingnamekeytemplatename="#2"\blx@nl
-  ~~~~~~~~~~~~~~~~labelprefix="#3"\blx@nl
-  ~~~~~~~~~~~~~~~~uniquenametemplatename="#4"\blx@nl
-  ~~~~~~~~~~~~~~~~labelalphanametemplatename="#5"}
-\xdef\blx@xml@dlist#1#2#3#4#5{%
-  ~~<bcf:datalist section="#3"\blx@nl
-  ~~~~~~~~~~~~~~~~name="#1"\blx@nl
-  ~~~~~~~~~~~~~~~~type="#2"\blx@nl
-  #4>\blx@nl
-  #5%
-  ~~</bcf:datalist>\blx@nl}
-\xdef\blx@xml@dlistfilterorbegin{%
+\xdef\blx@xml@slist#1#2#3#4#5#6#7#8{%
+  ~~<bcf:sortlist section="#3" name="#1" type="#2" sortscheme="#4"
+  sortnamekeyscheme="#5" labelprefix="#6">\blx@nl
+  #8%
+  #7%
+  ~~</bcf:sortlist>\blx@nl}
+\xdef\blx@xml@slistfilterorbegin{%
   ~~~~<bcf:filteror>\blx@nl}
-\xdef\blx@xml@dlistfilterorend{%
+\xdef\blx@xml@slistfilterorend{%
   ~~~~</bcf:filteror>\blx@nl}
-\xdef\blx@xml@dlistfilter#1#2{%
+\xdef\blx@xml@slistfilter#1#2{%
   ~~~~<bcf:filter type="#1">#2</bcf:filter>\blx@nl}
 
 \xdef\blx@xml@bibdata#1#2{%
@@ -10851,8 +10560,7 @@
     \blx@xml@toggle{singletitle}%
     \blx@xml@svalue{sortalphaothers}{\sortalphaothers}%
     \blx@xml@svalue{sortlocale}{\blx@sortlocale}%
-    \blx@xml@svalue{sortingtemplatename}{\blx@sorting}%
-    \blx@xml@toggle{sortsets}%
+    \blx@xml@svalue{sortscheme}{\blx@sorting}%
     \blx@xml@svalue{uniquelist}{\blx@uniquelist}%
     \blx@xml@svalue{uniquename}{\blx@uniquename}%
     \blx@xml@toggle{uniqueprimaryauthor}%
@@ -11021,56 +10729,68 @@
          {}}}}
   {}%
   % labelalpha name template
-  \eappto\blx@tempa{\blx@xml@comment{LABELALPHA NAME TEMPLATE}}%
+  \eappto\blx@tempa{%
+    \blx@xml@comment{LABELALPHA NAME TEMPLATE}}%
   \def\do##1{%
     \eappto\blx@tempa{%
-      \blx@xml@labelalphanametemplate{##1}{\csuse{blx@labelalphanametemplate@##1}}}}%
-  \dolistloop\blx@lantemplatespecs
+      \blx@xml@labelalphanametemplate{##1}{%
+      \csuse{blx@labelalphanametemplate@##1}}%
+      }%
+    }%
+  \dolistloop\blx@lantem@type
   % labelalpha template
   \eappto\blx@tempa{%
     \blx@xml@comment{LABELALPHA TEMPLATE}}%
   \def\do##1{%
     \eappto\blx@tempa{%
       \blx@xml@labelalphatemplate{##1}{%
-      \csuse{blx@labelalphatemplate@##1}}}}%
+      \csuse{blx@labelalphatemplate@##1}}%
+      }%
+    }%
   \dolistloop\blx@latem@type
-  % extradate specification
-  \eappto\blx@tempa{%
-    \blx@xml@comment{EXTRADATE}%
-    \blx@xml@extradate{\csuse{blx@bcf@extradatespec}}}%
   % data inheritance
   \eappto\blx@tempa{%
     \blx@xml@comment{INHERITANCE}%
     \blx@xml@inheritance{%
       \csuse{blx@inherit@default}%
-      \csuse{blx@inherit@data}}}%
+      \csuse{blx@inherit@data}%
+    }%
+  }%
   % noinit
   \ifcsdef{blx@noinit}
     {\eappto\blx@tempa{%
       \blx@xml@comment{NOINIT}%
       \blx@xml@noinits{%
-        \csuse{blx@noinit}}}}%
+        \csuse{blx@noinit}%
+      }%
+    }}
     {}%
   % nolabel
   \ifcsdef{blx@nolabel}
     {\eappto\blx@tempa{%
       \blx@xml@comment{NOLABEL}%
       \blx@xml@nolabels{%
-        \csuse{blx@nolabel}}}}%
+        \csuse{blx@nolabel}%
+      }%
+    }}
     {}%
   % nolabel
   \ifcsdef{blx@nolabelwidthcount}
     {\eappto\blx@tempa{%
       \blx@xml@comment{NOLABELWIDTHCOUNT}%
       \blx@xml@nolabelwidthcounts{%
-        \csuse{blx@nolabelwidthcount}}}}%
+        \csuse{blx@nolabelwidthcount}%
+      }%
+    }}
     {}%
   % nosort
   \ifcsdef{blx@nosort}
     {\eappto\blx@tempa{%
       \blx@xml@comment{NOSORT}%
       \blx@xml@nosorts{%
-        \csuse{blx@nosort}}}}%
+        \csuse{blx@nosort}%
+      }%
+    }}
     {}%
   % transliteration
   \ifdefempty\blx@translits
@@ -11080,18 +10800,16 @@
        \eappto\blx@tempa{\blx@xml@transliteration{##1}{\csuse{blx@translit@##1}}}}%
      \dolistloop\blx@translits}%
   % uniquenametemplate
-  \eappto\blx@tempa{\blx@xml@comment{UNIQUENAME TEMPLATES}}%
-  \def\do##1{%
-    \eappto\blx@tempa{%
-      \blx@xml@uniquenametemplate{##1}{\csuse{blx@uniquenametemplate@##1}}}}%
-  \dolistloop\blx@untemplatespecs
-  % sortingnamekeytemplate
-  \eappto\blx@tempa{\blx@xml@comment{SORTING NAME KEY TEMPLATES}}%
+  \eappto\blx@tempa{\blx@xml@comment{UNIQUENAME TEMPLATE}}%
+  \eappto\blx@tempa{\blx@xml@uniquenametemplate{\blx@uniquenametemplate}}%
+  % sortingnamekey
+  \eappto\blx@tempa{\blx@xml@comment{SORTING NAME KEY}}%
   \def\do##1{%
     \eappto\blx@tempa{%
-      \blx@xml@sortingnamekeytemplate{##1}{\csuse{blx@sortingnamekeytemplate@##1}}}}%
-  \dolistloop\blx@sortingnamekeytemplates
-  % presort/sorting excludes/sorting includes
+      \blx@xml@sortingnamekey{##1}{%
+        \csuse{blx@sortingnamekey@##1}}}}%
+  \dolistloop\blx@sortingnamekeyspecs
+  % sorting
   \def\do##1{%
     \eappto\blx@bcf@presort{\csuse{blx@bcf@presort@##1}}%
     \eappto\blx@bcf@exclude{\csuse{blx@bcf@exclude@##1}}%
@@ -11099,9 +10817,14 @@
   \abx@doentrytypes
   \do{*}% entrytype wildcard
   \eappto\blx@tempa{%
-    \blx@bcf@presort
-    \blx@bcf@exclude
-    \blx@bcf@include}%
+    \blx@xml@comment{SORTING}%
+    \blx@xml@sorting{}{%
+      \blx@bcf@presort
+      \blx@bcf@exclude
+      \blx@bcf@include
+      \csuse{blx@sorting@\blx@sorting}%
+    }%
+  }%
   % datamodel
   \eappto\blx@tempa{%
     \blx@xml@comment{DATA MODEL}%
@@ -11133,18 +10856,9 @@
   \global\undef\blx@tempa
   \endgroup
   \AfterEndDocument{%
-    \def\do##1{%
-      \csxappto{blx@sortingtemplates}{%
-        \blx@xml@sortingtemplate{##1}
-                        {\ifcsdef{blx@sortdef@locale@##1}{ locale="\csuse{blx@sortdef@locale@##1}"}{}}
-                        {\csuse{blx@sortingtemplate@##1}}}}%
-      \dolistloop\blx@sortingtemplatenames
     \blx@auxwrite\blx@bcfout{}{%
       \blx@xml@endsection\blx@nl
-      \blx@xml@comment{SORTING TEMPLATES}%
-      \csuse{blx@sortingtemplates}%
-      \blx@xml@comment{DATALISTS}%
-      \csuse{blx@dlists}%
+      \csuse{blx@slists}%
       \blx@xml@endfile}%
     \immediate\closeout\blx@bcfout}}
 
@@ -11433,25 +11147,29 @@
 \define@key{blx@sourcemap@step}{replace}{% characters
   \eappto\blx@tempf{ map\string_replace="#1"}}
 
-% [<specname>]{<spec>}
+% [<entrytype>]{<spec>}
 \newrobustcmd*{\DeclareLabelalphaNameTemplate}[2][]{%
+   \ifblank{#1}
+     {\blx@lantem{#2}{global}}
+     {\forcsvlist{\blx@lantem{#2}}{#1}}}
+\@onlypreamble\DeclareLabelalphaNameTemplate
+\blx@collectopts{xml}{blx@globalopts}{labelalphanametemplate}% for passing to the .bcf
+\blx@collectopts{xml}{blx@typeopts}{labelalphanametemplate}% for passing to the .bcf
+
+\def\blx@lantem#1#2{%
   \begingroup
-  \ifblank{#1}
-    {\def\blx@lantname{global}}% default
-    {\def\blx@lantname{#1}}%
   \let\namepart\blx@lantem@namepart
   \let\blx@tempa\@empty
   \blx@tempcnta\z@
-  #2%
-  \global\cslet{blx@labelalphanametemplate@\blx@lantname}\blx@tempa
-  \xifinlist\blx@lantname\blx@lantemplatespecs
-    {}
-    {\listxadd\blx@lantemplatespecs\blx@lantname}%
+  #1%
+  \ifdef\blx@lantem@type
+    {\ifinlist{#2}\blx@lantem@type
+      {\global\cslet{blx@labelalphanametemplate@#2}\blx@tempa}
+      {\listgadd\blx@lantem@type{#2}%
+       \global\cslet{blx@labelalphanametemplate@#2}\blx@tempa}}
+    {\listgadd\blx@lantem@type{#2}%
+     \global\cslet{blx@labelalphanametemplate@#2}\blx@tempa}%
   \endgroup}
-\@onlypreamble\DeclareLabelalphaNameTemplate
-\blx@collectopts{xml}{blx@globalopts}{labelalphanametemplate}% for passing to the .bcf
-\DeclareEntryOption[string]{labelalphanametemplatename}{%
-  \def\blx@refcontext@labelalphanametemplatename{#1}}
 
 \newcommand*{\blx@lantem@namepart}[2][]{%
   \advance\blx@tempcntb\@ne
@@ -11532,6 +11250,23 @@
   \eappto\blx@tempb{%
     \blx@xml@labelalpha@part{\blx@tempc}{#2}}}
 
+% Legacy options moved to \namepart in \DeclareLabelalphaNameTemplate
+\define@key{blx@latem@field}{compound}{% deprecated
+  \blx@warning@noline{%
+    Ignored 'compound' option to \string\field\space in \string\DeclareLabelalphaNameTemplate\MessageBreak
+    This is now the 'compound' option of \string\namepart\space in\MessageBreak
+    \string\DeclareLabelalphaNameTemplate}}
+\define@key{blx@latem@field}{pcompound}{% deprecated
+  \blx@warning@noline{%
+    Ignored 'pcompound' option to \string\field\space in \string\DeclareLabelalphaNameTemplate\MessageBreak
+    This is now the 'compound' option of \string\namepart\space in\MessageBreak
+    \string\DeclareLabelalphaNameTemplate}}
+\define@key{blx@latem@field}{pstrwidth}{% deprecated
+  \blx@warning@noline{%
+    Ignored 'pstrwidth' option to \string\field\space in \string\DeclareLabelalphaNameTemplate\MessageBreak
+    This is now the 'strwidth' option of \string\namepart\space in\MessageBreak
+    \string\DeclareLabelalphaNameTemplate}}
+
 \define@key{blx@latem@field}{uppercase}[true]{% true|false
   \ifstrequal{#1}{true}
     {\appto\blx@tempc{ uppercase="1"}}
@@ -11691,16 +11426,16 @@
 \@onlypreamble\DeclareBiblistFilter
 
 \newcommand*{\blx@biblistfilteror}[1]{%
-  \eappto\blx@tempa{\blx@xml@dlistfilterorbegin}%
+  \eappto\blx@tempa{\blx@xml@slistfilterorbegin}%
   #1%
-  \eappto\blx@tempa{\blx@xml@dlistfilterorend}}
+  \eappto\blx@tempa{\blx@xml@slistfilterorend}}
 
 \newcommand*{\blx@biblistfilter}[1][2]{%
   \let\blx@tempc\@empty
   \let\blx@tempd\@empty
   \setkeys{blx@biblistfilter@filter}{#1}%
   \eappto\blx@tempa{%
-    \blx@xml@dlistfilter{\blx@tempc}{\blx@tempd}}}
+    \blx@xml@slistfilter{\blx@tempc}{\blx@tempd}}}
 
 \define@key{blx@biblistfilter@filter}{type}{%
   \def\blx@tempc{#1}}
@@ -11733,25 +11468,17 @@
   \eappto\blx@tempb{%
     \blx@xml@translit{#1}{#2}{#3}}}
 
-% [<specname>]{<spec>}
-\newrobustcmd*{\DeclareUniquenameTemplate}[2][]{%
+% {<spec>}
+\newrobustcmd*{\DeclareUniquenameTemplate}[1]{%
   \begingroup
-  \ifblank{#1}
-    {\def\blx@untname{global}}% default
-    {\def\blx@untname{#1}}%
   \let\namepart\blx@untemp@namepart
   \let\blx@tempa\@empty
   \blx@tempcnta\z@
-  #2%
-  \global\cslet{blx@uniquenametemplate@\blx@untname}\blx@tempa
-  \xifinlist\blx@untname\blx@untemplatespecs
-    {}
-    {\listxadd\blx@untemplatespecs\blx@untname}%
+  #1%
+  \global\let\blx@uniquenametemplate\blx@tempa
   \endgroup}
 \@onlypreamble\DeclareUniquenameTemplate
 \blx@collectopts{xml}{blx@globalopts}{uniquenametemplate}% for passing to the .bcf
-\DeclareEntryOption[string]{uniquenametemplatename}{%
-  \def\blx@refcontext@uniquenametemplatename{#1}}
 
 \newcommand*{\blx@untemp@namepart}[2][]{%
   \advance\blx@tempcntb\@ne
@@ -11773,11 +11500,8 @@
     {\appto\blx@tempc{ base="1"}}
     {}}
 
-\define@key{blx@untemp@namepart}{disambiguation}{% disambiguation option for namepart none|inits|full|fullonly
-  \appto\blx@tempc{ disambiguation="#1"}}
-
-% [<templatename>]{<template>}
-\newrobustcmd*{\DeclareSortingNamekeyTemplate}[2][]{%
+% [<specname>]{<spec>}
+\newrobustcmd*{\DeclareSortingNamekeyScheme}[2][]{%
   \begingroup
   \ifblank{#1}
     {\def\blx@snkname{global}}% default
@@ -11788,23 +11512,19 @@
   \let\blx@tempa\@empty
   \blx@tempcnta\z@
   #2%
-  \global\cslet{blx@sortingnamekeytemplate@\blx@snkname}\blx@tempa
-  \xifinlist\blx@snkname\blx@sortingnamekeytemplates
+  \global\cslet{blx@sortingnamekey@\blx@snkname}\blx@tempa
+  \xifinlist\blx@snkname\blx@sortingnamekeyspecs
     {}
-    {\listxadd\blx@sortingnamekeytemplates\blx@snkname}%
+    {\listxadd\blx@sortingnamekeyspecs\blx@snkname}%
   \endgroup}
-\@onlypreamble\DeclareSortingNamekeyTemplate
-\blx@collectopts{xml}{blx@globalopts}{sortingnamekeytemplate}% for passing to the .bcf
-\DeclareEntryOption[string]{sortingnamekeytemplatename}{%
-  \def\blx@refcontext@sortingnamekeytemplatename{#1}}
-
-% User-mode macro for checking sorting name template options
-\def\ifuniquenametemplatename#1{%
-  \expandafter\ifstrequal\expandafter{\blx@refcontext@uniquenametemplatename}{#1}}
-\def\iflabelalphanametemplatename#1{%
-  \expandafter\ifstrequal\expandafter{\blx@refcontext@labelalphanametemplatename}{#1}}
-\def\ifsortingnamekeytemplatename#1{%
-  \expandafter\ifstrequal\expandafter{\blx@refcontext@sortingnamekeytemplatename}{#1}}
+\@onlypreamble\DeclareSortingNamekeyScheme
+\blx@collectopts{xml}{blx@globalopts}{sortingnamekey}% for passing to the .bcf
+\DeclareEntryOption[string]{sortnamekeyscheme}{%
+  \def\blx@refcontext@sortingnamekey{#1}}
+
+% User-mode macro for checking sorting name key scheme
+\def\ifsortnamekeyscheme#1{%
+  \expandafter\ifstrequal\expandafter{\blx@refcontext@sortingnamekey}{#1}}
 
 \newcommand*{\blx@sortnk@keypart}[1]{%
   \advance\blx@tempcnta\@ne
@@ -11842,8 +11562,8 @@
     {\appto\blx@tempc{ inits="1"}}
     {\appto\blx@tempc{ inits="0"}}}
 
-% [options]{<templatename>}{<template>}
-\newrobustcmd*{\DeclareSortingTemplate}[3][]{%
+% {<name>}{<spec>}
+\newrobustcmd*{\DeclareSortingScheme}[3][]{%
   \ifblank{#1}
     {}
     {\setkeys{blx@sortdef@sorting}{#1}%
@@ -11864,10 +11584,10 @@
   \blx@tempcnta\z@
   \let\blx@tempa\@empty
   #3%
-  \global\cslet{blx@sortingtemplate@#2}\blx@tempa
+  \global\cslet{blx@sorting@#2}\blx@tempa
   \endgroup}
-\@onlypreamble\DeclareSortingTemplate
-\blx@collectopts{xml}{blx@globalopts}{sortingtemplate}% for passing to the .bcf
+\@onlypreamble\DeclareSortingScheme
+\blx@collectopts{xml}{blx@globalopts}{sortscheme}% for passing to the .bcf
 
 \define@key{blx@sortdef@sorting}{locale}{% locale name
   \def\blx@templ{#1}}
@@ -11936,6 +11656,7 @@
     \blx@xml@sortitem{order="\the\blx@tempcntb"}{\blx@tempe}}}
 
 % [<type,type,...>]{<string>}
+
 \newrobustcmd*{\DeclarePresort}[2][]{%
   \begingroup
   \blx@xmlsanitizeafter{\def\blx@tempa}{#2}%
@@ -11993,29 +11714,6 @@
 \def\blx@sortinclude@i#1{%
   \appto\blx@tempa{\blx@xml@include{#1}}}
 
-% {<field,field,...>}
-\newrobustcmd*{\DeclareExtradate}[1]{%
-  \begingroup
-  \let\blx@tempa\@empty
-  \let\scope\blx@extradate@scope
-  #1%
-  \global\let\blx@bcf@extradatespec\blx@tempa
-  \endgroup}
-\@onlypreamble\DeclareExtradate
-\blx@collectopts{xml}{blx@globalopts}{extradatespec}% for passing to the .bcf
-
-\newrobustcmd*{\blx@extradate@scope}[1]{%
-  \let\blx@tempb\@empty
-  \let\field\blx@ordereded@field
-  #1%
-  \csxappto{blx@tempa}{%
-    \noexpand\blx@xml@extradatescope{\blx@tempb}}}
-
-\newcommand*{\blx@ordereded@field}[1]{%
-  \advance\blx@tempcnta\@ne
-    \csxappto{blx@tempb}{%
-      \noexpand\blx@xml@edordered{\the\blx@tempcnta}{#1}}}
-
 % [<type,type,...>]{<field,field,...>}
 \newrobustcmd*{\DeclareLabelname}[2][]{%
   \begingroup
@@ -12049,6 +11747,10 @@
 \blx@collectopts{xml}{blx@globalopts}{labeltitlespec}% for passing to the .bcf
 \blx@collectopts{xml}{blx@typeopts}{labeltitlespec}% for passing to the .bcf
 
+\newrobustcmd*{\DeclareLabelyear}[2][]{%
+  \blx@warning@noline{%
+    'DeclareLabelyear' is deprecated, please use 'DeclareLabeldate'}}
+
 \newrobustcmd*{\DeclareLabeldate}[2][]{%
   \begingroup
   \let\blx@tempa\@empty
@@ -12212,29 +11914,21 @@
   \settoggle{blx@safeinputenc}{#1}}
 \newtoggle{blx@safeinputenc}
 
-% global "sorting" option becomes "sortingtemplatename" in the .bcf and so
-% don't use \DeclareBibliographyOption. This is a legacy naming issue
-% unlikely to be corrected as "sorting" is an obvious name for biblatex users
-% "sorting" is used in the .bcf for the actual sorting template definitions and is
-% an XML format option
-\define@key{blx@opt@pre}{sorting}{%
+\DeclareBibliographyOption[string]{sorting}{%
   \def\blx@sorting{#1}%
-  \def\blx@refcontext@sortingtemplatename{#1}}
-\blx@collectopts{string}{blx@globalopts}{sortingtemplatename}% for passing to the .bcf
+  \def\blx@refcontext@sorting{#1}}
 
 \AtEndPreamble{%
-  \ifcsdef{blx@sortingtemplate@\blx@sorting}
+  \ifcsdef{blx@sorting@\blx@sorting}
     {}
     {\blx@err@invopt{sorting=\blx@sorting}{}%
      \def\blx@sorting{nty}%
-     \def\blx@refcontext@sortingtemplatename{nty}}%
-  \listxadd\blx@sortingtemplatenames\blx@sorting
-  \def\blx@refcontext@sortingnamekeytemplatename{global}%
-  \let\blx@refcontext@labelprefix\@empty
-  \def\blx@refcontext@uniquenametemplatename{global}%
-  \def\blx@refcontext@labelalphanametemplatename{global}%
-  \xdef\blx@refcontext@context{\blx@refcontext@sortingtemplatename/\blx@refcontext@sortingnamekeytemplatename/\blx@refcontext@labelprefix/\blx@refcontext@uniquenametemplatename/\blx@refcontext@labelalphanametemplatename}%
-  \listxadd\blx@refcontexts\blx@refcontext@context}
+     \def\blx@refcontext@sorting{nty}}%
+     \listxadd\blx@sortschemes\blx@sorting
+     \def\blx@refcontext@sortingnamekey{global}%
+     \let\blx@refcontext@labelprefix\@empty
+     \xdef\blx@refcontext@context{\blx@refcontext@sorting/\blx@refcontext@sortingnamekey/\blx@refcontext@labelprefix}%
+     \listxadd\blx@refcontexts\blx@refcontext@context}
 
 \DeclareBibliographyOption[boolean]{sortcase}[true]{%
   \settoggle{blx@sortcase}{#1}}
@@ -12242,6 +11936,10 @@
 \DeclareBibliographyOption[boolean]{sortupper}[true]{%
   \settoggle{blx@sortupper}{#1}}
 
+\DeclareBibliographyOption[string]{sortlos}{%
+  \blx@warning@noline{%
+    sortlos option is deprecated, use 'sorting' option to \string\printbiblist}}
+
 \DeclareBibliographyOption[integer]{maxnames}{%
   \numdef\blx@maxcitenames{#1}%
   \numdef\blx@maxbibnames{#1}}
@@ -12384,6 +12082,22 @@
      #3=#4}
     {}}
 
+% Legacy for giveninits
+\DeclareBibliographyOption[boolean]{firstinits}[true]{%
+  \blx@warning@noline{%
+    'firstinits' option is deprecated, use 'giveninits' instead}%
+  \settoggle{abx@bool@giveninits}{#1}}
+
+% Legacy for sortfirstinits/sortgiveninits
+\DeclareBibliographyOption[boolean]{sortfirstinits}[true]{%
+  \blx@warning@noline{%
+    'sortfirstinits' option is deprecated, use 'inits' option\MessageBreak
+    to \string\namepart\space in \string\DeclareSortingNamekeyScheme}}
+\DeclareBibliographyOption[boolean]{sortgiveninits}{%
+  \blx@warning@noline{%
+    'sortgiveninits' option is deprecated, use 'inits' option\MessageBreak
+    to \string\namepart\space in \string\DeclareSortingNamekeyScheme}}
+
 \DeclareBibliographyOption[boolean]{terseinits}[true]{%
   \ifstrequal{#1}{true}
     {\toggletrue{blx@terseinits}
@@ -12445,6 +12159,11 @@
 \DeclareBibliographyOption[boolean]{clearlang}[true]{%
   \settoggle{blx@clearlang}{#1}}
 
+\DeclareBibliographyOption[string]{babel}{%
+  \blx@warning@noline{%
+    'babel' option is deprecated, use 'autolang' instead}%
+  \blx@autolang@i{#1}}
+
 \DeclareBibliographyOption[string]{autolang}{%
   \blx@autolang@i{#1}}
 
@@ -12507,9 +12226,6 @@
     {\let\blx@thecitesort\blx@citenosort
      \let\blx@thenotecheck\relax}}
 
-\DeclareBibliographyOption[boolean]{sortsets}[true]{%
-  \settoggle{blx@sortsets}{#1}}
-
 \DeclareBibliographyOption[boolean]{hyperref}[true]{%
   \ifcsdef{blx@opt@hyperref@#1}
     {\letcs\blx@hyperref{blx@opt@hyperref@#1}}
@@ -12517,35 +12233,6 @@
 \def\blx@opt@hyperref@false{0}
 \def\blx@opt@hyperref@true{1}
 \def\blx@opt@hyperref@auto{2}
-\def\blx@opt@hyperref@manual{3}
-
-\def\blx@warn@usedmanualhyperrefs#1{%
-  \blx@warning@noline{The command '\string#1' can\MessageBreak
-    only be used with 'hyperref=manual'}}
-\def\blx@warn@multiplemanualhyperrefs{%
-  \blx@warning@noline{You must call either '\string\BiblatexManualHyperrefOn'\MessageBreak
-    or '\string\BiblatexManualHyperrefOff' exactly once.\MessageBreak
-    Subsequent calls to either command will be ignored}}
-\def\BiblatexManualHyperrefOn{%
-  \ifnum\blx@hyperref=\thr@@
-    \blx@mkhyperref
-    \global\undef\blx@mkhyperref
-    \global\undef\blx@mknohyperref
-    \global\let\BiblatexManualHyperrefOn\blx@warn@multiplemanualhyperrefs
-    \global\let\BiblatexManualHyperrefOff\blx@warn@multiplemanualhyperrefs
-  \else
-    \blx@warn@usedmanualhyperrefs{\BiblatexManualHyperrefOn}%
-  \fi}
-\def\BiblatexManualHyperrefOff{%
-  \ifnum\blx@hyperref=\thr@@
-    \blx@mknohyperref
-    \global\undef\blx@mkhyperref
-    \global\undef\blx@mknohyperref
-    \global\let\BiblatexManualHyperrefOn\blx@warn@multiplemanualhyperrefs
-    \global\let\BiblatexManualHyperrefOff\blx@warn@multiplemanualhyperrefs
-  \else
-    \blx@warn@usedmanualhyperrefs{\BiblatexManualHyperrefOff}%
-  \fi}
 
 \DeclareBibliographyOption[boolean]{backref}[true]{%
   \ifstrequal{#1}{true}
@@ -12839,7 +12526,7 @@
      test {\ifstrequal{#1}{false}}}
      {\blx@warning@noline{%
        'labeldate' option used to determine whether to provide label date fields and\MessageBreak
-       extradate field is renamed to 'labeldateparts', setting this instead. This option is
+       extrayear field is renamed to 'labeldateparts', setting this instead. This option is
        now used to set the format of the labeldate}%
       \settoggle{blx@labeldateparts}{#1}}
      {\ifstrequal{#1}{iso8601}
@@ -12864,6 +12551,11 @@
           \protected\def\blx@imc@printlabeldateextra{\csuse{mkbibrange#1extra}{label}}}
          {\blx@err@invopt{labeldate=#1}{}}}}}
 
+\DeclareBibliographyOption[string]{datelabel}{%
+  \blx@warning@noline{%
+    'datelabel' option is deprecated, use 'labeldate' instead}%
+  \setkeys{blx@opt@pre}{labeldate=#1}}
+
 \DeclareBibliographyOption[string]{labeltime}{%
   \ifcsdef{mktimerange#1}
     {\def\blx@timeformat@labeltime{#1}%
@@ -13079,6 +12771,15 @@
 \DeclareTypeOption[boolean]{labeldateparts}[true]{%
   \settoggle{blx@labeldateparts}{#1}}
 
+\DeclareBibliographyOption[boolean]{labelyear}[true]{%
+  \blx@warning@noline{%
+    'labelyear' option is deprecated, use 'labeldateparts' instead}%
+  \settoggle{blx@labeldateparts}{#1}}
+\DeclareTypeOption[boolean]{labelyear}[true]{%
+  \blx@warning@noline{%
+    'labelyear' option is deprecated, use 'labeldateparts' instead}%
+  \settoggle{blx@labeldateparts}{#1}}
+
 \DeclareBibliographyOption[boolean]{uniquelist}[true]{%
   \ifcsdef{blx@opt@uniquelist@#1}
     {\letcs\blx@uniquelist{blx@opt@uniquelist@#1}}
@@ -13252,6 +12953,15 @@
 \DeclareEntryOption[boolean]{skipbib}[true]{%
   \settoggle{blx@skipbib}{#1}}
 
+\DeclareTypeOption[boolean]{skiplos}{%
+  \blx@warning@noline{%
+    skiplos option is deprecated, use 'skipbiblist' instead}%
+  \settoggle{blx@skipbiblist}{#1}}
+\DeclareEntryOption[boolean]{skiplos}{%
+  \blx@warning@noline{%
+    skiplos option is deprecated, use 'skipbiblist' instead}%
+  \settoggle{blx@skipbiblist}{#1}}
+
 \DeclareTypeOption[boolean]{skipbiblist}[true]{%
   \settoggle{blx@skipbiblist}{#1}}
 \DeclareEntryOption[boolean]{skipbiblist}[true]{%
@@ -13482,6 +13192,7 @@
 
 % Deferred last minute setup
 \AtBeginDocument{%
+  \blx@auxwrite\@mainaux{}{\string\abx@aux@sortscheme{\blx@sorting}}%
   \blx@auxwrite\@mainaux{}{\string\abx@aux@refcontext{\blx@refcontext@context}}
   \blx@checkencoding
   \if@filesw
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def
index 13fcee24063..a96aa733775 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-bibtex.def
@@ -199,7 +199,7 @@
 \protected\def\blx@bibreq#1{%
   \blx@auxwrite\blx@aux{}{\string\citation{#1}}}
 
-% bibtex doesn't parse ISO8601 dates so these overrides do nothing
+% bibtex doesn't parse EDTF dates so these overrides do nothing
 \appto\blx@blxinit{%
   \def\iflabeldateera#1{\@secondoftwo}%
   \def\iflabelenddateera#1{\@secondoftwo}%
@@ -356,26 +356,6 @@
        {}}
     {}}
 
-\def\blx@citation@set#1#2{%
-  \blx@citation@entry{#1}{#2}%
-  \begingroup
-  \def\do##1{\blx@citation@entry{##1}\blx@msg@cundef}%
-  \expandafter\expandafter\expandafter\docsvlist
-  \expandafter\expandafter\expandafter{%
-    \csname blx@setp@\the\c@refsection @#1\endcsname}%
-  \endgroup}
-
-\def\blx@citation@inset#1#2{%
-  \blx@citation@entry{#1}{#2}%
-  \expandafter\expandafter\expandafter\blx@citation@inset@i
-  \expandafter\expandafter\expandafter{%
-    \csname blx@setc@\the\c@refsection @#1\endcsname}\blx@msg@cundef}
-
-\def\blx@citation@inset@i#1{%
-  \ifcsdef{blx@setp@\the\c@refsection @#1}
-    {\blx@citation@set{#1}}
-    {\blx@citation@entry{#1}}}
-  
 \def\blx@citation@xref#1{%
   \begingroup
   \edef\blx@tempa{blx@refp@\the\c@refsection @%
@@ -443,7 +423,6 @@
 % Disable some interfaces
 
 \renewrobustcmd*{\DeclareSortingScheme}[3][]{}
-\renewrobustcmd*{\DeclareExtradate}[1]{}
 
 \def\blx@checkencoding{}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
index 54fb9d14d31..dfead5ff694 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-compat.def
@@ -50,43 +50,19 @@
      {}%
    \DeclareOption{bibtotoc}{%
      \let\ifkomabibtotoc=\@firstoftwo
-     \let\ifkomabibtotocnumbered=\@secondoftwo}%
+     \let\ifkomabibtotocnumbered=\@secondoftwo}
    \DeclareOption{bibtotocnumbered}{%
      \let\ifkomabibtotoc=\@firstoftwo
      \let\ifkomabibtotocnumbered=\@firstoftwo}%
-   \DeclareOption{bibliography=notoc}{%
-     \let\ifkomabibtotoc=\@secondoftwo
-     \let\ifkomabibtotocnumbered=\@secondoftwo}%
-   \DeclareOption{bibliography=nottotoc}{%
-     \let\ifkomabibtotoc=\@secondoftwo
-     \let\ifkomabibtotocnumbered=\@secondoftwo}%
-   \DeclareOption{bibliography=plainheading}{%
-     \let\ifkomabibtotoc=\@secondoftwo
-     \let\ifkomabibtotocnumbered=\@secondoftwo}%
    \DeclareOption{bibliography=totoc}{%
      \let\ifkomabibtotoc=\@firstoftwo
-     \let\ifkomabibtotocnumbered=\@secondoftwo}%
-   \DeclareOption{bibliography=toc}{%
-     \let\ifkomabibtotoc=\@firstoftwo
-     \let\ifkomabibtotocnumbered=\@secondoftwo}%
-   \DeclareOption{bibliography=notnumbered}{%
-     \let\ifkomabibtotoc=\@firstoftwo
-     \let\ifkomabibtotocnumbered=\@secondoftwo}%
-   \DeclareOption{bibliography=numbered}{%
-     \let\ifkomabibtotoc=\@firstoftwo
-     \let\ifkomabibtotocnumbered=\@firstoftwo}%
+     \let\ifkomabibtotocnumbered=\@secondoftwo}
+   \DeclareOption{bibliography=nottotoc}{%
+     \let\ifkomabibtotoc=\@secondoftwo
+     \let\ifkomabibtotocnumbered=\@secondoftwo}
    \DeclareOption{bibliography=totocnumbered}{%
      \let\ifkomabibtotoc=\@firstoftwo
      \let\ifkomabibtotocnumbered=\@firstoftwo}%
-   \DeclareOption{bibliography=tocnumbered}{%
-     \let\ifkomabibtotoc=\@firstoftwo
-     \let\ifkomabibtotocnumbered=\@firstoftwo}%
-   \DeclareOption{bibliography=numberedtotoc}{%
-     \let\ifkomabibtotoc=\@firstoftwo
-     \let\ifkomabibtotocnumbered=\@firstoftwo}%
-   \DeclareOption{bibliography=numberedtoc}{%
-     \let\ifkomabibtotoc=\@firstoftwo
-     \let\ifkomabibtotocnumbered=\@firstoftwo}%
    \DeclareOption{bibliography=oldstyle}{%
      \ExecuteBibliographyOptions{block=space}}%
    \DeclareOption{bibliography=openstyle}{%
@@ -143,192 +119,4 @@
 \define@key{blx@bbg}{minitems}{\blx@warn@depropt{minitems}}
 \define@key{blx@bbc}{minitems}{\blx@warn@depropt{minitems}}
 
-% Legacy alias for \printshorthands
-\def\printshorthands{%
-  \@ifnextchar[%]
-    {\blx@printshorthands}
-    {\blx@printshorthands[]}}
-
-\def\blx@printshorthands[#1]{\printbiblist[#1]{shorthand}}
-
-% Legacy aliases
-\def\AtBeginShorthands{\AtBeginBiblist{shorthand}}
-\def\AtEveryLositem{\AtEveryBiblistitem{shorthand}}
-\@onlypreamble\AtBeginShorthands
-\@onlypreamble\AtEveryLositem
-
-\let\frangelen\rangelen % Legacy name for \rangelen
-
-\DeclareBibliographyOption[string]{sortlos}{%
-  \blx@warning@noline{%
-    'sortlos' option is deprecated.\MessageBreak
-    Please use 'sorting' option to '\string\printbiblist'}}
-
-\define@key{blx@bib1}{sorting}{%
-  \blx@warning@noline{%
-    'sorting' option to '\string\printbibliography' is no longer supported.\MessageBreak
-    Please use 'sorting' option to '\string\newrefcontext'}}
-
-\define@key{blx@biblist1}{sorting}{%
-  \blx@warning@noline{%
-    'sorting' option to '\string\printbiblist' is no longer supported.\MessageBreak
-    Please use 'sorting' option to '\string\newrefcontext'}}
-
-\define@key{blx@bib2}{prefixnumbers}{%
-  \blx@warning@noline{%
-    'prefixnumbers' option to '\string\printbibliography' is no longer supported.\MessageBreak
-    Please use 'labelprefix' option to '\string\newrefcontext'}}
-
-
-\DeclareBibliographyOption[string]{babel}{%
-  \blx@warning@noline{%
-    'babel' option is deprecated.\MessageBreak
-    Please use 'autolang' instead}%
-  \blx@autolang@i{#1}}
-
-\DeclareTypeOption[boolean]{skiplos}{%
-  \blx@warning@noline{%
-    skiplos option is deprecated.\MessageBreak
-    Please use 'skipbiblist' instead}%
-  \settoggle{blx@skipbiblist}{#1}}
-\DeclareEntryOption[boolean]{skiplos}{%
-  \blx@warning@noline{%
-    skiplos option is deprecated.\MessageBreak
-    Please use 'skipbiblist' instead}%
-  \settoggle{blx@skipbiblist}{#1}}
-
-% Legacy options moved to \namepart in \DeclareLabelalphaNameTemplate
-\define@key{blx@latem@field}{compound}{% deprecated
-  \blx@warning@noline{%
-    Ignored 'compound' option to '\string\field' in '\string\DeclareLabelalphaNameTemplate'\MessageBreak
-    This is now the 'compound' option of '\string\namepart\space' in\MessageBreak
-    '\string\DeclareLabelalphaNameTemplate'}}
-\define@key{blx@latem@field}{pcompound}{% deprecated
-  \blx@warning@noline{%
-    Ignored 'pcompound' option to '\string\field' in '\string\DeclareLabelalphaNameTemplate'\MessageBreak
-    This is now the 'compound' option of '\string\namepart' in\MessageBreak
-    '\string\DeclareLabelalphaNameTemplate'}}
-\define@key{blx@latem@field}{pstrwidth}{% deprecated
-  \blx@warning@noline{%
-    Ignored 'pstrwidth' option to '\string\field' in '\string\DeclareLabelalphaNameTemplate'\MessageBreak
-    This is now the 'strwidth' option of '\string\namepart' in\MessageBreak
-    '\string\DeclareLabelalphaNameTemplate'}}
-
-%LEGACY(<3.3) legacy name for \ifgiveninits which is autogenerated now
-\def\iffirstinits{
-  \blx@warning@noline{%
-    '\string\iffirstinits' is deprecated.\MessageBreak
-    Please use '\string\ifgiveninits'}%
-  \iftoggle{abx@bool@giveninits}}
-
-% Legacy for giveninits
-\DeclareBibliographyOption[boolean]{firstinits}[true]{%
-  \blx@warning@noline{%
-    'firstinits' option is deprecated.\MessageBreak
-    Please use 'giveninits' instead}%
-  \settoggle{abx@bool@giveninits}{#1}}
-
-% Legacy for sortfirstinits/sortgiveninits
-\DeclareBibliographyOption[boolean]{sortfirstinits}[true]{%
-  \blx@warning@noline{%
-    'sortfirstinits' option is deprecated.\MessageBreak
-    Please use 'inits' option to '\string\namepart\space'\MessageBreak
-    in '\string\DeclareSortingNamekeyTemplate'}}
-\DeclareBibliographyOption[boolean]{sortgiveninits}{%
-  \blx@warning@noline{%
-    'sortgiveninits' option is deprecated.\MessageBreak
-    Please use 'inits' option to '\string\namepart'\MessageBreak
-    in '\string\DeclareSortingNamekeyTemplate' instead}}
-
-\define@key{blx@refcontext}{prefixnumbers}{%LEGACY(<3.3)
-  \blx@warning@noline{%
-    prefixnumbers option to '\string\newrefcontext' has been renamed.\MessageBreak
-    Please use 'labelprefix' option instead}%
-  \setkeys{blx@refcontext}{labelprefix=#1}}
-
-% biblatex < 3.4
-\define@key{blx@bib1}{prefixnumbers}{}%LEGACY(<3.4) legacy name for labelprefix
-\DeprecateFieldWithReplacement{prefixnumber}{labelprefix}
-\DeclareFieldAlias{prefixnumber}{labelprefix}
-
-% biblatex < 3.5
-\DeclareBibliographyOption[string]{datelabel}{%
-  \blx@warning@noline{%
-    'datelabel' option is deprecated.\MessageBreak
-    Please use 'labeldate' instead}%
-  \setkeys{blx@opt@pre}{labeldate=#1}}
-
-\DeclareBibliographyOption[boolean]{labelyear}[true]{%
-  \blx@warning@noline{%
-    'labelyear' option is deprecated.\MessageBreak
-    Please use 'labeldateparts' instead}%
-  \settoggle{blx@labeldateparts}{#1}}
-\DeclareTypeOption[boolean]{labelyear}[true]{%
-  \blx@warning@noline{%
-    'labelyear' option is deprecated.\MessageBreak
-    Please use 'labeldateparts' instead}%
-  \settoggle{blx@labeldateparts}{#1}}
-
-\protected\def\mkdatezeros{%
-  \blx@warning@noline{%
-    '\string\mkdatezeros' is deprecated.\MessageBreak
-    Please use '\string\mkyearzeros', '\string\mkmonthzeros' or\MessageBreak
-    '\string\mkdayzeros' as appropriate. \MessageBreak
-    Falling back to '\string\mkmonthzeros'}%
-  \mkmonthzeros}
-
-\protected\def\printdatelabel{%
-  \blx@warning@noline{%
-    '\string\printdatelabel' is deprecated.\MessageBreak
-    Please use '\string\printlabeldate'}%
-  \blx@imc@printlabeldate}
-
-\protected\def\printdatelabelextra{%
-  \blx@warning@noline{%
-    '\string\printdatelabelextra' is deprecated.\MessageBreak
-    Please use '\string\printlabeldateextra'}%
-  \blx@imc@printlabeldateextra}
-
-\newrobustcmd*{\DeclareLabelyear}[2][]{%
-  \blx@warning@noline{%
-    'DeclareLabelyear' is deprecated.\MessageBreak
-    Please use 'DeclareLabeldate'}}
-
-\cslet{mkdaterangeiso8601}\mkdaterangeedtf% Legacy option support
-\cslet{mkdaterangeiso8601extra}\mkdaterangeedtfextra% Legacy option support
-
-\newrobustcmd*{\bibdatedash}{\bibrangedash}%LEGACY(<3.5)
-
-% biblatex < 3.8
-\define@key{blx@refcontext}{sortingnamekeyscheme}{%
-  \blx@warning@noline{'sortingnamekeyscheme' is deprecated.\MessageBreak
-    Please use 'sortingnamekeytemplatename' instead}%
-  \gdef\blx@refcontext@sortingnamekeytemplatename{#1}}
-
-\define@key{blx@assignrefcontext}{sortingnamekeyscheme}{%
-  \blx@warning@noline{'sortingnamekeyscheme' is deprecated.\MessageBreak
-    Please use 'sortingnamekeytemplatename' instead}%
-  \def\blx@tempb{#1}}
-
-\def\DeclareSortingScheme{%
-  \blx@warning@noline{%
-    '\string\DeclareSortingScheme' is deprecated.\MessageBreak
-    Please use '\string\DeclareSortingTemplate'}%
-  \DeclareSortingTemplate}
-
-\def\DeclareSortingNamekeyScheme{%
-  \blx@warning@noline{%
-    '\string\DeclareSortingNamekeyScheme' is deprecated.\MessageBreak
-    Please use '\string\DeclareSortingNamekeyTemplate'}%
-  \DeclareSortingNamekeyTemplate}
-
-\def\ifsortnamekeyscheme#1{%
-  \blx@warning@noline{%
-    '\string\ifsortnamekeyscheme' is deprecated in sorting specifications.\MessageBreak
-    Please use '\string\ifsortingnamekeytemplate'}%
-  \expandafter\ifstrequal\expandafter{\blx@refcontext@sortingnamekeytemplatename}{#1}}
-
-\DeprecateFieldWithReplacement{extrayear}{extradate}
-\DeclareFieldAlias{extrayear}{extradate}
-
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
index 959dbd398dc..7677cb148d6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
@@ -82,7 +82,7 @@
   \global\let\blx@bcf@datamodel@entryfields\@empty}
 
 \newrobustcmd*{\ResetDatamodelConstraints}{%
-  \global\let\blx@bcf@datamodel@constraints\@empty}
+  \global\letblx@bcf@datamodel@constraints\@empty}
 
 \newrobustcmd*{\DeclareDatamodelEntrytypes}[2][]{%
   \begingroup
@@ -435,7 +435,6 @@
   standard,
   suppbook,
   suppcollection,
-  suppperiodical,
   thesis,
   unpublished,
   video}
@@ -512,8 +511,9 @@
   shortseries,
   shorttitle}
 
+\DeclareDatamodelFields[type=field, datatype=integer, skipout]{sortyear}
+
 \DeclareDatamodelFields[type=field, datatype=literal, skipout]{
-  sortyear,
   sorttitle,
   sortshorthand,
   sortkey,
@@ -567,11 +567,12 @@
   nameatype,
   namebtype,
   namectype,
+  origlanguage,
   pagination,
   pubstate,
   type}
 
-\DeclareDatamodelFields[type=list, datatype=key]{language,origlanguage}
+\DeclareDatamodelFields[type=list, datatype=key]{language}
 
 \DeclareDatamodelFields[type=field, datatype=entrykey]{
   crossref,
@@ -609,21 +610,11 @@
   authortype,
   bookpagination,
   crossref,
-  day,
-  endday,
-  endhour,
-  endminute,
-  endmonth,
-  endseason,
-  endsecond,
-  endtimezone,
-  endyear,
   entryset,
   entrysubtype,
   execute,
   file,
   gender,
-  hour,
   ids,
   indextitle,
   indexsorttitle,
@@ -641,25 +632,13 @@
   listd,
   liste,
   listf,
-  minute,
-  month,
   nameaddon,
   options,
   origday,
   origendday,
-  origendhour,
-  origendminute,
   origendmonth,
-  origendseason,
-  origendsecond,
-  origendtimezone,
   origendyear,
-  orighour,
-  origminute,
   origmonth,
-  origseason,
-  origsecond,
-  origtimezone,
   origyear,
   origlocation,
   origpublisher,
@@ -670,8 +649,6 @@
   relatedoptions,
   relatedstring,
   relatedtype,
-  season,
-  second,
   shortauthor,
   shorteditor,
   shorthand,
@@ -684,22 +661,6 @@
   sortshorthand,
   sorttitle,
   sortyear,
-  timezone,
-  url,
-  urlday,
-  urlendday,
-  urlendhour,
-  urlendminute,
-  urlendmonth,
-  urlendsecond,  
-  urlendtimezone,
-  urlendyear,
-  urlhour,
-  urlminute,
-  urlmonth,
-  urlsecond,
-  urltimezone,
-  urlyear,
   usera,
   userb,
   userc,
@@ -710,17 +671,24 @@
   verbb,
   verbc,
   xdata,
-  xref,
-  year}
+  xref}
 
 \DeclareDatamodelEntryfields[set]{
   entryset,
   crossref}
 
 \DeclareDatamodelEntryfields[article]{
+  author,
+  journaltitle,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   annotator,
-  author,
   commentator,
   doi,
   editor,
@@ -740,7 +708,6 @@
   issuetitle,
   issuesubtitle,
   journalsubtitle,
-  journaltitle,
   language,
   note,
   number,
@@ -749,9 +716,15 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
   translator,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   version,
   volume}
 
@@ -759,6 +732,13 @@
 
 \DeclareDatamodelEntryfields[book]{
   author,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   afterword,
   annotator,
@@ -795,17 +775,30 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
   translator,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   volume,
   volumes}
 
 \DeclareDatamodelEntryfields[mvbook]{
+  author,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   afterword,
   annotator,
-  author,
   commentator,
   doi,
   edition,
@@ -833,18 +826,31 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
   translator,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   volume,
   volumes}
 
 \DeclareDatamodelEntryfields[inbook,bookinbook,suppbook]{
+  author,
+  title,
+  booktitle,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   afterword,
   annotator,
-  author,
-  booktitle,
   bookauthor,
   booksubtitle,
   booktitleaddon,
@@ -880,19 +886,32 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
   translator,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   volume,
   volumes}
 
 \DeclareDatamodelEntryfields[booklet]{
-  addendum,
   author,
-  chapter,
-  doi,
   editor,
   editortype,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
+  addendum,
+  chapter,
+  doi,
   eprint,
   eprintclass,
   eprinttype,
@@ -904,11 +923,25 @@
   pagetotal,
   pubstate,
   subtitle,
-  title,
   titleaddon,
-  type}
+  type,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear}
 
 \DeclareDatamodelEntryfields[collection,reference]{
+  editor,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   afterword,
   annotator,
@@ -916,7 +949,6 @@
   commentator,
   doi,
   edition,
-  editor,
   editora,
   editorb,
   editorc,
@@ -945,17 +977,30 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
   translator,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   volume,
   volumes}
 
 \DeclareDatamodelEntryfields[mvcollection,mvreference]{
+  author,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   afterword,
   annotator,
-  author,
   commentator,
   doi,
   edition,
@@ -981,25 +1026,38 @@
   publisher,
   pubstate,
   subtitle,
-  title,
   titleaddon,
   translator,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   volume,
   volumes}
 
 \DeclareDatamodelEntryfields[incollection,suppcollection,inreference]{
+  author,
+  editor,
+  title,
+  booktitle,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   afterword,
   annotator,
-  author,
   booksubtitle,
-  booktitle,
   booktitleaddon,
   chapter,
   commentator,
   doi,
   edition,
-  editor,
   editora,
   editorb,
   editorc,
@@ -1027,13 +1085,26 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
   translator,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   volume,
   volumes}
 
 \DeclareDatamodelEntryfields[manual]{
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   author,
   chapter,
@@ -1056,12 +1127,29 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
   type,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   version}
 
 \DeclareDatamodelEntryfields[misc]{
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   author,
   doi,
@@ -1077,28 +1165,59 @@
   organization,
   pubstate,
   subtitle,
-  title,
   titleaddon,
   type,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   version}
 
 \DeclareDatamodelEntryfields[online]{
+  title,
+  url,
   addendum,
   author,
   editor,
   editortype,
   language,
+  month,
   note,
   organization,
   pubstate,
   subtitle,
-  title,
   titleaddon,
-  version}
+  urlhour,
+  urlminute,
+  urlsecond,
+  urltimezone,
+  urlendhour,
+  urlendminute,
+  urlendsecond,
+  urlendtimezone,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
+  version,
+  year}
 
 \DeclareDatamodelEntryfields[patent]{
-  addendum,
   author,
+  title,
+  number,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
+  addendum,
   doi,
   eprint,
   eprintclass,
@@ -1106,18 +1225,30 @@
   holder,
   location,
   note,
-  number,
   pubstate,
   subtitle,
-  title,
   titleaddon,
   type,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   version}
 
 \DeclareDatamodelEntryfields[periodical]{
+  editor,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   doi,
-  editor,
   editora,
   editorb,
   editorc,
@@ -1136,17 +1267,29 @@
   note,
   number,
   pubstate,
-  season,
   series,
   subtitle,
-  title,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   volume}
 
 \DeclareDatamodelEntryfields[mvproceedings]{
-  addendum,
-  doi,
   editor,
   editortype,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
+  addendum,
+  doi,
   eprint,
   eprintclass,
   eprinttype,
@@ -1169,17 +1312,30 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   venue,
   volumes}
 
 \DeclareDatamodelEntryfields[proceedings]{
+  editor,
+  editortype,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
   addendum,
   chapter,
   doi,
-  editor,
-  editortype,
   eprint,
   eprintclass,
   eprinttype,
@@ -1207,22 +1363,35 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   venue,
   volume,
   volumes}
 
 \DeclareDatamodelEntryfields[inproceedings]{
-  addendum,
   author,
-  booksubtitle,
+  editor,
+  editortype,
+  title,
   booktitle,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
+  addendum,
+  booksubtitle,
   booktitleaddon,
   chapter,
   doi,
-  editor,
-  editortype,
   eprint,
   eprintclass,
   eprinttype,
@@ -1249,21 +1418,35 @@
   pubstate,
   series,
   subtitle,
-  title,
   titleaddon,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   venue,
   volume,
   volumes}
 
 \DeclareDatamodelEntryfields[report]{
-  addendum,
   author,
+  title,
+  type,
+  institution,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
+  addendum,
   chapter,
   doi,
   eprint,
   eprintclass,
   eprinttype,
-  institution,
   isrn,
   language,
   location,
@@ -1273,20 +1456,33 @@
   pagetotal,
   pubstate,
   subtitle,
-  title,
   titleaddon,
-  type,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
   version}
 
 \DeclareDatamodelEntryfields[thesis]{
-  addendum,
   author,
+  title,
+  type,
+  institution,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
+  addendum,
   chapter,
   doi,
   eprint,
   eprintclass,
   eprinttype,
-  institution,
   language,
   location,
   note,
@@ -1294,21 +1490,39 @@
   pagetotal,
   pubstate,
   subtitle,
-  title,
   titleaddon,
-  type}
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear}
 
 \DeclareDatamodelEntryfields[unpublished]{
-  addendum,
   author,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
+  addendum,
   howpublished,
   language,
   location,
   note,
   pubstate,
   subtitle,
-  title,
-  titleaddon}
+  titleaddon,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear}
 
 \DeclareDatamodelConstraints[
   article,
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
index efcc901a715..26625b06fb7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic-verb.cbx
@@ -5,18 +5,11 @@
 
 \renewcommand*{\iffinalcitedelim}{\iflastcitekey}
 
-\providebool{bbx:subentry}
-
-\DeclareFieldFormat{entrysetcount}{\mkbibparens{\mknumalph{#1}}}
-
 \newbibmacro*{cite}{%
   \printtext[bibhyperref]{%
     \printfield{labelprefix}%
     \printfield{labelalpha}%
-    \printfield{extraalpha}%
-    \ifbool{bbx:subentry}
-      {\printfield{entrysetcount}}
-      {}}}
+    \printfield{extraalpha}}}
 
 \newbibmacro*{textcite}{%
   \ifnameundef{labelname}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
index e6f4d7d4253..434986c6627 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/alphabetic.cbx
@@ -6,19 +6,13 @@
 \renewcommand*{\iffinalcitedelim}{%
   \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
 
-\providebool{bbx:subentry}
 \newbool{cbx:parens}
 
-\DeclareFieldFormat{entrysetcount}{\mkbibparens{\mknumalph{#1}}}
-
 \newbibmacro*{cite}{%
   \printtext[bibhyperref]{%
     \printfield{labelprefix}%
     \printfield{labelalpha}%
-    \printfield{extraalpha}%
-    \ifbool{bbx:subentry}
-      {\printfield{entrysetcount}}
-      {}}}
+    \printfield{extraalpha}}}
 
 \newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
@@ -37,7 +31,7 @@
   \usebibmacro{cite}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\bibclosebracket\global\boolfalse{cbx:parens}}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
 
@@ -53,11 +47,11 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\bibclosebracket\global\boolfalse{cbx:parens}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\bibclosebracket\global\boolfalse{cbx:parens}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
index 6d0daecea0a..1bf883a4196 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -25,8 +25,10 @@
   \iffieldundef{shorthand}
     {\iffieldequals{namehash}{\cbx@lasthash}
        {\setunit{\compcitedelim}}
-       {\printnames{labelname}%
-        \setunit*{\printdelim{nametitledelim}}%
+       {\ifnameundef{labelname}
+          {}
+          {\printnames{labelname}%
+           \setunit{\printdelim{nametitledelim}}}%
         \savefield{namehash}{\cbx@lasthash}}%
      \usebibmacro{cite:title}}
     {\usebibmacro{cite:shorthand}%
@@ -42,10 +44,12 @@
 \newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
     {\setunit{\compcitedelim}}
-    {\printnames{labelname}%
-     \setunit*{%
-       \global\booltrue{cbx:parens}%
-       \printdelim{nametitledelim}\bibopenparen}%
+    {\ifnameundef{labelname}
+       {}
+       {\printnames{labelname}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \printdelim{nametitledelim}\bibopenparen}}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
index 4c901a43b78..3b6618314b9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ibid.cbx
@@ -20,8 +20,10 @@
   \iffieldundef{shorthand}
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
-       {\printnames{labelname}%
-        \setunit*{\printdelim{nametitledelim}}%
+       {\ifnameundef{labelname}
+          {}
+          {\printnames{labelname}%
+           \setunit{\printdelim{nametitledelim}}}%
         \usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}}}
 
@@ -35,10 +37,12 @@
 
 \newbibmacro*{textcite}{%
   \global\boolfalse{cbx:loccit}%
-  \printnames{labelname}%
-    \setunit*{%
-      \global\booltrue{cbx:parens}%
-      \printdelim{nametitledelim}\bibopenparen}%
+  \ifnameundef{labelname}
+    {}
+    {\printnames{labelname}%
+     \setunit{%
+       \global\booltrue{cbx:parens}%
+       \printdelim{nametitledelim}\bibopenparen}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
index 3ae9a578027..2c6190900cd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-icomp.cbx
@@ -35,11 +35,13 @@
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
        {\iffieldequals{namehash}{\cbx@lasthash}
-          {\setunit{\compcitedelim}}
-          {\printnames{labelname}%
-           \setunit*{\printdelim{nametitledelim}}%
+	  {\setunit{\compcitedelim}}
+	  {\ifnameundef{labelname}
+             {}
+             {\printnames{labelname}%
+              \setunit{\printdelim{nametitledelim}}}%
            \savefield{namehash}{\cbx@lasthash}}%
-        \usebibmacro{cite:title}}}%
+	\usebibmacro{cite:title}}}%
     {\usebibmacro{cite:shorthand}%
      \usebibmacro{cite:reinit}}%
   \setunit{\multicitedelim}}
@@ -55,10 +57,12 @@
 \newbibmacro*{textcite}{%
   \iffieldequals{namehash}{\cbx@lasthash}
     {\setunit{\compcitedelim}}
-    {\printnames{labelname}%
-      \setunit*{%
-        \global\booltrue{cbx:parens}%
-        \printdelim{nametitledelim}\bibopenparen}%
+    {\ifnameundef{labelname}
+       {}
+       {\printnames{labelname}%
+        \setunit{%
+	  \global\booltrue{cbx:parens}%
+	  \printdelim{nametitledelim}\bibopenparen}}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
@@ -98,20 +102,20 @@
     {}
     {\ifnameundef{labelname}
        {\setunit{%
-          \global\booltrue{cbx:parens}%
-          \extpostnotedelim\bibopenparen}}
+	  \global\booltrue{cbx:parens}%
+	  \extpostnotedelim\bibopenparen}}
        {\setunit{\postnotedelim}}%
      \printfield{postnote}}%
   \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\bibcloseparen\global\boolfalse{cbx:parens}}
-         {}}}
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\bibcloseparen\global\boolfalse{cbx:parens}}
-         {}%
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}%
        \textcitedelim}}}
 
 \DeclareCiteCommand{\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
index bd463aa5a28..85cce7eedcd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-tcomp.cbx
@@ -17,8 +17,8 @@
           {\ifsingletitle
              {\printtext[bibhyperref]{\printnames{labelname}}}
              {\printnames{labelname}%
-              \setunit{\printdelim{nametitledelim}}%
-              \usebibmacro{cite:title}}}%
+	      \setunit{\printdelim{nametitledelim}}%
+	      \usebibmacro{cite:title}}}%
         \savefield{namehash}{\cbx@lasthash}}}
     {\usebibmacro{cite:shorthand}%
      \usebibmacro{cite:reinit}}%
@@ -42,24 +42,24 @@
        {\usebibmacro{cite:shorthand}}}
     {\ifnameundef{labelname}
        {\ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}
-          {}%
+	  {\usebibmacro{prenote}}
+	  {}%
         \iffieldundef{shorthand}
-          {\usebibmacro{cite:title}}%
-          {\usebibmacro{cite:shorthand}}}
+	  {\usebibmacro{cite:title}}%
+	  {\usebibmacro{cite:shorthand}}}
        {\ifthenelse{\ifsingletitle\AND
                     \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
           {\printtext[bibhyperref]{\printnames{labelname}}}
           {\printnames{labelname}
            \setunit{%
-             \global\booltrue{cbx:parens}%
-             \printdelim{nametitledelim}\bibopenparen}%
-           \ifnumequal{\value{citecount}}{1}
-             {\usebibmacro{prenote}}
-             {}%
-           \iffieldundef{shorthand}
-             {\usebibmacro{cite:title}}%
-             {\usebibmacro{cite:shorthand}}}}%
+	     \global\booltrue{cbx:parens}%
+	     \printdelim{nametitledelim}\bibopenparen}%
+	   \ifnumequal{\value{citecount}}{1}
+	     {\usebibmacro{prenote}}
+	     {}%
+	   \iffieldundef{shorthand}
+	     {\usebibmacro{cite:title}}%
+	     {\usebibmacro{cite:shorthand}}}}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
@@ -79,12 +79,12 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\bibcloseparen\global\boolfalse{cbx:parens}}
-         {}}}
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\bibcloseparen\global\boolfalse{cbx:parens}}
-         {}%
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}%
        \textcitedelim}}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
index 1ffd3ba454d..d83c432fd56 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-terse.cbx
@@ -11,8 +11,8 @@
        {\ifsingletitle
           {\printtext[bibhyperref]{\printnames{labelname}}}
           {\printnames{labelname}%
-           \setunit{\printdelim{nametitledelim}}%
-           \usebibmacro{cite:title}}}}%
+	   \setunit{\printdelim{nametitledelim}}%
+	   \usebibmacro{cite:title}}}}%
     {\usebibmacro{cite:shorthand}}}
 
 \renewbibmacro*{textcite}{%
@@ -27,14 +27,14 @@
                  \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
        {\printtext[bibhyperref]{\printnames{labelname}}}
        {\printnames{labelname}%
-        \setunit{%
-          \global\booltrue{cbx:parens}%
-          \printdelim{nametitledelim}\bibopenparen}%
-        \ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}
-          {}%
-        \iffieldundef{shorthand}
-          {\usebibmacro{cite:title}}%
-          {\usebibmacro{cite:shorthand}}}}}
+	\setunit{%
+	  \global\booltrue{cbx:parens}%
+	  \printdelim{nametitledelim}\bibopenparen}%
+	\ifnumequal{\value{citecount}}{1}
+	  {\usebibmacro{prenote}}
+	  {}%
+	\iffieldundef{shorthand}
+	  {\usebibmacro{cite:title}}%
+	  {\usebibmacro{cite:shorthand}}}}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
index 1fe4075cf31..54f10d6baaf 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-ticomp.cbx
@@ -12,15 +12,15 @@
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
        {\iffieldequals{namehash}{\cbx@lasthash}
-          {\setunit{\compcitedelim}%
+	  {\setunit{\compcitedelim}%
            \usebibmacro{cite:title}}
-          {\ifnameundef{labelname}
+	  {\ifnameundef{labelname}
              {\usebibmacro{cite:title}}
              {\ifsingletitle
-                {\printtext[bibhyperref]{\printnames{labelname}}}
-                {\printnames{labelname}%
-                 \setunit{\printdelim{nametitledelim}}%
-                 \usebibmacro{cite:title}}}%
+        	{\printtext[bibhyperref]{\printnames{labelname}}}
+        	{\printnames{labelname}%
+		 \setunit{\printdelim{nametitledelim}}%
+		 \usebibmacro{cite:title}}}%
            \savefield{namehash}{\cbx@lasthash}}}}
     {\usebibmacro{cite:shorthand}%
      \usebibmacro{cite:reinit}}%
@@ -31,9 +31,9 @@
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
        {\iffieldequals{namehash}{\cbx@lasthash}
-          {\setunit{\compcitedelim}}
-          {\savefield{namehash}{\cbx@lasthash}}%
-        \usebibmacro{cite:title}}}
+	  {\setunit{\compcitedelim}}
+	  {\savefield{namehash}{\cbx@lasthash}}%
+	\usebibmacro{cite:title}}}
     {\usebibmacro{cite:shorthand}%
      \usebibmacro{cite:reinit}}%
   \setunit{\multicitedelim}}
@@ -44,32 +44,32 @@
      \iffieldundef{shorthand}
        {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
           {\usebibmacro{cite:ibid}}
-          {\usebibmacro{cite:title}}}%
+	  {\usebibmacro{cite:title}}}%
        {\usebibmacro{cite:shorthand}}}
     {\ifnameundef{labelname}
        {\ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}
-          {}%
+	  {\usebibmacro{prenote}}
+	  {}%
         \iffieldundef{shorthand}
-          {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+	  {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
              {\usebibmacro{cite:ibid}}
-             {\usebibmacro{cite:title}}}%
-          {\usebibmacro{cite:shorthand}}}
+	     {\usebibmacro{cite:title}}}%
+	  {\usebibmacro{cite:shorthand}}}
        {\ifthenelse{\ifsingletitle\AND
                     \(\iffieldundef{prenote}\OR\value{citecount}>1\)}
           {\printtext[bibhyperref]{\printnames{labelname}}}
           {\printnames{labelname}
            \setunit{%
-             \global\booltrue{cbx:parens}%
-             \printdelim{nametitledelim}\bibopenparen}%
-           \ifnumequal{\value{citecount}}{1}
-             {\usebibmacro{prenote}}
-             {}%
-           \iffieldundef{shorthand}
-             {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
-                {\usebibmacro{cite:ibid}}
-                {\usebibmacro{cite:title}}}%
-             {\usebibmacro{cite:shorthand}}}}%
+	     \global\booltrue{cbx:parens}%
+	     \printdelim{nametitledelim}\bibopenparen}%
+	   \ifnumequal{\value{citecount}}{1}
+	     {\usebibmacro{prenote}}
+	     {}%
+	   \iffieldundef{shorthand}
+	     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+        	{\usebibmacro{cite:ibid}}
+		{\usebibmacro{cite:title}}}%
+	     {\usebibmacro{cite:shorthand}}}}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
@@ -89,12 +89,12 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-        {\bibcloseparen\global\boolfalse{cbx:parens}}
-        {}}}
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\bibcloseparen\global\boolfalse{cbx:parens}}
-         {}%
+	 {\bibcloseparen\global\boolfalse{cbx:parens}}
+	 {}%
        \textcitedelim}}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
index 3b3ed80deb7..8d52c873f3a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle.cbx
@@ -9,8 +9,10 @@
 
 \newbibmacro*{cite}{%
   \iffieldundef{shorthand}
-    {\printnames{labelname}%
-     \setunit*{\printdelim{nametitledelim}}%
+    {\ifnameundef{labelname}
+       {}
+       {\printnames{labelname}%
+        \setunit{\printdelim{nametitledelim}}}%
      \usebibmacro{cite:title}}%
     {\usebibmacro{cite:shorthand}}}
 
@@ -20,10 +22,12 @@
     {\usebibmacro{cite:shorthand}}}
 
 \newbibmacro*{textcite}{%
-  \printnames{labelname}%
-  \setunit*{%
-    \global\booltrue{cbx:parens}%
-    \printdelim{nametitledelim}\bibopenparen}%
+  \ifnameundef{labelname}
+    {}
+    {\printnames{labelname}%
+     \setunit{%
+       \global\booltrue{cbx:parens}%
+       \printdelim{nametitledelim}\bibopenparen}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
     {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
index 71e49ffbc9e..73f975bb976 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -28,19 +28,19 @@
     {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
        {\usebibmacro{cite:label}%
         \setunit{\printdelim{nonameyeardelim}}%
-        \usebibmacro{cite:labeldate+extradate}%
+        \usebibmacro{cite:labelyear+extrayear}%
         \usebibmacro{cite:reinit}}
        {\iffieldequals{namehash}{\cbx@lasthash}
           {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
                        \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
              {\setunit{\addcomma}%
-              \usebibmacro{cite:extradate}}
+              \usebibmacro{cite:extrayear}}
              {\setunit{\compcitedelim}%
-              \usebibmacro{cite:labeldate+extradate}%
+              \usebibmacro{cite:labelyear+extrayear}%
               \savefield{labelyear}{\cbx@lastyear}}}
           {\printnames{labelname}%
            \setunit{\printdelim{nameyeardelim}}%
-           \usebibmacro{cite:labeldate+extradate}%
+           \usebibmacro{cite:labelyear+extrayear}%
            \savefield{namehash}{\cbx@lasthash}%
            \savefield{labelyear}{\cbx@lastyear}}}}
     {\usebibmacro{cite:shorthand}%
@@ -56,11 +56,11 @@
           {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
                        \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
              {\setunit{\addcomma}%
-              \usebibmacro{cite:extradate}}
+              \usebibmacro{cite:extrayear}}
              {\setunit{\compcitedelim}%
-              \usebibmacro{cite:labeldate+extradate}%
+              \usebibmacro{cite:labelyear+extrayear}%
               \savefield{labelyear}{\cbx@lastyear}}}
-          {\usebibmacro{cite:labeldate+extradate}%
+          {\usebibmacro{cite:labelyear+extrayear}%
            \savefield{namehash}{\cbx@lasthash}%
            \savefield{labelyear}{\cbx@lastyear}}}}
     {\usebibmacro{cite:shorthand}%
@@ -73,9 +73,9 @@
        {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
                     \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
           {\setunit{\addcomma}%
-           \usebibmacro{cite:extradate}}
+           \usebibmacro{cite:extrayear}}
           {\setunit{\compcitedelim}%
-           \usebibmacro{cite:labeldate+extradate}%
+           \usebibmacro{cite:labelyear+extrayear}%
            \savefield{labelyear}{\cbx@lastyear}}}
        {\setunit{\compcitedelim}%
         \usebibmacro{cite:shorthand}%
@@ -89,7 +89,7 @@
            \ifnumequal{\value{citecount}}{1}
              {\usebibmacro{prenote}}
              {}%
-           \usebibmacro{cite:labeldate+extradate}}
+           \usebibmacro{cite:labelyear+extrayear}}
           {\usebibmacro{cite:shorthand}}}
        {\printnames{labelname}%
         \setunit{%
@@ -101,7 +101,7 @@
         \iffieldundef{shorthand}
           {\iffieldundef{labelyear}
              {\usebibmacro{cite:label}}
-             {\usebibmacro{cite:labeldate+extradate}}%
+             {\usebibmacro{cite:labelyear+extrayear}}%
            \savefield{labelyear}{\cbx@lastyear}}
           {\usebibmacro{cite:shorthand}%
            \global\undef\cbx@lastyear}}%
@@ -121,25 +121,43 @@
     {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
     {\printtext[bibhyperref]{\printfield{label}}}}
 
-\newbibmacro*{cite:labeldate+extradate}{%
+% Inside \printtext, argumentless macros also need '%' afterwards
+% otherwise the newlines are spaces
+\newbibmacro*{cite:labelyear+extrayear}{%
   \iffieldundef{labelyear}
     {}
-    {\printtext[bibhyperref]{\printlabeldateextra}}}
-
-\newbibmacro{cite:labelyear+extrayear}{%
-  \def\blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak
-    Using 'cite:labeldate+extradate' instead.}%
-  \usebibmacro{cite:labeldate+extradate}}
+    {\printtext[bibhyperref]{%
+     \ifdefstring\blx@dateformat@labeldate{edtf}
+       {}
+       {\datecircaprint}%
+     \dateeraprintpre{labelyear}%
+     \printfield{labelyear}%
+     \printfield{extrayear}%
+     \iffieldsequal{labeldateera}{labelenddateera}{}
+       {\dateeraprint{labelyear}}%
+     \dateuncertainprint%
+     \ifdefstring\blx@dateformat@labeldate{edtf}
+       {\datecircaprintedtf}
+       {}%
+     \iffieldundef{labelendyear}
+       {}
+       {\iffieldsequal{labelyear}{labelendyear}{}
+        {\ifdefstring\blx@dateformat@labeldate{edtf}
+          {\slash}% strict EDTF
+          {\bibdaterangesep
+           \enddatecircaprint}%
+         \dateeraprintpre{labelendyear}%
+         \printfield{labelendyear}%
+         \enddateuncertainprint
+         \ifdefstring\blx@dateformat@labeldate{edtf}
+           {\enddatecircaprintedtf}
+           {}%
+         \dateeraprint{labelendyear}}}}}}
 
-\newbibmacro*{cite:extradate}{%
-  \iffieldundef{extradate}
+\newbibmacro*{cite:extrayear}{%
+  \iffieldundef{extrayear}
     {}
-    {\printtext[bibhyperref]{\printfield{extradate}}}}
-
-\newbibmacro{cite:extrayear}{%
-  \def\blx@warning{bibmacro 'cite:extrayear' is deprecated.\MessageBreak
-    Using 'cite:extrayear' instead.}%
-  \usebibmacro{cite:extrayear}}
+    {\printtext[bibhyperref]{\printfield{extrayear}}}}
 
 \newbibmacro*{textcite:postnote}{%
   \usebibmacro{postnote}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index c69a1a28b4e..7148258f0fd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -25,7 +25,7 @@
            \setunit{\printdelim{nonameyeardelim}}}
           {\printnames{labelname}%
            \setunit{\printdelim{nameyeardelim}}}%
-        \usebibmacro{cite:labeldate+extradate}}}
+        \usebibmacro{cite:labelyear+extrayear}}}
     {\usebibmacro{cite:shorthand}}}
 
 \newbibmacro*{citeyear}{%
@@ -35,7 +35,7 @@
        {\usebibmacro{cite:ibid}}
        {\iffieldundef{labelyear}
           {\usebibmacro{cite:label}}
-          {\usebibmacro{cite:labeldate+extradate}}}}
+          {\usebibmacro{cite:labelyear+extrayear}}}}
     {\usebibmacro{cite:shorthand}}}
 
 \newbibmacro*{textcite}{%
@@ -49,7 +49,7 @@
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
-        \usebibmacro{cite:labeldate+extradate}}
+        \usebibmacro{cite:labelyear+extrayear}}
        {\usebibmacro{cite:shorthand}}}
     {\printnames{labelname}%
      \setunit{%
@@ -63,7 +63,7 @@
           {\usebibmacro{cite:ibid}}
           {\iffieldundef{labelyear}
              {\usebibmacro{cite:label}}
-             {\usebibmacro{cite:labeldate+extradate}}}}
+             {\usebibmacro{cite:labelyear+extrayear}}}}
        {\usebibmacro{cite:shorthand}}}}
 
 \newbibmacro*{cite:shorthand}{%
@@ -80,15 +80,38 @@
     {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
     {\printtext[bibhyperref]{\printfield{label}}}}
 
-\newbibmacro*{cite:labeldate+extradate}{%
+% Inside \printtext, argumentless macros also need '%' afterwards
+% otherwise the newlines are spaces
+\newbibmacro*{cite:labelyear+extrayear}{%
   \iffieldundef{labelyear}
     {}
-    {\printtext[bibhyperref]{\printlabeldateextra}}}
-
-\newbibmacro{cite:labelyear+extrayear}{%
-  \def\blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak
-    Using 'cite:labeldate+extradate' instead.}%
-  \usebibmacro{cite:labeldate+extradate}}
+    {\printtext[bibhyperref]{%
+     \ifdefstring\blx@dateformat@labeldate{edtf}
+       {}
+       {\datecircaprint}%
+     \dateeraprintpre{labelyear}%
+     \printfield{labelyear}%
+     \printfield{extrayear}%
+     \iffieldsequal{labeldateera}{labelenddateera}{}
+       {\dateeraprint{labelyear}}%
+     \dateuncertainprint%
+     \ifdefstring\blx@dateformat@labeldate{edtf}
+       {\datecircaprintedtf}
+       {}%
+     \iffieldundef{labelendyear}
+       {}
+       {\iffieldsequal{labelyear}{labelendyear}{}
+        {\ifdefstring\blx@dateformat@labeldate{edtf}
+          {\slash}% strict EDTF
+          {\bibdaterangesep
+           \enddatecircaprint}%
+         \dateeraprintpre{labelendyear}%
+         \printfield{labelendyear}%
+         \enddateuncertainprint
+         \ifdefstring\blx@dateformat@labeldate{edtf}
+           {\enddatecircaprintedtf}
+           {}%
+         \dateeraprint{labelendyear}}}}}}
 
 \newbibmacro*{cite:postnote}{%
   \ifbool{cbx:loccit}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index b7d9cc6ce8f..4bb47ceeea1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -38,19 +38,19 @@
        {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
           {\usebibmacro{cite:label}%
            \setunit{\printdelim{nonameyeardelim}}%
-           \usebibmacro{cite:labeldate+extradate}%
+           \usebibmacro{cite:labelyear+extrayear}%
            \usebibmacro{cite:reinit}}
           {\iffieldequals{namehash}{\cbx@lasthash}
              {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
                           \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
                 {\setunit{\addcomma}%
-                 \usebibmacro{cite:extradate}}
+                 \usebibmacro{cite:extrayear}}
                 {\setunit{\compcitedelim}%
-                 \usebibmacro{cite:labeldate+extradate}%
+                 \usebibmacro{cite:labelyear+extrayear}%
                  \savefield{labelyear}{\cbx@lastyear}}}
              {\printnames{labelname}%
               \setunit{\printdelim{nameyeardelim}}%
-              \usebibmacro{cite:labeldate+extradate}%
+              \usebibmacro{cite:labelyear+extrayear}%
               \savefield{namehash}{\cbx@lasthash}%
               \savefield{labelyear}{\cbx@lastyear}}}}}
     {\usebibmacro{cite:shorthand}%
@@ -68,11 +68,11 @@
              {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
                           \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
                 {\setunit{\addcomma}%
-                 \usebibmacro{cite:extradate}}
+                 \usebibmacro{cite:extrayear}}
                 {\setunit{\compcitedelim}%
-                 \usebibmacro{cite:labeldate+extradate}%
+                 \usebibmacro{cite:labelyear+extrayear}%
                  \savefield{labelyear}{\cbx@lastyear}}}
-             {\usebibmacro{cite:labeldate+extradate}%
+             {\usebibmacro{cite:labelyear+extrayear}%
               \savefield{namehash}{\cbx@lasthash}%
               \savefield{labelyear}{\cbx@lastyear}}}}}
     {\usebibmacro{cite:shorthand}%
@@ -85,9 +85,9 @@
        {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
                     \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
           {\setunit{\addcomma}%
-           \usebibmacro{cite:extradate}}
+           \usebibmacro{cite:extrayear}}
           {\setunit{\compcitedelim}%
-           \usebibmacro{cite:labeldate+extradate}%
+           \usebibmacro{cite:labelyear+extrayear}%
            \savefield{labelyear}{\cbx@lastyear}}}
        {\setunit{\compcitedelim}%
         \usebibmacro{cite:shorthand}%
@@ -103,7 +103,7 @@
              {}%
            \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
              {\usebibmacro{cite:ibid}}
-             {\usebibmacro{cite:labeldate+extradate}}}
+             {\usebibmacro{cite:labelyear+extrayear}}}
           {\usebibmacro{cite:shorthand}}}
        {\printnames{labelname}%
         \setunit{%
@@ -117,7 +117,7 @@
              {\usebibmacro{cite:label}}
              {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
                 {\usebibmacro{cite:ibid}}
-                {\usebibmacro{cite:labeldate+extradate}}}%
+                {\usebibmacro{cite:labelyear+extrayear}}}%
            \savefield{labelyear}{\cbx@lastyear}}
           {\usebibmacro{cite:shorthand}%
            \global\undef\cbx@lastyear}}%
@@ -137,25 +137,43 @@
     {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
     {\printtext[bibhyperref]{\printfield{label}}}}
 
-\newbibmacro*{cite:labeldate+extradate}{%
+% Inside \printtext, argumentless macros also need '%' afterwards
+% otherwise the newlines are spaces
+\newbibmacro*{cite:labelyear+extrayear}{%
   \iffieldundef{labelyear}
     {}
-    {\printtext[bibhyperref]{\printlabeldateextra}}}
-
-\newbibmacro{cite:labelyear+extrayear}{%
-  \def\blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak
-    Using 'cite:labeldate+extradate' instead.}%
-  \usebibmacro{cite:labeldate+extradate}}
-
-\newbibmacro*{cite:extradate}{%
-  \iffieldundef{extradate}
+    {\printtext[bibhyperref]{%
+     \ifdefstring\blx@dateformat@labeldate{edtf}
+       {}
+       {\datecircaprint}%
+     \dateeraprintpre{labelyear}%
+     \printfield{labelyear}%
+     \printfield{extrayear}%
+     \iffieldsequal{labeldateera}{labelenddateera}{}
+       {\dateeraprint{labelyear}}%
+     \dateuncertainprint%
+     \ifdefstring\blx@dateformat@labeldate{edtf}
+       {\datecircaprintedtf}
+       {}%
+     \iffieldundef{labelendyear}
+       {}
+       {\iffieldsequal{labelyear}{labelendyear}{}
+        {\ifdefstring\blx@dateformat@labeldate{edtf}
+          {\slash}% strict EDTF
+          {\bibdaterangesep
+           \enddatecircaprint}%
+         \dateeraprintpre{labelendyear}%
+         \printfield{labelendyear}%
+         \enddateuncertainprint
+         \ifdefstring\blx@dateformat@labeldate{edtf}
+           {\enddatecircaprintedtf}
+           {}%
+         \dateeraprint{labelendyear}}}}}}
+
+\newbibmacro*{cite:extrayear}{%
+  \iffieldundef{extrayear}
     {}
-    {\printtext[bibhyperref]{\printfield{extradate}}}}
-
-\newbibmacro{cite:extrayear}{%
-  \def\blx@warning{bibmacro 'cite:extrayear' is deprecated.\MessageBreak
-    Using 'cite:extrayear' instead.}%
-  \usebibmacro{cite:extrayear}}
+    {\printtext[bibhyperref]{\printfield{extrayear}}}}
 
 \newbibmacro*{cite:ibid}{%
   \printtext[bibhyperref]{\bibstring[\mkibid]{ibidem}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index cff210e5f1f..fd411c90b55 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
@@ -14,14 +14,14 @@
         \setunit{\printdelim{nonameyeardelim}}}
        {\printnames{labelname}%
         \setunit{\printdelim{nameyeardelim}}}%
-     \usebibmacro{cite:labeldate+extradate}}
+     \usebibmacro{cite:labelyear+extrayear}}
     {\usebibmacro{cite:shorthand}}}
 
 \newbibmacro*{citeyear}{%
   \iffieldundef{shorthand}
     {\iffieldundef{labelyear}
        {\usebibmacro{cite:label}}
-       {\usebibmacro{cite:labeldate+extradate}}}
+       {\usebibmacro{cite:labelyear+extrayear}}}
     {\usebibmacro{cite:shorthand}}}
 
 \newbibmacro*{textcite}{%
@@ -34,7 +34,7 @@
         \ifnumequal{\value{citecount}}{1}
           {\usebibmacro{prenote}}
           {}%
-        \usebibmacro{cite:labeldate+extradate}}
+        \usebibmacro{cite:labelyear+extrayear}}
        {\usebibmacro{cite:shorthand}}}
     {\printnames{labelname}%
      \setunit{%
@@ -53,15 +53,38 @@
     {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}
     {\printtext[bibhyperref]{\printfield{label}}}}
 
-\newbibmacro*{cite:labeldate+extradate}{%
+% Inside \printtext, argumentless macros also need '%' afterwards
+% otherwise the newlines are spaces
+\newbibmacro*{cite:labelyear+extrayear}{%
   \iffieldundef{labelyear}
     {}
-    {\printtext[bibhyperref]{\printlabeldateextra}}}
-
-\newbibmacro{cite:labelyear+extrayear}{%
-  \def\blx@warning{bibmacro 'cite:labelyear+extrayear' is deprecated.\MessageBreak
-    Using 'cite:labeldate+extradate' instead.}%
-  \usebibmacro{cite:labeldate+extradate}}
+    {\printtext[bibhyperref]{%
+     \ifdefstring\blx@dateformat@labeldate{edtf}
+       {}
+       {\datecircaprint}%
+     \dateeraprintpre{labelyear}%
+     \printfield{labelyear}%
+     \printfield{extrayear}%
+     \dateuncertainprint%
+     \iffieldsequal{labeldateera}{labelenddateera}{}
+       {\dateeraprint{labelyear}}%
+     \ifdefstring\blx@dateformat@labeldate{edtf}
+       {\datecircaprintedtf}
+       {}%
+     \iffieldundef{labelendyear}
+       {}
+       {\iffieldsequal{labelyear}{labelendyear}{}
+        {\ifdefstring\blx@dateformat@labeldate{edtf}
+          {\slash}% strict EDTF
+          {\bibdaterangesep
+           \enddatecircaprint}%
+         \dateeraprintpre{labelendyear}%
+         \printfield{labelendyear}%
+         \enddateuncertainprint
+         \ifdefstring\blx@dateformat@labeldate{edtf}
+           {\enddatecircaprintedtf}
+           {}%
+         \dateeraprint{labelendyear}}}}}}
 
 \newbibmacro*{textcite:postnote}{%
   \iffieldundef{postnote}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
index b649cbeaee8..7f2b64d569c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric-comp.cbx
@@ -103,7 +103,7 @@
     {\usebibmacro{cite:comp}}
     {\usebibmacro{cite:dump}%
      \ifbool{cbx:parens}
-       {\printtext{\bibclosebracket}\global\boolfalse{cbx:parens}}
+       {\bibclosebracket\global\boolfalse{cbx:parens}}
        {}%
      \iffirstcitekey
        {}
@@ -112,8 +112,8 @@
      \ifnameundef{labelname}
        {\printfield[citetitle]{labeltitle}}
        {\printnames{labelname}}%
-     \setunit*{\printdelim{namelabeldelim}}%
-     \printtext{\bibopenbracket}\global\booltrue{cbx:parens}%
+     \global\booltrue{cbx:parens}%
+     \printdelim{namelabeldelim}\bibopenbracket%
      \ifnumequal{\value{citecount}}{1}
        {\usebibmacro{prenote}}
        {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
index 8ea47d1338d..81b3bcb80e5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
@@ -26,8 +26,9 @@
     {\ifnameundef{labelname}
        {\printfield[citetitle]{labeltitle}}
        {\printnames{labelname}}%
-     \setunit*{\printdelim{namelabeldelim}}%
-     \printtext{\bibopenbracket}\global\booltrue{cbx:parens}%
+     \setunit{%
+       \global\booltrue{cbx:parens}%
+       \printdelim{namelabeldelim}\bibopenbracket}%
      \stepcounter{textcitecount}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
@@ -36,7 +37,7 @@
   \usebibmacro{cite}%
   \setunit{%
     \ifbool{cbx:parens}
-      {\bibclosebracket\global\boolfalse{cbx:parens}}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
       {}%
     \textcitedelim}}
 
@@ -52,11 +53,11 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-         {\bibclosebracket\global\boolfalse{cbx:parens}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
          {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-         {\bibclosebracket\global\boolfalse{cbx:parens}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
          {}%
        \textcitedelim}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
index 02a7aad2d89..ae5dccc7ca7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-ibid.cbx
@@ -78,9 +78,9 @@
       test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
       and
       (
-       not test {\iffieldundef{pages}}
-       or
-       not test {\iffieldundef{pagetotal}}
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
       )
     }
       {\usebibmacro{cite:postnote:pages}}
@@ -101,8 +101,8 @@
     {\iffieldundef{shorthand}
        {\ifboolexpr{
           test {\ifciteibid}
-          and
-          not test {\iffirstonpage}
+	  and
+	  not test {\iffirstonpage}
         }
           {\usebibmacro{cite:ibid}}
           {\usebibmacro{cite:short}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
index 5749af7793d..6fc88f6b6d6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-inote.cbx
@@ -79,9 +79,9 @@
       test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
       and
       (
-       not test {\iffieldundef{pages}}
-       or
-       not test {\iffieldundef{pagetotal}}
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
       )
     }
       {\usebibmacro{cite:postnote:pages}}
@@ -178,8 +178,8 @@
       {\ifsamepage{\the\value{instcount}}
                   {\csuse{cbx@f@\thefield{entrykey}}}
          {}
-         {\addcomma\space\bibstring{page}\addnbspace
-          \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
+	 {\addcomma\space\bibstring{page}\addnbspace
+	  \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
       {}}}
 
 \newbibmacro*{footcite:shorthand}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
index 5b67757ce4d..42156224c97 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-note.cbx
@@ -73,9 +73,9 @@
       test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
       and
       (
-       not test {\iffieldundef{pages}}
-       or
-       not test {\iffieldundef{pagetotal}}
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
       )
     }
       {\usebibmacro{cite:postnote:pages}}
@@ -155,8 +155,8 @@
       {\ifsamepage{\the\value{instcount}}
                   {\csuse{cbx@f@\thefield{entrykey}}}
          {}
-         {\addcomma\space\bibstring{page}\addnbspace
-          \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
+	 {\addcomma\space\bibstring{page}\addnbspace
+	  \pageref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}
       {}}}
 
 \newbibmacro*{footcite:shorthand}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
index a361766f169..33841be3ed6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad1.cbx
@@ -79,9 +79,9 @@
       test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
       and
       (
-       not test {\iffieldundef{pages}}
-       or
-       not test {\iffieldundef{pagetotal}}
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
       )
     }
       {\usebibmacro{cite:postnote:pages}}
@@ -116,8 +116,8 @@
                   {\usebibmacro{cite:name}%
                    \ifopcit
                      {\ifloccit
-                        {\usebibmacro{cite:loccit}}
-                        {\usebibmacro{cite:opcit}}}
+		        {\usebibmacro{cite:loccit}}
+		        {\usebibmacro{cite:opcit}}}
                      {\usebibmacro{cite:title}}}}}%
           \usebibmacro{cite:save}}
          {\usebibmacro{cite:shorthand}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
index 9ad583e1992..0461eb14d20 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad2.cbx
@@ -86,9 +86,9 @@
       test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
       and
       (
-       not test {\iffieldundef{pages}}
-       or
-       not test {\iffieldundef{pagetotal}}
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
       )
     }
       {\usebibmacro{cite:postnote:pages}}
@@ -119,7 +119,7 @@
                {\usebibmacro{cite:idem}}
                {\usebibmacro{cite:name}}%
              \usebibmacro{cite:title}}%
-          \usebibmacro{cite:save}}
+	  \usebibmacro{cite:save}}
          {\usebibmacro{cite:shorthand}}}
       {\usebibmacro{cite:full}%
        \usebibmacro{cite:save}}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
index 1fab909cc4f..80a45d6a004 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/verbose-trad3.cbx
@@ -74,9 +74,9 @@
       test {\ifnumequal{\value{citecount}}{\value{citetotal}}}
       and
       (
-       not test {\iffieldundef{pages}}
-       or
-       not test {\iffieldundef{pagetotal}}
+	not test {\iffieldundef{pages}}
+	or
+	not test {\iffieldundef{pagetotal}}
       )
     }
       {\usebibmacro{cite:postnote:pages}}
@@ -96,13 +96,13 @@
   \ifciteseen
     {\ifciteibid
        {\ifloccit
-          {\usebibmacro{cite:ibid}}
-          {\iffieldundef{shorthand}
-             {\usebibmacro{cite:opcit}}
-             {\usebibmacro{cite:shorthand}}}}
+	  {\usebibmacro{cite:ibid}}
+	  {\iffieldundef{shorthand}
+	     {\usebibmacro{cite:opcit}}
+	     {\usebibmacro{cite:shorthand}}}}
        {\iffieldundef{shorthand}
-          {\usebibmacro{cite:short}}
-          {\usebibmacro{cite:shorthand}}}}
+	  {\usebibmacro{cite:short}}
+	  {\usebibmacro{cite:shorthand}}}}
     {\usebibmacro{cite:full}}}
 
 \newbibmacro*{cite:full}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
index cc01743e3cc..80e2fd4ede3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
@@ -97,14 +97,14 @@
   founders         = {{fundadores}{fund\adddot}},
   continuator      = {{continuador}{cont\adddot}},
   continuators     = {{continuadores}{cont\adddot}},
-  collaborator     = {{colaborador}{colab\adddot}},
-  collaborators    = {{colaboradores}{colab\adddot}},
+  collaborator     = {{colaborador}{col\adddot}},
+  collaborators    = {{colaboradores}{cols\adddot}},
   translator       = {{tradutor}{trad\adddot}},
-  translators      = {{tradutores}{trad\adddot}},
+  translators      = {{tradutores}{trads\adddot}},
   commentator      = {{comentador}{coment\adddot}},
-  commentators     = {{comentadores}{coment\adddot}},
+  commentators     = {{comentadores}{coments\adddot}},
   annotator        = {{anotador}{anot\adddot}},
-  annotators       = {{anotadores}{anot\adddot}},
+  annotators       = {{anotadores}{anots\adddot}},
   commentary       = {{coment\'ario}{coment\adddot}},
   annotations      = {{notas}{notas}},
   introduction     = {{introdu\c{c}\~ao}{introd\adddot}},
@@ -113,15 +113,15 @@
   editortr         = {{editor e tradutor}%
                       {ed\adddotspace e trad\adddot}},
   editorstr        = {{editores e tradutores}%
-                      {eds\adddotspace e trad\adddot}},
+                      {eds\adddotspace e trads\adddot}},
   editorco         = {{editor e comentador}%
                       {ed\adddotspace e coment\adddot}},
   editorsco        = {{editores e comentadores}%
-                      {eds\adddotspace e coment\adddot}},
+                      {eds\adddotspace e coments\adddot}},
   editoran         = {{editor e anotador}%
                       {ed\adddotspace e anot\adddot}},
   editorsan        = {{editores e anotadores}%
-                      {eds\adddotspace e anot\adddot}},
+                      {eds\adddotspace e anots\adddot}},
   editorin         = {{editor e introdu\c{c}\~ao}%
                       {ed\adddotspace e introd\adddot}},
   editorsin        = {{editores e introdu\c{c}\~ao}%
@@ -137,79 +137,79 @@
   editortrco       = {{editor, tradutor e comentador}%
                       {ed., trad\adddot\ e coment\adddot}},
   editorstrco      = {{editores, tradutores e comentadores}%
-                      {eds., trad\adddot\ e coment\adddot}},
+                      {eds., trads\adddot\ e coments\adddot}},
   editortran       = {{editor, tradutor e anotador}%
                       {ed., trad\adddot\ e anot\adddot}},
   editorstran      = {{editores, tradutores e anotadores}%
-                      {eds., trad\adddot\ e anot\adddot}},
+                      {eds., trads\adddot\ e anots\adddot}},
   editortrin       = {{editor, tradutor e introdu\c{c}\~ao}%
                       {ed., trad\adddot\ e introd\adddot}},
   editorstrin      = {{editores, tradutores e introdu\c{c}\~ao}%
-                      {eds., trad\adddot\ e introd\adddot}},
+                      {eds., trads\adddot\ e introd\adddot}},
   editortrfo       = {{editor, tradutor e pref\'acio}%
                       {ed., trad\adddot\ e pref\adddot}},
   editorstrfo      = {{editores, tradutores e pref\'acio}%
-                      {eds., trad\adddot\ e pref\adddot}},
+                      {eds., trads\adddot\ e pref\adddot}},
   editortraf       = {{editor, tradutor e posf\'acio}%
                       {ed., trad\adddot\ e posf\adddot}},
   editorstraf      = {{editores, tradutores e posf\'acio}%
-                      {eds., trad\adddot\ e posf\adddot}},
+                      {eds., trads\adddot\ e posf\adddot}},
   editorcoin       = {{editor, comentador e introdu\c{c}\~ao}%
                       {ed., coment\adddot\ e introd\adddot}},
   editorscoin      = {{editores, comentadores e introdu\c{c}\~ao}%
-                      {eds., coment\adddot\ e introd\adddot}},
+                      {eds., coments\adddot\ e introd\adddot}},
   editorcofo       = {{editor, comentador e pref\'acio}%
                       {ed., coment\adddot\ e pref\adddot}},
   editorscofo      = {{editores, comentadores e pref\'acio}%
-                      {eds., coment\adddot\ e pref\adddot}},
+                      {eds., coments\adddot\ e pref\adddot}},
   editorcoaf       = {{editor, comentador e posf\'acio}%
                       {ed., coment\adddot\ e posf\adddot}},
   editorscoaf      = {{editores, comentadores e posf\'acio}%
-                      {eds., coment\adddot\ e posf\adddot}},
+                      {eds., coments\adddot\ e posf\adddot}},
   editoranin       = {{editor, anotador e introdu\c{c}\~ao}%
                       {ed., anot\adddot\ e introd\adddot}},
   editorsanin      = {{editores, anotadores e introdu\c{c}\~ao}%
-                      {eds., anot\adddot\ e introd\adddot}},
+                      {eds., anots\adddot\ e introd\adddot}},
   editoranfo       = {{editor, anotador e pref\'acio}%
                       {ed., anot\adddot\ e pref\adddot}},
   editorsanfo      = {{editores, anotadores e pref\'acio}%
-                      {eds., anot\adddot\ e pref\adddot}},
+                      {eds., anots\adddot\ e pref\adddot}},
   editoranaf       = {{editor, anotador e posf\'acio}%
                       {ed., anot\adddot\ e posf\adddot}},
   editorsanaf      = {{editores, anotadores e posf\'acio}%
-                      {eds., anot\adddot\ e posf\adddot}},
+                      {eds., anots\adddot\ e posf\adddot}},
   editortrcoin     = {{editor, tradutor, comentador e introdu\c{c}\~ao}%
                       {ed., trad., coment\adddot\ e introd\adddot}},
   editorstrcoin    = {{editores, tradutores, comentadores e introdu\c{c}\~ao}%
-                      {eds., trad., coment\adddot\ e introd\adddot}},
+                      {eds., trads., coments\adddot\ e introd\adddot}},
   editortrcofo     = {{editor, tradutor, comentador e pref\'acio}%
                       {ed., trad., coment\adddot\ e pref\adddot}},
   editorstrcofo    = {{editores, tradutores, comentadores e pref\'acio}%
-                      {eds., trad., coment\adddot\ e pref\adddot}},
+                      {eds., trads., coments\adddot\ e pref\adddot}},
   editortrcoaf     = {{editor, tradutor, comentador e posf\'acio}%
                       {ed., trad., coment\adddot\ e posf\adddot}},
   editorstrcoaf    = {{editores, tradutores, comentadores e posf\'acio}%
-                      {eds., trad., coment\adddot\ e posf\adddot}},
+                      {eds., trads., coments\adddot\ e posf\adddot}},
   editortranin     = {{editor, tradutor, anotador e introdu\c{c}\~ao}%
                       {ed., trad., anot\adddot\ e introd\adddot}},
   editorstranin    = {{editores, tradutores, anotadores e introdu\c{c}\~ao}%
-                      {eds., trad., anot\adddot\ e introd\adddot}},
+                      {eds., trads., anots\adddot\ e introd\adddot}},
   editortranfo     = {{editor, tradutor, anotador e pref\'acio}%
                       {ed., trad., anot\adddot\ e pref\adddot}},
   editorstranfo    = {{editores, tradutores, anotadores e pref\'acio}%
-                      {eds., trad., anot\adddot\ e pref\adddot}},
+                      {eds., trads., anots\adddot\ e pref\adddot}},
   editortranaf     = {{editor, tradutor, anotador e posf\'acio}%
                       {ed., trad., anot\adddot\ e posf\adddot}},
   editorstranaf    = {{editores, tradutores, anotadores e posf\'acio}%
-                      {eds., trad., anot\adddot\ e posf\adddot}},
-  translatorco     = {{tradu\c{c}\~ao e coment\'ario}%
+                      {eds., trads., anots\adddot\ e posf\adddot}},
+  translatorco     = {{tradutor e comentador}%
                       {trad\adddot\ e coment\adddot}},
-  translatorsco    = {{tradu\c{c}\~ao e coment\'ario}%
-                      {trad\adddot\ e coment\adddot}},
-  translatoran     = {{tradu\c{c}\~ao e notas}%
-                      {trad\adddot\ e notas}},
-  translatorsan    = {{tradu\c{c}\~ao e notas}%
-                      {trad\adddot\ e notas}},
+  translatorsco    = {{tradutores e comentadores}%
+                      {trads\adddot\ e coments\adddot}},
+  translatoran     = {{tradutor e anotador}%
+                      {trad\adddot\ e anot\adddot}},
+  translatorsan    = {{tradutores e anotadores}%
+                      {trads\adddot\ e anots\adddot}},
   translatorin     = {{tradu\c{c}\~ao e introdu\c{c}\~ao}%
                       {trad\adddot\ e introd\adddot}},
   translatorsin    = {{tradu\c{c}\~ao e introdu\c{c}\~ao}%
@@ -246,21 +246,18 @@
                       {trad., notas e posf\adddot}},
   translatorsanaf  = {{tradu\c{c}\~ao, notas e posf\'acio}%
                       {trad., notas e posf\adddot}},
-  organizer        = {{organizador}{org\adddot}},
-  organizers       = {{organizadores}{orgs\adddot}},
   byauthor         = {{por}{por}},
   byeditor         = {{editado por}{ed\adddotspace por}},
   bycompiler       = {{compilado por}{comp\adddotspace por}},
   byredactor       = {{redigido por}{red\adddotspace por}},
   byreviser        = {{revisado por}{rev\adddotspace por}},
-  byreviewer       = {{resenhado por}{res\adddotspace por}},
+  byreviewer       = {{resenhado por}{res\adddotspace}},
   byfounder        = {{fundado por}{fund\adddotspace por}},
   bycontinuator    = {{continuado por}{cont\adddotspace por}},
-  bycollaborator   = {{em colabora\c{c}\~ao com}{em colab\adddotspace com}},
+  bycollaborator   = {{em colabora\c{a}\~o com}{em col\adddotspace com}},
   bytranslator     = {{traduzido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}},
-  bycommentator    = {{comentado por}{coment\adddot\ por}},
+  bycommentator    = {{comentado por}{com\adddot\ por}},
   byannotator      = {{anotado por}{anot\adddot\ por}},
-  byorganizer      = {{organizado por}{org\adddotspace por}},
   withcommentator  = {{com coment\'ario de}{com coment\adddot\ de}},
   withannotator    = {{com notas de}{com notas de}},
   withintroduction = {{com introdu\c{c}\~ao de}{com introd\adddot\ de}},
@@ -269,7 +266,7 @@
   byeditortr       = {{editado e traduzido \lbx@lfromlang\ por}%
                       {ed\adddotspace e trad\adddot\ \lbx@sfromlang\ por}},
   byeditorco       = {{editado e comentado por}%
-                      {ed\adddotspace e coment\adddot\ por}},
+                      {ed\adddotspace e com\adddot\ por}},
   byeditoran       = {{editado e anotado por}%
                       {ed\adddotspace e anot\adddot\ por}},
   byeditorin       = {{editado e introduzido por}%
@@ -279,7 +276,7 @@
   byeditoraf       = {{editado e posfaciado por}%
                       {ed\adddotspace e posf\adddot\ por}},
   byeditortrco     = {{editado, traduzido \lbx@lfromlang\ e comentado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e coment\adddot\ por}},
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
   byeditortran     = {{editado, traduzido \lbx@lfromlang\ e anotado por}%
                       {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
   byeditortrin     = {{editado, traduzido \lbx@lfromlang\ e introduzido por}%
@@ -289,11 +286,11 @@
   byeditortraf     = {{editado, traduzido \lbx@lfromlang\ e posfaciado por}%
                       {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}},
   byeditorcoin     = {{editado, comentado e introduzido por}%
-                      {ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}},
+                      {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}},
   byeditorcofo     = {{editado, comentado e prefaciado por}%
-                      {ed.,\addabbrvspace coment\adddot\ e pref\adddot\ por}},
+                      {ed.,\addabbrvspace com\adddot\ e pref\adddot\ por}},
   byeditorcoaf     = {{editado, comentado e posfaciado por}%
-                      {ed.,\addabbrvspace coment\adddot\ e posf\adddot\ por}},
+                      {ed.,\addabbrvspace com\adddot\ e posf\adddot\ por}},
   byeditoranin     = {{editado, anotado e introduzido por}%
                       {ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}},
   byeditoranfo     = {{editado, anotado e prefaciado por}%
@@ -301,11 +298,11 @@
   byeditoranaf     = {{editado, anotado e posfaciado por}%
                       {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}},
   byeditortrcoin   = {{editado, traduzido \lbx@lfromlang, comentado e introduzido por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e introd\adddot\ por}},
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
   byeditortrcofo   = {{editado, traduzido \lbx@lfromlang, comentado e prefaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e pref\adddot\ por}},
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
   byeditortrcoaf   = {{editado, traduzido \lbx@lfromlang, comentado e posfaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e posf\adddot\ por}},
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
   byeditortranin   = {{editado, traduzido \lbx@lfromlang, anotado e introduzido por}%
                       {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
   byeditortranfo   = {{editado, traduzido \lbx@lfromlang, anotado e prefaciado por}%
@@ -313,7 +310,7 @@
   byeditortranaf   = {{editado, traduzido \lbx@lfromlang, anotado e posfaciado por}%
                       {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}},
   bytranslatorco   = {{traduzido \lbx@lfromlang\ e comentado por}%
-                      {trad\adddot\ \lbx@sfromlang\ e coment\adddot\ por}},
+                      {trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
   bytranslatoran   = {{traduzido \lbx@lfromlang\ e anotado por}%
                       {trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
   bytranslatorin   = {{traduzido \lbx@lfromlang\ e introduzido por}%
@@ -323,11 +320,11 @@
   bytranslatoraf   = {{traduzido \lbx@lfromlang\ e posfaciado por}%
                       {trad\adddot\ \lbx@sfromlang\ e posf\adddot\ por}},
   bytranslatorcoin = {{traduzido \lbx@lfromlang, comentado e introduzido por}%
-                      {trad\adddot\ \lbx@sfromlang, coment\adddot\ e introd\adddot\ por}},
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
   bytranslatorcofo = {{traduzido \lbx@lfromlang, comentado e prefaciado por}%
-                      {trad\adddot\ \lbx@sfromlang, coment\adddot\ e pref\adddot\ por}},
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
   bytranslatorcoaf = {{traduzido \lbx@lfromlang, comentado e posfaciado por}%
-                      {trad\adddot\ \lbx@sfromlang, coment\adddot\ e posf\adddot\ por}},
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
   bytranslatoranin = {{traduzido \lbx@lfromlang, anotado e introduzido por}%
                       {trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
   bytranslatoranfo = {{traduzido \lbx@lfromlang, anotado e prefaciado por}%
@@ -344,7 +341,7 @@
   jourser          = {{s\'erie}{s\'er\adddot}},
   book             = {{livro}{livro}},
   part             = {{parte}{parte}},
-  issue            = {{n\'umero}{n\'um\adddot}},
+  issue            = {{edi\c{c}\~ao}{edi\c{c}\~ao}},
   newseries        = {{nova s\'erie}{nova s\'er\adddot}},
   oldseries        = {{s\'erie antiga}{s\'er\adddot\ antiga}},
   edition          = {{edi\c{c}\~ao}{ed\adddot}},
@@ -360,55 +357,42 @@
   origpubin        = {{originalmente publicado em}{orig\adddotspace pub\adddotspace em}},
   astitle          = {{como}{como}},
   bypublisher      = {{por}{por}},
-  nodate           = {{sem\space data}{s\adddot d\adddot}},
   page             = {{p\'agina}{p\adddot}},
   pages            = {{p\'aginas}{pp\adddot}},
   column           = {{coluna}{col\adddot}},
   columns          = {{colunas}{cols\adddot}},
   line             = {{linha}{l\adddot}},
   lines            = {{linhas}{ll\adddot}},
+  nodate           = {{sem\space data}{s\adddot d\adddot}},
   verse            = {{verso}{v\adddot}},
   verses           = {{versos}{vv\adddot}},
   section          = {{se\c{c}\~ao}{\S}},
   sections         = {{se\c{c}\~oes}{\S\S}},
   paragraph        = {{par\'agrafo}{par\adddot}},
-  paragraphs       = {{par\'agrafos}{par\adddot}},
-  pagetotal        = {{p\'agina}{p\adddot}},
-  pagetotals       = {{p\'aginas}{pp\adddot}},
-  columntotal      = {{coluna}{col\adddot}},
-  columntotals     = {{colunas}{cols\adddot}},
-  linetotal        = {{linha}{l\adddot}},
-  linetotals       = {{linhas}{ll\adddot}},
-  versetotal       = {{verso}{v\adddot}},
-  versetotals      = {{versos}{vv\adddot}},
-  sectiontotal     = {{se\c{c}\~ao}{\S}},
-  sectiontotals    = {{se\c{c}\~oes}{\S\S}},
-  paragraphtotal   = {{par\'agrafo}{par\adddot}},
-  paragraphtotals  = {{par\'agrafos}{par\adddot}},
+  paragraphs       = {{par\'agrafo}{pars\adddot}},
   in               = {{em}{em}},
   inseries         = {{em}{em}},
   ofseries         = {{de}{de}},
-  number           = {{n\'umero}{n\adddot\textordmasculine}},
+  number           = {{n\'umero}{n\textordmasculine}},
   chapter          = {{cap\'\i tulo}{cap\adddot}},
-  mathesis         = {{disserta\c{c}\~ao de mestrado}{diss\adddot\ de mestr\adddot}},
-  phdthesis        = {{tese de doutorado}{tese de dout\adddot}},
-  candthesis       = {{trabalho de conclus\~ao}{trab\adddotspace de conc\adddot}},
-  resreport        = {{relat\'orio de pesquisa}{rel\adddotspace de pesq\adddot}},
-  techreport       = {{relat\'orio t\'ecnico}{rel\adddotspace t\'ecn\adddot}},
+  mathesis         = {{disserta\c{c}\~ao de mestrado}{diss\adddot\ de mestrado}},
+  phdthesis        = {{tese de doutorado}{tese de doutorado}},
+% candthesis       = {{}{}},% FIXME: missing
+  resreport        = {{relat\'orio de pesquisa}{rel\adddotspace de pesquisa}},
+  techreport       = {{relat\'orio t\'ecnico}{rel\adddotspace t\'ec\adddot}},
   software         = {{software}{software}},
   datacd           = {{CD-ROM}{CD-ROM}},
   audiocd          = {{CD de \'audio}{CD de \'audio}},
   version          = {{vers\~ao}{vers\~ao}},
-  url              = {{endere\c{c}o}{endere\c{c}o}},
-  urlfrom          = {{dispon\'ivel em}{disp\adddotspace em}},
+  url              = {{endere\c{c}o eletr\^onico}{endere\c{c}o}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{acesso em}{acesso em}},
-  inpreparation    = {{em prepara\c{c}\~ao}{em prepara\c{c}\~ao}},
-  submitted        = {{submetido}{submetido}},
-  forthcoming      = {{aceito para publica\c{c}\~ao}{aceito para publica\c{c}\~ao}},
+  inpreparation    = {{em prepara\c{c}\~ao}{em prep\adddot}},
+  submitted        = {{submetido}{subm\adddot}},
+  forthcoming      = {{aceito para publica\c{c}\~ao}{aceito para publ\adddot}},
   inpress          = {{no prelo}{no prelo}},
-  prepublished     = {{pr\'e-publicado}{pr\'e-publicado}},
+% prepublished     = {{pr\'e-publicado}{pr\'e-publ\adddot}},% FIXME: missing
   citedas          = {{doravante citado como}{doravante citado como}},
-  thiscite         = {{especialmente}{esp\adddot}},
   seenote          = {{ver nota}{ver nota}},
   quotedin         = {{apud}{apud}},
   idem             = {{idem}{idem}},
@@ -434,7 +418,7 @@
   february         = {{fevereiro}{fev\adddot}},
   march            = {{mar\c{c}o}{mar\adddot}},
   april            = {{abril}{abr\adddot}},
-  may              = {{maio}{mai\adddot}},
+  may              = {{maio}{maio}},
   june             = {{junho}{jun\adddot}},
   july             = {{julho}{jul\adddot}},
   august           = {{agosto}{ago\adddot}},
@@ -444,71 +428,63 @@
   december         = {{dezembro}{dez\adddot}},
   langamerican     = {{ingl\^es}{ingl\^es}},
   langbrazilian    = {{portugu{\^e}s}{portugu{\^e}s}},
-  langbulgarian    = {{b\'ulgaro}{b\'ulgaro}},
-  langcatalan      = {{catal\~ao}{catal\~ao}},
+% langcatalan      = {{}{}},% FIXME: missing
   langcroatian     = {{croata}{croata}},
-  langczech        = {{tcheco}{tcheco}},
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{dinamarqu\^es}{dinamarqu\^es}},
   langdutch        = {{holand{\^e}s}{holand{\^e}s}},
   langenglish      = {{ingl\^es}{ingl\^es}},
   langfinnish      = {{finland\^es}{finland\^es}},
-  langestonian     = {{estoniano}{estoniano}},
+%  langestonian     = {{}{}},% FIXME: missing
   langfrench       = {{franc\^es}{franc\^es}},
-  langgalician     = {{galego}{galego}},
   langgerman       = {{alem\~ao}{alem\~ao}},
   langgreek        = {{grego}{grego}},
   langitalian      = {{italiano}{italiano}},
-  langjapanese     = {{japon\^es}{japon\^es}},
   langlatin        = {{latim}{latim}},
   langnorwegian    = {{noruegu\^es}{noruegu\^es}},
-  langpolish       = {{polon\^es}{polon\^es}},
+% langpolish       = {{}{}},% FIXME: missing
   langportuguese   = {{portugu{\^e}s}{portugu{\^e}s}},
   langrussian      = {{russo}{russo}},
-  langslovak       = {{eslovaco}{eslovaco}},
-  langslovene      = {{esloveno}{esloveno}},
+% langslovene      = {{}{}},% FIXME: missing
   langspanish      = {{espanhol}{espanhol}},
   langswedish      = {{sueco}{sueco}},
   fromamerican     = {{do ingl\^es}{do ingl\^es}},
   frombrazilian    = {{do portugu{\^e}s}{do portugu{\^e}s}},
-  frombulgarian    = {{do b\'ulgaro}{do b\'ulgaro}},
-  fromcatalan      = {{do catal\~ao}{do catal\~ao}},
+% fromcatalan      = {{}{}},% FIXME: missing
   fromcroatian     = {{do croata}{do croata}},
-  fromczech        = {{do tcheco}{do tcheco}},
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{do dinamarqu\^es}{do dinamarqu\^es}},
   fromdutch        = {{do holand{\^e}s}{do holand{\^e}s}},
   fromenglish      = {{do ingl\^es}{do ingl\^es}},
-  fromestonian     = {{do estoniano}{do estoniano}},
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{do finland\^es}{do finland\^es}},
   fromfrench       = {{do franc\^es}{do franc\^es}},
-  fromgalician     = {{do galego}{do galego}},
   fromgerman       = {{do alem\~ao}{do alem\~ao}},
   fromgreek        = {{do grego}{do grego}},
   fromitalian      = {{do italiano}{do italiano}},
-  fromjapanese     = {{do japon\^es}{do japon\^es}},
   fromlatin        = {{do latim}{do latim}},
   fromnorwegian    = {{do noruegu\^es}{do noruegu\^es}},
-  frompolish       = {{do polon\^es}{do polon\^es}},
+% frompolish       = {{}{}},% FIXME: missing
   fromportuguese   = {{do portugu{\^e}s}{do portugu{\^e}s}},
   fromrussian      = {{do russo}{do russo}},
-  fromslovak       = {{do eslovaco}{do eslovaco}},
-  fromslovene      = {{do esloveno}{do esloveno}},
+% fromslovene      = {{}{}},% FIXME: missing
   fromspanish      = {{do espanhol}{do espanhol}},
   fromswedish      = {{do sueco}{do sueco}},
   countryde        = {{Alemanha}{DE}},
-  countryeu        = {{Uni\~ao Europeia}{EU}},
-  countryep        = {{Uni\~ao Europeia}{EP}},
+  countryeu        = {{Uni\~ao Europ\'eia}{EU}},
+  countryep        = {{Uni\~ao Europ\'eia}{EP}},
   countryfr        = {{Fran\c{c}a}{FR}},
   countryuk        = {{Reino Unido}{GB}},
-  countryus        = {{Estados Unidos}{US}},
+  countryus        = {{Estados Unidos da Am\'erica}{US}},
   patent           = {{patente}{pat\adddot}},
   patentde         = {{patente alem\~a}{pat\adddot\ alem\~a}},
-  patenteu         = {{patente europeia}{pat\adddot\ europeia}},
-  patentfr         = {{patente francesa}{pat\adddot\ francesa}},
+  patenteu         = {{patente europ\'eia}{pat\adddot\ europ\'eia}},
+  patentfr         = {{patente francesa}{pat\adddot francesa}},
   patentuk         = {{patente brit\^anica}{pat\adddot\ brit\^anica}},
   patentus         = {{patente americana}{pat\adddot\ americana}},
   patreq           = {{pedido de patente}{ped\adddot\ de pat\adddot}},
   patreqde         = {{pedido de patente alem\~a}{ped\adddot\ de pat\adddot\ alem\~a}},
-  patreqeu         = {{pedido de patente europeia}{ped\adddot\ de pat\adddot\ europeia}},
+  patreqeu         = {{pedido de patente europ\'eia}{ped\adddot\ de pat\adddot\ europ\'eia}},
   patreqfr         = {{pedido de patente francesa}{ped\adddot\ de pat\adddot\ francesa}},
   patrequk         = {{pedido de patente brit\^anica}{ped\adddot\ de pat\adddot\ brit\^anica}},
   patrequs         = {{pedido de patente americana}{ped\adddot\ de pat\adddot\ americana}},
@@ -520,11 +496,11 @@
   beforecommonera  = {{antes da Era Comum}{AEC}},
   annodomini       = {{depois de Cristo}{d\adddot C\adddot}},
   beforechrist     = {{antes de Cristo}{a\adddot C\adddot}},
-  circa            = {{circa}{ca\adddot}},
-  spring           = {{primavera}{primavera}},
-  summer           = {{ver\~ao}{ver\~ao}},
-  autumn           = {{outono}{outono}},
-  winter           = {{inverno}{inverno}},
+% circa            = {{}{}},% FIXME: missing
+% spring           = {{}{}},% FIXME: missing
+% summer           = {{}{}},% FIXME: missing
+% autumn           = {{}{}},% FIXME: missing
+% winter           = {{}{}},% FIXME: missing
   am               = {{AM}{AM}},
   pm               = {{PM}{PM}},
 }
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index 49f90393cc3..fe10f05545d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
@@ -76,11 +76,6 @@
     \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
 }
 
-\DeclareBibliographyStrings{%
-  inherit          = {english},
-  organizer        = {{organiser}{org\adddot}},
-  organizers       = {{organisers}{orgs\adddot}},
-  byorganizer      = {{organised by}{org\adddotspace by}},
-}
+\InheritBibliographyStrings{english}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx
deleted file mode 100644
index e0a2647c9d0..00000000000
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/bulgarian.lbx
+++ /dev/null
@@ -1,593 +0,0 @@
-\ProvidesFile{bulgarian.lbx}
-[\abx@lbxid]
-
-\DeclareRedundantLanguages{bulgarian}{bulgarian} 
-
-% This file requires UTF-8 support!
-
-\lbx@ifutfinput
-  {}
-  {\PackageError{biblatex}
-     {Bulgarian requires UTF-8 support}
-     {The 'bulgarian.lbx' file requires UTF-8 encoding but you
-      seem\MessageBreak to be using a different encoding.
-      This is a fatal error. I will\MessageBreak abort loading
-      bulgarian.lbx now.}%
-   \endinput}
-
-\NewBibliographyString{% Used only Bulgarian for month checks
-  datejanuary,
-  datefebruary,
-  datemarch,
-  dateapril,
-  datemay,
-  datejune,
-  datejuly,
-  dateaugust,
-  dateseptember,
-  dateoctober,
-  datenovember,
-  datedecember%
-}
-
-\DeclareBibliographyExtras{%
-  \protected\def\bibrangedash{%
-    \textemdash\penalty\hyphenpenalty}% breakable dash
-  \let\finalandcomma=\empty
-  \let\finalandsemicolon=\empty
-  \protected\def\mkbibordinal#1{\mkbibmascord}%
-  \protected\def\mkbibmascord#1{#1-й}%
-  \protected\def\mkbibfemord#1{#1-я}%
-  \protected\def\mkbibneutord#1{#1-е}%
-  \protected\def\mkbibdatelong#1#2#3{%
-    \iffieldundef{#3}
-      {}
-      {\stripzeros{\thefield{#3}}%
-       \iffieldundef{#2}{}{\nobreakspace}}%
-    \iffieldundef{#2}
-      {}
-      {\iffieldundef{#3}
-         {\mkbibmonth{\thefield{#2}}}
-         {\lbx@ru@mkbibdatemonth{\thefield{#2}}}%
-       \iffieldundef{#1}{}{\space}}%
-    \iffieldbibstring{#1}
-      {\bibstring{\thefield{#1}}}
-      {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
-  \protected\def\mkbibdateshort#1#2#3{%
-    \iffieldundef{#3}
-      {}
-      {\mkdayzeros{\thefield{#3}}%
-       \iffieldundef{#2}{}{\adddot}}%
-    \iffieldundef{#2}
-      {}
-      {\mkmonthzeros{\thefield{#2}}%
-       \iffieldundef{#1}{}{\adddot}}%
-    \iffieldbibstring{#1}
-      {\bibstring{\thefield{#1}}}
-      {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
-  \savecommand\mkbibordedition
-  \savecommand\mkbibordseries
-  \def\mkbibordedition{\mkbibneutord}%
-  \def\mkbibordseries{\mkbibfemord}%
-  \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{%
-      \iffieldundef{#1}{}
-        {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}%
-      \iffieldundef{#2}{}
-        {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}%
-      \iffieldundef{#3}{}
-        {\printtext{\mktimezeros{\thefield{#3}}}}%
-      \setunit{}%
-      \iffieldundef{#4}{}
-        {\bibtimezonesep
-         \mkbibtimezone{\thefield{#4}}}}%
-  \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{%
-      \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep
-      \forcezerosmdt{\thefield{#2}}%
-      \iffieldundef{#3}{}
-        {\bibtimesep
-         \forcezeros{\thefield{#3}}}%
-       \space
-       \ifnumless{\thefield{#1}}{12}
-         {\bibstring{am}}
-         {\bibstring{pm}}%
-      \iffieldundef{#4}{}
-       {\space\bibtimezonesep
-        \parentext{\mkbibtimezone{\thefield{#4}}}}}%
-  \protected\def\mkbibseasondateshort#1#2{%
-    \mkbibseason{\thefield{#2}}%
-    \iffieldundef{#1}{}{\space}%
-    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
-  \protected\def\mkbibseasondatelong#1#2{%
-    \mkbibseason{\thefield{#2}}%
-    \iffieldundef{#1}{}{\space}%
-    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
-}
-
-\UndeclareBibliographyExtras{%
-  \restorecommand\mkbibordedition
-  \restorecommand\mkbibordseries
-}
-
-\DeclareBibliographyStrings{%
-  bibliography     = {{Библиография}{Библиография}},%book-like (chapter)
-  references       = {{Литература}{Литература}},%article-like (section)
-  shorthands       = {{Списък на съкращенията}{Съкращения}},
-  editor           = {{редактор}{ред\adddot}},
-  editors          = {{редактори}{ред\adddot}},
-  compiler         = {{съставител}{съст\adddot}},
-  compilers        = {{съставители}{съст\adddot}},
-  redactor         = {{редактор}{ред\adddot}},% FIXME: unsure
-  redactors        = {{редактори}{ред\adddot}},% FIXME: unsure
-  reviser          = {{коректор}{кор\adddotspace кор\adddot}},
-  revisers         = {{коректор}{кор\adddotspace кор\adddot}},
-  founder          = {{основател}{осн\adddot}},
-  founders         = {{основатели}{осн\adddot}},
-  continuator      = {{продължител}{прод\adddot}},% FIXME: unsure
-  continuators     = {{продължител}{прод\adddot}},% FIXME: unsure
-  collaborator     = {{участник}{участ\adddot}},% FIXME: unsure
-  collaborators    = {{участници}{участ\adddot}},% FIXME: unsure
-  translator       = {{преводач}{прев\adddot}},
-  translators      = {{преводачи}{прев\adddot}},
-  commentator      = {{коментатор}{комент\adddot}},
-  commentators     = {{коментатори}{комент\adddot}},
-  annotator        = {{бележки}{бел\adddot}},
-  annotators       = {{бележки}{бел\adddot}},
-  commentary       = {{комментар}{комент\adddot}},
-  annotations      = {{бележки}{бел\adddot}},
-  introduction     = {{уводна статия}{ув\adddotspace ст\adddot}},
-  foreword         = {{предговор}{предг\adddot}},
-  afterword        = {{послеслов}{послесл\adddot}},
-  editortr         = {{редактор и преводач}%
-                      {ред\adddotspace и прев\adddot}},
-  editorstr        = {{редактори и преводачи}%
-                      {ред\adddotspace и прев\adddot}},
-  editorco         = {{редактор и коментатор}%
-                      {ред\adddotspace и комент\adddot}},
-  editorsco        = {{редактори и коментатори}%
-                      {ред\adddotspace и комент\adddot}},
-  editoran         = {{редактор и съставител на бележките}%
-                      {ред\adddotspace и съст\adddotspace на бел\adddot}},
-  editorsan        = {{редактори и съставители на бележките}%
-                      {ред\adddotspace и съст\adddotspace на бел\adddot}},
-  editorin         = {{редактор и автор на уводната статия}%
-                      {ред\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}},
-  editorsin        = {{редактори и автори на уводната статия}%
-                      {ред\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}},
-  editorfo         = {{редактор и автор на предговора}%
-                      {ред\adddotspace и авт\adddotspace на предг\adddot}},
-  editorsfo        = {{редактори и автори на предговора}%
-                      {ред\adddotspace и авт\adddotspace на предговора\adddot}},
-  editoraf         = {{редактор и автор на послеслова}%
-                      {ред\adddotspace и авт\adddotspace на послесл\adddot}},
-  editorsaf        = {{редактори и автори на послеслова}%
-                      {ред\adddotspace и авт\adddotspace на послесл\adddot}},
-  editortrco       = {{редактор, преводач и автор на коментарите}%
-                      {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на комент\adddot}},
-  editorstrco      = {{редактори, преводачи и автори коментарите}%
-                      {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на комент\adddot}},
-  editortran       = {{редактор, преводач и съставител на бележките}%
-                      {ред.,\addabbrvspace прев.\adddotspace и съст\adddotspace на бел\adddot}},
-  editorstran      = {{редактори, преводачи и съставители на бележките}%
-                      {ред.,\addabbrvspace прев.\adddotspace и съст\adddotspace на бел\adddot}},
-  editortrin       = {{редактор, преводач и автор на уводната статия}%
-                      {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}},
-  editorstrin      = {{редактори, преводачи и автори на уводната статия}%
-                      {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}},
-  editortrfo       = {{редактор, преводач и автор на предговора}%
-                      {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на предг\adddot}},
-  editorstrfo      = {{редактори, преводачи и автори на предговора}%
-                      {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на предг\adddot}},
-  editortraf       = {{редактор, преводач и автор на послеслова}%
-                      {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на послеслова\adddot}},
-  editorstraf      = {{редактори, преводачи и автори на послеслова}%
-                      {ред.,\addabbrvspace прев\adddotspace и авт\adddotspace на послеслова\adddot}},
-  editorcoin       = {{редактор, автор на коментарите и уводната статия}%
-                      {ред.,\addabbrvspace авт\adddotspace на комент\adddotspace и ун\adddotspace ст\adddot}},
-  editorscoin      = {{редактори, автори на коментарите и уводната статия}%
-                      {ред.,\addabbrvspace авт\adddotspace на комент\adddotspace и ун\adddotspace ст\adddot}},
-  editorcofo       = {{редактор, автор на комментарите и предговора}%
-                      {ред.,\addabbrvspace авт\adddotspace на комент\adddotspace и предг\adddot}},
-  editorscofo      = {{редактори, автори на комментарите и предговора}%
-                      {ред.,\addabbrvspace авт\adddotspace на комент\adddotspace и предг\adddot}},
-  editorcoaf       = {{редактор, автор на комментарите и послеслова}%
-                      {ред.,\addabbrvspace авт\adddotspace на комент\adddotspace и послесл\adddot}},
-  editorscoaf      = {{редактори, автори на комментарите и послеслова}%
-                      {ред.,\addabbrvspace авт\adddotspace на комент\adddotspace и послесл\adddot}},
-  editoranin       = {{редактор, съставител на бележките и автор на уводната статия}%
-                      {ред.,\addabbrvspace съст\adddotspace на бел.\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}},
-  editorsanin      = {{редактори, съставители на бележките и автори на уводната статия}%
-                      {ред.,\addabbrvspace съст\adddotspace на бел.\adddotspace и авт\adddotspace на ув\adddotspace ст\adddot}},
-  editoranfo       = {{редактор, съставител на бележките и автор на предговора}%
-                      {ред.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на предг\adddot}},
-  editorsanfo      = {{редактори, съставители на бележките и автори на предговора}%
-                      {ред.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на предг\adddot}},
-  editoranaf       = {{редактор, съставител на бележките и автор на послеслова}%
-                      {ред.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на послесл\adddot}},
-  editorsanaf      = {{редактори, съставители на бележките и автори на послеслова}%
-                      {ред.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на послесл\adddot}},
-  editortrcoin     = {{редактор, преводач, автор на коментарите и уводната статия}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и ув\adddotspace ст\adddot}},
-  editorstrcoin    = {{редактори, преводачи, автори на коментарите и уводната статия}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и ув\adddotspace ст\adddot}},
-  editortrcofo     = {{редактор, преводач, автор на коментарите и предговора}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и предг\adddot}},
-  editorstrcofo    = {{редактори, преводачи, автори на коментарите и предговора}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и предг\adddot}},
-  editortrcoaf     = {{редактор, преводач, автор на комментарите и послеслова}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и послесл\adddot}},
-  editorstrcoaf    = {{редактори, преводачи, автори на комментарите и послеслова}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и послесл\adddot}},
-  editortranin     = {{редактор, переводач, съставител на бележките и автор на уводната статия}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на ув.\adddotspace ст\adddot}},
-  editorstranin    = {{редактори, переводачи, съставители на бележките и автори на уводната статия}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на ув.\adddotspace ст\adddot}},
-  editortranfo     = {{редактор, преводач, съставител на бележките и автор на предговора}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на предг\adddot}},
-  editorstranfo    = {{редактор, преводач, съставител на бележките и автор на предговора}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на предг\adddot}},
-  editortranaf     = {{редактор, преводач, съставител на бележките и автор на послеслова}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на послесл\adddot}},
-  editorstranaf    = {{редактори, преводачи, съставители на бележките и автори на послеслова}%
-                      {ред.,\addabbrvspace прев.,\addabbrvspace съст\adddotspace на бел\adddotspace и авт\adddotspace на послесл\adddot}},
-  translatorco     = {{преводач и автор на коментарите}%
-                      {прев\adddotspace и авт\adddotspace на комент\adddot}},
-  translatorsco    = {{преводачи и автори на коментарите}%
-                      {прев\adddotspace и авт\adddotspace на комент\adddot}},
-  translatoran     = {{преводач и съставител на бележките}%
-                      {прев\adddotspace и съст\adddotspace на бел\adddot}},
-  translatorsan    = {{преводачи и съставители на бележките}%
-                      {прев\adddotspace и съст\adddotspace на бел\adddot}},
-  translatorin     = {{преводач и автор на уводната статия}%
-                      {прев\adddotspace и авт\adddotspace  на ув\adddotspace ст\adddot}},
-  translatorsin    = {{преводач и автор на уводната статия}%
-                      {прев\adddotspace и авт\adddotspace  на ув\adddotspace ст\adddot}},
-  translatorfo     = {{преводач и автор на предговора}%
-                      {прев\adddotspace и авт\adddotspace на предг\adddot}},
-  translatorsfo    = {{преводачи и автори на предговора}%
-                      {прев\adddotspace и авт\adddotspace на предг\adddot}},
-  translatoraf     = {{преводач и автор на послеслова}%
-                      {прев\adddotspace и авт\adddotspace на послесл\adddot}},
-  translatorsaf    = {{преводачи и автори на послеслова}%
-                      {прев\adddotspace и авт\adddotspace на послесл\adddot}},
-  translatorcoin   = {{преводач, автор ва коментарите и уводната статия}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и ув\adddotspace ст\adddot}},
-  translatorscoin  = {{преводач, автор ва коментарите и уводната статия}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и ув\adddotspace ст\adddot}},
-  translatorcofo   = {{преводач, автор на коментарите и предговора}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и предг\adddot}},
-  translatorscofo  = {{преводачи, автори на коментарите и предговора}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и предг\adddot}},
-  translatorcoaf   = {{преводач, автор на комментарите и послеслова}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и послесл\adddot}},
-  translatorscoaf  = {{преводачи, автори на комментарите и послеслова}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и послесл\adddot}},
-  translatoranin   = {{преводач, автор на комментарите и уводната статия}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и ув\adddotspace ст\adddot}},
-  translatorsanin  = {{преводачи, автори на комментарите и уводната статия}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и ув\adddotspace ст\adddot}},
-  translatoranfo   = {{преводач, автор на коментарите и предговора}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и предг\adddot}},
-  translatorsanfo  = {{преводачи, автори на коментарите и предговора}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и предг\adddot}},
-  translatoranaf   = {{преводач, автор на коментарите и послеслова}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и послесл\adddot}},
-  translatorsanaf  = {{преводачи, автори на коментарите и послеслова}%
-                      {прев.,\addabbrvspace авт\adddotspace на комент\adddotspace и послесл\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
-% byauthor         = {{}{}},% FIXME: missing
-  byeditor         = {{под редакцията на}{под\addabbrvspace ред\adddotspace на}},
-  bycompiler       = {{съставител}{съст\adddot}},
-  byredactor       = {{под редакцията на }{под\addabbrvspace ред\adddotspace на}},
-  byreviser        = {{коригирано от}{кор\adddotspace от}},
-  byreviewer       = {{рецензия от}{рец\adddotspace от}},
-  byfounder        = {{основател}{осн\adddot}},
-  bycontinuator    = {{продължител}{продълж\adddot}},
-  bycollaborator   = {{сътрудник}{сътр\adddot}},
-  bytranslator     = {{превод \lbx@lfromlang}{прев\adddot\ \lbx@sfromlang}},
-  bycommentator    = {{коментари}{комент\adddot}},
-  byannotator      = {{бележки}{бел\adddot}},
-  withcommentator  = {{коментари}{комент\adddot}},
-  withannotator    = {{бележки}{бел\adddot}},
-  withintroduction = {{уводна статия}{ув\adddotspace ст\adddot}},
-  withforeword     = {{предговор}{предг\adddot}},
-  withafterword    = {{послеслов}{послесл\adddot}},
-  byeditortr       = {{превод \lbx@lfromlang, под редакцията на}%
-                      {прев\adddot\ \lbx@sfromlang, под\addabbrvspace ред\adddot}},
-  byeditorco       = {{под редакцията на, коментари}%
-                      {под ред.,\addabbrvspace коммент\adddot}},
-  byeditoran       = {{под редакцията на, бележки}%
-                      {под ред.,\addabbrvspace бел\adddot}},
-  byeditorin       = {{под редакцията на, уводна статия}%
-                      {под ред.,\addabbrvspace ув\adddotspace ст\adddot}},
-  byeditorfo       = {{под редакцията на, предговор}%
-                      {под ред.,\addabbrvspace предг\adddot}},
-  byeditoraf       = {{под редакцията на, послеслов}%
-                      {под ред.,\addabbrvspace послесл\adddot}},
-  byeditortrco     = {{под редакцията на, превод \lbx@lfromlang\ и комментари}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang\ и коммент\adddot}},
-  byeditortran     = {{под редакцията на, превод \lbx@lfromlang\ и бележки}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang\ и бел\adddot}},
-  byeditortrin     = {{под редакцията на, превод \lbx@lfromlang, уводна статия}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, ув\adddotspace ст\adddot}},
-  byeditortrfo     = {{под редакцията на, превод \lbx@lfromlang, предговор}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, предг\adddot}},
-  byeditortraf     = {{под редакцията на, превод \lbx@lfromlang, послеслов}%
-                      {под ред\adddotspace и прев\adddot\ \lbx@sfromlang, послесл\adddot}},
-  byeditorcoin     = {{под редакцията на, коментари и уводна статия}%
-                      {под ред.,\addabbrvspace комент\adddotspace и ув\adddotspace ст\adddot}},
-  byeditorcofo     = {{под редакцията на, коментари и предговор}%
-                      {под ред.,\addabbrvspace комент\adddotspace и предг\adddot}},
-  byeditorcoaf     = {{под редакцията на, коментари и послеслов}%
-                      {под ред.,\addabbrvspace комент\adddotspace и послесл\adddot}},
-  byeditoranin     = {{под редакцията на, бележки и уводна статия}%
-                      {под ред.,\addabbrvspace бел\adddotspace и ув\adddotspace ст\adddot}},
-  byeditoranfo     = {{под редакцията на, бележки и предговор}%
-                      {под ред.,\addabbrvspace бел\adddotspace и предг\adddot}},
-  byeditoranaf     = {{под редакцията на, бележки и послеслов}%
-                      {под ред.,\addabbrvspace бел\adddotspace и послесл\adddot}},
-  byeditortrcoin   = {{под редакцията на, превод \lbx@lfromlang, коментари и уводна статия}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, комент\adddotspace и ув\adddotspace ст\adddot}},
-  byeditortrcofo   = {{под редакцията на, превод \lbx@lfromlang, коментари и предгово}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, комент\adddotspace и предг\adddot}},
-  byeditortrcoaf   = {{под редакцията на, превод \lbx@lfromlang, коментари и послеслов}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, комент\adddotspace и послесл\adddot}},
-  byeditortranin   = {{под редакцията на, превод \lbx@lfromlang, бележки и уводна статия}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, бел\adddotspace и ув\adddotspace ст\adddot}},
-  byeditortranfo   = {{под редакцията на, превод \lbx@lfromlang, бележки и предговор}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, бел\adddotspace и предг\adddot}},
-  byeditortranaf   = {{под редакцията на, превод \lbx@lfromlang, бележки и послеслов}%
-                      {под ред.,\addabbrvspace прев\adddot\ \lbx@sfromlang, бел\adddotspace и послесл\adddot}},
-  bytranslatorco   = {{превод \lbx@lfromlang\ и коментари}%
-                      {прев\adddot\ \lbx@sfromlang\ и коммент\adddot}},
-  bytranslatoran   = {{превод \lbx@lfromlang\ и бележки}%
-                      {прев\adddot\ \lbx@sfromlang\ и бел\adddot}},
-  bytranslatorin   = {{превод \lbx@lfromlang\ и уводна статия}%
-                      {прев\adddot\ \lbx@sfromlang\ и ув\adddotspace ст\adddot}},
-  bytranslatorfo   = {{превод \lbx@lfromlang\ и предговор}%
-                      {прев\adddot\ \lbx@sfromlang\ и предг\adddot}},
-  bytranslatoraf   = {{превод \lbx@lfromlang\ и послеслов}%
-                      {прев\adddot\ \lbx@sfromlang\ и и послесл\adddot}},
-  bytranslatorcoin = {{превод \lbx@lfromlang, коментари и уводна статия}%
-                      {прев\adddot\ \lbx@sfromlang, комент\adddotspace и ув\adddotspace ст\adddot}},
-  bytranslatorcofo = {{превод \lbx@lfromlang, коментари и предговор}%
-                      {прев\adddot\ \lbx@sfromlang, комент\adddotspace и предг\adddot}},
-  bytranslatorcoaf = {{превод \lbx@lfromlang, коментари и послеслов}%
-                      {прев\adddot\ \lbx@sfromlang, комент\adddotspace и послесл\adddot}},
-  bytranslatoranin = {{превод \lbx@lfromlang, бележки и уводна статия}%
-                      {прев\adddot\ \lbx@sfromlang, бел\adddotspace и ув\adddotspace ст\adddot}},
-  bytranslatoranfo = {{превод \lbx@lfromlang, бележки и предговор}%
-                      {прев\adddot\ \lbx@sfromlang, бел\adddotspace и предг\adddot}},
-  bytranslatoranaf = {{превод \lbx@lfromlang, бележки и послеслов}%
-                      {прев\adddot\ \lbx@sfromlang, бел\adddotspace и послесл\adddot}},
-  and              = {{и}{и}},
-  andothers        = {{и\addabbrvspace др\adddot}{и\addabbrvspace др\adddot}},
-  andmore          = {{и\addabbrvspace др\adddot}{и\addabbrvspace др\adddot}},
-  volume           = {{том}{т\adddot}},
-  volumes          = {{тома}{т\adddot}},
-  involumes        = {{в}{в}},
-  jourvol          = {{том}{т\adddot}},
-  jourser          = {{поредица}{пор\adddot}},
-  book             = {{книга}{кн\adddot}},
-  part             = {{част}{ч\adddot}},
-  issue            = {{брой}{бр\adddot}},
-  newseries        = {{нова поредица}{нова пор\adddot}},
-  oldseries        = {{стара поредица}{стара пор\adddot}},
-  edition          = {{издание}{изд\adddot}},
-  reprint          = {{преиздание}{преизд\adddot}},
-  reprintof        = {{преиздание на}{преизд\adddotspace на}},
-  reprintas        = {{переиздадено като}{преизд\adddotspace като}},
-  reprintfrom      = {{преиздадено с}{преизд\adddotspace с}},
-  translationof    = {{превод по изданието\addcolon}{прев\adddotspace по изд\adddot\addcolon}},
-  translationas    = {{превод\addcolon}{прев\adddot\addcolon}},
-  translationfrom  = {{превод от}{прев\adddotspace от}},
-  reviewof         = {{рецензия на\addcolon}{рец\adddotspace на\addcolon}},
-  origpubas        = {{първо публикуване\addcolon}%
-                      {първо публ\adddot\addcolon}},
-  origpubin        = {{първо публикувано в}%
-                      {първо публ\adddotspace в}},
-  astitle          = {{под заглавие\addcolon}{под загл\adddot\addcolon}},
-  bypublisher      = {{издател\addcomma}{изд\addcomma}},% FIXME: unsure
-  nodate           = {{б\adddot г\adddot}{б\adddot г\adddot}},
-  page             = {{страница}{с\adddot}},
-  pages            = {{страници}{с\adddot}},
-  column           = {{колона}{кол\adddot}},
-  columns          = {{колони}{кол\adddot}},
-  line             = {{ред}{ред}},
-  lines            = {{редове}{редове}},
-  verse            = {{стих}{стих}},
-  verses           = {{стихове}{стихове}},
-  section          = {{параграф}{\S}},
-  sections         = {{параграфи}{\S\S}},
-  paragraph        = {{абзац}{абз\adddot}},
-  paragraphs       = {{абзаци}{абз\adddot}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
-  in               = {{в}{в}},
-  inseries         = {{в}{в}},
-  ofseries         = {{от}{от}},
-  number           = {{номер}{№}},
-  chapter          = {{глава}{гл\adddot}},
-  mathesis         = {{маг\adddotspace\textellipsis\ дис\adddot}
-                      {маг\adddotspace\textellipsis\ дис\adddot}},
-  phdthesis        = {{докт\adddotspace\textellipsis\ дис\adddot}
-                      {докт\adddotspace\textellipsis\ дис\adddot}},
-  candthesis       = {{канд\adddotspace\textellipsis\ дис\adddot}
-                      {канд\adddotspace\textellipsis\ дис\adddot}},
-  resreport        = {{научен доклад}{научен докл\adddot}},
-  techreport       = {{технически доклад}{техн\adddotspace докл\adddot}},
-  software         = {{програмно обезпечение}{прогр\adddotspace обезп\adddot}},
-  datacd           = {{CD-ROM}{CD-ROM}},
-  audiocd          = {{audio CD}{audio CD}},
-  version          = {{версия}{вер\adddot}},
-  url              = {{url}{url}},
-  urlfrom          = {{режим на достъп}{режим на достъп}},
-  urlseen          = {{дата на посещение}{дата\addabbrvspace на посещ\adddot}},
-  inpreparation    = {{в\addabbrvspace подготовка на}{в подг\adddotspace на}},
-  submitted        = {{изпратено}{изпр\adddot}},
-  forthcoming      = {{предстоящо публикуване}{предст\adddotspace публ\adddot}},
-  inpress          = {{под\addabbrvspace печат}{под печ\adddot}},
-  prepublished     = {{предварителна публикация}{предв\adddotspace публ\adddot}},% FIXME: unsure
-  citedas          = {{по-нататък цитирано като}{по-нататък цит\addabbrvspace като}},
-  thiscite         = {{тук}{тук}},
-  seenote          = {{виж бележката под линия}{вж\adddotspace бел\adddotspace под линия}},
-  quotedin         = {{цитирано в}{цит\adddotspace в}},
-  idem             = {{същия\addabbrvspace автор}{същ\adddotspace авт\adddot}},
-  idemsm           = {{същия\addabbrvspace автор}{същ\adddotspace авт\adddot}},
-  idemsf           = {{същия\addabbrvspace автор}{същ\adddotspace авт\adddot}},
-  idemsn           = {{същия\addabbrvspace автор}{същ\adddotspace авт\adddot}},
-  idempm           = {{същите\addabbrvspace автори}{същ\adddotspace авт\adddot}},
-  idempf           = {{същите\addabbrvspace автори}{същ\adddotspace авт\adddot}},
-  idempn           = {{същите\addabbrvspace автори}{същ\adddotspace авт\adddot}},
-  idempp           = {{същите\addabbrvspace автори}{същ\adddotspace авт\adddot}},
-  ibidem           = {{пак\addabbrvspace там}{пак\addabbrvspace там}},
-  opcit            = {{цит\adddotspace съч\adddot}{цит\adddotspace съч\adddot}},
-  loccit           = {{цит\adddotspace място}{цит\adddotspace място}},
-  confer           = {{сравни}{срв\adddot}},
-  sequens          = {{и следващата}{и\addabbrvspace следв\adddot}},
-  sequentes        = {{и следващите}{и\addabbrvspace следв\adddot}},
-  passim           = {{навсякъде}{навс\adddot}},
-  see              = {{виж}{вж\adddot}},
-  seealso          = {{виж също}{вж\adddotspace също}},
-  backrefpage      = {{цитирано на страница}{цит\adddotspace на\addabbrvspace с\adddot}},
-  backrefpages     = {{цитирано на страници}{цит\adddotspace на\addabbrvspace с\adddot}},
-  january          = {{януари}{ян\adddot}},
-  february         = {{февруари}{февр\adddot}},
-  march            = {{март}{март}},
-  april            = {{април}{апр\adddot}},
-  may              = {{май}{май}},
-  june             = {{юни}{юни}},
-  july             = {{юли}{юли}},
-  august           = {{август}{авг\adddot}},
-  september        = {{септември}{септ\adddot}},
-  october          = {{октомври}{окт\adddot}},
-  november         = {{ноември}{ноем\adddot}},
-  december         = {{декември}{дек\adddot}},
-  datejanuary      = {{януари}{ян\adddot}},
-  datefebruary     = {{февруари}{февр\adddot}},
-  datemarch        = {{март}{март}},
-  dateapril        = {{април}{апр\adddot}},
-  datemay          = {{май}{май}},
-  datejune         = {{юни}{юни}},
-  datejuly         = {{юли}{юли}},
-  dateaugust       = {{август}{авг\adddot}},
-  dateseptember    = {{септември}{септ\adddot}},
-  dateoctober      = {{октомври}{окт\adddot}},
-  datenovember     = {{ноември}{ноем\adddot}},
-  datedecember     = {{декември}{дек\adddot}},
-  langamerican     = {{американски}{амер\adddot}},
-  langbrazilian    = {{бразилски}{браз\adddot}},
-  langbulgarian = {{български}{бълг\adddot}},
-  langcatalan      = {{каталунски}{катал\adddot}},
-  langcroatian     = {{хърватски}{хърв\adddot}},
-  langczech        = {{чешки}{чеш\adddot}},
-  langdanish       = {{датски}{дат\adddot}},
-  langdutch        = {{нидерландски}{нидерл\adddot}},
-  langenglish      = {{английски}{англ\adddot}},
-  langestonian     = {{естонски}{ест\adddot}},
-  langfinnish      = {{фински}{фин\adddot}},
-  langfrench       = {{френски}{фр\adddot}},
-  langgalician     = {{галисийски}{гал\adddot}},
-  langgerman       = {{немски}{нем\adddot}},
-  langgreek        = {{гръцки}{гр\adddot}},
-  langitalian      = {{италиански}{итал\adddot}},
-  langjapanese     = {{японски}{яп\adddot}},
-  langlatin        = {{латински}{лат\adddot}},
-  langnorwegian    = {{норвежки}{норв\adddot}},
-  langpolish       = {{полски}{пол\adddot}},
-  langportuguese   = {{португалски}{порт\adddot}},
-  langrussian      = {{русски}{рус\adddot}},
-  langslovene      = {{словенски}{слов\adddot}},
-  langspanish      = {{испански}{исп\adddot}},
-  langswedish      = {{шведски}{швед\adddot}},
-  fromamerican     = {{от американски}{от\addabbrvspace амер\adddot}},
-  frombrazilian    = {{от бразилски}{от\addabbrvspace браз\adddot}},
-  frombulgarian    = {{от български}{от\addabbrvspace бълг\adddot}},
-  fromcatalan      = {{от каталунски}{от\addabbrvspace катал\adddot}},
-  fromcroatian     = {{от хърватски}{от\addabbrvspace хърв\adddot}},
-  fromczech        = {{от чешки}{от\addabbrvspace чеш\adddot}},
-  fromdanish       = {{от датски}{от\addabbrvspace дат\adddot}},
-  fromdutch        = {{от нидерландски}{от\addabbrvspace нидерл\adddot}},
-  fromenglish      = {{от английски}{от\addabbrvspace англ\adddot}},
-  fromestonian     = {{от естонски}{от\addabbrvspace эст\adddot}},
-  fromfinnish      = {{от фински}{от\addabbrvspace фин\adddot}},
-  fromfrench       = {{от френски}{от\addabbrvspace фр\adddot}},
-  fromgalician     = {{от галисийски}{от\addabbrvspace гал\adddot}},
-  fromgerman       = {{от немски}{от\addabbrvspace нем\adddot}},
-  fromgreek        = {{от гръцки}{от\addabbrvspace греч\adddot}},
-  fromitalian      = {{от италиански}{от\addabbrvspace итал\adddot}},
-  fromjapanese     = {{от японски}{от\addabbrvspace яп\adddot}},
-  fromlatin        = {{от латински}{от\addabbrvspace лат\adddot}},
-  fromnorwegian    = {{от норвежки}{от\addabbrvspace норв\adddot}},
-  frompolish       = {{от полски}{от пол\adddot}},
-  fromportuguese   = {{от португалски}{от\addabbrvspace порт\adddot}},
-  fromrussian      = {{от руски}{от\addabbrvspace рус\adddot}},
-  fromslovene      = {{от словенски}{от\addabbrvspace слов\adddot}},
-  fromspanish      = {{от испански}{от\addabbrvspace исп\adddot}},
-  fromswedish      = {{от шведски}{от\addabbrvspace швед\adddot}},
-  countryde        = {{Германия}{Германия}},
-  countryeu        = {{Европейски съюз}{ЕС}},
-  countryep        = {{Европейски съюз}{ЕС}},
-  countryfr        = {{Франция}{Франция}},
-  countryuk        = {{Великобритания}{Великобритания}},
-  countryus        = {{Съединени американски щати}{САЩ}},
-  patent           = {{патент}{пат\adddot}},
-  patentde         = {{патент на Германия}{пат\adddotspace на Германия}},
-  patenteu         = {{патент на Европа}{пат\adddotspace на Европа}},
-  patentfr         = {{патент на Франция}{пат\adddotspace на Франции}},
-  patentuk         = {{патент на Великобритания}{пат\adddotspace на Великобритания}},
-  patentus         = {{патент на САЩ}{пат\adddotspace на САЩ}},
-  patreq           = {{заявка}{заявка}},
-  patreqde         = {{заявка за патент на Германии}{заявка за пат\adddotspace на Германия}},
-  patreqeu         = {{заявка за патент на Европа}{заявка за пат\adddotspace на Европа}},
-  patreqfr         = {{заявка за патент на Франция}{заявка за пат\adddotspace на Франция}},
-  patrequk         = {{заявка за патент на Великобритания}{заявка за пат\adddotspace на Великобритания}},
-  patrequs         = {{заявка за патент на САЩ}{заявка за пат\adddotspace на САЩ}},
-  file             = {{файл}{файл}},
-  library          = {{библиотека}{б-ка}},
-  abstract         = {{резюме}{рез\adddot}},
-  annotation       = {{анотация}{анот\adddot}},
-  commonera        = {{новата ера}{н\adddotspace е\adddot}},
-  beforecommonera  = {{до новата ера}{до н\adddotspace е\adddot}},
-  annodomini       = {{след Христа}{сл\adddotspace Хр\adddot}},
-  beforechrist     = {{до Христа}{до Хр\adddot}},
-  circa            = {{около}{ок\adddot}},
-  spring           = {{пролет}{пролет}},
-  summer           = {{лято}{лято}},
-  autumn           = {{есен}{есен}},
-  winter           = {{зима}{зима}},
-  am               = {{преди обяд}{преди обяд}},
-  pm               = {{след обяд}{сдед обяд}},
-}
-
-\protected\gdef\lbx@bg@mkbibdatemonth#1{%
-  \ifcase0#1\relax
-    #1\BibliographyWarning{Month out of range}%
-  \or\abx@bibmonth{datejanuary}%
-  \or\abx@bibmonth{datefebruary}%
-  \or\abx@bibmonth{datemarch}%
-  \or\abx@bibmonth{dateapril}%
-  \or\abx@bibmonth{datemay}%
-  \or\abx@bibmonth{datejune}%
-  \or\abx@bibmonth{datejuly}%
-  \or\abx@bibmonth{dateaugust}%
-  \or\abx@bibmonth{dateseptember}%
-  \or\abx@bibmonth{dateoctober}%
-  \or\abx@bibmonth{datenovember}%
-  \or\abx@bibmonth{datedecember}%
-  \else
-    #1\BibliographyWarning{Month out of range}%
-  \fi}%
-
-\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
index 257bc601e2c..8b6675d12b0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
@@ -11,7 +11,7 @@
   \protected\def\mkbibmascord#1{%
     \begingroup
     \@tempcnta0#1\relax\number\@tempcnta
-    \ifcase\@tempcnta\or r\or n\or r\or t\else\`e\fi
+    \ifcase\@tempcnta\or r\or n\or r\or t\else\`e\fi		
     \endgroup}%
   \protected\def\mkbibfemord#1{\stripzeros{#1}a}%
   \protected\def\mkbibdatelong#1#2#3{% maintainers: check me
@@ -266,9 +266,6 @@
                       {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}},
   translatorsanaf  = {{traductors, anotadors i autors de l'ep{\'\i}leg}
                       {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{per}{per}},
   byeditor         = {{edici\'o a cura \smartof}{ed\adddotspace\smartof}},
   bycompiler       = {{compilaci\'o a cura \smartof}{comp\adddotspace\smartof}},
@@ -384,27 +381,15 @@
   pages            = {{p\`agines}{p\`ag\adddot}},
   column           = {{columna}{col\adddot}},
   columns          = {{columnes}{cols\adddot}},
-  line             = {{l{\'\i}nia}{l{\'\i}n\adddot}},
+  line             = {{l{\'\i}nia}{l{\'\i}n\adddot}}, 
   lines            = {{l{\'\i}nies}{l{\'\i}n\adddot}},
   nodate           = {{sine data}{s\adddotspace d\adddot}},
-  verse            = {{vers}{v\adddot}},
+  verse            = {{vers}{v\adddot}}, 
   verses           = {{versos}{v\adddot}},
   section          = {{apartat}{\S}},
   sections         = {{apartats}{\S}},
   paragraph        = {{par\`agraf}{\P}},
   paragraphs       = {{par\`agrafs}{\P}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{a}{a}},
   inseries         = {{\smartof}{\smartof}},
   ofseries         = {{\smartof}{\smartof}},
@@ -464,17 +449,15 @@
   december         = {{desembre}{des\adddot}},
   langamerican     = {{angl\`es americ\`a}{ang\adddotspace amer\adddot}},
   langbrazilian    = {{portugu\`es brasiler}{port\adddotspace bras\adddot}},
-% langbulgarian    = {{}{}},% FIXME: missing
   langcatalan      = {{catal\`a}{cat\adddot}},
   langczech        = {{txec}{txec}},
   langcroatian     = {{croat}{croat}},
   langdanish       = {{dan\`es}{dan\adddot}},
   langdutch        = {{neerland\`es}{neerl\adddot}},
   langenglish      = {{angl\`es}{ang\adddot}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{fin\`es}{fin\adddot}},
   langfrench       = {{franc\`es}{fr\adddot}},
-  langgalician     = {{gallec}{gal\adddot}},
   langgerman       = {{alemany}{al\adddot}},
   langgreek        = {{grec}{grec}},
   langitalian      = {{itali\`a}{it\adddot}},
@@ -488,17 +471,15 @@
   langswedish      = {{suec}{suec}},
   fromamerican     = {{de l'angl\`es americ\`a}{de l'ang\adddotspace amer\adddot}},
   frombrazilian    = {{del portugu\`es brasiler}{del port\adddotspace bras\adddot}},
-% frombulgarian    = {{}{}},% FIXME: missing
   fromcatalan      = {{del catal\`a}{del cat\adddot}},
   fromcroatian     = {{del croat}{del croat}},
   fromczech        = {{del txec}{del txec}},
   fromdanish       = {{del dan\`es}{del dan\adddot}},
   fromdutch        = {{del neerland\`es}{del neerl\adddot}},
   fromenglish      = {{de l'angl\`es}{de l'ang\adddot}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{del fin\`es}{del fin\adddot}},
   fromfrench       = {{del franc\`es}{del fr\adddot}},
-  fromgalician     = {{del gallec}{del gal\adddot}},
   fromgerman       = {{de l'alemany}{de l'al\adddot}},
   fromgreek        = {{del grec}{del grec}},
   fromitalian      = {{de l'itali\`a}{de l'it\adddot}},
@@ -530,8 +511,8 @@
   patrequs         = {{so\l.licitud de patent estatunidenca}{so\l.l\adddotspace de pat\adddot\ EUA}},
   file             = {{fitxer}{fitx\adddot}},
   library          = {{biblioteca}{bibl\adddot}},
-  abstract         = {{resum}{res\adddot}},
-  annotation       = {{nota}{n\adddot}},
+  abstract         = {{resum}{res\adddot}}, 
+  annotation       = {{nota}{n\adddot}}, 
   commonera        = {{Era Comuna}{EC}},
   beforecommonera  = {{abans de l’Era Comuna}{AEC}},
   annodomini       = {{despr\'es de Crist}{dC}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx
index f47be0901c9..cacb3ced281 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx
@@ -262,9 +262,6 @@
                       {prijevod, bilje\v{s}ke i pogovor}},
   translatorsanaf  = {{prijevod, bilje\v{s}ke i pogovor}%
                       {prijevod, bilje\v{s}ke i pogovor}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{autor\addcolon}{autor\addcolon}},% gender biased
   byeditor         = {{obrada\addcolon}{ur\adddot}},%
   bycompiler       = {{sastavlja\v{c}\addcolon}{sast\adddot}},% gender biased
@@ -377,31 +374,19 @@
 % origpubin        = {{}{}},% FIXME: missing
 % astitle          = {{}{}},% FIXME: missing
 % bypublisher      = {{}{}},% FIXME: missing
-  nodate           = {{no date}{n\adddot d\adddot}},% FIXME
   page             = {{stranica}{str\adddot}},
   pages            = {{stranice}{str\adddot}},
   column           = {{stupac}{stupac}},
   columns          = {{stupci}{stupci}},
   line             = {{linija}{l\adddot}},
   lines            = {{linije}{ll\adddot}},
+  nodate           = {{no date}{n\adddot d\adddot}},% FIXME
   verse            = {{stih}{stih}},
   verses           = {{stihovi}{stihovi}},
   section          = {{odjeljak}{\S}},
   sections         = {{odjeljci}{\S\S}},
   paragraph        = {{stavak}{st\adddot}},
   paragraphs       = {{stavci}{st\adddot}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{}{}},% FIXME: check
   inseries         = {{u seriji}{u seriji}},
   ofseries         = {{iz serije}{iz serije}},
@@ -473,17 +458,15 @@
   datedecember     = {{prosinca}{prosinca}},
   langamerican     = {{engleski}{engleski}},
   langbrazilian    = {{portugalski}{portugalski}},
-% langbulgarian    = {{}{}},% FIXME: missing
 % langcatalan      = {{}{}},% FIXME: missing
   langcroatian     = {{hrvatski}{hrvatski}},
 % langczech        = {{}{}},% FIXME: missing
   langdanish       = {{danski}{danski}},
   langdutch        = {{nizozemski}{nizozemski}},
   langenglish      = {{engleski}{engleski}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
 % langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{francuski}{francuski}},
-  langgalician     = {{galicijski}{galicijski}},
   langgerman       = {{njema\v{c}ki}{njema\v{c}ki}},
   langgreek        = {{gr\v{c}ki}{gr\v{c}ki}},
   langitalian      = {{talijanski}{talijanski}},
@@ -497,17 +480,15 @@
   langswedish      = {{\v{s}vedski}{\v{s}vedski}},
   fromamerican     = {{s engleskog}{s engleskog}},
   frombrazilian    = {{s portugalskog}{s portugalskog}},
-% frombulgarian    = {{}{}},% FIXME: missing
 % fromcatalan      = {{}{}},% FIXME: missing
   fromcroatian     = {{s hrvatskog}{s hrvatskog}},
 % fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{s danskog}{s danskog}},
   fromdutch        = {{s nizozemskog}{s nizozemskog}},
   fromenglish      = {{s engleskog}{s engleskog}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
 % fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{s francuskog}{s francuskog}},
-  fromgalician     = {{s galicijskog}{s galicijskog}},
   fromgerman       = {{s njema\v{c}kog}{s njema\v{c}kog}},
   fromgreek        = {{s gr\v{c}kog}{s gr\v{c}kog}},
   fromitalian      = {{s talijanskog}{s talijanskog}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx
index e5a2dc1908e..0a8cfeeef94 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx
@@ -32,8 +32,8 @@
       {}
       {\mkmonthzeros{\thefield{#2}}%
        \iffieldundef{#1}
-         {}
-         {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
+	       {}
+	       {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
           \iffieldbibstring{#1}
             {\bibstring{\thefield{#1}}}
             {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
@@ -199,9 +199,6 @@
   translatorsanfo  = {{p\v{r}eklad, anotace,\ a p\v{r}edmluva}{p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}},
   translatoranaf   = {{p\v{r}eklad, anotace,\ a  doslov}{p\v{r}ekl., anot\adddot\ a dosl\adddot}},
   translatorsanaf  = {{p\v{r}eklad, anotace,\ a  doslov}{p\v{r}ekl., anot\adddot\ a dosl\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{by}{by}},
   byeditor         = {{editov\'{a}no}{ed\adddotspace}},
   bycompiler       = {{sestaveno}{comp\adddotspace}},
@@ -300,31 +297,19 @@
   origpubin        = {{p\r{u}vodn\v{e} vyd\'{a}no v}{p\r{u}v\adddotspace vyd\adddotspace v}},
   astitle          = {{jako}{as}},
   bypublisher      = {{od}{od}},% nejist\'{e}
-  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   page             = {{strana}{s\adddot}},
   pages            = {{strany}{s\adddot}},
   column           = {{sloupek}{sl\adddot}},% nebo sloupec?
   columns          = {{sloupce}{sl\adddot}},
   line             = {{\v{r}\'{a}dek}{\v{r}\adddot}},
   lines            = {{\v{r}\'{a}dky}{\v{r}\adddot}},
+  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   verse            = {{ver\v{s}}{v\adddot}},
   verses           = {{ver\v{s}e}{v\adddot}},
   section          = {{sekce}{\S}},
   sections         = {{sekce}{\S\S}},
   paragraph        = {{odstavec}{ods\adddot}},
   paragraphs       = {{odstavce}{ods\adddot}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{in}{in}},% Pouziti napriklad u sborniku nebo
   inseries         = {{in}{in}},% casopisu, zni to lip new "v".
   % V pripade potreby pouzit lokalni lbx soubor
@@ -385,17 +370,15 @@
   december         = {{prosince}{pros\adddot}},
   langamerican     = {{americk\'{a} angli\v{c}tina}{am\adddot angl\adddot}},
   langbrazilian    = {{brazilsk\'{a} portugal\v{s}tina}{braz\adddot portugal\adddot}},
-% langbulgarian    = {{}{}},% FIXME: missing
 % langcatalan      = {{}{}},% FIXME: missing
   langcroatian     = {{chorvat\v{s}tina}{chorv\adddot}},
 % langczech        = {{}{}},% FIXME: missing
   langdanish       = {{d\'{a}n\v{s}tina}{d\'{a}n\adddot}},
   langdutch        = {{holand\v{s}tina}{hol.\adddot}},
   langenglish      = {{angli\v{c}tina}{angl\adddot}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{fin\v{s}tina}{fin\adddot}},
   langfrench       = {{francouz\v{s}tina}{franc\adddot}},
-  langgalician     = {{galicij\v{s}tina}{gal\adddot}},
   langgerman       = {{n\v{e}m\v{c}ina}{n\v{e}m\adddot}},
   langgreek        = {{\v{r}e\v{c}tina}{\v{r}e\v{c}\adddot}},
   langitalian      = {{ital\v{s}tina}{ital\adddot}},
@@ -408,17 +391,15 @@
   langswedish      = {{\v{s}v\'{e}d\v{s}tina}{\v{s}v\'{e}d\adddot}},
   fromamerican     = {{z americk\'{e} angli\v{c}tiny}{z amer\adddot angl\adddot}},
   frombrazilian    = {{z brazilsk\'{e} portugal\v{s}tiny}{z braz\adddotspace port\adddot}},
-% frombulgarian    = {{}{}},% FIXME: missing
 % fromcatalan      = {{}{}},% FIXME: missing
   fromcroatian     = {{z chorvat\v{s}tiny}{z chorv.}},
 % fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{z d\'{a}n\v{s}tiny}{z d\'{a}n\adddot}},
   fromdutch        = {{z holand\v{s}tiny}{z hol\adddot}},
   fromenglish      = {{z angli\v{c}tiny}{z angl\adddot}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{z fin\v{s}tiny}{z fin.}},
   fromfrench       = {{z francouz\v{s}tiny}{z franc\adddot}},
-  fromgalician     = {{z galicij\v{s}tiny}{z gal\adddot}},
   fromgerman       = {{z n\v{e}m\v{c}iny}{z n\v{e}m\adddot}},
   fromgreek        = {{z \v{r}e\v{c}tiny}{z \v{r}e\v{c}\adddot}},
   fromitalian      = {{z ital\v{s}tiny}{z ital\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
index b2f229d0fae..c9786e9ee96 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
@@ -242,9 +242,6 @@
                       {overs., forkl\adddotspace og efterord}},
   translatorsanaf  = {{overs\ae ttere, forklaringer og efterord}%
                       {overs., forkl\adddotspace og efterord}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{af}{af}},
   byeditor         = {{udgivet af}{udg\adddotspace af}},
   bycompiler       = {{kompileret af}{komp\adddotspace af}},
@@ -363,13 +360,13 @@
   origpubin        = {{oprindeligt udgivet i}{oprindeligt udgivet i}},% FIXME: check
   astitle          = {{i}{i}},% FIXME: check
   bypublisher      = {{af}{af}},% FIXME: check
-  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   page             = {{side}{s\adddot}},
   pages            = {{sider}{s\adddot}},
   column           = {{spalte}{sp\adddot}},
   columns          = {{spalter}{sp\adddot}},
   line             = {{linje}{l\adddot}},
   lines            = {{linjer}{l\adddot}},
+  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   verse            = {{vers}{v\adddot}},
   verses           = {{vers}{v\adddot}},
   section          = {{afsnit}{\S}},% FIXME: check
@@ -379,18 +376,6 @@
 % sections         = {{paragrafer}{\S\S}},
 % paragraph        = {{}{}},% FIXME: missing
 % paragraphs       = {{}{}},% FIXME: missing
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{i}{i}},
   inseries         = {{r\ae kken}{r\ae kken}},
   ofseries         = {{af r\ae kken}{af r\ae kken}},
@@ -452,17 +437,15 @@
   december         = {{december}{dec\adddot}},
   langamerican     = {{amerikansk-engelsk}{amerikansk-engelsk}},
   langbrazilian    = {{brasiliansk-portugisisk}{brasiliansk-portugisisk}},
-% langbulgarian    = {{}{}},% FIXME: missing
   langcatalan      = {{catalansk}{catalansk}},
   langcroatian     = {{kroatisk}{kroatisk}},
   langczech        = {{tjekkisk}{tjekkisk}},
   langdanish       = {{dansk}{dansk}},
   langdutch        = {{nederlandsk}{nederlandsk}},
   langenglish      = {{engelsk}{engelsk}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{finsk}{finsk}},
   langfrench       = {{fransk}{fransk}},
-  langgalician     = {{galicisk}{galicisk}},
   langgerman       = {{tysk}{tysk}},
   langgreek        = {{gr\ae sk}{gr\ae sk}},
   langitalian      = {{italiensk}{italiensk}},
@@ -476,17 +459,15 @@
   langswedish      = {{svensk}{svensk}},
   fromamerican     = {{fra amerikansk-engelsk}{fra amerikansk-engelsk}},
   frombrazilian    = {{fra brasiliansk-portugisisk}{fra brasiliansk-portugisisk}},
-% frombulgarian    = {{}{}},% FIXME: missing
   fromcatalan      = {{fra catalansk}{fra catalansk}},
   fromcroatian     = {{fra kroatisk}{fra kroatisk}},
   fromczech        = {{fra tjekkisk}{fra tjekkisk}},
   fromdanish       = {{fra dansk}{fra dansk}},
   fromdutch        = {{fra nederlandsk}{fra nederlandsk}},
   fromenglish      = {{fra engelsk}{fra engelsk}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{fra finsk}{fra finsk}},
   fromfrench       = {{fra fransk}{fra fransk}},
-  fromgalician     = {{fra galicisk}{fra galicisk}},
   fromgerman       = {{fra tysk}{fra tysk}},
   fromgreek        = {{fra gr\ae sk}{fra gr\ae sk}},
   fromitalian      = {{fra italiensk}{fra italiensk}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 95469a497e8..e9a068242a5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
@@ -250,9 +250,6 @@
                       {vert., annot\adddotspace en naw\adddot}},
   translatorsanaf  = {{vertaling, annotaties en nawoord}%
                       {vert., annot\adddotspace en naw\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{door}{door}},
   byeditor         = {{geredigeerd door}{red\adddot\addabbrvspace door}},
   bycompiler       = {{samengesteld door}{sam\adddot\addabbrvspace door}},
@@ -367,8 +364,8 @@
   translationas    = {{vertaald als}{vert\adddotspace als}},
   translationfrom  = {{vertaald van}{vert\adddotspace van}},
   reviewof         = {{bespreking van}{bespr\adddotspace van}},
-  origpubas        = {{oorspronkelijk gepubliceerd als}{oorspr\adddotspace gep\adddotspace als}},
-  origpubin        = {{oorspronkelijk gepubliceerd in}{oorspr\adddotspace gep\adddotspace in}},
+  origpubas        = {{oorspronkelijk gepubliceerd als}{oorspr\addotspace gep\addotspace als}},
+  origpubin        = {{oorspronkelijk gepubliceerd in}{oorspr\addotspace gep\addotspace in}},
   astitle          = {{als}{als}},% FIXME: check
   bypublisher      = {{door}{door}},% FIXME: check
   inpreparation    = {{in voorbereiding}{in voorbereiding}},
@@ -376,7 +373,6 @@
 % forthcoming      = {{onderweg}{onderweg}},% FIXME: check
   inpress          = {{in druk}{in druk}},
   prepublished     = {{voorpublicatie}{voorpublicatie}},
-  nodate           = {{geen\space datum}{{}g\adddot d\adddot}},
   page             = {{pagina}{p\adddot}},
   pages            = {{pagina's}{p\adddot}},
   column           = {{kolom}{kol\adddot}},
@@ -389,18 +385,7 @@
   verses           = {{verzen}{v\adddot}},
   line             = {{regel}{r\adddot}},
   lines            = {{regels}{r\adddot}},
-  pagetotal        = {{pagina}{p\adddot}},
-  pagetotals       = {{pagina's}{p\adddot}},
-  columntotal      = {{kolom}{kol\adddot}},
-  columntotals     = {{kolommen}{kol\adddot}},
-  linetotal        = {{regel}{r\adddot}},
-  linetotals       = {{regels}{r\adddot}},
-  versetotal       = {{vers}{v\adddot}},
-  versetotals      = {{verzen}{v\adddot}},
-  sectiontotal     = {{sectie}{\S}},
-  sectiontotals    = {{secties}{\S}},
-  paragraphtotal   = {{paragraaf}{par\adddot}},
-  paragraphtotals  = {{paragrafen}{par\adddot}},
+  nodate           = {{geen\space datum}{{}g\adddot d\adddot}},
   mathesis         = {{masterscriptie}{masterscriptie}},
   phdthesis        = {{proefschrift}{proefschrift}},
   resreport        = {{onderzoeksrapport}{onderzoeksrap\adddot}},
@@ -455,58 +440,48 @@
   december         = {{december}{dec}},
   langamerican     = {{Amerikaans Engels}{Amerikaans Engels}},
   langbrazilian    = {{Braziliaans Portugeens}{Braziliaans Portugees}},
-  langbulgarian    = {{Bulgaars}{Bulgaars}},
   langcatalan      = {{Catalaans}{Catalaans}},
   langcroatian     = {{Kroatisch}{Kroatisch}},
   langczech        = {{Tsjechisch}{Tsjechisch}},
   langdanish       = {{Deens}{Deens}},
   langdutch        = {{Nederlands}{Nederlands}},
   langenglish      = {{Engels}{Engels}},
-  langestonian     = {{Estisch}{Estisch}},
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{Fins}{Fins}},
   langfrench       = {{Frans}{Frans}},
-  langgalician     = {{Galicisch}{Galicisch}},
   langgerman       = {{Duits}{Duits}},
   langgreek        = {{Grieks}{Grieks}},
   langitalian      = {{Italiaans}{Italiaans}},
-  langjapanese     = {{Japaans}{Japaans}},
   langlatin        = {{Latijn}{Latijn}},
   langnorwegian    = {{Noors}{Noors}},
   langpolish       = {{Pools}{Pools}},
   langportuguese   = {{Portugees}{Portugees}},
   langrussian      = {{Russisch}{Russisch}},
-  langslovak       = {{Slowaaks}{Slowaaks}},% FIXME: or Slovaaks
-  langslovene      = {{Sloveens}{Sloveens}},
+% langslovene      = {{}{}},% FIXME: missing
   langspanish      = {{Spaans}{Spaans}},
   langswedish      = {{Zweeds}{Zweeds}},
-  langukrainian    = {{Oekra\"iens}{Oekra\"iens}},
   fromamerican     = {{uit het Amerikaans Engels}{uit het Amerikaans Engels}},
   frombrazilian    = {{uit het Braziliaans Portugees}{uit het Braziliaans Portugees}},
-  frombulgarian    = {{uit het Bulgaars}{uit het Bulgaars}},
   fromcatalan      = {{uit het Catalaans}{uit het Catalaans}},
   fromcroatian     = {{uit het Kroatisch}{uit het Kroatisch}},
   fromczech        = {{uit het Tsjechisch}{uit het Tsjechisch}},
   fromdanish       = {{uit het Deens}{uit het Deens}},
   fromdutch        = {{uit het Nederlands}{uit het Nederlands}},
   fromenglish      = {{uit het Engels}{uit het Engels}},
-  fromestonian     = {{uit het Estisch}{uit het Estisch}},
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{uit het Fins}{uit het Fins}},
   fromfrench       = {{uit het Frans}{uit het Frans}},
-  fromgalician     = {{uit het Galicisch}{uit het Galicisch}},
   fromgerman       = {{uit het Duits}{uit het Duits}},
   fromgreek        = {{uit het Grieks}{uit het Grieks}},
   fromitalian      = {{uit het Italiaans}{uit het Italiaans}},
-  fromjapanese     = {{uit het Japaans}{uit het Japaans}},
   fromlatin        = {{uit het Latijn}{uit het Latijn}},
   fromnorwegian    = {{uit het Noors}{uit het Noors}},
   frompolish       = {{uit het Pools}{uit het Pools}},
   fromportuguese   = {{uit het Portugees}{uit het Portugees}},
   fromrussian      = {{uit het Russisch}{uit het Russisch}},
-  fromslovak       = {{uit het Slowaaks}{uit het Slowaaks}},% FIXME: or Slovaaks
-  fromslovene      = {{uit het Sloveens}{uit het Sloveens}},
+% fromslovene      = {{}{}},% FIXME: missing
   fromspanish      = {{uit het Spaans}{uit het Spaans}},
   fromswedish      = {{uit het Zweeds}{uit het Zweeds}},
-  fromukrainian    = {{uit het Oekra\"iens}{uit het Oekra\"iens}},
   countryde        = {{Duitsland}{DE}},
   countryeu        = {{Europese Unie}{EU}},
   countryep        = {{Europese Unie}{EP}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index fefd5e87f94..b8f5ff5728c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
@@ -27,7 +27,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#3}
          {\iffieldundef{#1}{}{\space}}
-         {\nobreakspace}}%
+	 {\nobreakspace}}%
     \iffieldundef{#3}
       {}
       {\stripzeros{\thefield{#3}}%
@@ -268,9 +268,6 @@ canadian,australian,newzealand,USenglish,UKenglish}
                       {trans., annot\adddot\finalandcomma\ and afterw\adddot}},
   translatorsanaf  = {{translation, annotations\finalandcomma\ and afterword}%
                       {trans., annot\adddot\finalandcomma\ and afterw\adddot}},
-  organizer        = {{organizer}{org\adddot}},
-  organizers       = {{organizers}{orgs\adddot}},
-  byorganizer      = {{organized by}{org\adddotspace by}},
   byauthor         = {{by}{by}},
   byeditor         = {{edited by}{ed\adddotspace by}},
   bycompiler       = {{compiled by}{comp\adddotspace by}},
@@ -382,31 +379,19 @@ canadian,australian,newzealand,USenglish,UKenglish}
   origpubin        = {{originally published in}{orig\adddotspace pub\adddotspace in}},
   astitle          = {{as}{as}},
   bypublisher      = {{by}{by}},
-  nodate           = {{no date}{n\adddot d\adddot}},
   page             = {{page}{p\adddot}},
   pages            = {{pages}{pp\adddot}},
   column           = {{column}{col\adddot}},
   columns          = {{columns}{cols\adddot}},
   line             = {{line}{l\adddot}},
   lines            = {{lines}{ll\adddot}},
+  nodate           = {{no date}{n\adddot d\adddot}},
   verse            = {{verse}{v\adddot}},
   verses           = {{verses}{vv\adddot}},
   section          = {{section}{\S}},
   sections         = {{sections}{\S\S}},
   paragraph        = {{paragraph}{par\adddot}},
   paragraphs       = {{paragraphs}{par\adddot}},
-  pagetotal        = {{page}{p\adddot}},
-  pagetotals       = {{pages}{pp\adddot}},
-  columntotal      = {{column}{col\adddot}},
-  columntotals     = {{columns}{cols\adddot}},
-  linetotal        = {{line}{l\adddot}},
-  linetotals       = {{lines}{ll\adddot}},
-  versetotal       = {{verse}{v\adddot}},
-  versetotals      = {{verses}{vv\adddot}},
-  sectiontotal     = {{section}{\S}},
-  sectiontotals    = {{sections}{\S\S}},
-  paragraphtotal   = {{paragraph}{par\adddot}},
-  paragraphtotals  = {{paragraphs}{par\adddot}},
   in               = {{in}{in}},
   inseries         = {{in}{in}},
   ofseries         = {{of}{of}},
@@ -466,7 +451,6 @@ canadian,australian,newzealand,USenglish,UKenglish}
   december         = {{December}{Dec\adddot}},
   langamerican     = {{American}{American}},
   langbrazilian    = {{Brazilian}{Brazilian}},
-  langbulgarian    = {{Bulgarian}{Bulgarian}},
   langcatalan      = {{Catalan}{Catalan}},
   langcroatian     = {{Croatian}{Croatian}},
   langczech        = {{Czech}{Czech}},
@@ -476,7 +460,6 @@ canadian,australian,newzealand,USenglish,UKenglish}
   langestonian     = {{Estonian}{Estonian}},
   langfinnish      = {{Finnish}{Finnish}},
   langfrench       = {{French}{French}},
-  langgalician     = {{Galician}{Galician}},
   langgerman       = {{German}{German}},
   langgreek        = {{Greek}{Greek}},
   langitalian      = {{Italian}{Italian}},
@@ -488,10 +471,8 @@ canadian,australian,newzealand,USenglish,UKenglish}
   langslovene      = {{Slovene}{Slovene}},
   langspanish      = {{Spanish}{Spanish}},
   langswedish      = {{Swedish}{Swedish}},
-  langukrainian    = {{Ukrainian}{Ukrainian}},
   fromamerican     = {{from the American}{from the American}},
   frombrazilian    = {{from the Brazilian}{from the Brazilian}},
-  frombulgarian    = {{from the Bulgarian}{from the Bulgarian}},
   fromcatalan      = {{from the Catalan}{from the Catalan}},
   fromcroatian     = {{from the Croatian}{from the Croatian}},
   fromczech        = {{from the Czech}{from the Czech}},
@@ -501,7 +482,6 @@ canadian,australian,newzealand,USenglish,UKenglish}
   fromestonian     = {{from the Estonian}{from the Estonian}},
   fromfinnish      = {{from the Finnish}{from the Finnish}},
   fromfrench       = {{from the French}{from the French}},
-  fromgalician     = {{from the Galician}{from the Galician}},
   fromgerman       = {{from the German}{from the German}},
   fromgreek        = {{from the Greek}{from the Greek}},
   fromitalian      = {{from the Italian}{from the Italian}},
@@ -513,7 +493,6 @@ canadian,australian,newzealand,USenglish,UKenglish}
   fromslovene      = {{from the Slovene}{from the Slovene}},
   fromspanish      = {{from the Spanish}{from the Spanish}},
   fromswedish      = {{from the Swedish}{from the Swedish}},
-  fromukrainian    = {{from the Ukrainian}{from the Ukrainian}},
   countryde        = {{Germany}{DE}},
   countryeu        = {{European Union}{EU}},
   countryep        = {{European Union}{EP}},
@@ -622,9 +601,9 @@ canadian,australian,newzealand,USenglish,UKenglish}
             \dateeraprint{#2}}%
        \dateuncertainprint
        \iffieldundef{#2endyear}
-         {\printfield{extradate}}
+         {\printfield{extrayear}}
          {\iffieldequalstr{#2endyear}{}
-            {\printfield{extradate}%
+            {\printfield{extrayear}%
              \mbox{\bibdaterangesep}}
             {\bibdaterangesep
              \enddatecircaprint
@@ -635,7 +614,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
                     {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
                {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
-             \printfield{extradate}%
+             \printfield{extrayear}%
              \enddateuncertainprint
              \dateeraprint{#2}}}}}}
 
@@ -654,16 +633,16 @@ canadian,australian,newzealand,USenglish,UKenglish}
             \dateeraprint{#2}}%
        \dateuncertainprint
        \iffieldundef{#2endyear}
-         {\printfield{extradate}}
+         {\printfield{extrayear}}
          {\iffieldequalstr{#2endyear}{}
-            {\printfield{extradate}%
+            {\printfield{extrayear}%
           \mbox{\bibdaterangesep}}
          {\bibdaterangesep
           \enddatecircaprint
           \iffieldundef{#2season}
             {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}
             {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
-          \printfield{extradate}%
+          \printfield{extrayear}%
           \enddateuncertainprint
           \dateeraprint{#2}}}}}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx
index 36d22587ea8..3af5e3c9cb0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/estonian.lbx
@@ -59,21 +59,21 @@
       {}
       {\mkmonthzeros{\thefield{#2}}%
        \iffieldundef{#1}
-         {}
-         {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
+	 {}
+	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
     \iffieldbibstring{#1}
       {\bibstring{\thefield{#1}}}
       {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
   \savecommand\lbx@lfromlang
   \savecommand\lbx@sfromlang
   \def\lbx@lfromlang{%
-    \iflistundef{origlanguage}
+    \iffieldundef{origlanguage}
       {}
-      {\printlist[lfromoriglanguage]{origlanguage}\space}}%
+      {\biblstring{from\thefield{origlanguage}}\space}}%
   \def\lbx@sfromlang{%
-    \iflistundef{origlanguage}
+    \iffieldundef{origlanguage}
       {}
-      {\printlist[sfromoriglanguage]{origlanguage}\space}}%
+      {\bibsstring{from\thefield{origlanguage}}\space}}%
   \savebibmacro{in:}%
   \renewbibmacro{in:}{%
     \iffieldequalstr{entrytype}{article}
@@ -140,14 +140,14 @@
   translator       = {{t\~{o}lkija}{t\~{o}lkija}},
   translators      = {{t\~{o}lkijad}{t\~{o}lkijad}},
   commentator      = {{kommentaator}{kommentaator}},
-  commentators     = {{kommentaatorid}{kommentaatorid}},
+  commentators     = {{kommentaatorid}{kommentaatorid}}, 
   annotator        = {{selityksin varustanut}{selityksin varustanut}},
   annotators       = {{selityksin varustaneet}{selityksin varustaneet}},
   commentary       = {{kommentaaris}{kommentaaris}},
   annotations      = {{annotatsioonide}{annotatsioonide}},
   introduction     = {{sissejuhatus}{sissejuhatus}},
   foreword         = {{eess\~{o}na}{eess\~{o}na}},
-  afterword        = {{j\"{a}rels\~{o}na}{j\"{a}rels\~{o}na}},
+  afterword        = {{j\"{a}rels\~{o}na}{j\"{a}rels\~{o}na}}, 
   editortr         = {{toimetaja ja t\~{o}lkija}%
                       {toim\adddotspace ja t\~{o}lk\adddot}},
   editorstr        = {{toimetajad ja t\~{o}lkijate}%
@@ -156,9 +156,9 @@
                       {toimetaja ja kommentaator}},
   editorsco        = {{toimetajad ja kommentaatorid}%
                       {toimetajad ja kommentaatorid}},
-  editoran         = {{toimetaja ja annotator}%
+  editoran         = {{toimetaja ja annotator}% 
                       {toimetaja ja annotator}},
-  editorsan        = {{toimetajad ja annotators}%
+  editorsan        = {{toimetajad ja annotators}% 
                       {toimetajad ja annotators}},
   editorin         = {{toimetaja ja sissejuhatus}%
                       {toimetaja ja sissejuhatus}},
@@ -172,121 +172,118 @@
                       {toimetaja ja j\"{a}rels\~{o}na}},
   editorsaf        = {{toimetajad ja j\"{a}rels\~{o}na}%
                       {toimetajad ja j\"{a}rels\~{o}na}},
-  editortrco       = {{toimetaja, translator\finalandcomma\ ja kommentaator} %
-                      {toim, \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}},
+  editortrco       = {{toimetaja, translator\finalandcomma\ ja kommentaator} % 
+	              {toim, \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}},
   editorstrco      = {{toimetajad, translators\finalandcomma\ ja kommentaatorid} %
-                      {eds., \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}},
+	              {eds., \addabbrvspace trans\adddot\finalandcomma\ ja comm\adddot}},
   editortran       = {{toimetaja, translator\finalandcomma\ ja annotator} %
-                      {toim, \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}},
-  editorstran      = {{toimetajad, translators\finalandcomma\ ja annotators} %
-                      {eds., \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}},
+	              {toim, \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}},
+  editorstran      = {{toimetajad, translators\finalandcomma\ ja annotators} % 
+	              {eds., \addabbrvspace trans\adddot\finalandcomma\ ja annot\adddot}},
   editortrin       = {{toimetaja, translator\finalandcomma\ ja Sissejuhatus} %
-                      {toim, \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}},
-  editorstrin      = {{toimetajad, translators\finalandcomma\ ja Sissejuhatus} %
-                      {eds., \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}},
+	              {toim, \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}},
+  editorstrin      = {{toimetajad, translators\finalandcomma\ ja Sissejuhatus} % 
+	              {eds., \addabbrvspace trans\adddot\finalandcomma\ ja introd\adddot}},
   editortrfo       = {{toimetaja, translator\finalandcomma\ ja eess\~{o}na} %
-                      {toim, \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}},
-  editorstrfo      = {{toimetajad, translators\finalandcomma\ ja eess\~{o}na} %
-                      {eds., \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}},
+	              {toim, \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}},
+  editorstrfo      = {{toimetajad, translators\finalandcomma\ ja eess\~{o}na} % 
+	              {eds., \addabbrvspace trans\adddot\finalandcomma\ ja forew\adddot}},
   editortraf       = {{toimetaja, translator\finalandcomma\ ja J\"{a}rels\~{o}na}  %
-                      {toim, \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}},
+	              {toim, \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}},
   editorstraf      = {{toimetajad, translators\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {eds., \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}},
-  editorcoin       = {{toimetaja, commentator\finalandcomma\ ja Sissejuhatus} %
-                      {toim, \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}},
-  editorscoin      = {{toimetajad, commentators\finalandcomma\ ja Sissejuhatus} %
-                      {eds., \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}},
-  editorcofo       = {{toimetaja, commentator\finalandcomma\ ja eess\~{o}na} %
-                      {toim, \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}},
-  editorscofo      = {{toimetajad, commentators\finalandcomma\ ja eess\~{o}na} %
-                      {eds., \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}},
+	              {eds., \addabbrvspace trans\adddot\finalandcomma\ ja afterw\adddot}},
+  editorcoin       = {{toimetaja, commentator\finalandcomma\ ja Sissejuhatus} % 
+	              {toim, \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}},
+  editorscoin      = {{toimetajad, commentators\finalandcomma\ ja Sissejuhatus} % 
+	              {eds., \addabbrvspace comm\adddot\finalandcomma\ ja introd\adddot}},
+  editorcofo       = {{toimetaja, commentator\finalandcomma\ ja eess\~{o}na} %	
+	              {toim, \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}},
+  editorscofo      = {{toimetajad, commentators\finalandcomma\ ja eess\~{o}na} % 
+	              {eds., \addabbrvspace comm\adddot\finalandcomma\ ja forew\adddot}},
   editorcoaf       = {{toimetaja, commentator\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {toim, \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}},
-  editorscoaf      = {{toimetajad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {eds., \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}},
+	              {toim, \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}},
+  editorscoaf      = {{toimetajad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} % 
+	              {eds., \addabbrvspace comm\adddot\finalandcomma\ ja afterw\adddot}},
   editoranin       = {{toimetaja, annotator\finalandcomma\ ja Sissejuhatus} %
-                      {toim, \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}},
-  editorsanin      = {{toimetajad, annotators\finalandcomma\ ja Sissejuhatus} %
-                      {eds., \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}},
+	              {toim, \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}},
+  editorsanin      = {{toimetajad, annotators\finalandcomma\ ja Sissejuhatus} % 
+	              {eds., \addabbrvspace annot\adddot\finalandcomma\ ja introd\adddot}},
   editoranfo       = {{toimetaja, annotator\finalandcomma\ ja eess\~{o}na} %
-                      {toim, \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}},
-  editorsanfo      = {{toimetajad, annotators\finalandcomma\ ja eess\~{o}na} %
-                      {eds., \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}},
+	              {toim, \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}},
+  editorsanfo      = {{toimetajad, annotators\finalandcomma\ ja eess\~{o}na} % 
+	              {eds., \addabbrvspace annot\adddot\finalandcomma\ ja forew\adddot}},
   editoranaf       = {{toimetaja, annotator\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {toim, \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}},
-  editorsanaf      = {{toimetajad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {eds., \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}},
-  editortrcoin     = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja Sissejuhatus} %
-                      {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}},
-  editorstrcoin    = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja Sissejuhatus} %
-                      {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}},
+	              {toim, \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}},
+  editorsanaf      = {{toimetajad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} % 
+	              {eds., \addabbrvspace annot\adddot\finalandcomma\ ja afterw\adddot}},
+  editortrcoin     = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja Sissejuhatus} % 
+	              {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}},
+  editorstrcoin    = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja Sissejuhatus} % 
+	              {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja introd\adddot}},
   editortrcofo     = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja eess\~{o}na} %
-                      {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}},
-  editorstrcofo    = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja eess\~{o}na} %
-                      {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}},
+	              {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}},
+  editorstrcofo    = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja eess\~{o}na} % 
+	              {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja forew\adddot}},
   editortrcoaf     = {{toimetaja, t\~{o}lkija, commentator\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}},
-  editorstrcoaf    = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}},
+	              {toim, \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}},
+  editorstrcoaf    = {{toimetajad, t\~{o}lkijad, commentators\finalandcomma\ ja J\"{a}rels\~{o}na} % 
+	              {eds., \addabbrvspace trans., comm\adddot\finalandcomma\ ja afterw\adddot}},
   editortranin     = {{toimetaja, t\~{o}lkija, annotator\finalandcomma\ ja Sissejuhatus} %
-                      {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}},
-  editorstranin    = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja Sissejuhatus} %
-                      {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}},
+	              {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}},
+  editorstranin    = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja Sissejuhatus} % 
+	              {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja introd\adddot}},
   editortranfo     = {{toimetaja, t\~{o}lkija, annotator\finalandcomma\ ja eess\~{o}na} %
-                      {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}},
-  editorstranfo    = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja eess\~{o}na} %
-                      {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}},
+	              {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}},
+  editorstranfo    = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja eess\~{o}na} % 
+	              {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja forew\adddot}},
   editortranaf     = {{toimetaja, t\~{o}lkija, annotator\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}},
-  editorstranaf    = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}},
+	              {toim, \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}},
+  editorstranaf    = {{toimetajad, t\~{o}lkijad, annotators\finalandcomma\ ja J\"{a}rels\~{o}na} % 
+	              {eds., \addabbrvspace trans., annot\adddot\finalandcomma\ ja afterw\adddot}},
   translatorco     = {{t\~{o}lkija ja kommentaator} %
-                      {trans\adddot\ ja comm\adddot}},
-  translatorsco    = {{t\~{o}lkijate ja kommentaatorid} %
-                      {trans\adddot\ ja comm\adddot}},
+	              {trans\adddot\ ja comm\adddot}},
+  translatorsco    = {{t\~{o}lkijate ja kommentaatorid} % 
+	              {trans\adddot\ ja comm\adddot}},
   translatoran     = {{t\~{o}lkija ja annotator}  %
-                      {trans\adddot\ ja annot\adddot}},
-  translatorsan    = {{t\~{o}lkijate ja annotators} %
-                      {trans\adddot\ ja annot\adddot}},
+	              {trans\adddot\ ja annot\adddot}},
+  translatorsan    = {{t\~{o}lkijate ja annotators} % 
+	              {trans\adddot\ ja annot\adddot}},
   translatorin     = {{t\~{o}lkimine ja Sissejuhatus} %
-                      {trans\adddot\ ja introd\adddot}},
+	              {trans\adddot\ ja introd\adddot}},
   translatorsin    = {{t\~{o}lkimine ja Sissejuhatus} %
-                      {trans\adddot\ ja introd\adddot}},
-  translatorfo     = {{t\~{o}lkimine ja eess\~{o}na} %
-                      {trans\adddot\ ja forew\adddot}},
+	              {trans\adddot\ ja introd\adddot}},
+  translatorfo     = {{t\~{o}lkimine ja eess\~{o}na} % 	
+	              {trans\adddot\ ja forew\adddot}},
   translatorsfo    = {{t\~{o}lkimine ja eess\~{o}na} %
-                      {trans\adddot\ ja forew\adddot}},
+	              {trans\adddot\ ja forew\adddot}},
   translatoraf     = {{t\~{o}lkimine ja J\"{a}rels\~{o}na} %
-                      {trans\adddot\ ja afterw\adddot}},
+	              {trans\adddot\ ja afterw\adddot}},
   translatorsaf    = {{t\~{o}lkimine ja J\"{a}rels\~{o}na} %
-                      {trans\adddot\ ja afterw\adddot}},
+	              {trans\adddot\ ja afterw\adddot}},
   translatorcoin   = {{t\~{o}lkimine, commentary\finalandcomma\ ja Sissejuhatus} %
-                      {trans., comm\adddot\finalandcomma\ ja introd\adddot}},
+	              {trans., comm\adddot\finalandcomma\ ja introd\adddot}},
   translatorscoin  = {{t\~{o}lkimine, commentary\finalandcomma\ ja Sissejuhatus} %
-                      {trans., comm\adddot\finalandcomma\ ja introd\adddot}},
+	              {trans., comm\adddot\finalandcomma\ ja introd\adddot}},
   translatorcofo   = {{t\~{o}lkimine, commentary\finalandcomma\ ja eess\~{o}na} %
-                      {trans., comm\adddot\finalandcomma\ ja forew\adddot}},
+	              {trans., comm\adddot\finalandcomma\ ja forew\adddot}},
   translatorscofo  = {{t\~{o}lkimine, commentary\finalandcomma\ ja eess\~{o}na} %
-                      {trans., comm\adddot\finalandcomma\ ja forew\adddot}},
+	              {trans., comm\adddot\finalandcomma\ ja forew\adddot}},
   translatorcoaf   = {{t\~{o}lkimine, commentary\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {trans., comm\adddot\finalandcomma\ ja afterw\adddot}},
+	              {trans., comm\adddot\finalandcomma\ ja afterw\adddot}},
   translatorscoaf  = {{t\~{o}lkimine, commentary\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {trans., comm\adddot\finalandcomma\ ja afterw\adddot}},
+	              {trans., comm\adddot\finalandcomma\ ja afterw\adddot}},
   translatoranin   = {{t\~{o}lkimine, annotations\finalandcomma\ ja Sissejuhatus} %
-                      {trans., annot\adddot\finalandcomma\ ja introd\adddot}},
+	              {trans., annot\adddot\finalandcomma\ ja introd\adddot}},
   translatorsanin  = {{t\~{o}lkimine, annotations\finalandcomma\ ja Sissejuhatus} %
-                      {trans., annot\adddot\finalandcomma\ ja introd\adddot}},
+	              {trans., annot\adddot\finalandcomma\ ja introd\adddot}},
   translatoranfo   = {{t\~{o}lkimine, annotations\finalandcomma\ ja eess\~{o}na} %
-                      {trans., annot\adddot\finalandcomma\ ja forew\adddot}},
+	              {trans., annot\adddot\finalandcomma\ ja forew\adddot}},
   translatorsanfo  = {{t\~{o}lkimine, annotations\finalandcomma\ ja eess\~{o}na} %
-                      {trans., annot\adddot\finalandcomma\ ja forew\adddot}},
+	              {trans., annot\adddot\finalandcomma\ ja forew\adddot}},
   translatoranaf   = {{t\~{o}lkimine, annotations\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {trans., annot\adddot\finalandcomma\ ja afterw\adddot}},
+	              {trans., annot\adddot\finalandcomma\ ja afterw\adddot}},
   translatorsanaf  = {{t\~{o}lkimine, annotations\finalandcomma\ ja J\"{a}rels\~{o}na} %
-                      {trans., annot\adddot\finalandcomma\ ja afterw\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
+	              {trans., annot\adddot\finalandcomma\ ja afterw\adddot}},  
   byauthor         = {{kirjuttanud}{kirj\adddot}},
   byeditor         = {{toimittanud}{toim\adddot}},
   bycompiler       = {{koontanud}{koontanud}},
@@ -295,7 +292,7 @@
   byreviewer       = {{vaadanud}{rev\adddotspace poolt}},
   byfounder        = {{asutasid}{found\adddotspace poolt}},
   bycontinuator    = {{j\"{a}tkas}{cont\adddotspace poolt}},
-  bycollaborator   = {{koost\"{o}\"{o}s}{in collab\adddotspace koos}},
+  bycollaborator   = {{koost\"{o}\"{o}s}{in collab\adddotspace koos}}, 
   bytranslator     = {{t\~{o}lgitud \lbx@lfromlang\ poolt}{trans\adddot\ \lbx@sfromlang\ poolt}},
   bycommentator    = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},% FIXME: unsure
   byannotator      = {{selgitustega poolt}{annot\adddot\ poolt}},
@@ -304,66 +301,66 @@
   withintroduction = {{koos tutvustus poolt}{koos poolt intro\adddot }},
   withforeword     = {{mis eess\~{o}na Autor}{koos forew\adddot\ poolt}},
   withafterword    = {{koos J\"{a}rels\~{o}na poolt}{koos poolt afterw\adddot }},
-  byeditortr       = {{redigeeritud ja t\~{o}lgitud \lbx@lfromlang\ poolt}
+  byeditortr       = {{redigeeritud ja t\~{o}lgitud \lbx@lfromlang\ poolt} 
                       {toim\adddotspace ja \lbx@sfromlang k\"a\"ant\adddot}},
   byeditorco       = {{toimetatud ja kommenteeritud} %
-                      {ed\adddotspace ja comm\adddot\ poolt}},
+	              {ed\adddotspace ja comm\adddot\ poolt}},
   byeditoran       = {{redigeerida ja kanda} %
-                      {ed\adddotspace ja annot\adddot\ poolt}},
+	              {ed\adddotspace ja annot\adddot\ poolt}},
   byeditorin       = {{redigeerida, tutvustus, Autor} %
-                      {toim, \addabbrvspace koos m\~{o}ne introd. esitab}},
-  byeditorfo       = {{redigeerinud, eess\~{o}na, kus autor} %
-                      {toim, \addabbrvspace koos forew., poolt}},
+	              {toim, \addabbrvspace koos m\~{o}ne introd. esitab}},
+  byeditorfo       = {{redigeerinud, eess\~{o}na, kus autor} % 
+	              {toim, \addabbrvspace koos forew., poolt}},
   byeditoraf       = {{redigeerida, j\"{a}rels\~{o}na, Autor} %
-                      {toim, koos m\~{o}ne afterw., \addabbrvspace poolt}},
+	              {toim, koos m\~{o}ne afterw., \addabbrvspace poolt}},
   byeditortrco     = {{toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud} %
-                      {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja comm\adddot\ poolt}},
+	              {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja comm\adddot\ poolt}},
   byeditortran     = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja kanda} %
-                      {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja annot\adddot\ poolt}},
+	              {toim, \addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ ja annot\adddot\ poolt}},
   byeditortrin     = {{edited and translated \lbx@lfromlang, with an introduction, by} %
-                      {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne introd. esitab}},
+	              {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne introd. esitab}},
   byeditortrfo     = {{edited and translated \lbx@lfromlang, with a foreword, by} %
-                      {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos forew., poolt}},
+	              {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos forew., poolt}},
   byeditortraf     = {{edited and translated \lbx@lfromlang, with an afterword, by} %
-                      {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne afterw., poolt}},
+	              {ed\adddotspace ja trans\adddot\ \lbx@sfromlang, koos m\~{o}ne afterw., poolt}},
   byeditorcoin     = {{toimetanud ja kommenteerinud koos tutvustus,} %
-                      {ed\adddotspace ja comm., koos m\~{o}ne introd. esitab}},
+	              {ed\adddotspace ja comm., koos m\~{o}ne introd. esitab}},
   byeditorcofo     = {{toimetanud ja kommenteerinud mis eess\~{o}na,} %
-                      {ed\adddotspace ja comm., koos forew., poolt}},
-  byeditorcoaf     = {{toimetanud ja kommenteerinud koos J\"{a}rels\~{o}na,} %
-                      {ed\adddotspace ja comm., koos m\~{o}ne afterw., poolt}},
+	              {ed\adddotspace ja comm., koos forew., poolt}},
+  byeditorcoaf     = {{toimetanud ja kommenteerinud koos J\"{a}rels\~{o}na,} % 
+	              {ed\adddotspace ja comm., koos m\~{o}ne afterw., poolt}},
   byeditoranin     = {{redigeerida ja selgitustega koos tutvustus,}  %
-                      {ed\adddotspace ja annot., koos m\~{o}ne introd. esitab}},
+	              {ed\adddotspace ja annot., koos m\~{o}ne introd. esitab}},
   byeditoranfo     = {{redigeerida ja selgitustega mis eess\~{o}na,} %
-                      {ed\adddotspace ja annot., koos forew., poolt}},
-  byeditoranaf     = {{redigeerida ja selgitustega koos J\"{a}rels\~{o}na,} %
-                      {ed\adddotspace ja annot., koos m\~{o}ne afterw., poolt}},
+	              {ed\adddotspace ja annot., koos forew., poolt}},
+  byeditoranaf     = {{redigeerida ja selgitustega koos J\"{a}rels\~{o}na,} % 
+	              {ed\adddotspace ja annot., koos m\~{o}ne afterw., poolt}},
   byeditortrcoin   = {{redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud koos tutvustus,} %
-                      {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}},
+	              {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}},
   byeditortrcofo   = {{redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,} %
-                      {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}},
-  byeditortrcoaf   = {{toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,} %
-                      {toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,}},
+	              {redigeerida, \lbx@lfromlang\finalandcomma\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}},
+  byeditortrcoaf   = {{toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,} % 
+	              {toimetatud, \lbx@lfromlang\finalandcomma\ t\~{o}lgitud ja kommenteeritud koos J\"{a}rels\~{o}na,}},
   byeditortranin   = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos tutvustus,} %
-                      {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos tutvustus,}},
+	              {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos tutvustus,}},
   byeditortranfo   = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega mis eess\~{o}na,} %
-                      {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega mis eess\~{o}na,}},
-  byeditortranaf   = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,} %
-                      {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,}},
+	              {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega mis eess\~{o}na,}},
+  byeditortranaf   = {{redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,} % 
+	              {redigeerida t\~{o}lgitud \lbx@lfromlang\finalandcomma\ ja selgitustega koos J\"{a}rels\~{o}na,}},
   bytranslatorco   = {{\lbx@lfromlang\ t\~{o}lgitud ja kommenteeritud} %
-                      {\lbx@lfromlang\ t\~{o}lgitud ja kommenteeritud}},
+	              {\lbx@lfromlang\ t\~{o}lgitud ja kommenteeritud}},
   bytranslatoran   = {{t\~{o}lgitud \lbx@lfromlang\ ja kanda} %
-                      {t\~{o}lgitud \lbx@lfromlang\ ja kanda}},
+	              {t\~{o}lgitud \lbx@lfromlang\ ja kanda}},
   bytranslatorin   = {{translated \lbx@lfromlang, with an introduction, by} %
-                      {trans\adddot\ \lbx@sfromlang, with an introd., by}},
+	              {trans\adddot\ \lbx@sfromlang, with an introd., by}}, 
   bytranslatorfo   = {{translated \lbx@lfromlang, with a foreword, by} %
-                      {trans\adddot\ \lbx@sfromlang, with a forew., by}},
+	              {trans\adddot\ \lbx@sfromlang, with a forew., by}},
   bytranslatoraf   = {{translated \lbx@lfromlang, with an afterword, by} %
-                      {trans\adddot\ \lbx@sfromlang, with an afterw., by}},
-  bytranslatorcoin = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,} %
-                      {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}},
+	              {trans\adddot\ \lbx@sfromlang, with an afterw., by}},
+  bytranslatorcoin = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,} % 
+	              {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos tutvustus,}},
   bytranslatorcofo = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,} %
-                      {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}},
+	              {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud mis eess\~{o}na,}},
   bytranslatorcoaf = {{\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos J\"{a}rels\~{o}na,} %
                       {\lbx@lfromlang\ t\~{o}lkinud ja kommenteerinud koos J\"{a}rels\~{o}na,}},
   bytranslatoranin = {{t\~{o}lgitud \lbx@lfromlang\ ja selgitustega koos tutvustus,} %
@@ -411,18 +408,6 @@
   sections         = {{kohdat}{kohdat}},
   paragraph        = {{kappale}{kappale}},
   paragraphs       = {{kappaleet}{kappaleet}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{teoksessa}{teoksessa}},
   inseries         = {{sarjassa}{sarjassa}},
   ofseries         = {{sarjassa}{sarjassa}},
@@ -445,12 +430,12 @@
   forthcoming      = {{tulevases}{tulevases}},
   inpress          = {{ajakirjanduses}{ajakirjanduses}},
   prepublished     = {{eelnevalt avaldatud} {eelnevalt avaldatud}},
-  citedas          = {{edaspidi viidatud kui}{edaspidi viidatud kui}},
+  citedas          = {{edaspidi viidatud kui}{edaspidi viidatud kui}}, 
   thiscite         = {{eriti}{eriti}},
   seenote          = {{vaata m\"{a}rkus}{vaata m\"{a}rkus}},
   quotedin         = {{noteeritud}{noteeritud}},
   idem             = {{idem}{idem}}, % It its not necessary to translate Latin phrases.
-  idemsm           = {{idem}{idem}},
+  idemsm           = {{idem}{idem}}, 
   idemsf           = {{eadem}{eadem}},
   idemsn           = {{idem}{idem}},
   idempm           = {{eidem}{eidem}},
@@ -494,7 +479,6 @@
   basicdecember    = {{detsember}{detsember}},
   langamerican     = {{Ameerika}{Ameerika}},
   langbrazilian    = {{Brasiilia}{Brasiilia}},
-% langbulgarian    = {{}{}},% FIXME: missing
   langcatalan      = {{katalaani}{katalaani}},
   langcroatian     = {{horvaadi}{horvaadi}},
   langczech        = {{t\v{s}ehhii}{t\v{s}ehhii}},
@@ -504,7 +488,6 @@
   langestonian     = {{eesti}{eesti}},
   langfinnish      = {{soome}{soome}},
   langfrench       = {{prantsuse}{prantsuse}},
-  langgalician     = {{galeegi}{galeegi}},
   langgerman       = {{saksa}{saksa}},
   langgreek        = {{kreeka}{kreeka}},
   langitalian      = {{itaalia}{itaalia}},
@@ -518,7 +501,6 @@
   langswedish      = {{rootsi}{rootsi}},
   fromamerican     = {{alates USA}{alates USA}},
   frombrazilian    = {{alates Brasiilia}{: Brasiilia}},
-% frombulgarian    = {{}{}},% FIXME: missing
   fromcatalan      = {{alates katalaani}{: Catalan}},
   fromcroatian     = {{alates horvaadi}{: Horvaatia}},
   fromczech        = {{alates T\v{s}ehhi}{: T\v{s}ehhi}},
@@ -528,7 +510,6 @@
   fromestonian     = {{eesti kielest\"a}{eesti kielest\"a}},
   fromfinnish      = {{Soome}{alates Soome}},
   fromfrench       = {{alates Prantsuse}{alates prantsuse}},
-  fromgalician     = {{alates Galeegi}{alates Galeegi}},
   fromgerman       = {{, saksa keeles}{: Saksa}},
   fromgreek        = {{alates Kreeka}{alates Kreeka}},
   fromitalian      = {{alates Itaalia}{: Itaalia}},
@@ -557,7 +538,7 @@
   patreqeu         = {{Euroopa patendi taotluse}{Euroopa pat\adddot\ req\adddot}},
   patreqfr         = {{Prantsuse patent taotluse}{Prantsuse pat\adddot\ req\adddot}},
   patrequk         = {{Briti patendi taotluse}{Briti pat\adddot\ req\adddot}},
-  patrequs         = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}},
+  patrequs         = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}},  
   file             = {{faili}{faili}},
   library          = {{raamatukogu}{raamatukogu}},
   abstract         = {{abstraktne}{abstraktne}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index 9f15fd16e52..6b987a3127d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
@@ -58,21 +58,21 @@
       {}
       {\mkmonthzeros{\thefield{#2}}%
        \iffieldundef{#1}
-        {}
-        {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
+	 {}
+	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
     \iffieldbibstring{#1}
       {\bibstring{\thefield{#1}}}
       {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
   \savecommand\lbx@lfromlang
   \savecommand\lbx@sfromlang
   \def\lbx@lfromlang{%
-    \iflistundef{origlanguage}
+    \iffieldundef{origlanguage}
       {}
-      {\printlist[lfromoriglanguage]{origlanguage}\space}}%
+      {\biblstring{from\thefield{origlanguage}}\space}}%
   \def\lbx@sfromlang{%
-    \iflistundef{origlanguage}
+    \iffieldundef{origlanguage}
       {}
-      {\printlist[sfromoriglanguage]{origlanguage}\space}}%
+      {\bibsstring{from\thefield{origlanguage}}\space}}%
   \savebibmacro{in:}%
   \renewbibmacro{in:}{%
     \iffieldequalstr{entrytype}{article}
@@ -283,9 +283,6 @@
                       {k\"a\"ant\"anyt, selitykset ja j\"alkisanat kirjoittanut}},
   translatorsanaf  = {{k\"a\"ant\"aneet, selitykset ja j\"alkisanat kirjoittaneet}%
                       {k\"a\"ant\"aneet, selitykset ja j\"alkisanat kirjoittaneet}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{kirjoittanut}{kirj\adddot}},
   byeditor         = {{toimittanut}{toim\adddot}},
   bycompiler       = {{koontanut}{koontanut}},
@@ -410,18 +407,6 @@
   sections         = {{kohdat}{kohdat}},% Bad translation, but "pyk\"al\"at" is no better.
   paragraph        = {{kappale}{kappale}},
   paragraphs       = {{kappaleet}{kappaleet}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{teoksessa}{teoksessa}},
   inseries         = {{sarjassa}{sarjassa}},
   ofseries         = {{sarjassa}{sarjassa}},
@@ -493,17 +478,15 @@
   basicdecember    = {{joulukuu}{joulukuu}},
   langamerican     = {{amerikanenglanti}{amerikanenglanti}},
   langbrazilian    = {{brasilianportugali}{brasilianportugali}},
-% langbulgarian    = {{}{}},% FIXME: missing
   langcatalan      = {{katalonia}{katalonia}},
   langcroatian     = {{kroataia}{kroatia}},
   langczech        = {{t\v{s}ekki}{t\v{s}ekki}},
   langdanish       = {{tanska}{tanska}},
   langdutch        = {{hollanti}{hollanti}},
   langenglish      = {{englanti}{englanti}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{suomi}{suomi}},
   langfrench       = {{ranska}{ranska}},
-  langgalician     = {{galician}{galician}},
   langgerman       = {{saksa}{saksa}},
   langgreek        = {{kreikka}{kreikka}},
   langitalian      = {{italia}{italia}},
@@ -517,17 +500,15 @@
   langswedish      = {{ruotsi}{ruotsi}},
   fromamerican     = {{englannin kielest\"a}{englannin kielest\"a}},
   frombrazilian    = {{portugalin kielest\"a}{portugalin kielest\"a}},
-% frombulgarian    = {{}{}},% FIXME: missing
   fromcatalan      = {{katalonian kielest\"a}{katalonian kielest\"a}},
   fromcroatian     = {{kroatian kielest\"a}{kroatian kielest\"a}},
   fromczech        = {{t\v{s}ekin kielest\"a}{t\v{s}ekin kielest\"a}},
   fromdanish       = {{tanskan kielest\"a}{tanskan kielest\"a}},
   fromdutch        = {{hollannin kielest\"a}{hollannin kielest\"a}},
   fromenglish      = {{englannin kielest\"a}{englannin kielest\"a}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{suomen kielest\"a}{suomen kielest\"a}},
   fromfrench       = {{ranskan kielest\"a}{ranskan kielest\"a}},
-  fromgalician     = {{galician kielest\"a}{galician kielest\"a}},
   fromgerman       = {{saksan kielest\"a}{saksan kielest\"a}},
   fromgreek        = {{kreikan kielest\"a}{kreikan kielest\"a}},
   fromitalian      = {{italian kielest\"a}{italian kielest\"a}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index 954b3da99f3..becb278054c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -6,7 +6,8 @@
 \DeclareRedundantLanguages{french}{french}
 
 \DeclareBibliographyExtras{%
-  \protected\def\bibrangedash{-}%
+  \protected\def\bibrangedash{%
+    \textendash\penalty\hyphenpenalty}% breakable dash
   \let\finalandcomma=\empty
   \let\finalandsemicolon=\empty
   \def\mkbibordinal{\mkbibmascord}%
@@ -112,7 +113,7 @@
   references       = {{R\'ef\'erences}{R\'ef\'erences}},
   shorthands       = {{Liste des sigles}{Sigles}},
   editor           = {{\'editeur}{\'ed\adddot}},
-  editors          = {{\'editeurs}{\'ed\adddot}},
+  editors          = {{\'editeurs}{\'eds\adddot}},
   compiler         = {{compilateur}{comp\adddot}},
   compilers        = {{compilateurs}{comp\adddot}},
   redactor         = {{r\'edacteur}{r\'ed\adddot}},
@@ -136,116 +137,116 @@
   introduction     = {{introduction}{introd\adddot}},
   foreword         = {{pr\'eface}{pr\'ef\adddot}},
   afterword        = {{postface}{postf\adddot}},
-  editortr         = {{\'editeur et traducteur}{\'ed\adddotspace et trad\adddot}},
-  editorstr        = {{\'editeurs et traducteurs}{\'ed\adddotspace et trad\adddot}},
+  editortr         = {{\'editeur et traducteur}{\'ed et trad\adddot}},
+  editorstr        = {{\'editeurs et traducteurs}{\'ed\adddot et trad\adddot}},
   editorco         = {{\'editeur et commentateur}%
                       {\'ed\adddotspace et comm\adddot}},
   editorsco        = {{\'editeurs et commentateurs}%
-                      {\'ed\adddotspace et comm\adddot}},
+                      {\'eds\adddotspace et comm\adddot}},
   editoran         = {{\'editeur et annotateur}%
                       {\'ed\adddotspace et annot\adddot}},
   editorsan        = {{\'editeurs et annotateurs}%
-                      {\'ed\adddotspace et annot\adddot}},
+                      {\'eds\adddotspace et annot\adddot}},
   editorin         = {{\'editeur et introduction}%
                       {\'ed\adddotspace et introd\adddot}},
   editorsin        = {{\'editeurs et introduction}%
-                      {\'ed\adddotspace et introd\adddot}},
+                      {\'eds\adddotspace et introd\adddot}},
   editorfo         = {{\'editeur et pr\'eface}%
                       {\'ed\adddotspace et pr\'ef\adddot}},
   editorsfo        = {{\'editeurs et pr\'eface}%
-                      {\'ed\adddotspace et pr\'ef\adddot}},
+                      {\'eds\adddotspace et pr\'ef\adddot}},
   editoraf         = {{\'editeur et postface}%
                       {\'ed\adddotspace et postf\adddot}},
   editorsaf        = {{\'editeurs et postface}%
-                      {\'ed\adddotspace et postf\adddot}},
+                      {\'eds\adddotspace et postf\adddot}},
   editortrco       = {{\'editeur, traducteur et commentateur}%
-                      {\'ed.,\addabbrvspace trad\adddotspace et comm\adddot}},
+                      {\'ed.,\addabbrvspace trans\adddotspace et comm\adddot}},
   editorstrco      = {{\'editeurs, traducteurs et commentateurs}%
-                      {\'ed.,\addabbrvspace trad\adddotspace et comm\adddot}},
+                      {\'eds.,\addabbrvspace trans\adddotspace et comm\adddot}},
   editortran       = {{\'editeur, traducteur et annotateur}%
-                      {\'ed.,\addabbrvspace trad\adddotspace et annot\adddot}},
+                      {\'ed.,\addabbrvspace trans\adddotspace et annot\adddot}},
   editorstran      = {{\'editeurs, traducteurs et annotateurs}%
-                      {\'ed.,\addabbrvspace trad\adddotspace et annot\adddot}},
+                      {\'eds.,\addabbrvspace trans\adddotspace et annot\adddot}},
   editortrin       = {{\'editeur, traducteur et introduction}%
-                      {\'ed.,\addabbrvspace trad\adddotspace et introd\adddot}},
+                      {\'ed.,\addabbrvspace trans\adddotspace et introd\adddot}},
   editorstrin      = {{\'editeurs, traducteurs et introduction}%
-                      {\'ed.,\addabbrvspace trad\adddotspace et introd\adddot}},
+                      {\'eds.,\addabbrvspace trans\adddotspace et introd\adddot}},
   editortrfo       = {{\'editeur, traducteur et pr\'eface}%
-                      {\'ed.,\addabbrvspace trad\adddotspace et pr\'ef\adddot}},
+                      {\'ed.,\addabbrvspace trans\adddotspace et pr\'ef\adddot}},
   editorstrfo      = {{\'editeurs, traducteurs et pr\'eface}%
-                      {\'ed.,\addabbrvspace trad\adddotspace et pr\'ef\adddot}},
+                      {\'eds.,\addabbrvspace trans\adddotspace et pr\'ef\adddot}},
   editortraf       = {{\'editeur, traducteur et postface}%
-                      {\'ed.,\addabbrvspace trad\adddotspace et postf\adddot}},
+                      {\'ed.,\addabbrvspace trans\adddotspace et postf\adddot}},
   editorstraf      = {{\'editeurs, traducteurs et postface}%
-                      {\'ed.,\addabbrvspace trad\adddot et postf\adddot}},
+                      {\'eds.,\addabbrvspace trans\adddot et postf\adddot}},
   editorcoin       = {{\'editeur, commentateur et introduction}%
                       {\'ed.,\addabbrvspace comm\adddotspace et introd\adddot}},
   editorscoin      = {{\'editeurs, commentateurs et introduction}%
-                      {\'ed.,\addabbrvspace comm\adddotspace et introd\adddot}},
+                      {\'eds.,\addabbrvspace comm\adddotspace et introd\adddot}},
   editorcofo       = {{\'editeur, commentateur et pr\'eface}%
                       {\'ed.,\addabbrvspace comm\adddotspace et pr\'ef\adddot}},
   editorscofo      = {{\'editeurs, commentateurs et pr\'eface}%
-                      {\'ed.,\addabbrvspace comm\adddotspace et pr\'ef\adddot}},
+                      {\'eds.,\addabbrvspace comm\adddotspace et pr\'ef\adddot}},
   editorcoaf       = {{\'editeur, commentateur et postface}%
                       {\'ed.,\addabbrvspace comm\adddotspace et postf\adddot}},
   editorscoaf      = {{\'editeurs, commentateurs et postface}%
-                      {\'ed.,\addabbrvspace comm\adddotspace et postf\adddot}},
+                      {\'eds.,\addabbrvspace comm\adddotspace et postf\adddot}},
   editoranin       = {{\'editeur, annotateur et introduction}%
                       {\'ed.,\addabbrvspace annot\adddotspace et introd\adddot}},
   editorsanin      = {{\'editeurs, annotateurs et introduction}%
-                      {\'ed.,\addabbrvspace annot\adddotspace et introd\adddot}},
+                      {\'eds.,\addabbrvspace annot\adddotspace et introd\adddot}},
   editoranfo       = {{\'editeur, annotateur et pr\'eface}%
                       {\'ed.,\addabbrvspace annot\adddotspace et pr\'ef\adddot}},
   editorsanfo      = {{\'editeurs, annotateurs et pr\'eface}%
-                      {\'ed.,\addabbrvspace annot\adddotspace et pr\'ef\adddot}},
+                      {\'eds.,\addabbrvspace annot\adddotspace et pr\'ef\adddot}},
   editoranaf       = {{\'editeur, annotateur et postface}%
                       {\'ed.,\addabbrvspace annot\adddotspace et postf\adddot}},
   editorsanaf      = {{\'editeurs, annotateurs et postface}%
-                      {\'ed.,\addabbrvspace annot\adddotspace et postf\adddot}},
+                      {\'eds.,\addabbrvspace annot\adddotspace et postf\adddot}},
   editortrcoin     = {{\'editeur, traducteur, commentateur et introduction}%
                       {\'ed.,\addabbrvspace trad., comm\adddotspace et introd\adddot}},
   editorstrcoin    = {{\'editeurs, traducteurs, commentateurs et introduction}%
-                      {\'ed.,\addabbrvspace trad., comm\adddotspace et introd\adddot}},
+                      {\'eds.,\addabbrvspace trad., comm\adddotspace et introd\adddot}},
   editortrcofo     = {{\'editeur, traducteur, commentateur et pr\'eface}%
                       {\'ed.,\addabbrvspace trad., comm\adddotspace et pr\'ef\adddot}},
   editorstrcofo    = {{\'editeurs, traducteurs, commentateurs et pr\'eface}%
-                      {\'ed.,\addabbrvspace trad., comm\adddotspace et pr\'ef\adddot}},
+                      {\'eds.,\addabbrvspace trad., comm\adddotspace et pr\'ef\adddot}},
   editortrcoaf     = {{\'editeur, traducteur, commentateur et postface}%
                       {\'ed.,\addabbrvspace trad., comm\adddotspace et postf\adddot}},
   editorstrcoaf    = {{\'editeurs, traducteurs, commentateurs et postface}%
-                      {\'ed.,\addabbrvspace trad., comm\adddotspace et postf\adddot}},
+                      {\'eds.,\addabbrvspace trad., comm\adddotspace et postf\adddot}},
   editortranin     = {{\'editeur, traducteur, annotateur et introduction}%
                       {\'ed.,\addabbrvspace trad., annot\adddotspace et introd\adddot}},
   editorstranin    = {{\'editeurs, traducteurs, annotateurs et introduction}%
-                      {\'ed.,\addabbrvspace trad., annot\adddotspace et introd\adddot}},
+                      {\'eds.,\addabbrvspace trad., annot\adddotspace et introd\adddot}},
   editortranfo     = {{\'editeur, traducteur, annotateur et pr\'eface}%
                       {\'ed.,\addabbrvspace trad., annot\adddotspace et pr\'ef\adddot}},
   editorstranfo    = {{\'editeurs, traducteurs, annotateurs et pr\'eface}%
-                      {\'ed.,\addabbrvspace trad., annot\adddotspace et pr\'ef\adddot}},
+                      {\'eds.,\addabbrvspace trad., annot\adddotspace et pr\'ef\adddot}},
   editortranaf     = {{\'editeur, traducteur, annotateur et postface}%
                       {\'ed.,\addabbrvspace trad., annot\adddotspace et postf\adddot}},
   editorstranaf    = {{\'editeurs, traducteurs, annotateurs et postface}%
-                      {\'ed.,\addabbrvspace trad., annot\adddotspace et postf\adddot}},
+                      {\'eds.,\addabbrvspace trad., annot\adddotspace et postf\adddot}},
   translatorco     = {{traducteur et commentateur}%
-                      {trad\adddotspace et comm\adddot}},
+                      {trans\adddotspace et comm\adddot}},
   translatorsco    = {{traducteurs et commentateurs}%
-                      {trad\adddotspace et comm\adddot}},
+                      {trans\adddotspace et comm\adddot}},
   translatoran     = {{traducteur et annotateur}%
-                      {trad\adddotspace et annot\adddot}},
+                      {trans\adddotspace et annot\adddot}},
   translatorsan    = {{traducteurs et annotateurs}%
-                      {trad\adddotspace et annot\adddot}},
+                      {trans\adddotspace et annot\adddot}},
   translatorin     = {{traduction et introduction}%
-                      {trad\adddotspace et introd\adddot}},
+                      {trans\adddotspace et introd\adddot}},
   translatorsin    = {{traduction et introduction}%
-                      {trad\adddotspace et introd\adddot}},
+                      {trans\adddotspace et introd\adddot}},
   translatorfo     = {{traduction et pr\'eface}%
-                      {trad\adddotspace et pr\'ef\adddot}},
+                      {trans\adddotspace et pr\'ef\adddot}},
   translatorsfo    = {{traduction et pr\'eface}%
-                      {trad\adddotspace et pr\'ef\adddot}},
+                      {trans\adddotspace et pr\'ef\adddot}},
   translatoraf     = {{traduction et postface}%
-                      {trad\adddotspace et postf\adddot}},
+                      {trans\adddotspace et postf\adddot}},
   translatorsaf    = {{traduction et postface}%
-                      {trad\adddotspace et postf\adddot}},
+                      {trans\adddotspace et postf\adddot}},
   translatorcoin   = {{traduction, commentaire et introduction}%
                       {trad., comm\adddotspace et introd\adddot}},
   translatorscoin  = {{traduction, commentaire et introduction}%
@@ -270,9 +271,6 @@
                       {trad., annot\adddotspace et postf\adddot}},
   translatorsanaf  = {{traduction, annotations et postface}%
                       {trad., annot\adddotspace et postf\adddot}},
-  organizer        = {{organisateur}{org\adddot}},%
-  organizers       = {{organisateurs}{org\adddot}},%
-  byorganizer      = {{organis\'e par}{org\adddotspace par}},%
   byauthor         = {{par}{par}},
   byeditor         = {{sous la direction \smartof}{sous la dir\adddotspace\smartof}},
   bycompiler       = {{compil\'e par}{comp\adddotspace par}},
@@ -385,37 +383,25 @@
   origpubin        = {{publi\'e \`a l'origine en}{pub\adddotspace \`a l'orig\adddotspace en}},
   astitle          = {{sous le titre}{sous le titre}},
   bypublisher      = {{par}{par}},
-  nodate           = {{pas\space de\space date}{{}p\adddotspace d\adddot}},
   page             = {{page}{p\adddot}},
   pages            = {{pages}{p\adddot}},
   column           = {{colonne}{col\adddot}},
   columns          = {{colonnes}{col\adddot}},
   line             = {{ligne}{l\adddot}},
   lines            = {{lignes}{l\adddot}},
+  nodate           = {{pas\space de\space date}{{}p\adddot d\adddot}},
   verse            = {{vers}{v\adddot}},
   verses           = {{vers}{v\adddot}},
   section          = {{section}{\S}},
-  sections         = {{sections}{\S}},
+  sections         = {{sections}{\S\S}},
   paragraph        = {{paragraphe}{par\adddot}},
   paragraphs       = {{paragraphes}{par\adddot}},
-  pagetotal        = {{page}{p\adddot}},
-  pagetotals       = {{pages}{p\adddot}},
-  columntotal      = {{colonne}{col\adddot}},
-  columntotals     = {{colonnes}{col\adddot}},
-  linetotal        = {{ligne}{l\adddot}},
-  linetotals       = {{lignes}{l\adddot}},
-  versetotal       = {{vers}{v\adddot}},
-  versetotals      = {{vers}{v\adddot}},
-  sectiontotal     = {{section}{\S}},
-  sectiontotals    = {{sections}{\S}},
-  paragraphtotal   = {{paragraphe}{par\adddot}},
-  paragraphtotals  = {{paragraphes}{par\adddot}},
   in               = {{in}{in}},
   inseries         = {{in}{in}},
   ofseries         = {{de}{de}},
   number           = {{num\'ero}{n\textsuperscript{o}}},
   chapter          = {{chapitre}{chap\adddot}},
-  mathesis         = {{m\'emoire de master}{m\'em\adddotspace de mast\adddot}},
+  mathesis         = {{m\'emoire de master}{m\'em\adddot de mast\adddot}},
   phdthesis        = {{th\`ese de doctorat}{th\`ese de doct\adddot}},
   candthesis       = {{th\`ese de candidature}{th\`ese de cand\adddot}},
   resreport        = {{rapport scientifique}{rapp\adddotspace scient\adddot}},
@@ -469,58 +455,48 @@
   december         = {{d\'ecembre}{d\'ec\adddot}},
   langamerican     = {{am\'ericain}{am\'ericain}},
   langbrazilian    = {{br\'esilien}{br\'esilien}},
-  langbulgarian    = {{bulgare}{bulgare}},
   langcatalan      = {{catalan}{catalan}},
   langcroatian     = {{croate}{croate}},
   langczech        = {{tch\`eque}{tch\`eque}},
   langdanish       = {{danois}{danois}},
   langdutch        = {{n\'eerlandais}{n\'eerlandais}},
   langenglish      = {{anglais}{anglais}},
-  langestonian     = {{estonien}{estonien}},
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{finnois}{finnois}},
   langfrench       = {{fran\c{c}ais}{fran\c{c}ais}},
-  langgalician     = {{galicien}{galicien}},
   langgerman       = {{allemand}{allemand}},
   langgreek        = {{grec}{grec}},
   langitalian      = {{italien}{italien}},
-  langjapanese     = {{japonais}{japonais}},
   langlatin        = {{latin}{latin}},
   langnorwegian    = {{norv\'egien}{norv\'egien}},
   langpolish       = {{polonais}{polonais}},
   langportuguese   = {{portugais}{portugais}},
   langrussian      = {{russe}{russe}},
-  langslovak       = {{slovaque}{slovaque}},
   langslovene      = {{slov\`ene}{slov\`ene}},
   langspanish      = {{espagnol}{espagnol}},
   langswedish      = {{su\'edois}{su\'edois}},
-  langukrainian    = {{ukrainien}{ukrainien}},
   fromamerican     = {{de l'am\'ericain}{de l'am\'ericain}},
   frombrazilian    = {{du br\'esilien}{du br\'esilien}},
-  frombulgarian    = {{du bulgare}{du bulgare}},
   fromcatalan      = {{du catalan}{du catalan}},
   fromcroatian     = {{du croate}{du croate}},
   fromczech        = {{du tch\`eque}{du tch\`eque}},
   fromdanish       = {{du danois}{du danois}},
   fromdutch        = {{du n\'eerlandais}{du n\'eerlandais}},
   fromenglish      = {{de l'anglais}{de l'anglais}},
-  fromestonian     = {{de l'estonien}{de l'estonien}},
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{du finnois}{du finnois}},
   fromfrench       = {{du fran\c{c}ais}{du fran\c{c}ais}},
-  fromgalician     = {{du galicien}{du galicien}},
   fromgerman       = {{de l'allemand}{de l'allemand}},
   fromgreek        = {{du grec}{du grec}},
   fromitalian      = {{de l'italien}{de l'italien}},
-  fromjapanese     = {{du japonais}{du japonais}},
   fromlatin        = {{du latin}{du latin}},
   fromnorwegian    = {{du norv\'egien}{du norv\'egien}},
   frompolish       = {{du polonais}{du polonais}},
   fromportuguese   = {{du portugais}{du portugais}},
   fromrussian      = {{du russe}{du russe}},
-  fromslovak       = {{du slovaque}{du slovaque}},
   fromslovene      = {{du slov\`ene}{du slov\`ene}},
   fromspanish      = {{de l'espagnol}{de l'espagnol}},
   fromswedish      = {{du su\'edois}{du su\'edois}},
-  fromukrainian    = {{de l'ukrainien}{de l'ukrainien}},
   countryde        = {{Allemagne}{DE}},
   countryeu        = {{Union europ\'eenne}{EU}},
   countryep        = {{Union europ\'eenne}{EP}},
@@ -545,13 +521,13 @@
   annotation       = {{annotations}{annotations}},
   commonera        = {{de l’\`ere commune}{EC}},
   beforecommonera  = {{avant l’\`ere commune}{AEC}},
-  annodomini       = {{apr\`es J\'esus-Christ}{apr\adddotspace J\adddot-C\adddot}},
+  annodomini       = {{apr\`es J\'esus-Christ}{ap\adddotspace J\adddot-C\adddot}},
   beforechrist     = {{avant J\'esus-Christ}{av\adddotspace J\adddot-C\adddot}},
-  circa            = {{vers}{vers}},
-  spring           = {{printemps}{printemps}},
-  summer           = {{été}{été}},
-  autumn           = {{automne}{automne}},
-  winter           = {{hiver}{hiver}},
+% circa            = {{}{}},% FIXME: missing
+% spring           = {{}{}},% FIXME: missing
+% summer           = {{}{}},% FIXME: missing
+% autumn           = {{}{}},% FIXME: missing
+% winter           = {{}{}},% FIXME: missing
   am               = {{AM}{AM}},
   pm               = {{PM}{PM}},
 }
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx
deleted file mode 100644
index 35bb4ae52ce..00000000000
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/galician.lbx
+++ /dev/null
@@ -1,527 +0,0 @@
-\ProvidesFile{galician.lbx}
-[\abx@lbxid]
-
-\DeclareRedundantLanguages{galician}{galician}
-
-\DeclareBibliographyExtras{%
-  \protected\def\bibrangedash{%
-    \textendash\penalty\hyphenpenalty}% breakable dash
-  \let\finalandcomma=\empty
-  \let\finalandsemicolon=\empty
-  \def\mkbibordinal{\mkbibmascord}%
-  \protected\def\mkbibmascord#1{%
-    \stripzeros{#1}\textordmasculine}% \textordmasculine -> textcomp.sty
-  \protected\def\mkbibfemord#1{%
-    \stripzeros{#1}\textordfeminine}%  \textordfeminine  -> textcomp.sty
-  \protected\def\mkbibneutord{\mkbibmascord}%
-  \protected\def\mkbibdatelong#1#2#3{%
-    \iffieldundef{#3}
-      {}
-      {\stripzeros{\thefield{#3}}%
-       \iffieldundef{#2}{}{\nobreakspace de\space}}%
-    \iffieldundef{#2}
-      {}
-      {\mkbibmonth{\thefield{#2}}%
-       \iffieldundef{#1}{}{\nobreakspace de\space}}%
-    \iffieldbibstring{#1}
-      {\bibstring{\thefield{#1}}}
-      {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
-  \protected\def\mkbibdateshort#1#2#3{%
-    \iffieldundef{#3}
-      {}
-      {\mkdayzeros{\thefield{#3}}%
-       \iffieldundef{#2}{}{/}}%
-    \iffieldundef{#2}
-      {}
-      {\mkmonthzeros{\thefield{#2}}%
-       \iffieldundef{#1}{}{/}}%
-    \iffieldbibstring{#1}
-      {\bibstring{\thefield{#1}}}
-      {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
-  \savecommand\mkbibordedition
-  \savecommand\mkbibordseries
-  \def\mkbibordedition{\mkbibfemord}%
-  \def\mkbibordseries{\mkbibfemord}%
-  \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{%
-      \iffieldundef{#1}{}
-        {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}%
-      \iffieldundef{#2}{}
-        {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}%
-      \iffieldundef{#3}{}
-        {\printtext{\mktimezeros{\thefield{#3}}}}%
-      \setunit{}%
-      \iffieldundef{#4}{}
-        {\bibtimezonesep
-         \mkbibtimezone{\thefield{#4}}}}%
-  \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{%
-      \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep
-      \forcezerosmdt{\thefield{#2}}%
-      \iffieldundef{#3}{}
-        {\bibtimesep
-         \forcezeros{\thefield{#3}}}%
-       \space
-       \ifnumless{\thefield{#1}}{12}
-         {\bibstring{am}}
-         {\bibstring{pm}}%
-      \iffieldundef{#4}{}
-       {\space\bibtimezonesep
-        \parentext{\mkbibtimezone{\thefield{#4}}}}}%
-  \protected\def\mkbibseasondateshort#1#2{%
-    \mkbibseason{\thefield{#2}}%
-    \iffieldundef{#1}{}{\space}%
-    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
-  \protected\def\mkbibseasondatelong#1#2{%
-    \mkbibseason{\thefield{#2}}%
-    \iffieldundef{#1}{}{\space}%
-    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
-}
-
-\UndeclareBibliographyExtras{%
-  \restorecommand\mkbibordedition
-  \restorecommand\mkbibordseries
-}
-
-\DeclareBibliographyStrings{%
-  bibliography     = {{Bibliograf\'ia}{Bibliograf\'ia}},
-  references       = {{Referencias}{Referencias}},
-  shorthands       = {{Lista de abreviaturas}{Abreviaturas}},
-  editor           = {{editor}{ed\adddot}},
-  editors          = {{editores}{eds\adddot}},
-  compiler         = {{compilador}{comp\adddot}},
-  compilers        = {{compiladores}{comp\adddot}},
-  redactor         = {{redactor}{red\adddot}},
-  redactors        = {{redactores}{red\adddot}},
-  reviser          = {{revisor}{rev\adddot}},
-  revisers         = {{revisores}{revs\adddot}},
-  founder          = {{fundador}{fund\adddot}},
-  founders         = {{fundadores}{fund\adddot}},
-  continuator      = {{continuador}{cont\adddot}},
-  continuators     = {{continuadores}{cont\adddot}},
-  collaborator     = {{colaborador}{col\adddot}},
-  collaborators    = {{colaboradores}{cols\adddot}},
-  translator       = {{tradutor}{trad\adddot}},
-  translators      = {{tradutores}{trads\adddot}},
-  commentator      = {{comentador}{coment\adddot}},
-  commentators     = {{comentadores}{coments\adddot}},
-  annotator        = {{anotador}{anot\adddot}},
-  annotators       = {{anotadores}{anots\adddot}},
-  commentary       = {{comentario}{coment\adddot}},
-  annotations      = {{notas}{notas}},
-  introduction     = {{introduci\'on}{introd\adddot}},
-  foreword         = {{prefacio}{pref\adddot}},
-  afterword        = {{posfacio}{posf\adddot}},
-  editortr         = {{editor e tradutor}%
-                      {ed\adddotspace e trad\adddot}},
-  editorstr        = {{editores e tradutores}%
-                      {eds\adddotspace e trads\adddot}},
-  editorco         = {{editor e comentador}%
-                      {ed\adddotspace e coment\adddot}},
-  editorsco        = {{editores e comentadores}%
-                      {eds\adddotspace e coments\adddot}},
-  editoran         = {{editor e anotador}%
-                      {ed\adddotspace e anot\adddot}},
-  editorsan        = {{editores e anotadores}%
-                      {eds\adddotspace e anots\adddot}},
-  editorin         = {{editor e introduci\'on}%
-                      {ed\adddotspace e introd\adddot}},
-  editorsin        = {{editores e introduci\'on}%
-                      {eds\adddotspace e introd\adddot}},
-  editorfo         = {{editor e prefacio}%
-                      {ed\adddotspace e pref\adddot}},
-  editorsfo        = {{editores e prefacio}%
-                      {eds\adddotspace e pref\adddot}},
-  editoraf         = {{editor e posfacio}%
-                      {ed\adddotspace e posf\adddot}},
-  editorsaf        = {{editores e posfacio}%
-                      {eds\adddotspace e posf\adddot}},
-  editortrco       = {{editor, tradutor e comentador}%
-                      {ed., trad\adddot\ e coment\adddot}},
-  editorstrco      = {{editores, tradutores e comentadores}%
-                      {eds., trads\adddot\ e coments\adddot}},
-  editortran       = {{editor, tradutor e anotador}%
-                      {ed., trad\adddot\ e anot\adddot}},
-  editorstran      = {{editores, tradutores e anotadores}%
-                      {eds., trads\adddot\ e anots\adddot}},
-  editortrin       = {{editor, tradutor e introduci\'on}%
-                      {ed., trad\adddot\ e introd\adddot}},
-  editorstrin      = {{editores, tradutores e introduci\'on}%
-                      {eds., trads\adddot\ e introd\adddot}},
-  editortrfo       = {{editor, tradutor e prefacio}%
-                      {ed., trad\adddot\ e pref\adddot}},
-  editorstrfo      = {{editores, tradutores e prefacio}%
-                      {eds., trads\adddot\ e pref\adddot}},
-  editortraf       = {{editor, tradutor e posfacio}%
-                      {ed., trad\adddot\ e posf\adddot}},
-  editorstraf      = {{editores, tradutores e posfacio}%
-                      {eds., trads\adddot\ e posf\adddot}},
-  editorcoin       = {{editor, comentador e introduci\'on}%
-                      {ed., coment\adddot\ e introd\adddot}},
-  editorscoin      = {{editores, comentadores e introduci\'on}%
-                      {eds., coments\adddot\ e introd\adddot}},
-  editorcofo       = {{editor, comentador e prefacio}%
-                      {ed., coment\adddot\ e pref\adddot}},
-  editorscofo      = {{editores, comentadores e prefacio}%
-                      {eds., coments\adddot\ e pref\adddot}},
-  editorcoaf       = {{editor, comentador e posfacio}%
-                      {ed., coment\adddot\ e posf\adddot}},
-  editorscoaf      = {{editores, comentadores e posfacio}%
-                      {eds., coments\adddot\ e posf\adddot}},
-  editoranin       = {{editor, anotador e introduci\'on}%
-                      {ed., anot\adddot\ e introd\adddot}},
-  editorsanin      = {{editores, anotadores e introduci\'on}%
-                      {eds., anots\adddot\ e introd\adddot}},
-  editoranfo       = {{editor, anotador e prefacio}%
-                      {ed., anot\adddot\ e pref\adddot}},
-  editorsanfo      = {{editores, anotadores e prefacio}%
-                      {eds., anots\adddot\ e pref\adddot}},
-  editoranaf       = {{editor, anotador e posfacio}%
-                      {ed., anot\adddot\ e posf\adddot}},
-  editorsanaf      = {{editores, anotadores e posfacio}%
-                      {eds., anots\adddot\ e posf\adddot}},
-  editortrcoin     = {{editor, tradutor, comentador e introduci\'on}%
-                      {ed., trad., coment\adddot\ e introd\adddot}},
-  editorstrcoin    = {{editores, tradutores, comentadores e introduci\'on}%
-                      {eds., trads., coments\adddot\ e introd\adddot}},
-  editortrcofo     = {{editor, tradutor, comentador e prefacio}%
-                      {ed., trad., coment\adddot\ e pref\adddot}},
-  editorstrcofo    = {{editores, tradutores, comentadores e prefacio}%
-                      {eds., trads., coments\adddot\ e pref\adddot}},
-  editortrcoaf     = {{editor, tradutor, comentador e posfacio}%
-                      {ed., trad., coment\adddot\ e posf\adddot}},
-  editorstrcoaf    = {{editores, tradutores, comentadores e posfacio}%
-                      {eds., trads., coments\adddot\ e posf\adddot}},
-  editortranin     = {{editor, tradutor, anotador e introduci\'on}%
-                      {ed., trad., anot\adddot\ e introd\adddot}},
-  editorstranin    = {{editores, tradutores, anotadores e introduci\'on}%
-                      {eds., trads., anots\adddot\ e introd\adddot}},
-  editortranfo     = {{editor, tradutor, anotador e prefacio}%
-                      {ed., trad., anot\adddot\ e pref\adddot}},
-  editorstranfo    = {{editores, tradutores, anotadores e prefacio}%
-                      {eds., trads., anots\adddot\ e pref\adddot}},
-  editortranaf     = {{editor, tradutor, anotador e posfacio}%
-                      {ed., trad., anot\adddot\ e posf\adddot}},
-  editorstranaf    = {{editores, tradutores, anotadores e posfacio}%
-                      {eds., trads., anots\adddot\ e posf\adddot}},
-  translatorco     = {{tradutor e comentador}%
-                      {trad\adddot\ e coment\adddot}},
-  translatorsco    = {{tradutores e comentadores}%
-                      {trads\adddot\ e coments\adddot}},
-  translatoran     = {{tradutor e anotador}%
-                      {trad\adddot\ e anot\adddot}},
-  translatorsan    = {{tradutores e anotadores}%
-                      {trads\adddot\ e anots\adddot}},
-  translatorin     = {{traduci\'on e introduci\'on}%
-                      {trad\adddot\ e introd\adddot}},
-  translatorsin    = {{traduci\'on e introduci\'on}%
-                      {trad\adddot\ e introd\adddot}},
-  translatorfo     = {{traduci\'on e prefacio}%
-                      {trad\adddot\ e pref\adddot}},
-  translatorsfo    = {{traduci\'on e prefacio}%
-                      {trad\adddot\ e pref\adddot}},
-  translatoraf     = {{traduci\'on e posfacio}%
-                      {trad\adddot\ e posf\adddot}},
-  translatorsaf    = {{traduci\'on e posfacio}%
-                      {trad\adddot\ e posf\adddot}},
-  translatorcoin   = {{traduci\'on, comentario e introduci\'on}%
-                      {trad., coment\adddot\ e introd\adddot}},
-  translatorscoin  = {{traduci\'on, comentario e introduci\'on}%
-                      {trad., coment\adddot\ e introd\adddot}},
-  translatorcofo   = {{traduci\'on, comentario e prefacio}%
-                      {trad., coment\adddot\ e pref\adddot}},
-  translatorscofo  = {{traduci\'on, comentario e prefacio}%
-                      {trad., coment\adddot\ e pref\adddot}},
-  translatorcoaf   = {{traduci\'on, comentario e posfacio}%
-                      {trad., coment\adddot\ e posf\adddot}},
-  translatorscoaf  = {{traduci\'on, comentario e posfacio}%
-                      {trad., coment\adddot\ e posf\adddot}},
-  translatoranin   = {{traduci\'on, notas e introduci\'on}%
-                      {trad., notas e introd\adddot}},
-  translatorsanin  = {{traduci\'on, notas e introduci\'on}%
-                      {trad., notas e introd\adddot}},
-  translatoranfo   = {{traduci\'on, notas e prefacio}%
-                      {trad., notas e pref\adddot}},
-  translatorsanfo  = {{traduci\'on, notas e prefacio}%
-                      {trad., notas e pref\adddot}},
-  translatoranaf   = {{traduci\'on, notas e posfacio}%
-                      {trad., notas e posf\adddot}},
-  translatorsanaf  = {{traduci\'on, notas e posfacio}%
-                      {trad., notas e posf\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
-  byauthor         = {{por}{por}},
-  byeditor         = {{editado por}{ed\adddotspace por}},
-  bycompiler       = {{compilado por}{comp\adddotspace por}},
-  byredactor       = {{redactado por}{red\adddotspace por}},
-  byreviser        = {{revisto por}{rev\adddotspace por}},
-  byreviewer       = {{avaliado por}{aval\adddotspace por}},
-  byfounder        = {{fundado por}{fund\adddotspace por}},
-  bycontinuator    = {{continuado por}{cont\adddotspace por}},
-  bycollaborator   = {{en colaboraci\'on con}{en col\adddotspace con}},
-  bytranslator     = {{traducido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}},
-  bycommentator    = {{comentado por}{com\adddot\ por}},
-  byannotator      = {{notas de}{notas de}},
-  withcommentator  = {{con comentarios de}{con coment\adddot\ de}},
-  withannotator    = {{con notas de}{con notas de}},
-  withintroduction = {{con introduci\'on de}{con introd\adddot\ de}},
-  withforeword     = {{con prefacio de}{con pref\adddot\ de}},
-  withafterword    = {{con posfacio de}{con posf\adddot\ de}},
-  byeditortr       = {{editado e traducido \lbx@lfromlang\ por}%
-                      {ed\adddotspace e trad\adddot\ \lbx@sfromlang\ por}},
-  byeditorco       = {{editado e comentado por}%
-                      {ed\adddotspace e com\adddot\ por}},
-  byeditoran       = {{editado e anotado por}%
-                      {ed\adddotspace e anot\adddot\ por}},
-  byeditorin       = {{editado e introducido por}%
-                      {ed\adddotspace e introd\adddot\ por}},
-  byeditorfo       = {{editado e prefaciado por}%
-                      {ed\adddotspace e pref\adddot\ por}},
-  byeditoraf       = {{editado e posfaciado por}%
-                      {ed\adddotspace e posf\adddot\ por}},
-  byeditortrco     = {{editado, traducido \lbx@lfromlang\ e comentado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
-  byeditortran     = {{editado, traducido \lbx@lfromlang\ e anotado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
-  byeditortrin     = {{editado, traducido \lbx@lfromlang\ e introducido por}%
-                      {ed.,\addabbrvspace trad. \lbx@sfromlang\ e introd\adddot\ por}},
-  byeditortrfo     = {{editado, traducido \lbx@lfromlang\ e prefaciado por}%
-                      {ed.,\addabbrvspace trad. \lbx@sfromlang\ e pref\adddot\ por}},
-  byeditortraf     = {{editado, traducido \lbx@lfromlang\ e posfaciado por}%
-                      {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}},
-  byeditorcoin     = {{editado, comentado e introducido por}%
-                      {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}},
-  byeditorcofo     = {{editado, comentado e prefaciado por}%
-                      {ed.,\addabbrvspace com\adddot\ e pref\adddot\ por}},
-  byeditorcoaf     = {{editado, comentado e posfaciado por}%
-                      {ed.,\addabbrvspace com\adddot\ e posf\adddot\ por}},
-  byeditoranin     = {{editado, anotado e introducido por}%
-                      {ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}},
-  byeditoranfo     = {{editado, anotado e prefaciado por}%
-                      {ed.,\addabbrvspace anot\adddot\ e pref\adddot\ por}},
-  byeditoranaf     = {{editado, anotado e posfaciado por}%
-                      {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}},
-  byeditortrcoin   = {{editado, traducido \lbx@lfromlang, comentado e introducido por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
-  byeditortrcofo   = {{editado, traducido \lbx@lfromlang, comentado e prefaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
-  byeditortrcoaf   = {{editado, traducido \lbx@lfromlang, comentado e posfaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
-  byeditortranin   = {{editado, traducido \lbx@lfromlang, anotado e introducido por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
-  byeditortranfo   = {{editado, traducido \lbx@lfromlang, anotado e prefaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e pref\adddot\ por}},
-  byeditortranaf   = {{editado, traducido \lbx@lfromlang, anotado e posfaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}},
-  bytranslatorco   = {{traducido \lbx@lfromlang\ e comentado por}%
-                      {trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
-  bytranslatoran   = {{traducido \lbx@lfromlang\ e anotado por}%
-                      {trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
-  bytranslatorin   = {{traducido \lbx@lfromlang\ e introducido por}%
-                      {trad\adddot\ \lbx@sfromlang\ e introd\adddot\ por}},
-  bytranslatorfo   = {{traducido \lbx@lfromlang\ e prefaciado por}%
-                      {trad\adddot\ \lbx@sfromlang\ e pref\adddot\ por}},
-  bytranslatoraf   = {{traducido \lbx@lfromlang\ e posfaciado por}%
-                      {trad\adddot\ \lbx@sfromlang\ e posf\adddot\ por}},
-  bytranslatorcoin = {{traducido \lbx@lfromlang, comentado e introducido por}%
-                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
-  bytranslatorcofo = {{traducido \lbx@lfromlang, comentado e prefaciado por}%
-                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
-  bytranslatorcoaf = {{traducido \lbx@lfromlang, comentado e posfaciado por}%
-                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
-  bytranslatoranin = {{traducido \lbx@lfromlang, anotado e introducido por}%
-                      {trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
-  bytranslatoranfo = {{traducido \lbx@lfromlang, anotado e prefaciado por}%
-                      {trad\adddot\ \lbx@sfromlang, anot\adddot\ e pref\adddot\ por}},
-  bytranslatoranaf = {{traducido \lbx@lfromlang, anotado e posfaciado por}%
-                      {trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}},
-  and              = {{e}{e}},
-  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
-  andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
-  volume           = {{volume}{vol\adddot}},
-  volumes          = {{volumes}{vols\adddot}},
-  involumes        = {{en}{en}},
-  jourvol          = {{volume}{vol\adddot}},
-  jourser          = {{serie}{ser\adddot}},
-  book             = {{libro}{libro}},
-  part             = {{parte}{parte}},
-  issue            = {{n\'umero}{n\'umero}},
-  newseries        = {{nova serie}{nova ser\adddot}},
-  oldseries        = {{serie antiga}{ser\adddot\ antiga}},
-  edition          = {{edici\'on}{ed\adddot}},
-  reprint          = {{reimpresi\'on}{reimpr\adddot}},
-  reprintof        = {{reimpresi\'on' de}{reimpr\adddotspace de}},
-  reprintas        = {{reimpreso como}{reimpr\adddotspace como}},
-  reprintfrom      = {{reimpreso de}{reimpr\adddotspace de}},
-  translationof    = {{traduci\'on de}{trad\adddotspace de}},
-  translationas    = {{traducido como}{trad\adddotspace como}},
-  translationfrom  = {{traducido de}{trad\adddotspace de}},
-  reviewof         = {{recensi\'on de}{rec.\adddotspace de}},
-  origpubas        = {{orixinalmente publicado como}{orix\adddotspace pub\adddotspace como}},
-  origpubin        = {{orixinalmente publicado en}{orix\adddotspace pub\adddotspace en}},
-  astitle          = {{como}{como}},
-  bypublisher      = {{por}{por}},
-nodate           = {{sen data}{s\adddot d\adddot}},
-  page             = {{p\'axina}{p\adddot}},
-  pages            = {{p\'axinas}{pp\adddot}},
-  column           = {{coluna}{col\adddot}},
-  columns          = {{colunas}{cols\adddot}},
-  line             = {{li\~{n}a}{l\adddot}},
-  lines            = {{li\~{n}as}{ll\adddot}},
-  verse            = {{verso}{v\adddot}},
-  verses           = {{versos}{vv\adddot}},
-  section          = {{secci\'on}{\S}},
-  sections         = {{secci\'ons'}{\S\S}},
-  paragraph        = {{par\'agrafo}{par\adddot}},
-  paragraphs       = {{par\'agrafo}{pars\adddot}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
-  in               = {{en}{en}},
-  inseries         = {{en}{en}},
-  ofseries         = {{de}{de}},
-  number           = {{n\'umero}{n\adddot\textordmasculine}},
-  chapter          = {{cap\'itulo}{cap\adddot}},
-  mathesis         = {{tese de mestrado}{tese de mestrado}},
-  phdthesis        = {{tese de doutoramento}{tese de doutoramento}},
-  candthesis       = {{proposta de tese}{proposta de tese}},
-  resreport        = {{memoria de investigaci\'on'}{mem\adddotspace de inv\adddot}},
-  techreport       = {{informe t\'ecnico}{inf\adddotspace t\'ec\adddot}},
-  software         = {{software}{software}},
-  datacd           = {{CD-ROM}{CD-ROM}},
-  audiocd          = {{CD audio}{CD audio}},
-  version          = {{versi\'on'}{versi\'on}},
-  url              = {{URL}{URL}},
-  urlfrom          = {{URL}{URL}},
-  urlseen          = {{accedido en}{accedido en}},
-  inpreparation    = {{en preparaci\'on'}{en prep\adddot}},
-  submitted        = {{enviado}{env\adddot}},
-  forthcoming      = {{no prelo}{no prelo}},
-  inpress          = {{no prelo}{no prelo}},
-  prepublished     = {{prepublicado}{prepub\adddot}},
-  citedas          = {{de agora en diante}{de agora en diante}},
-  seenote          = {{ver nota}{ver nota}},
-  quotedin         = {{citado en}{citado en}},
-  idem             = {{\'idem}{\'idem}},
-  idemsm           = {{\'idem}{\'idem}},
-  idemsf           = {{\'idem}{\'idem}},
-  idemsn           = {{\'idem}{\'idem}},
-  idempm           = {{\'idem}{\'idem}},
-  idempf           = {{\'idem}{\'idem}},
-  idempn           = {{\'idem}{\'idem}},
-  idempp           = {{\'idem}{\'idem}},
-  ibidem           = {{ib\'idem}{ib\'id\adddot}},
-  opcit            = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
-  loccit           = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
-  confer           = {{cf\adddot}{cf\adddot}},
-  sequens          = {{sq\adddot}{sq\adddot}},
-  sequentes        = {{sqq\adddot}{sqq\adddot}},
-  passim           = {{p\'assim}{p\'ass\adddot}},
-  see              = {{v\'exase}{vid\adddotspace}},
-  seealso          = {{v\'exase tam\'en}{vid\adddotspace tam\'en}},
-  backrefpage      = {{v\'exase p\'axina}{vid\adddotspace p\adddot}},
-  backrefpages     = {{v\'exanse p\'axinas}{vid\adddotspace pp\adddot}},
-  january          = {{xaneiro}{xan\adddot}},
-  february         = {{febreiro}{feb\adddot}},
-  march            = {{marzo}{mar\adddot}},
-  april            = {{abril}{abr\adddot}},
-  may              = {{maio}{maio}},
-  june             = {{xu\~{n}o}{xu\~{n}\adddot}},
-  july             = {{xullo}{xul\adddot}},
-  august           = {{agosto}{ago\adddot}},
-  september        = {{setembro}{set\adddot}},
-  october          = {{outubro}{out\adddot}},
-  november         = {{novembro}{nov\adddot}},
-  december         = {{decembro}{dec\adddot}},
-  langamerican     = {{ingl\'es americano}{ing\adddotspace am\adddot}},
-  langbulgarian    = {{b\'ulgaro}{b\'ulg\adddot}}
-  langbrazilian    = {{portugu\'es brasileiro}{port\adddotspace br\adddot}},
-  langcatalan      = {{catal\'an}{cat\adddot}},
-  langcroatian     = {{croata}{croata}},
-  langczech        = {{checo}{checo}},
-  langdanish       = {{dinamarqu\'es}{dan\'es}},
-  langdutch        = {{neerland\'es}{neerl\adddot}},
-  langenglish      = {{ingl\'es}{ing\adddot}},
-  langestonian     = {{estoniano}{eston\adddot}},
-  langfinnish      = {{fin\'es}{fin\'es}},
-  langfrench       = {{franc\'es}{fr\adddot}},
-  langgalician     = {{galego}{gal\adddot}},
-  langgerman       = {{alem\'an}{al\adddot}},
-  langgreek        = {{grego}{grego}},
-  langitalian      = {{italiano}{ital\adddot}},
-  langlatin        = {{lat\'in}{lat\adddot}},
-  langnorwegian    = {{noruegu\'es}{nor\adddot}},
-  langpolish       = {{polaco}{pol\adddot}},
-  langportuguese   = {{portugu\'es}{port\adddot}},
-  langrussian      = {{ruso}{ruso}},
-  langslovene      = {{esloveno}{eslov\adddot}},
-  langspanish      = {{castel\'an}{cast\adddot}},
-  langswedish      = {{sueco}{sueco}},
-  fromamerican     = {{do ingl\'es americano}{do ingl\adddotspace am\adddot}},
-  frombulgarian    = {{do b\'ulgaro}{do b\'ulg\adddot}},
-  frombrazilian    = {{do portugu\'es brasileiro}{do port\adddotspace br\adddot}},
-  fromcatalan      = {{do catal\~ao}{do cat\adddot}},
-  fromcroatian     = {{do croata}{do croata}},
-  fromczech        = {{do checo}{do checo}},
-  fromdanish       = {{do dinamarqu\'es}{do dan\'es}},
-  fromdutch        = {{do neerland\'es}{do neerl\adddot}},
-  fromenglish      = {{do ingl\'es}{do ing\adddo}},
-  fromestonian     = {{do estoniano}{do eston\adddot}},
-  fromfinnish      = {{do fin\'es}{do fin\'es}},
-  fromfrench       = {{do franc\'es}{do fr\adddot}},
-  fromgalician     = {{do galego}{do gal\adddot}},
-  fromgerman       = {{do alem\'an}{do al\adddot}},
-  fromgreek        = {{do grego}{do grego}},
-  fromitalian      = {{do italiano}{do ital\adddot}},
-  fromlatin        = {{do lat\'in'}{do lat\adddot}},
-  fromnorwegian    = {{do noruegu\'es}{do nor\adddot}},
-  frompolish       = {{do polaco}{do pol\adddot}},
-  fromportuguese   = {{do portugu\'es}{do port\adddot}},
-  fromrussian      = {{do ruso}{do ruso}},
-  fromslovene      = {{do esloveno}{do eslov\adddot}},
-  fromspanish      = {{do castel\'an}{do cast\adddot}},
-  fromswedish      = {{do sueco}{do sueco}},
-  countryde        = {{Aleman\{{n}a}{DE}},
-  countryeu        = {{Uni\'on Europea}{EU}},
-  countryep        = {{Uni\'on Europea}{EU}},
-  countryfr        = {{Francia}{FR}},
-  countryuk        = {{Reino Unido}{GB}},
-  countryus        = {{Estados Unidos de Am\'erica}{EUA}},
-  patent           = {{patente}{pat\adddot}},
-  patentde         = {{patente alem\'a}{pat\adddot\ al\adddot}},
-  patenteu         = {{patente europea}{pat\adddot\ eur\adddot}},
-  patentfr         = {{patente francesa}{pat\adddot fr\adddot}},
-  patentuk         = {{patente brit\'anica}{pat\adddot\ brit\adddot}},
-  patentus         = {{patente americana}{pat\adddot\ am\adddot}},
-  patreq           = {{solicitude de patente}{sol\adddot\ de pat\adddot}},
-  patreqde         = {{solicitude de patente alem\'a}{sol\adddot\ de pat\adddot\ al\adddot}},
-  patreqeu         = {{solicitude de patente europea}{sol\adddot\ de pat\adddot\ eur\adddot}},
-  patreqfr         = {{solicitude de patente francesa}{sol\adddot\ de pat\adddot\ fr\adddot}},
-  patrequk         = {{solicitude de patente brit\'anica}{sol\adddot\ de pat\adddot\ brit\adddot}},
-  patrequs         = {{solicitude de patente americana}{sol\adddot\ de pat\adddot\ EUA}},
-  file             = {{arquivo}{arq\adddot}},
-  library          = {{biblioteca}{bibl\adddot}},
-  abstract         = {{resumo}{res\adddot}},
-  annotation       = {{anotaci\'on}{anot\adddot}},
-  commonera        = {{Era Com\'un'}{EC}},
-  beforecommonera  = {{antes da Era Com\'un'}{AEC}},
-  annodomini       = {{despois de Cristo}{d\adddot C\adddot}},
-  beforechrist     = {{antes de Cristo}{a\adddot C\adddot}},
-  circa            = {{circa}{ca\adddot}},
-  spring           = {{primavera}{primavera}},
-  summer           = {{ver\'an}{ver\'an}},
-  autumn           = {{outono}{outono}},
-  winter           = {{inverno}{inverno}},
-  am               = {{AM}{AM}},
-  pm               = {{PM}{PM}},
-}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index 0b28a6b1e37..29dc2a10f1b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
@@ -34,21 +34,21 @@
       {}
       {\mkmonthzeros{\thefield{#2}}%
        \iffieldundef{#1}
-         {}
-         {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
+	 {}
+	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
     \iffieldbibstring{#1}
       {\bibstring{\thefield{#1}}}
       {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
   \savecommand\lbx@lfromlang
   \savecommand\lbx@sfromlang
   \def\lbx@lfromlang{%
-    \iflistundef{origlanguage}
+    \iffieldundef{origlanguage}
       {}
-      {\printlist[lfromoriglanguage]{origlanguage}\space}}%
+      {\bibstring{from\thefield{origlanguage}}\space}}%
   \def\lbx@sfromlang{%
-    \iflistundef{origlanguage}
+    \iffieldundef{origlanguage}
       {}
-      {\printlist[sfromoriglanguage]{origlanguage}\space}}%
+      {\bibstring{from\thefield{origlanguage}}\space}}%
   \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{%
       \iffieldundef{#1}{}
         {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}%
@@ -253,9 +253,6 @@
                       {\"Ubers., Erl\"aut\adddot\ und Nachw\adddot}},
   translatorsanaf  = {{\"Ubersetzung, Erl\"auterungen und Nachwort}%
                       {\"Ubers., Erl\"aut\adddot\ und Nachw\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{von}{von}},
   byeditor         = {{herausgegeben von}{hrsg\adddotspace von}},
   bycompiler       = {{kompiliert von}{komp\adddotspace von}},
@@ -367,31 +364,19 @@
   origpubin        = {{Zuerst publiziert in}{Zuerst publ\adddotspace in}},
   astitle          = {{unter dem Titel}{unter dem Titel}},
   bypublisher      = {{von}{von}},
-  nodate           = {{ohne\space Datum}{{}o\adddot D\adddot}},
   page             = {{Seite}{S\adddot}},
   pages            = {{Seiten}{S\adddot}},
   column           = {{Spalte}{Sp\adddot}},
   columns          = {{Spalten}{Sp\adddot}},
   line             = {{Zeile}{Z\adddot}},
   lines            = {{Zeilen}{Z\adddot}},
+  nodate           = {{ohne\space Datum}{{}o\adddot D\adddot}},
   verse            = {{Vers}{V\adddot}},
   verses           = {{Verse}{V\adddot}},
   section          = {{Paragraph}{\S}},
   sections         = {{Paragraphen}{\S\S}},
   paragraph        = {{Absatz}{Abs\adddot}},
   paragraphs       = {{Abs\"atze}{Abs\adddot}},
-  pagetotal        = {{Seite}{S\adddot}},
-  pagetotals       = {{Seiten}{S\adddot}},
-  columntotal      = {{Spalte}{Sp\adddot}},
-  columntotals     = {{Spalten}{Sp\adddot}},
-  linetotal        = {{Zeile}{Z\adddot}},
-  linetotals       = {{Zeilen}{Z\adddot}},
-  versetotal       = {{Vers}{V\adddot}},
-  versetotals      = {{Verse}{V\adddot}},
-  sectiontotal     = {{Paragraph}{\S}},
-  sectiontotals    = {{Paragraphen}{\S\S}},
-  paragraphtotal   = {{Absatz}{Abs\adddot}},
-  paragraphtotals  = {{Abs\"atze}{Abs\adddot}},
   in               = {{in}{in}},
   inseries         = {{der Reihe}{der Reihe}},
   ofseries         = {{der Reihe}{der Reihe}},
@@ -451,58 +436,46 @@
   december         = {{Dezember}{Dez\adddot}},
   langamerican     = {{Amerikanisch}{Amerikanisch}},
   langbrazilian    = {{Brasilianisch}{Brasilianisch}},
-  langbulgarian    = {{Bulgarisch}{Bulgarisch}},
   langcatalan      = {{Katalanisch}{Katalanisch}},
   langcroatian     = {{Kroatisch}{Kroatisch}},
   langczech        = {{Tschechisch}{Tschechisch}},
   langdanish       = {{D\"anisch}{D\"anisch}},
   langdutch        = {{Niederl\"andisch}{Niederl\"andisch}},
   langenglish      = {{Englisch}{Englisch}},
-  langestonian     = {{Estnisch}{Estnisch}},
   langfinnish      = {{Finnisch}{Finnisch}},
   langfrench       = {{Franz\"osisch}{Franz\"osisch}},
-  langgalician     = {{Galicisch}{Galicisch}},
   langgerman       = {{Deutsch}{Deutsch}},
   langgreek        = {{Griechisch}{Griechisch}},
   langitalian      = {{Italienisch}{Italienisch}},
-  langjapanese     = {{Japanisch}{Japanisch}},
   langlatin        = {{Lateinisch}{Lateinisch}},
   langnorwegian    = {{Norwegisch}{Norwegisch}},
   langpolish       = {{Polnisch}{Polnisch}},
   langportuguese   = {{Portugiesisch}{Portugiesisch}},
   langrussian      = {{Russisch}{Russisch}},
-  langslovak       = {{Slowakisch}{Slowakisch}},
   langslovene      = {{Slowenisch}{Slowenisch}},
   langspanish      = {{Spanisch}{Spanisch}},
   langswedish      = {{Schwedisch}{Schwedisch}},
-  langukrainian    = {{Ukrainisch}{Ukrainisch}},
   fromamerican     = {{aus dem Amerikanischen}{aus dem Amerikanischen}},
   frombrazilian    = {{aus dem Brasilianischen}{aus dem Brasilianischen}},
-  frombulgarian    = {{aus dem Bulgarischen}{aus dem Bulgarischen}},
   fromcatalan      = {{aus dem Katalanischen}{aus dem Katalanischen}},
   fromcroatian     = {{aus dem Kroatischen}{aus dem Kroatischen}},
   fromczech        = {{aus dem Tschechischen}{aus dem Tschechischen}},
   fromdanish       = {{aus dem D\"anischen}{aus dem D\"anischen}},
   fromdutch        = {{aus dem Niederl\"andischen}{aus dem Niederl\"andischen}},
   fromenglish      = {{aus dem Englischen}{aus dem Englischen}},
-  fromestonian     = {{aus dem Estnischen}{aus dem Estnischen}},
   fromfinnish      = {{aus dem Finnischen}{aus dem Finnischen}},
   fromfrench       = {{aus dem Franz\"osischen}{aus dem Franz\"osischen}},
-  fromgalician     = {{aus dem Galicischen}{aus dem Galicischen}},
   fromgerman       = {{aus dem Deutschen}{aus dem Deutschen}},
   fromgreek        = {{aus dem Griechischen}{aus dem Griechischen}},
   fromitalian      = {{aus dem Italienischen}{aus dem Italienischen}},
-  fromjapanese     = {{aus dem Japanischen}{aus dem Japanischen}},
   fromlatin        = {{aus dem Lateinischen}{aus dem Lateinischen}},
   fromnorwegian    = {{aus dem Norwegischen}{aus dem Norwegischen}},
   frompolish       = {{aus dem Polnischen}{aus dem Polnischen}},
   fromportuguese   = {{aus dem Portugiesischen}{aus dem Portugiesischen}},
   fromrussian      = {{aus dem Russischen}{aus dem Russischen}},
-  fromslovak       = {{aus dem Slowakischen}{aus dem Slowakischen}},
   fromslovene      = {{aus dem Slowenischen}{aus dem Slowenischen}},
   fromspanish      = {{aus dem Spanischen}{aus dem Spanischen}},
   fromswedish      = {{aus dem Schwedischen}{aus dem Schwedischen}},
-  fromukrainian    = {{aus dem Ukrainischen}{aus dem Ukrainischen}},
   countryde        = {{Deutschland}{DE}},
   countryep        = {{Europ\"aische Union}{EP}},
   countryeu        = {{Europ\"aische Union}{EU}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index d2d1a9fc1da..f397ce37454 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
@@ -281,9 +281,6 @@
                       {μτφρ., επισημ\adddot\ και επίλ\adddot}},
   translatorsanaf  = {{μετάφραση, επισημείωση και επίλογος}
                       {μτφρ., επισημ\adddot\ και επίλ\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{υπό}{υπό}},
   byeditor         = {{επιμέλεια υπό}{επιμέλεια υπό}},
   bycompiler       = {{σύνταξη υπό}{σύνταξη υπό}},
@@ -374,18 +371,6 @@
   sections         = {{ενότητες}{ενότητες}},
   paragraph        = {{παράγραφος}{§}},
   paragraphs       = {{παράγραφοι}{§§}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{στο}{στο}},
   inseries         = {{στη}{στη}},
   ofseries         = {{της}{της}},
@@ -470,17 +455,15 @@
   datedecember     = {{Δεκεμβρίου}{Δεκ\adddot}},
   langamerican     = {{Αγγλικά}{Αγγλικά}},
   langbrazilian    = {{Βραζιλιάνικα}{Βραζιλιάνικα}},
-% langbulgarian    = {{}{}},% FIXME: missing
 % langcatalan      = {{}{}},% FIXME: missing
 % langcroatian     = {{}{}},% FIXME: missing
 % langczech        = {{}{}},% FIXME: missing
   langdanish       = {{Δανέζικα}{Δανέζικα}},
   langdutch        = {{Ολλανδικά}{Ολλανδικά}},
   langenglish      = {{Αγγλικά}{Αγγλικά}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
 % langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{Γαλλικά}{Γαλλικά}},
-  langgalician     = {{Γαλικιανή}{Γαλικιανή}},
   langgerman       = {{Γερμανικά}{Γερμανικά}},
   langgreek        = {{Ελληνικά}{Ελληνικά}},
   langitalian      = {{Ιταλικά}{Ιταλικά}},
@@ -494,17 +477,15 @@
   langswedish      = {{Σουηδικά}{Σουηδικά}},
   fromamerican     = {{από τα Αγγλικά}{από τα Αγγλικά}},
   frombrazilian    = {{από τα Βραζιλιάνικα}{από τα Βραζιλιάνικα}},
-% frombulgarian    = {{}{}},% FIXME: missing
 % fromcatalan      = {{}{}},% FIXME: missing
 % fromcroatian     = {{}{}},% FIXME: missing
 % fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{από τα Δανέζικα}{από τα Δανέζικα}},
   fromdutch        = {{από τα Ολλανδικά}{από τα Ολλανδικά}},
   fromenglish      = {{από τα Αγγλικά}{από τα Αγγλικά}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
 % fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{από τα Γαλλικά}{από τα Γαλλικά}},
-  fromgalician     = {{από τα Γαλικιανή}{από τα Γαλικιανή}},
   fromgerman       = {{από τα Γερμανικά}{από τα Γερμανικά}},
   fromgreek        = {{από τα Ελληνικά}{από τα Ελληνικά}},
   fromitalian      = {{από τα Ιταλικά}{από τα Ιταλικά}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
index ba4b2bc4ae4..3085110ed7f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
@@ -194,9 +194,6 @@
 % translatorsanfo  = {{}{}},% FIXME: missing
 % translatoranaf   = {{}{}},% FIXME: missing
 % translatorsanaf  = {{}{}},% FIXME: missing
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{h\"ofundur}{h\"of\adddot}},
   byeditor         = {{gefi\dh{} \'ut af}{gefi\dh{} \'ut af}},
   bycompiler       = {{teki\dh{} saman af}{teki\dh{} saman af}},
@@ -310,31 +307,19 @@
 % origpubas        = {{}{}},% FIXME: missing
 % origpubin        = {{}{}},% FIXME: missing
 % astitle          = {{}{}},% FIXME: missing
-  nodate           = {{\'an \'ars}{\'an \'ars}},
   page             = {{bla\dh{}s\'{\i}\dh{}a}{bls\adddot}},
   pages            = {{bla\dh{}s\'{\i}\dh{}ur}{bls\adddot}},
   column           = {{d\'alkur}{dlk\adddot}},
   columns          = {{d\'alkar}{dlk\adddot}},
   line             = {{l\'{\i}na}{l\adddot}},
   lines            = {{l\'{\i}nur}{l\adddot}},
+  nodate           = {{\'an \'ars}{\'an \'ars}},
   verse            = {{erindi}{er\adddot}},
   verses           = {{erindi}{er\adddot}},
   section          = {{grein}{\S}},
   sections         = {{grein}{\S\S}},
   paragraph        = {{m\'alsgrein}{mgr\adddot}},
   paragraphs       = {{m\'alsgreinar}{mgr\adddot}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{\'{\i}}{\'{\i}}},
   inseries         = {{ritr\"o\dh{}in}{ritr\"o\dh{}in}},
   ofseries         = {{\'ur ritr\"o\dh{}inni}{\'ur ritr\adddot}},
@@ -393,17 +378,15 @@
   december         = {{desember}{des\adddot}},
   langamerican     = {{bandar\'{\i}ska}{bandar\'{\i}ska}},
 % langbrazilian    = {{}{}},% FIXME: missing
-% langbulgarian    = {{}{}},% FIXME: missing
 % langcatalan      = {{}{}},% FIXME: missing
 % langcroatian     = {{}{}},% FIXME: missing
 % langczech        = {{}{}},% FIXME: missing
   langdanish       = {{danska}{danska}},
   langdutch        = {{hollenska}{hollenska}},
   langenglish      = {{enska}{enska}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{finnska}{finnska}},
   langfrench       = {{franska}{franska}},
-  langgalician     = {{galis\'iska}{galis\'iska}},
   langgerman       = {{\th\'yska}{\th\'yska}},
   langgreek        = {{gr\'{\i}ska}{gr\'{\i}ska}},
   langitalian      = {{\'{\i}talska}{\'{\i}talska}},
@@ -417,17 +400,15 @@
   langswedish      = {{s\ae{}nska}{s\ae{}nska}},
   fromamerican     = {{\'ur bandar\'{\i}sku}{\'ur bandar\'{\i}sku}},
 % frombrazilian    = {{}{}},% FIXME: missing
-% frombulgarian    = {{}{}},% FIXME: missing
 % fromcatalan      = {{}{}},% FIXME: missing
 % fromcroatian     = {{}{}},% FIXME: missing
 % fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{\'ur d\"onsku}{\'ur d\"onsku}},
   fromdutch        = {{\'ur hollensku}{\'ur hollensku}},
   fromenglish      = {{\'ur ensku}{\'ur ensku}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{\'ur finnsku}{\'ur finnsku}},
   fromfrench       = {{\'ur fr\"onsku}{\'ur fr\"onsku}},
-  fromgalician     = {{\'ur galis\'isku}{\'ur galis\'isku}},
   fromgerman       = {{\'ur \th\'ysku}{\'ur \th\'ysku}},
   fromgreek        = {{\'ur gr\'{\i}sku}{\'ur gr\'{\i}sku}},
   fromitalian      = {{\'ur \'{\i}t\"olsku}{\'ur \'{\i}t\"olsku}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index c0087da6d4b..d039a568d6d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
@@ -178,9 +178,6 @@
 % translatorsanfo  = {{}{}},% FIXME: missing
 % translatoranaf   = {{}{}},% FIXME: missing
 % translatorsanaf  = {{}{}},% FIXME: missing
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{di}{di}},
   byeditor         = {{a cura di}{a cura di}},
   bycompiler       = {{compilato da}{comp\adddotspace da}},
@@ -292,31 +289,19 @@
 % origpubin        = {{}{}},% FIXME: missing
 % astitle          = {{}{}},% FIXME: missing
 % bypublisher      = {{}{}},% FIXME: missing
-  nodate           = {{senza\space data}{{}n\adddot d\adddot}},
   page             = {{pagina}{p\adddot}},
   pages            = {{pagine}{pp\adddot}},
   column           = {{colonna}{col\adddot}},  
   columns          = {{colonne}{coll\adddot}},
   line             = {{riga}{r\adddot}},  
   lines            = {{righe}{rr\adddot}}, 
+  nodate           = {{senza\space data}{{}n\adddot d\adddot}},
   verse            = {{verso}{v\adddot}},
   verses           = {{versi}{vv\adddot}},
 % section          = {{}{\S}},% FIXME: missing
 % sections         = {{}{\S\S}},% FIXME: missing
   paragraph        = {{paragrafo}{par\adddot}},
   paragraphs       = {{paragrafi}{par\adddot}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{in}{in}},
   inseries         = {{in}{in}},
   ofseries         = {{di}{di}},
@@ -376,17 +361,15 @@
   december         = {{dicembre}{dic\adddot}},
   langamerican     = {{americano}{americano}},
   langbrazilian    = {{brasiliano}{brasiliano}},
-% langbulgarian    = {{}{}},% FIXME: missing
 % langcatalan      = {{}{}},% FIXME: missing
 % langcroatian     = {{}{}},% FIXME: missing
 % langczech        = {{}{}},% FIXME: missing
   langdanish       = {{danese}{danese}},
   langdutch        = {{olandese}{olandese}},
   langenglish      = {{inglese}{inglese}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
 % langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{francese}{francese}},
-  langgalician     = {{galiziano}{galiziano}},
   langgerman       = {{tedesco}{tedesco}},
   langgreek        = {{greco}{greco}},
   langitalian      = {{italiano}{italiano}},
@@ -400,17 +383,15 @@
   langswedish      = {{svedese}{svedese}},
   fromamerican     = {{dall'americano}{dall'americano}},
   frombrazilian    = {{dall brasiliano}{dall brasiliano}},
-% frombulgarian    = {{}{}},% FIXME: missing
 % fromcatalan      = {{}{}},% FIXME: missing
 % fromcroatian     = {{}{}},% FIXME: missing
 % fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{dal danese}{dal danese}},
   fromdutch        = {{dall'olandese}{dall'olandese}},
   fromenglish      = {{dall'inglese}{dall'inglese}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
 % fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{dal francese}{dal francese}},
-  fromgalician     = {{dal galiziano}{dal galiziano}},
   fromgerman       = {{dal tedesco}{dal tedesco}},
   fromgreek        = {{dal greco}{dal greco}},
   fromitalian      = {{dall'italiano}{dall'italiano}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
index bcd2181858b..fbf1a7f542e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/naustrian.lbx
@@ -10,8 +10,6 @@
 % alternative spelling, uncomment to enable:
 % section          = {{Paragraf}{\S}},
 % sections         = {{Paragrafen}{\S\S}},
-% sectiontotal     = {{Paragraf}{\S}},
-% sectiontotals    = {{Paragrafen}{\S\S}},
 }
 
 \DeclareHyphenationExceptions{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
index e8e26aedf6b..459b92acb67 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/ngerman.lbx
@@ -9,8 +9,6 @@
 % alternative spelling, uncomment to enable:
 % section          = {{Paragraf}{\S}},
 % sections         = {{Paragrafen}{\S\S}},
-% sectiontotal     = {{Paragraf}{\S}},
-% sectiontotals    = {{Paragrafen}{\S\S}},
 }
 
 \DeclareHyphenationExceptions{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
index bf6ffd52fb3..adfadba47f9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norsk.lbx
@@ -1,527 +1,10 @@
 \ProvidesFile{norsk.lbx}
 [\abx@lbxid]
 
-\DeclareRedundantLanguages{norsk}{norwegian,nynorsk}
+% Status:
+% - 'norsk' and 'nynorsk' use the same translations, correct?
 
-\DeclareBibliographyExtras{%
-  \protected\def\bibrangedash{%
-    \textendash\penalty\hyphenpenalty}% breakable dash
-  \let\finalandcomma=\empty
-  \let\finalandsemicolon=\empty
-  \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
-  \protected\def\mkbibmascord{\mkbibordinal}%
-  \protected\def\mkbibfemord{\mkbibordinal}%
-  \protected\def\mkbibneutord{\mkbibordinal}%
-  \protected\def\mkbibdatelong#1#2#3{%
-    \iffieldundef{#3}
-      {}
-      {\mkbibordinal{\thefield{#3}}%
-       \iffieldundef{#2}{}{\nobreakspace}}%
-    \iffieldundef{#2}
-      {}
-      {\mkbibmonth{\thefield{#2}}%
-       \iffieldundef{#1}{}{\space}}%
-    \iffieldbibstring{#1}
-      {\bibstring{\thefield{#1}}}
-      {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
-  \protected\def\mkbibdateshort#1#2#3{%
-    \iffieldundef{#3}
-      {}
-      {\mkdayzeros{\thefield{#3}}\adddot}%
-    \iffieldundef{#2}
-      {}
-      {\mkmonthzeros{\thefield{#2}}%
-       \iffieldundef{#1}{}{\adddot}}%
-    \iffieldbibstring{#1}
-      {\bibstring{\thefield{#1}}}
-      {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
-  \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{%
-      \iffieldundef{#1}{}
-        {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}%
-      \iffieldundef{#2}{}
-        {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}%
-      \iffieldundef{#3}{}
-        {\printtext{\mktimezeros{\thefield{#3}}}}%
-      \setunit{}%
-      \iffieldundef{#4}{}
-        {\bibtimezonesep
-         \mkbibtimezone{\thefield{#4}}}}%
-  \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{%
-      \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep
-      \forcezerosmdt{\thefield{#2}}%
-      \iffieldundef{#3}{}
-        {\bibtimesep
-         \forcezeros{\thefield{#3}}}%
-       \space
-       \ifnumless{\thefield{#1}}{12}
-         {\bibstring{am}}
-         {\bibstring{pm}}%
-      \iffieldundef{#4}{}
-       {\space\bibtimezonesep
-        \parentext{\mkbibtimezone{\thefield{#4}}}}}%
-  \protected\def\mkbibseasondateshort#1#2{%
-    \mkbibseason{\thefield{#2}}%
-    \iffieldundef{#1}{}{\space}%
-    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
-  \protected\def\mkbibseasondatelong#1#2{%
-    \mkbibseason{\thefield{#2}}%
-    \iffieldundef{#1}{}{\space}%
-    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
-}
-
-\DeclareBibliographyStrings{%
-  bibliography     = {{Bibliografi}{Bibliografi}},
-  references       = {{Referanser}{Referanser}},
-  shorthands       = {{Forkortelser}{Forkortelser}},
-  editor           = {{redakt{\o}r}{red\adddot}},
-  editors          = {{redakt{\o}rer}{red\adddot}},
-  compiler         = {{kompilator}{komp\adddot}},
-  compilers        = {{kompilatorer}{komp\adddot}},
-  redactor         = {{bearbeidelse}{bearb\adddot}},
-  redactors        = {{bearbeidelse}{bearb\adddot}},
-  reviser          = {{revisjon}{rev\adddot}},
-  revisers         = {{revisjon}{rev\adddot}},
-  founder          = {{grunnlegger}{grunnl\adddot}},
-  founders         = {{grunnleggere}{grunnl\adddot}},
-  continuator      = {{videref{\o}ring}{videref\adddot}},
-  continuators     = {{videref{\o}ring}{videref\adddot}},
-  collaborator     = {{samarbeid}{samarb\adddot}},
-  collaborators    = {{samarbeid}{samarb\adddot}},
-  translator       = {{oversetter}{overs\adddot}},
-  translators      = {{oversettere}{overs\adddot}},
-  commentator      = {{kommentarer}{komm\adddot}},
-  commentators     = {{kommentarer}{komm\adddot}},
-  annotator        = {{forklaringer}{forkl\adddot}},
-  annotators       = {{forklaringer}{forkl\adddot}},
-  commentary       = {{kommentarer}{komm\adddot}},
-  annotations      = {{forklaringer}{forkl\adddot}},
-  introduction     = {{innledning}{innl\adddot}},
-  foreword         = {{forord}{forord}},
-  afterword        = {{etterord}{etterord}},
-  editortr         = {{redakt{\o}r og oversetter}%
-                      {red\adddotspace og overs\adddot}},
-  editorstr        = {{redakt{\o}rer og oversettere}%
-                      {red\adddotspace og overs\adddot}},
-  editorco         = {{redakt{\o}r og kommentarer}
-                      {red\adddotspace og komm\adddot}},
-  editorsco        = {{redakt{\o}rer og kommentarer}
-                      {red\adddotspace og komm\adddot}},
-  editoran         = {{redakt{\o}r og forklaringer}%
-                      {red\adddotspace og forkl\adddot}},
-  editorsan        = {{redakt{\o}rer og forklaringer}%
-                      {red\adddotspace og forkl\adddot}},
-  editorin         = {{redakt{\o}r og innledning}%
-                      {red\adddotspace og innl\adddot}},
-  editorsin        = {{redakt{\o}rer og innledning}%
-                      {red\adddotspace og innl\adddot}},
-  editorfo         = {{redakt{\o}r og forord}%
-                      {red\adddotspace og forord}},
-  editorsfo        = {{redakt{\o}rer og forord}%
-                      {red\adddotspace og forord}},
-  editoraf         = {{redakt{\o}r og etterord}%
-                      {red\adddotspace og etterord}},
-  editorsaf        = {{redakt{\o}rer og etterord}%
-                      {red\adddotspace og etterord}},
-  editortrco       = {{redakt{\o}r, oversetter og kommentarer}%
-                      {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
-  editorstrco      = {{redakt{\o}rer, oversettere og kommentarer}%
-                      {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
-  editortran       = {{redakt{\o}r, oversetter og forklaringer}%
-                      {red.,\addabbrvspace overs\adddotspace og forkl\adddot}},
-  editorstran      = {{redakt{\o}rer, oversettere og forklaringer}%
-                      {red.,\addabbrvspace overs\adddotspace og forkl\adddot}},
-  editortrin       = {{redakt{\o}r, oversetter og innledning}%
-                      {red.,\addabbrvspace overs\adddotspace og innl\adddot}},
-  editorstrin      = {{redakt{\o}rer, oversettere og innledning}%
-                      {red.,\addabbrvspace overs\adddotspace og innl\adddot}},
-  editortrfo       = {{redakt{\o}r, oversetter og forord}%
-                      {red.,\addabbrvspace overs\adddotspace og forord}},
-  editorstrfo      = {{redakt{\o}rer, oversettere og forord}%
-                      {red.,\addabbrvspace overs\adddotspace og forord}},
-  editortraf       = {{redakt{\o}r, oversetter og etterord}%
-                      {red.,\addabbrvspace overs\adddotspace og etterord}},
-  editorstraf      = {{redakt{\o}rer, oversettere og etterord}%
-                      {red.,\addabbrvspace overs\adddotspace og etterord}},
-  editorcoin       = {{redakt{\o}r, kommentarer og innledning}%
-                      {red.,\addabbrvspace komm\adddotspace og innl\adddot}},
-  editorscoin      = {{redakt{\o}rer, kommentarer og innledning}%
-                      {red.,\addabbrvspace komm\adddotspace og innl\adddot}},
-  editorcofo       = {{redakt{\o}r, kommentarer og forord}%
-                      {red.,\addabbrvspace komm\adddotspace og forord}},
-  editorscofo      = {{redakt{\o}rer, kommentarer og forord}%
-                      {red.,\addabbrvspace komm\adddotspace og forord}},
-  editorcoaf       = {{redakt{\o}r, kommentarer og etterord}%
-                      {red.,\addabbrvspace komm\adddotspace og etterord}},
-  editorscoaf      = {{redakt{\o}rer, kommentarer og etterord}%
-                      {red.,\addabbrvspace komm\adddotspace og etterord}},
-  editoranin       = {{redakt{\o}r, forklaringer og innledning}%
-                      {red.,\addabbrvspace forkl\adddotspace og innl\adddot}},
-  editorsanin      = {{redakt{\o}rer, forklaringer og innledning}%
-                      {red.,\addabbrvspace forkl\adddotspace og innl\adddot}},
-  editoranfo       = {{redakt{\o}r, forklaringer og forord}%
-                      {red.,\addabbrvspace forkl\adddotspace og forord}},
-  editorsanfo      = {{redakt{\o}rer, forklaringer og forord}%
-                      {red.,\addabbrvspace forkl\adddotspace og forord}},
-  editoranaf       = {{redakt{\o}r, forklaringer og etterord}%
-                      {red.,\addabbrvspace forkl\adddotspace og etterord}},
-  editorsanaf      = {{redakt{\o}rer, forklaringer og etterord}%
-                      {red.,\addabbrvspace forkl\adddotspace og etterord}},
-  editortrcoin     = {{redakt{\o}r, oversetter, kommentarer og innledning}%
-                      {red.,\addabbrvspace overs., komm\adddotspace og innl\adddot}},
-  editorstrcoin    = {{redakt{\o}rer, oversettere, kommentarer og innledning}%
-                      {red.,\addabbrvspace overs., komm\adddotspace og innl\adddot}},
-  editortrcofo     = {{redakt{\o}r, oversetter, kommentarer og forord}%
-                      {red.,\addabbrvspace overs., komm\adddotspace og forord}},
-  editorstrcofo    = {{redakt{\o}rer, oversettere, kommentarer og forord}%
-                      {red.,\addabbrvspace overs., komm\adddotspace og forord}},
-  editortrcoaf     = {{redakt{\o}r, oversetter, kommentarer og etterord}%
-                      {red.,\addabbrvspace overs., komm\adddotspace og etterord}},
-  editorstrcoaf    = {{redakt{\o}rer, oversettere, kommentarer og etterord}%
-                      {red.,\addabbrvspace overs., komm\adddotspace og etterord}},
-  editortranin     = {{redakt{\o}r, oversetter, forklaringer og innledning}%
-                      {red.,\addabbrvspace overs., forkl\adddotspace og innl\adddot}},
-  editorstranin    = {{redakt{\o}rer, oversettere, forklaringer og innledning}%
-                      {red.,\addabbrvspace overs., forkl\adddotspace og innl\adddot}},
-  editortranfo     = {{redakt{\o}r, oversetter, forklaringer og forord}%
-                      {red.,\addabbrvspace overs., forkl\adddotspace og forord}},
-  editorstranfo    = {{redakt{\o}rer, oversettere, forklaringer og forord}%
-                      {red.,\addabbrvspace overs., forkl\adddotspace og forord}},
-  editortranaf     = {{redakt{\o}r, oversetter, forklaringer og etterord}%
-                      {red.,\addabbrvspace overs., forkl\adddotspace og etterord}},
-  editorstranaf    = {{redakt{\o}rer, oversettere, forklaringer og etterord}%
-                      {red.,\addabbrvspace overs., forkl\adddotspace og etterord}},
-  translatorco     = {{oversetter og kommentarer}%
-                      {overs\adddotspace og komm\adddot}},
-  translatorsco    = {{oversettere og kommentarer}%
-                      {overs\adddotspace og komm\adddot}},
-  translatoran     = {{oversetter og forklaringer}%
-                      {overs\adddotspace og forkl\adddot}},
-  translatorsan    = {{oversettere og forklaringer}%
-                      {overs\adddotspace og forkl\adddot}},
-  translatorin     = {{oversetter og innledning}%
-                      {overs\adddotspace og innl\adddot}},
-  translatorsin    = {{oversettere og innledning}%
-                      {overs\adddotspace og innl\adddot}},
-  translatorfo     = {{oversetter og forord}%
-                      {overs\adddotspace og forord}},
-  translatorsfo    = {{oversettere og forord}%
-                      {overs\adddotspace og forord}},
-  translatoraf     = {{oversetter og etterord}%
-                      {overs\adddotspace og etterord}},
-  translatorsaf    = {{oversettere og etterord}%
-                      {overs\adddotspace og etterord}},
-  translatorcoin   = {{oversetter, kommentarer og innledning}%
-                      {overs., komm\adddotspace og innl\adddot}},
-  translatorscoin  = {{oversettere, kommentarer og innledning}%
-                      {overs., komm\adddotspace og innl\adddot}},
-  translatorcofo   = {{oversetter, kommentarer og forord}%
-                      {overs., komm\adddotspace og forord}},
-  translatorscofo  = {{oversettere, kommentarer og forord}%
-                      {overs., komm\adddotspace og forord}},
-  translatorcoaf   = {{oversetter, kommentarer og etterord}%
-                      {overs., komm\adddotspace og etterord}},
-  translatorscoaf  = {{oversettere, kommentarer og etterord}%
-                      {overs., komm\adddotspace og etterord}},
-  translatoranin   = {{oversetter, forklaringer og innledning}%
-                      {overs., forkl\adddotspace og innl\adddot}},
-  translatorsanin  = {{oversettere, forklaringer og innledning}%
-                      {overs., forkl\adddotspace og innl\adddot}},
-  translatoranfo   = {{oversetter, forklaringer og forord}%
-                      {overs., forkl\adddotspace og forord}},
-  translatorsanfo  = {{oversettere, forklaringer og forord}%
-                      {overs., forkl\adddotspace og forord}},
-  translatoranaf   = {{oversetter, forklaringer og etterord}%
-                      {overs., forkl\adddotspace og etterord}},
-  translatorsanaf  = {{oversettere, forklaringer og etterord}%
-                      {overs., forkl\adddotspace og etterord}},
-  organizer        = {{organisator}{org\adddot}},
-  organizers       = {{organisatorer}{org\adddot}},
-  byorganizer      = {{organisert av}{org\adddotspace av}},
-  byauthor         = {{av}{av}},
-  byeditor         = {{redigert av}{red\adddotspace av}},
-  bycompiler       = {{kompilert av}{komp\adddotspace av}},
-  byredactor       = {{bearbeidet av}{bearb\adddotspace av}},
-  byreviser        = {{revidert av}{rev\adddotspace av}},
-  byreviewer       = {{kritikk ved}{krit\adddotspace ved}},
-  byfounder        = {{grunnlagt av}{grunnl\adddotspace av}},
-  bycontinuator    = {{videref{\o}rt av}{videref\adddotspace av}},
-  bycollaborator   = {{i samarbeid med}{i samarb\adddotspace med}},
-  bytranslator     = {{oversatt \lbx@lfromlang\ av}{overs\adddot\ \lbx@sfromlang\ av}},
-  bycommentator    = {{kommentert av}{komm\adddot\ av}},
-  byannotator      = {{forklart av}{forkl\adddot\ av}},
-  withcommentator  = {{med kommentarer av}{med komm\adddot\ av}},
-  withannotator    = {{med forklaringer av}{med forkl\adddot\ av}},
-  withintroduction = {{med innledning av}{med innl\adddot\ av}},
-  withforeword     = {{med forord av}{med forord av}},
-  withafterword    = {{med etterord av}{med etterord av}},
-  byeditortr       = {{redigert og oversatt \lbx@lfromlang\ av}%
-                      {red\adddotspace og overs\adddot\ \lbx@sfromlang\ av}},
-  byeditorco       = {{redigert og kommentert av}%
-                      {red\adddotspace og komm\adddot\ av}},
-  byeditoran       = {{redigert og forklart av}%
-                      {red\adddotspace og forkl\adddot\ av}},
-  byeditorin       = {{redigert, med innledning, av}%
-                      {red.,\addabbrvspace med innl., av}},
-  byeditorfo       = {{redigert, med forord, av}%
-                      {red.,\addabbrvspace med forord, av}},
-  byeditoraf       = {{redigert, med etterord, av}%
-                      {red.,\addabbrvspace med etterord, av}},
-  byeditortrco     = {{redigert, oversatt \lbx@lfromlang\ og kommentert av}%
-                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm\adddot\ av}},
-  byeditortran     = {{redigert, oversatt \lbx@lfromlang\ og forklart av}%
-                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}},
-  byeditortrin     = {{redigert og oversatt \lbx@lfromlang, med innledning, av}%
-                      {red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}},
-  byeditortrfo     = {{redigert og oversatt \lbx@lfromlang, med forord, av}%
-                      {red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}},
-  byeditortraf     = {{redigert og oversatt \lbx@lfromlang, med etterord, av}%
-                      {red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}},
-  byeditorcoin     = {{redigert og kommentert, med innledning, av}%
-                      {red\adddotspace og komm., med innl., av}},
-  byeditorcofo     = {{redigert og kommentert, med forord, av}%
-                      {red\adddotspace og komm., med forord, av}},
-  byeditorcoaf     = {{redigert og kommentert, med etterord, av}%
-                      {red\adddotspace og komm., med etterord, av}},
-  byeditoranin     = {{redigert og forklart, med innledning, av}%
-                      {red\adddotspace og forkl., med innl., av}},
-  byeditoranfo     = {{redigert og forklart, med forord, av}%
-                      {red\adddotspace og forkl., med forord, av}},
-  byeditoranaf     = {{redigert og forklart, med etterord, av}%
-                      {red\adddotspace og forkl., med etterord, av}},
-  byeditortrcoin   = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med innledning, av}%
-                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med innl., av}},
-  byeditortrcofo   = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med forord, av}%
-                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med forord, av}},
-  byeditortrcoaf   = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med etterord, av}%
-                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med etterord, av}},
-  byeditortranin   = {{redigert, oversatt \lbx@lfromlang\ og forklart, med innledning, av}%
-                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med innl., av}},
-  byeditortranfo   = {{redigert, oversatt \lbx@lfromlang\ og forklart, med forord, av}%
-                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med forord, av}},
-  byeditortranaf   = {{redigert, oversatt \lbx@lfromlang\ og forklart, med etterord, av}%
-                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}},
-  bytranslatorco   = {{oversatt \lbx@lfromlang\ og kommentert av}%
-                      {overs\adddot\ \lbx@sfromlang\ og komm\adddot\ av}},
-  bytranslatoran   = {{oversatt \lbx@lfromlang\ og forklart av}%
-                      {overs\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}},
-  bytranslatorin   = {{oversatt \lbx@lfromlang, med innledning, av}%
-                      {overs\adddot\ \lbx@sfromlang, med innl., av}},
-  bytranslatorfo   = {{oversatt \lbx@lfromlang, med forord, av}%
-                      {overs\adddot\ \lbx@sfromlang, med forord, av}},
-  bytranslatoraf   = {{oversatt \lbx@lfromlang, med etterord, av}%
-                      {overs\adddot\ \lbx@sfromlang, med etterord, av}},
-  bytranslatorcoin = {{oversatt \lbx@lfromlang\ og kommentert, med innledning, av}%
-                      {overs\adddot\ \lbx@sfromlang\ og komm., med innl., av}},
-  bytranslatorcofo = {{oversatt \lbx@lfromlang\ og kommentert, med forord, av}%
-                      {overs\adddot\ \lbx@sfromlang\ og komm., med forord, av}},
-  bytranslatorcoaf = {{oversatt \lbx@lfromlang\ og kommentert, med etterord, av}%
-                      {overs\adddot\ \lbx@sfromlang\ og komm., med etterord, av}},
-  bytranslatoranin = {{oversatt \lbx@lfromlang\ og forklart, med innledning, av}%
-                      {overs\adddot\ \lbx@sfromlang\ og forkl., med innl., av}},
-  bytranslatoranfo = {{oversatt \lbx@lfromlang\ og forklart, med forord, av}%
-                      {overs\adddot\ \lbx@sfromlang\ og forkl., med forord, av}},
-  bytranslatoranaf = {{oversatt \lbx@lfromlang\ og forklart, med etterord, av}%
-                      {overs\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}},
-  and              = {{og}{og}},
-  andothers        = {{med flere}{mfl\adddot}},
-  andmore          = {{med mer}{m.m\adddot}},
-  volume           = {{bind}{bd\adddot}},
-  volumes          = {{bind}{bd\adddot}},
-  involumes        = {{i}{i}},
-  jourvol          = {{{\aa}rgang}{{\aa}rg\adddot}},
-  jourser          = {{serie}{ser\adddot}},
-  book             = {{bok}{bok}},
-  part             = {{del}{del}},
-  issue            = {{nummer}{nr\adddot}},
-  newseries        = {{ny serie}{ny ser\adddot}},
-  oldseries        = {{gammel serie}{gl\adddotspace ser\adddot}},
-  edition          = {{utgave}{utg\adddot}},
-  reprint          = {{opptrykk}{opptr\adddot}},
-  reprintof        = {{opptrykk av}{opptr\adddotspace av}},
-  reprintas        = {{trykt om som}{tr\adddotspace om som}},
-  reprintfrom      = {{opptrykk fra}{opptr\adddotspace fra}},
-  translationof    = {{oversettelse av}{overs\adddotspace av}},
-  translationas    = {{oversatt som}{overs\adddotspace som}},
-  translationfrom  = {{oversatt fra}{overs\adddotspace fra}},
-  reviewof         = {{kritikk av}{krit\adddotspace av}},
-  origpubas        = {{opprinnelig utgitt som}{oppr\adddot\ utg\adddot\ som}},
-  origpubin        = {{opprinnelig utgitt i}{oppr\adddot\ utg\adddot\ i}},
-  astitle          = {{som}{som}},
-  bypublisher      = {{av}{av}},
-  nodate           = {{udatert}{udatert}},
-  page             = {{side}{s\adddot}},
-  pages            = {{sider}{s\adddot}},
-  column           = {{spalte}{sp\adddot}},
-  columns          = {{spalter}{sp\adddot}},
-  line             = {{linje}{l\adddot}},
-  lines            = {{linjer}{l\adddot}},
-  verse            = {{vers}{v\adddot}},
-  verses           = {{vers}{v\adddot}},
-  section          = {{avsnitt}{avsn\adddot}},
-  sections         = {{avsnitt}{avsn\adddot}},
-  paragraph        = {{avsnitt}{avsn\adddot}},
-  paragraphs       = {{avsnitt}{avsn\adddot}},
-  pagetotal        = {{side}{s\adddot}},
-  pagetotals       = {{sider}{s\adddot}},
-  columntotal      = {{spalte}{sp\adddot}},
-  columntotals     = {{spalter}{sp\adddot}},
-  linetotal        = {{linje}{l\adddot}},
-  linetotals       = {{linjer}{l\adddot}},
-  versetotal       = {{vers}{v\adddot}},
-  versetotals      = {{vers}{v\adddot}},
-  sectiontotal     = {{avsnitt}{avsn\adddot}},
-  sectiontotals    = {{avsnitt}{avsn\adddot}},
-  paragraphtotal   = {{avsnitt}{avsn\adddot}},
-  paragraphtotals  = {{avsnitt}{avsn\adddot}},
-  in               = {{i}{i}},
-  inseries         = {{i}{i}},
-  ofseries         = {{av}{av}},
-  number           = {{nummer}{nr\adddot}},
-  chapter          = {{kapittel}{kap\adddot}},
-  mathesis         = {{masteroppgave}{masteroppg\adddot}},
-  phdthesis        = {{ph.d.-avhandling}{ph.d.-avh\adddot}},
-  candthesis       = {{hovedoppgave}{hovedoppg\adddot}},
-  resreport        = {{forskningsrapport}{forskn.rapp\adddot}},
-  techreport       = {{teknisk rapport}{tekn\adddotspace rapp\adddot}},
-  software         = {{programvare}{programvare}},
-  datacd           = {{data-cd}{data-cd}},
-  audiocd          = {{lyd-cd}{lyd-cd}},
-  version          = {{versjon}{versjon}},
-  url              = {{adresse}{adresse}},
-  urlfrom          = {{tilgjengelig fra}{tilgj\adddotspace fra}},
-  urlseen          = {{sjekket}{sjekket}},
-  inpreparation    = {{under utarbeidelse}{under utarb\adddot}},
-  submitted        = {{innsendt}{innsendt}},
-  forthcoming      = {{under utgivelse}{under utgiv\adddot}},
-  inpress          = {{i trykken}{i trykken}},
-  prepublished     = {{prepublisert}{prepubl\adddot}},
-  citedas          = {{heretter sitert som}{heretter sit\adddotspace som}},
-  thiscite         = {{her}{her}},
-  seenote          = {{se note}{se n\adddot}},
-  quotedin         = {{sitert i}{sit\adddotspace i}},
-  idem             = {{den samme}{d.s\adddot}},
-  idemsf           = {{den samme}{d.s\adddot}},
-  idemsm           = {{den samme}{d.s\adddot}},
-  idemsn           = {{det samme}{d.s\adddot}},
-  idempf           = {{de samme}{d.s\adddot}},
-  idempm           = {{de samme}{d.s\adddot}},
-  idempn           = {{de samme}{d.s\adddot}},
-  idempp           = {{de samme}{d.s\adddot}},
-  ibidem           = {{samme sted}{sst\adddot}},
-  opcit            = {{samme sted}{sst\adddot}},
-  loccit           = {{samme sted}{sst\adddot}},
-  confer           = {{jamf{\o}r}{jf\adddot}},
-  sequens          = {{f\adddot}{f\adddot}},
-  sequentes        = {{ff\adddot}{ff\adddot}},
-  passim           = {{passim}{pass\adddot}},
-  see              = {{se}{se}},
-  seealso          = {{se ogs{\aa}}{se ogs{\aa}}},
-  backrefpage      = {{se side}{se s\adddot}},
-  backrefpages     = {{se sidene}{se s\adddot}},
-  january          = {{januar}{jan\adddot}},
-  february         = {{februar}{feb\adddot}},
-  march            = {{mars}{mar\adddot}},
-  april            = {{april}{apr\adddot}},
-  may              = {{mai}{mai}},
-  june             = {{juni}{jun\adddot}},
-  july             = {{juli}{jul\adddot}},
-  august           = {{august}{aug\adddot}},
-  september        = {{september}{sep\adddot}},
-  october          = {{oktober}{okt\adddot}},
-  november         = {{november}{nov\adddot}},
-  december         = {{desember}{des\adddot}},
-  langamerican     = {{amerikansk-engelsk}{amerikansk-engelsk}},
-  langbrazilian    = {{brasiliansk-portugisisk}{brasiliansk-portugisisk}},
-  langbulgarian    = {{bulgarsk}{bulgarsk}},
-  langcatalan      = {{katalansk}{katalansk}},
-  langcroatian     = {{kroatisk}{kroatisk}},
-  langczech        = {{tsjekkisk}{tsjekkisk}},
-  langdanish       = {{dansk}{dansk}},
-  langdutch        = {{nederlandsk}{nederlandsk}},
-  langenglish      = {{engelsk}{engelsk}},
-  langestonian     = {{estisk}{estisk}},
-  langfinnish      = {{finsk}{finsk}},
-  langfrench       = {{fransk}{fransk}},
-  langgalician     = {{galisisk}{galisisk}},
-  langgerman       = {{tysk}{tysk}},
-  langgreek        = {{gresk}{gresk}},
-  langitalian      = {{italiensk}{italiensk}},
-  langjapanese     = {{japansk}{japansk}},
-  langlatin        = {{latin}{latin}},
-  langnorwegian    = {{norsk}{norsk}},
-  langpolish       = {{polsk}{polsk}},
-  langportuguese   = {{portugisisk}{portugisisk}},
-  langrussian      = {{russisk}{russisk}},
-  langslovak       = {{slovakisk}{slovakisk}},
-  langslovene      = {{slovensk}{slovensk}},
-  langspanish      = {{spansk}{spansk}},
-  langswedish      = {{svensk}{svensk}},
-  langukrainian    = {{ukrainsk}{ukrainsk}},
-  fromamerican     = {{fra amerikansk-engelsk}{fra amerikansk-engelsk}},
-  frombrazilian    = {{fra brasiliansk-portugisisk}{fra brasiliansk-portugisisk}},
-  frombulgarian    = {{fra bulgarsk}{fra bulgarsk}},
-  fromcatalan      = {{fra katalansk}{fra katalansk}},
-  fromcroatian     = {{fra kroatisk}{fra kroatisk}},
-  fromczech        = {{fra tsjekkisk}{fra tsjekkisk}},
-  fromdanish       = {{fra dansk}{fra dansk}},
-  fromdutch        = {{fra nederlandsk}{fra nederlandsk}},
-  fromenglish      = {{fra engelsk}{fra engelsk}},
-  fromestonian     = {{fra estisk}{fra estisk}},
-  fromfinnish      = {{fra finsk}{fra finsk}},
-  fromfrench       = {{fra fransk}{fra fransk}},
-  fromgalician     = {{fra galisisk}{fra galisisk}},
-  fromgerman       = {{fra tysk}{fra tysk}},
-  fromgreek        = {{fra gresk}{fra gresk}},
-  fromitalian      = {{fra italiensk}{fra italiensk}},
-  fromjapanese     = {{fra japansk}{fra japansk}},
-  fromlatin        = {{fra latin}{fra latin}},
-  fromnorwegian    = {{fra norsk}{fra norsk}},
-  frompolish       = {{fra polsk}{fra polsk}},
-  fromportuguese   = {{fra portugisisk}{fra portugisisk}},
-  fromrussian      = {{fra russisk}{fra russisk}},
-  fromslovak       = {{fra slovakisk}{fra slovakisk}},
-  fromslovene      = {{fra slovensk}{fra slovensk}},
-  fromspanish      = {{fra spansk}{fra spansk}},
-  fromswedish      = {{fra svensk}{fra svensk}},
-  fromukrainian    = {{fra ukrainsk}{fra ukrainsk}},
-  countryde        = {{Tyskland}{DE}},
-  countryeu        = {{Den europeiske union}{EU}},
-  countryep        = {{Den europeiske union}{EP}},
-  countryfr        = {{Frankrike}{FR}},
-  countryuk        = {{Storbritannia}{GB}},
-  countryus        = {{USA}{US}},
-  patent           = {{patent}{patent}},
-  patentde         = {{tysk patent}{ty\adddotspace pat\adddot}},
-  patenteu         = {{europeisk patent}{eur\adddotspace pat\adddot}},
-  patentfr         = {{fransk patent}{fr\adddotspace pat\adddot}},
-  patentuk         = {{britisk patent}{br\adddotspace pat\adddot}},
-  patentus         = {{amerikansk patent}{am\adddotspace pat\adddot}},
-  patreq           = {{patents{\o}knad}{pat.s{\o}kn\adddot}},
-  patreqde         = {{tysk patents{\o}knad}%
-                      {ty\adddotspace pat.s{\o}kn\adddot}},
-  patreqeu         = {{europeisk patents{\o}knad}%
-                      {eur\adddotspace pat.s{\o}kn\adddot}},
-  patreqfr         = {{fransk patents{\o}knad}%
-                      {fr\adddotspace pat.s{\o}kn\adddot}},
-  patrequk         = {{britisk patents{\o}knad}%
-                      {br\adddotspace pat.s{\o}kn\adddot}},
-  patrequs         = {{amerikansk patents{\o}knad}%
-                      {am\adddotspace pat.s{\o}kn\adddot}},
-  file             = {{fil}{fil}},
-  library          = {{bibliotek}{bibliotek}},
-  abstract         = {{sammendrag}{sammendrag}},
-  annotation       = {{merknad}{merknad}},
-  commonera        = {{etter v{\aa}r tidsregning}{evt\adddot}},
-  beforecommonera  = {{f{\o}r v{\aa}r tidsregning}{fvt\adddot}},
-  annodomini       = {{etter Kristus}{e\adddot Kr\adddot}},
-  beforechrist     = {{f{\o}r Kristus}{f\adddot Kr\adddot}},
-  circa            = {{cirka}{ca\adddot}},
-  spring           = {{v{\aa}r}{v{\aa}r}},
-  summer           = {{sommer}{sommer}},
-  autumn           = {{h{\o}st}{h{\o}st}},
-  winter           = {{vinter}{vinter}},
-  am               = {{a\adddot m\adddot}{a\adddot m\adddot}},
-  pm               = {{p\adddot m\adddot}{p\adddot m\adddot}},
-}
+\InheritBibliographyExtras{norwegian}
+\InheritBibliographyStrings{norwegian}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
new file mode 100644
index 00000000000..9b251e2b824
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
@@ -0,0 +1,502 @@
+\ProvidesFile{norwegian.lbx}
+[\abx@lbxid]
+
+\DeclareRedundantLanguages{norwegian}{norsk,nynorsk}
+
+\DeclareBibliographyExtras{%
+  \protected\def\bibrangedash{%
+    \textendash\penalty\hyphenpenalty}% breakable dash
+  \let\finalandcomma=\empty
+  \let\finalandsemicolon=\empty
+  \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
+  \protected\def\mkbibmascord{\mkbibordinal}%
+  \protected\def\mkbibfemord{\mkbibordinal}%
+  \protected\def\mkbibneutord{\mkbibordinal}%
+  \protected\def\mkbibdatelong#1#2#3{%
+    \iffieldundef{#3}
+      {}
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}{}{\nobreakspace}}%
+    \iffieldundef{#2}
+      {}
+      {\mkbibmonth{\thefield{#2}}%
+       \iffieldundef{#1}{}{\space}}%
+    \iffieldbibstring{#1}
+      {\bibstring{\thefield{#1}}}
+      {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
+  \protected\def\mkbibdateshort#1#2#3{%
+    \iffieldundef{#3}
+      {}
+      {\mkdayzeros{\thefield{#3}}\adddot}%
+    \iffieldundef{#2}
+      {}
+      {\mkmonthzeros{\thefield{#2}}%
+       \iffieldundef{#1}{}{\adddot}}%
+    \iffieldbibstring{#1}
+      {\bibstring{\thefield{#1}}}
+      {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
+  \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{%
+      \iffieldundef{#1}{}
+        {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}%
+      \iffieldundef{#2}{}
+        {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}%
+      \iffieldundef{#3}{}
+        {\printtext{\mktimezeros{\thefield{#3}}}}%
+      \setunit{}%
+      \iffieldundef{#4}{}
+        {\bibtimezonesep
+         \mkbibtimezone{\thefield{#4}}}}%
+  \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{%
+      \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep
+      \forcezerosmdt{\thefield{#2}}%
+      \iffieldundef{#3}{}
+        {\bibtimesep
+         \forcezeros{\thefield{#3}}}%
+       \space
+       \ifnumless{\thefield{#1}}{12}
+         {\bibstring{am}}
+         {\bibstring{pm}}%
+      \iffieldundef{#4}{}
+       {\space\bibtimezonesep
+        \parentext{\mkbibtimezone{\thefield{#4}}}}}%
+  \protected\def\mkbibseasondateshort#1#2{%
+    \mkbibseason{\thefield{#2}}%
+    \iffieldundef{#1}{}{\space}%
+    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
+  \protected\def\mkbibseasondatelong#1#2{%
+    \mkbibseason{\thefield{#2}}%
+    \iffieldundef{#1}{}{\space}%
+    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
+}
+
+\DeclareBibliographyStrings{%
+  bibliography     = {{Bibliografi}{Bibliografi}},
+  references       = {{Referanser}{Referanser}},
+  shorthands       = {{Forkortelser}{Forkortelser}},
+  editor           = {{redakt{\o}r}{red\adddot}},
+  editors          = {{redakt{\o}rer}{red\adddot}},
+  compiler         = {{kompilator}{komp\adddot}},
+  compilers        = {{kompilatorer}{komp\adddot}},
+  redactor         = {{bearbeidelse}{bearb\adddot}},
+  redactors        = {{bearbeidelse}{bearb\adddot}},
+  reviser          = {{revisjon}{rev\adddot}},
+  revisers         = {{revisjon}{rev\adddot}},
+  founder          = {{grunnlegger}{grunnl\adddot}},
+  founders         = {{grunnleggere}{grunnl\adddot}},
+  continuator      = {{videref{\o}ring}{videref\adddot}},
+  continuators     = {{videref{\o}ring}{videref\adddot}},
+  collaborator     = {{samarbeid}{samarb\adddot}},
+  collaborators    = {{samarbeid}{samarb\adddot}},
+  translator       = {{oversetter}{overs\adddot}},
+  translators      = {{oversettere}{overs\adddot}},
+  commentator      = {{kommentarer}{komm\adddot}},
+  commentators     = {{kommentarer}{komm\adddot}},
+  annotator        = {{forklaringer}{forkl\adddot}},
+  annotators       = {{forklaringer}{forkl\adddot}},
+  commentary       = {{kommentarer}{komm\adddot}},
+  annotations      = {{forklaringer}{forkl\adddot}},
+  introduction     = {{innledning}{innl\adddot}},
+  foreword         = {{forord}{forord}},
+  afterword        = {{etterord}{etterord}},
+  editortr         = {{redakt{\o}r og oversetter}%
+                      {red\adddotspace og overs\adddot}},
+  editorstr        = {{redakt{\o}rer og oversettere}%
+                      {red\adddotspace og overs\adddot}},
+  editorco         = {{redakt{\o}r og kommentarer}
+                      {red\adddotspace og komm\adddot}},
+  editorsco        = {{redakt{\o}rer og kommentarer}
+                      {red\adddotspace og komm\adddot}},
+  editoran         = {{redakt{\o}r og forklaringer}%
+                      {red\adddotspace og forkl\adddot}},
+  editorsan        = {{redakt{\o}rer og forklaringer}%
+                      {red\adddotspace og forkl\adddot}},
+  editorin         = {{redakt{\o}r og innledning}%
+                      {red\adddotspace og innl\adddot}},
+  editorsin        = {{redakt{\o}rer og innledning}%
+                      {red\adddotspace og innl\adddot}},
+  editorfo         = {{redakt{\o}r og forord}%
+                      {red\adddotspace og forord}},
+  editorsfo        = {{redakt{\o}rer og forord}%
+                      {red\adddotspace og forord}},
+  editoraf         = {{redakt{\o}r og etterord}%
+                      {red\adddotspace og etterord}},
+  editorsaf        = {{redakt{\o}rer og etterord}%
+                      {red\adddotspace og etterord}},
+  editortrco       = {{redakt{\o}r, oversetter og kommentarer}%
+                      {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
+  editorstrco      = {{redakt{\o}rer, oversettere og kommentarer}%
+                      {red.,\addabbrvspace overs\adddotspace og komm\adddot}},
+  editortran       = {{redakt{\o}r, oversetter og forklaringer}%
+                      {red.,\addabbrvspace overs\adddotspace og forkl\adddot}},
+  editorstran      = {{redakt{\o}rer, oversettere og forklaringer}%
+                      {red.,\addabbrvspace overs\adddotspace og forkl\adddot}},
+  editortrin       = {{redakt{\o}r, oversetter og innledning}%
+                      {red.,\addabbrvspace overs\adddotspace og innl\adddot}},
+  editorstrin      = {{redakt{\o}rer, oversettere og innledning}%
+                      {red.,\addabbrvspace overs\adddotspace og innl\adddot}},
+  editortrfo       = {{redakt{\o}r, oversetter og forord}%
+                      {red.,\addabbrvspace overs\adddotspace og forord}},
+  editorstrfo      = {{redakt{\o}rer, oversettere og forord}%
+                      {red.,\addabbrvspace overs\adddotspace og forord}},
+  editortraf       = {{redakt{\o}r, oversetter og etterord}%
+                      {red.,\addabbrvspace overs\adddotspace og etterord}},
+  editorstraf      = {{redakt{\o}rer, oversettere og etterord}%
+                      {red.,\addabbrvspace overs\adddotspace og etterord}},
+  editorcoin       = {{redakt{\o}r, kommentarer og innledning}%
+                      {red.,\addabbrvspace komm\adddotspace og innl\adddot}},
+  editorscoin      = {{redakt{\o}rer, kommentarer og innledning}%
+                      {red.,\addabbrvspace komm\adddotspace og innl\adddot}},
+  editorcofo       = {{redakt{\o}r, kommentarer og forord}%
+                      {red.,\addabbrvspace komm\adddotspace og forord}},
+  editorscofo      = {{redakt{\o}rer, kommentarer og forord}%
+                      {red.,\addabbrvspace komm\adddotspace og forord}},
+  editorcoaf       = {{redakt{\o}r, kommentarer og etterord}%
+                      {red.,\addabbrvspace komm\adddotspace og etterord}},
+  editorscoaf      = {{redakt{\o}rer, kommentarer og etterord}%
+                      {red.,\addabbrvspace komm\adddotspace og etterord}},
+  editoranin       = {{redakt{\o}r, forklaringer og innledning}%
+                      {red.,\addabbrvspace forkl\adddotspace og innl\adddot}},
+  editorsanin      = {{redakt{\o}rer, forklaringer og innledning}%
+                      {red.,\addabbrvspace forkl\adddotspace og innl\adddot}},
+  editoranfo       = {{redakt{\o}r, forklaringer og forord}%
+                      {red.,\addabbrvspace forkl\adddotspace og forord}},
+  editorsanfo      = {{redakt{\o}rer, forklaringer og forord}%
+                      {red.,\addabbrvspace forkl\adddotspace og forord}},
+  editoranaf       = {{redakt{\o}r, forklaringer og etterord}%
+                      {red.,\addabbrvspace forkl\adddotspace og etterord}},
+  editorsanaf      = {{redakt{\o}rer, forklaringer og etterord}%
+                      {red.,\addabbrvspace forkl\adddotspace og etterord}},
+  editortrcoin     = {{redakt{\o}r, oversetter, kommentarer og innledning}%
+                      {red.,\addabbrvspace overs., komm\adddotspace og innl\adddot}},
+  editorstrcoin    = {{redakt{\o}rer, oversettere, kommentarer og innledning}%
+                      {red.,\addabbrvspace overs., komm\adddotspace og innl\adddot}},
+  editortrcofo     = {{redakt{\o}r, oversetter, kommentarer og forord}%
+                      {red.,\addabbrvspace overs., komm\adddotspace og forord}},
+  editorstrcofo    = {{redakt{\o}rer, oversettere, kommentarer og forord}%
+                      {red.,\addabbrvspace overs., komm\adddotspace og forord}},
+  editortrcoaf     = {{redakt{\o}r, oversetter, kommentarer og etterord}%
+                      {red.,\addabbrvspace overs., komm\adddotspace og etterord}},
+  editorstrcoaf    = {{redakt{\o}rer, oversettere, kommentarer og etterord}%
+                      {red.,\addabbrvspace overs., komm\adddotspace og etterord}},
+  editortranin     = {{redakt{\o}r, oversetter, forklaringer og innledning}%
+                      {red.,\addabbrvspace overs., forkl\adddotspace og innl\adddot}},
+  editorstranin    = {{redakt{\o}rer, oversettere, forklaringer og innledning}%
+                      {red.,\addabbrvspace overs., forkl\adddotspace og innl\adddot}},
+  editortranfo     = {{redakt{\o}r, oversetter, forklaringer og forord}%
+                      {red.,\addabbrvspace overs., forkl\adddotspace og forord}},
+  editorstranfo    = {{redakt{\o}rer, oversettere, forklaringer og forord}%
+                      {red.,\addabbrvspace overs., forkl\adddotspace og forord}},
+  editortranaf     = {{redakt{\o}r, oversetter, forklaringer og etterord}%
+                      {red.,\addabbrvspace overs., forkl\adddotspace og etterord}},
+  editorstranaf    = {{redakt{\o}rer, oversettere, forklaringer og etterord}%
+                      {red.,\addabbrvspace overs., forkl\adddotspace og etterord}},
+  translatorco     = {{oversetter og kommentarer}%
+                      {overs\adddotspace og komm\adddot}},
+  translatorsco    = {{oversettere og kommentarer}%
+                      {overs\adddotspace og komm\adddot}},
+  translatoran     = {{oversetter og forklaringer}%
+                      {overs\adddotspace og forkl\adddot}},
+  translatorsan    = {{oversettere og forklaringer}%
+                      {overs\adddotspace og forkl\adddot}},
+  translatorin     = {{oversetter og innledning}%
+                      {overs\adddotspace og innl\adddot}},
+  translatorsin    = {{oversettere og innledning}%
+                      {overs\adddotspace og innl\adddot}},
+  translatorfo     = {{oversetter og forord}%
+                      {overs\adddotspace og forord}},
+  translatorsfo    = {{oversettere og forord}%
+                      {overs\adddotspace og forord}},
+  translatoraf     = {{oversetter og etterord}%
+                      {overs\adddotspace og etterord}},
+  translatorsaf    = {{oversettere og etterord}%
+                      {overs\adddotspace og etterord}},
+  translatorcoin   = {{oversetter, kommentarer og innledning}%
+                      {overs., komm\adddotspace og innl\adddot}},
+  translatorscoin  = {{oversettere, kommentarer og innledning}%
+                      {overs., komm\adddotspace og innl\adddot}},
+  translatorcofo   = {{oversetter, kommentarer og forord}%
+                      {overs., komm\adddotspace og forord}},
+  translatorscofo  = {{oversettere, kommentarer og forord}%
+                      {overs., komm\adddotspace og forord}},
+  translatorcoaf   = {{oversetter, kommentarer og etterord}%
+                      {overs., komm\adddotspace og etterord}},
+  translatorscoaf  = {{oversettere, kommentarer og etterord}%
+                      {overs., komm\adddotspace og etterord}},
+  translatoranin   = {{oversetter, forklaringer og innledning}%
+                      {overs., forkl\adddotspace og innl\adddot}},
+  translatorsanin  = {{oversettere, forklaringer og innledning}%
+                      {overs., forkl\adddotspace og innl\adddot}},
+  translatoranfo   = {{oversetter, forklaringer og forord}%
+                      {overs., forkl\adddotspace og forord}},
+  translatorsanfo  = {{oversettere, forklaringer og forord}%
+                      {overs., forkl\adddotspace og forord}},
+  translatoranaf   = {{oversetter, forklaringer og etterord}%
+                      {overs., forkl\adddotspace og etterord}},
+  translatorsanaf  = {{oversettere, forklaringer og etterord}%
+                      {overs., forkl\adddotspace og etterord}},
+  byauthor         = {{av}{av}},
+  byeditor         = {{redigert av}{red\adddotspace av}},
+  bycompiler       = {{kompilert av}{komp\adddotspace av}},
+  byredactor       = {{bearbeidet av}{bearb\adddotspace av}},
+  byreviser        = {{revidert av}{rev\adddotspace av}},
+  byreviewer       = {{kritikk ved}{krit\adddotspace ved}},
+  byfounder        = {{grunnlagt av}{grunnl\adddotspace av}},
+  bycontinuator    = {{videref{\o}rt av}{videref\adddotspace av}},
+  bycollaborator   = {{i samarbeid med}{i samarb\adddotspace med}},
+  bytranslator     = {{oversatt \lbx@lfromlang\ av}{overs\adddot\ \lbx@sfromlang\ av}},
+  bycommentator    = {{kommentert av}{komm\adddot\ av}},
+  byannotator      = {{forklart av}{forkl\adddot\ av}},
+  withcommentator  = {{med kommentarer av}{med komm\adddot\ av}},
+  withannotator    = {{med forklaringer av}{med forkl\adddot\ av}},
+  withintroduction = {{med innledning av}{med innl\adddot\ av}},
+  withforeword     = {{med forord av}{med forord av}},
+  withafterword    = {{med etterord av}{med etterord av}},
+  byeditortr       = {{redigert og oversatt \lbx@lfromlang\ av}%
+                      {red\adddotspace og overs\adddot\ \lbx@sfromlang\ av}},
+  byeditorco       = {{redigert og kommentert av}%
+                      {red\adddotspace og komm\adddot\ av}},
+  byeditoran       = {{redigert og forklart av}%
+                      {red\adddotspace og forkl\adddot\ av}},
+  byeditorin       = {{redigert, med innledning, av}%
+                      {red.,\addabbrvspace med innl., av}},
+  byeditorfo       = {{redigert, med forord, av}%
+                      {red.,\addabbrvspace med forord, av}},
+  byeditoraf       = {{redigert, med etterord, av}%
+                      {red.,\addabbrvspace med etterord, av}},
+  byeditortrco     = {{redigert, oversatt \lbx@lfromlang\ og kommentert av}%
+                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm\adddot\ av}},
+  byeditortran     = {{redigert, oversatt \lbx@lfromlang\ og forklart av}%
+                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}},
+  byeditortrin     = {{redigert og oversatt \lbx@lfromlang, med innledning, av}%
+                      {red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}},
+  byeditortrfo     = {{redigert og oversatt \lbx@lfromlang, med forord, av}%
+                      {red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}},
+  byeditortraf     = {{redigert og oversatt \lbx@lfromlang, med etterord, av}%
+                      {red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}},
+  byeditorcoin     = {{redigert og kommentert, med innledning, av}%
+                      {red\adddotspace og komm., med innl., av}},
+  byeditorcofo     = {{redigert og kommentert, med forord, av}%
+                      {red\adddotspace og komm., med forord, av}},
+  byeditorcoaf     = {{redigert og kommentert, med etterord, av}%
+                      {red\adddotspace og komm., med etterord, av}},
+  byeditoranin     = {{redigert og forklart, med innledning, av}%
+                      {red\adddotspace og forkl., med innl., av}},
+  byeditoranfo     = {{redigert og forklart, med forord, av}%
+                      {red\adddotspace og forkl., med forord, av}},
+  byeditoranaf     = {{redigert og forklart, med etterord, av}%
+                      {red\adddotspace og forkl., med etterord, av}},
+  byeditortrcoin   = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med innledning, av}%
+                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med innl., av}},
+  byeditortrcofo   = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med forord, av}%
+                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med forord, av}},
+  byeditortrcoaf   = {{redigert, oversatt \lbx@lfromlang\ og kommentert, med etterord, av}%
+                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og komm., med etterord, av}},
+  byeditortranin   = {{redigert, oversatt \lbx@lfromlang\ og forklart, med innledning, av}%
+                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med innl., av}},
+  byeditortranfo   = {{redigert, oversatt \lbx@lfromlang\ og forklart, med forord, av}%
+                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med forord, av}},
+  byeditortranaf   = {{redigert, oversatt \lbx@lfromlang\ og forklart, med etterord, av}%
+                      {red.,\addabbrvspace overs\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}},
+  bytranslatorco   = {{oversatt \lbx@lfromlang\ og kommentert av}%
+                      {overs\adddot\ \lbx@sfromlang\ og komm\adddot\ av}},
+  bytranslatoran   = {{oversatt \lbx@lfromlang\ og forklart av}%
+                      {overs\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}},
+  bytranslatorin   = {{oversatt \lbx@lfromlang, med innledning, av}%
+                      {overs\adddot\ \lbx@sfromlang, med innl., av}},
+  bytranslatorfo   = {{oversatt \lbx@lfromlang, med forord, av}%
+                      {overs\adddot\ \lbx@sfromlang, med forord, av}},
+  bytranslatoraf   = {{oversatt \lbx@lfromlang, med etterord, av}%
+                      {overs\adddot\ \lbx@sfromlang, med etterord, av}},
+  bytranslatorcoin = {{oversatt \lbx@lfromlang\ og kommentert, med innledning, av}%
+                      {overs\adddot\ \lbx@sfromlang\ og komm., med innl., av}},
+  bytranslatorcofo = {{oversatt \lbx@lfromlang\ og kommentert, med forord, av}%
+                      {overs\adddot\ \lbx@sfromlang\ og komm., med forord, av}},
+  bytranslatorcoaf = {{oversatt \lbx@lfromlang\ og kommentert, med etterord, av}%
+                      {overs\adddot\ \lbx@sfromlang\ og komm., med etterord, av}},
+  bytranslatoranin = {{oversatt \lbx@lfromlang\ og forklart, med innledning, av}%
+                      {overs\adddot\ \lbx@sfromlang\ og forkl., med innl., av}},
+  bytranslatoranfo = {{oversatt \lbx@lfromlang\ og forklart, med forord, av}%
+                      {overs\adddot\ \lbx@sfromlang\ og forkl., med forord, av}},
+  bytranslatoranaf = {{oversatt \lbx@lfromlang\ og forklart, med etterord, av}%
+                      {overs\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}},
+  and              = {{og}{og}},
+  andothers        = {{med flere}{mfl\adddot}},
+  andmore          = {{med mer}{m.m\adddot}},
+  volume           = {{bind}{bd\adddot}},
+  volumes          = {{bind}{bd\adddot}},
+  involumes        = {{i}{i}},
+  jourvol          = {{{\aa}rgang}{{\aa}rg\adddot}},
+  jourser          = {{serie}{ser\adddot}},
+  book             = {{bok}{bok}},
+  part             = {{del}{del}},
+  issue            = {{nummer}{nr\adddot}},
+  newseries        = {{ny serie}{ny ser\adddot}},
+  oldseries        = {{gammel serie}{gl\adddotspace ser\adddot}},
+  edition          = {{utgave}{utg\adddot}},
+  reprint          = {{opptrykk}{opptr\adddot}},
+  reprintof        = {{opptrykk av}{opptr\adddotspace av}},
+  reprintas        = {{trykt om som}{tr\adddotspace om som}},
+  reprintfrom      = {{opptrykk fra}{opptr\adddotspace fra}},
+  translationof    = {{oversettelse av}{overs\adddotspace av}},
+  translationas    = {{oversatt som}{overs\adddotspace som}},
+  translationfrom  = {{oversatt fra}{overs\adddotspace fra}},
+  reviewof         = {{kritikk av}{krit\adddotspace av}},
+  origpubas        = {{opprinnelig utgitt som}{oppr\adddot\ utg\adddot\ som}},
+  origpubin        = {{opprinnelig utgitt i}{oppr\adddot\ utg\adddot\ i}},
+  astitle          = {{som}{som}},
+  bypublisher      = {{av}{av}},
+  page             = {{side}{s\adddot}},
+  pages            = {{sider}{s\adddot}},
+  column           = {{spalte}{sp\adddot}},
+  columns          = {{spalter}{sp\adddot}},
+  line             = {{linje}{l\adddot}},
+  lines            = {{linjer}{l\adddot}},
+  nodate           = {{udatert}{udatert}},
+  verse            = {{vers}{v\adddot}},
+  verses           = {{vers}{v\adddot}},
+  section          = {{avsnitt}{avsn\adddot}},
+  sections         = {{avsnitt}{avsn\adddot}},
+  paragraph        = {{avsnitt}{avsn\adddot}},
+  paragraphs       = {{avsnitt}{avsn\adddot}},
+  in               = {{i}{i}},
+  inseries         = {{i}{i}},
+  ofseries         = {{av}{av}},
+  number           = {{nummer}{nr\adddot}},
+  chapter          = {{kapittel}{kap\adddot}},
+  mathesis         = {{masteroppgave}{masteroppg\adddot}},
+  phdthesis        = {{ph.d.-avhandling}{ph.d.-avh\adddot}},
+  candthesis       = {{hovedoppgave}{hovedoppg\adddot}},
+  resreport        = {{forskningsrapport}{forskn.rapp\adddot}},
+  techreport       = {{teknisk rapport}{tekn\adddotspace rapp\adddot}},
+  software         = {{programvare}{programvare}},
+  datacd           = {{data-cd}{data-cd}},
+  audiocd          = {{lyd-cd}{lyd-cd}},
+  version          = {{versjon}{versjon}},
+  url              = {{side}{side}},
+  urlfrom          = {{tilgjengelig fra}{tilgj\adddotspace fra}},
+  urlseen          = {{sjekket}{sjekket}},
+  inpreparation    = {{under utarbeidelse}{under utarb\adddot}},
+  submitted        = {{innsendt}{innsendt}},
+  forthcoming      = {{under utgivelse}{under utgiv\adddot}},
+  inpress          = {{i trykken}{i trykken}},
+  prepublished     = {{prepublisert}{prepubl\adddot}},
+  citedas          = {{fremover sitert som}{fremover sit\adddotspace som}},
+  thiscite         = {{her}{her}},
+  seenote          = {{se note}{se n\adddot}},
+  quotedin         = {{sitert i}{sit\adddotspace i}},
+  idem             = {{den samme}{d.s\adddot}},
+  idemsf           = {{den samme}{d.s\adddot}},
+  idemsm           = {{den samme}{d.s\adddot}},
+  idemsn           = {{det samme}{d.s\adddot}},
+  idempf           = {{de samme}{d.s\adddot}},
+  idempm           = {{de samme}{d.s\adddot}},
+  idempn           = {{de samme}{d.s\adddot}},
+  idempp           = {{de samme}{d.s\adddot}},
+  ibidem           = {{samme sted}{sst\adddot}},
+  opcit            = {{samme sted}{sst\adddot}},
+  loccit           = {{samme sted}{sst\adddot}},
+  confer           = {{jamf{\o}r}{jf\adddot}},
+  sequens          = {{f\adddot}{f\adddot}},
+  sequentes        = {{ff\adddot}{ff\adddot}},
+  passim           = {{passim}{pass\adddot}},
+  see              = {{se}{se}},
+  seealso          = {{se ogs{\aa}}{se ogs{\aa}}},
+  backrefpage      = {{se side}{se s\adddot}},
+  backrefpages     = {{se sidene}{se s\adddot}},
+  january          = {{januar}{jan\adddot}},
+  february         = {{februar}{feb\adddot}},
+  march            = {{mars}{mar\adddot}},
+  april            = {{april}{apr\adddot}},
+  may              = {{mai}{mai}},
+  june             = {{juni}{jun\adddot}},
+  july             = {{juli}{jul\adddot}},
+  august           = {{august}{aug\adddot}},
+  september        = {{september}{sep\adddot}},
+  october          = {{oktober}{okt\adddot}},
+  november         = {{november}{nov\adddot}},
+  december         = {{desember}{des\adddot}},
+  langamerican     = {{amerikansk-engelsk}{amerikansk-engelsk}},
+  langbrazilian    = {{brasiliansk-portugisisk}{brasiliansk-portugisisk}},
+  langcatalan      = {{katalansk}{katalansk}},
+  langcroatian     = {{kroatisk}{kroatisk}},
+  langczech        = {{tsjekkisk}{tsjekkisk}},
+  langdanish       = {{dansk}{dansk}},
+  langdutch        = {{nederlandsk}{nederlandsk}},
+  langenglish      = {{engelsk}{engelsk}},
+%  langestonian     = {{}{}},% FIXME: missing
+  langfinnish      = {{finsk}{finsk}},
+  langfrench       = {{fransk}{fransk}},
+  langgerman       = {{tysk}{tysk}},
+  langgreek        = {{gresk}{gresk}},
+  langitalian      = {{italiensk}{italiensk}},
+  langlatin        = {{latin}{latin}},
+  langnorwegian    = {{norsk}{norsk}},
+% langpolish       = {{}{}},% FIXME: missing
+  langportuguese   = {{portugisisk}{portugisisk}},
+  langrussian      = {{russisk}{russisk}},
+% langslovene      = {{}{}},% FIXME: missing
+  langspanish      = {{spansk}{spansk}},
+  langswedish      = {{svensk}{svensk}},
+  fromamerican     = {{fra amerikansk-engelsk}{fra amerikansk-engelsk}},
+  frombrazilian    = {{fra brasiliansk-portugisisk}{fra brasiliansk-portugisisk}},
+  fromcatalan      = {{fra katalansk}{fra katalansk}},
+  fromcroatian     = {{fra kroatisk}{fra kroatisk}},
+  fromczech        = {{fra tsjekkisk}{fra tsjekkisk}},
+  fromdanish       = {{fra dansk}{fra dansk}},
+  fromdutch        = {{fra nederlandsk}{fra nederlandsk}},
+  fromenglish      = {{fra engelsk}{fra engelsk}},
+%  fromestonian     = {{}{}},% FIXME: missing
+  fromfinnish      = {{fra finsk}{fra finsk}},
+  fromfrench       = {{fra fransk}{fra fransk}},
+  fromgerman       = {{fra tysk}{fra tysk}},
+  fromgreek        = {{fra gresk}{fra gresk}},
+  fromitalian      = {{fra italiensk}{fra italiensk}},
+  fromlatin        = {{fra latin}{fra latin}},
+  fromnorwegian    = {{fra norsk}{fra norsk}},
+% frompolish       = {{}{}},% FIXME: missing
+  fromportuguese   = {{fra portugisisk}{fra portugisisk}},
+  fromrussian      = {{fra russisk}{fra russisk}},
+% fromslovene      = {{}{}},% FIXME: missing
+  fromspanish      = {{fra spansk}{fra spansk}},
+  fromswedish      = {{fra svensk}{fra svensk}},
+  countryde        = {{Tyskland}{DE}},
+  countryeu        = {{Den europeiske union}{EU}},
+  countryep        = {{Den europeiske union}{EP}},
+  countryfr        = {{Frankrike}{FR}},
+  countryuk        = {{Storbritannia}{GB}},
+  countryus        = {{USA}{US}},
+  patent           = {{patent}{patent}},
+  patentde         = {{tysk patent}{ty\adddotspace pat\adddot}},
+  patenteu         = {{europeisk patent}{eur\adddotspace pat\adddot}},
+  patentfr         = {{fransk patent}{fr\adddotspace pat\adddot}},
+  patentuk         = {{britisk patent}{br\adddotspace pat\adddot}},
+  patentus         = {{amerikansk patent}{am\adddotspace pat\adddot}},
+  patreq           = {{patents{\o}knad}{pat.s{\o}kn\adddot}},
+  patreqde         = {{tysk patents{\o}knad}%
+                      {ty\adddotspace pat.s{\o}kn\adddot}},
+  patreqeu         = {{europeisk patents{\o}knad}%
+                      {eur\adddotspace pat.s{\o}kn\adddot}},
+  patreqfr         = {{fransk patents{\o}knad}%
+                      {fr\adddotspace pat.s{\o}kn\adddot}},
+  patrequk         = {{britisk patents{\o}knad}%
+                      {br\adddotspace pat.s{\o}kn\adddot}},
+  patrequs         = {{amerikansk patents{\o}knad}%
+                      {am\adddotspace pat.s{\o}kn\adddot}},
+  file             = {{fil}{fil}},
+  library          = {{bibliotek}{bibliotek}},
+  abstract         = {{sammendrag}{sammendrag}},
+  annotation       = {{merknad}{merknad}},
+  commonera        = {{etter v\aa r tidsregning}{evt\adddot}},
+  beforecommonera  = {{f{\o}r v\aa r tidsregning}{fvt\adddot}},
+  annodomini       = {{etter Kristus}{e\adddot Kr\adddot}},
+  beforechrist     = {{f{\o}r Kristus}{f\adddot Kr\adddot}},
+% circa            = {{}{}},% FIXME: missing
+% spring           = {{}{}},% FIXME: missing
+% summer           = {{}{}},% FIXME: missing
+% autumn           = {{}{}},% FIXME: missing
+% winter           = {{}{}},% FIXME: missing
+  am               = {{a\adddot m\adddot}{a\adddot m\adddot}},
+  pm               = {{p\adddot m\adddot}{p\adddot m\adddot}},
+}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx
index f54a078b267..65b02b83d16 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nswissgerman.lbx
@@ -5,7 +5,7 @@
 
 % Swiss time sep is a dot
 \DeclareBibliographyExtras{%
-  \protected\def\bibtimesep{.}%
+  \protected\def\bibtimesep{.}
 }
 
 % One point where Swiss German spelling
@@ -18,8 +18,6 @@
 % alternative spelling, uncomment to enable:
 % section          = {{Paragraf}{\S}},
 % sections         = {{Paragrafen}{\S\S}},
-% sectiontotal     = {{Paragraf}{\S}},
-% sectiontotals    = {{Paragrafen}{\S\S}},
 }
 
 \DeclareHyphenationExceptions{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 7930ffba1f4..5f2e12c24d2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
@@ -1,17 +1,14 @@
 \ProvidesFile{nynorsk.lbx}
 [\abx@lbxid]
 
-% Remarks by translators:
-%
-% Since "nynorsk" inherits "norsk" (bokmål) only strings that are
-% different in the two languages are included. In particular, this
-% means that no language or month name strings are listed below.
-%
+% Status:
+% - 'norsk' and 'nynorsk' use the same translations, correct?
 
-\InheritBibliographyExtras{norsk}
+\InheritBibliographyExtras{norwegian}
+\InheritBibliographyStrings{norwegian}
 
 \DeclareBibliographyStrings{%
-  inherit          = {norsk},
+  inherit          = {norwegian},
   references       = {{Referansar}{Referansar}},
   shorthands       = {{Forkortingar}{Forkortingar}},
   editors          = {{redakt{\o}rar}{red\adddot}},
@@ -166,7 +163,6 @@
                       {oms., forkl\adddotspace og etterord}},
   translatorsanaf  = {{omsetjarar, forklaringar og etterord}%
                       {oms., forkl\adddotspace og etterord}},
-  organizers       = {{organisatorar}{org\adddot}},
   byredactor       = {{omarbeidd av}{omarb\adddotspace av}},
   bycontinuator    = {{vidaref{\o}rt av}{vidaref\adddotspace av}},
   bytranslator     = {{omsett \lbx@lfromlang\ av}%
@@ -246,12 +242,11 @@
   mathesis         = {{masteroppg{\aa}ve}{masteroppg\adddot}},
   candthesis       = {{hovudoppg{\aa}ve}{hovudoppg\adddot}},
   resreport        = {{forskingsrapport}{forsk.rapp\adddot}},
-  url              = {{adresse}{adresse}},
   urlfrom          = {{tilgjengeleg fr{\aa}}{tilgj\adddotspace fr{\aa}}},
   urlseen          = {{sjekka}{sjekka}},
   inpreparation    = {{under utarbeiding}{under utarb\adddot}},
   forthcoming      = {{under utgiving}{under utgiv\adddot}},
-  citedas          = {{heretter sitert som}{heretter sit\adddotspace som}},
+  citedas          = {{framover sitert som}{framover sit\adddotspace som}},
   seenote          = {{sj{\aa} note}{sj{\aa} n\adddot}},
   idem             = {{den same}{d.s\adddot}},
   idemsf           = {{den same}{d.s\adddot}},
@@ -270,31 +265,26 @@
   backrefpages     = {{sj{\aa} sidene}{sj{\aa} s\adddot}},
   fromamerican     = {{fr{\aa} amerikansk-engelsk}{fr{\aa} amerikansk-engelsk}},
   frombrazilian    = {{fr{\aa} brasiliansk-portugisisk}{fr{\aa} brasiliansk-portugisisk}},
-  frombulgarian    = {{fr{\aa} bulgarsk}{fr{\aa} bulgarsk}},
   fromcatalan      = {{fr{\aa} katalansk}{fr{\aa} katalansk}},
   fromcroatian     = {{fr{\aa} kroatisk}{fr{\aa} kroatisk}},
   fromczech        = {{fr{\aa} tsjekkisk}{fr{\aa} tsjekkisk}},
   fromdanish       = {{fr{\aa} dansk}{fr{\aa} dansk}},
   fromdutch        = {{fr{\aa} nederlandsk}{fr{\aa} nederlandsk}},
   fromenglish      = {{fr{\aa} engelsk}{fr{\aa} engelsk}},
-  fromestonian     = {{fr{\aa} estisk}{fr{\aa} estisk}},
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{fr{\aa} finsk}{fr{\aa} finsk}},
   fromfrench       = {{fr{\aa} fransk}{fr{\aa} fransk}},
-  fromgalician     = {{fr{\aa} galisisk}{fr{\aa} galisisk}},
   fromgerman       = {{fr{\aa} tysk}{fr{\aa} tysk}},
   fromgreek        = {{fr{\aa} gresk}{fr{\aa} gresk}},
   fromitalian      = {{fr{\aa} italiensk}{fr{\aa} italiensk}},
-  fromjapanese     = {{fr{\aa} japansk}{fr{\aa} japansk}},
   fromlatin        = {{fr{\aa} latin}{fr{\aa} latin}},
   fromnorwegian    = {{fr{\aa} norsk}{fr{\aa} norsk}},
-  frompolish       = {{fr{\aa} polsk}{fr{\aa} polsk}},
+% frompolish       = {{}{}},% FIXME: missing
   fromportuguese   = {{fr{\aa} portugisisk}{fr{\aa} portugisisk}},
   fromrussian      = {{fr{\aa} russisk}{fr{\aa} russisk}},
-  fromslovene      = {{fr{\aa} slovakisk}{fr{\aa} slovakisk}},
-  fromslovak       = {{fr{\aa} slovensk}{fr{\aa} slovensk}},
+% fromslovene      = {{}{}},% FIXME: missing
   fromspanish      = {{fr{\aa} spansk}{fr{\aa} spansk}},
   fromswedish      = {{fr{\aa} svensk}{fr{\aa} svensk}},
-  fromukrainian    = {{fr{\aa} ukrainsk}{fr{\aa} ukrainsk}},
   countryeu        = {{Den europeiske unionen}{EU}},
   countryep        = {{Den europeiske unionen}{EP}},
   abstract         = {{samandrag}{samandrag}},
@@ -302,13 +292,13 @@
   beforecommonera  = {{f{\o}r vesterlandsk tidsrekning}{f\adddot v\adddot t\adddot}},
   annodomini       = {{e\adddot Kr\adddot}{e\adddot Kr\adddot}},
   beforechrist     = {{f\adddot Kr\adddot}{f\adddot Kr\adddot}},
-  circa            = {{cirka}{ca\adddot}},
-  spring           = {{v{\aa}r}{v{\aa}r}},
-  summer           = {{sommar}{sommar}},
-  autumn           = {{haust}{haust}},
-  winter           = {{vinter}{vinter}},
-  am               = {{a\adddot m\adddot}{a\adddot m\adddot}},
-  pm               = {{p\adddot m\adddot}{p\adddot m\adddot}},
+% circa            = {{}{}},% FIXME: missing
+% spring           = {{}{}},% FIXME: missing
+% summer           = {{}{}},% FIXME: missing
+% autumn           = {{}{}},% FIXME: missing
+% winter           = {{}{}},% FIXME: missing
+  am               = {{formiddag}{f\adddot m\adddot}},
+  pm               = {{ettermiddag}{e\adddot m\adddot}},
 }
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx
index e8c49a1b989..d8a4e9566e2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx
@@ -257,9 +257,6 @@
                       {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace pos\l \adddot}},
   translatorsanaf  = {{t\l umacze, autorzy komentarzy i autorzy pos\l owia}%
                       {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace pos\l \adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{autorstwo}{aut\adddot}},% FIXME: unsure
   byeditor         = {{wyedytowano}{wyed\adddot}},% FIXME: unsure
   bycompiler       = {{wykonano}{wyk\adddot}},% FIXME: unsure
@@ -375,18 +372,6 @@
   sections         = {{paragrafy}{par\adddot}},% FIXME: check
   paragraph        = {{akapit}{aka\adddot}},
   paragraphs       = {{akapity}{aka\adddot}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{w}{w}},
   inseries         = {{w}{w}},
   ofseries         = {{z}{z}},
@@ -459,7 +444,6 @@
   datedecember     = {{grudnia}{grud\adddot}},
   langamerican     = {{ameryka\'{n}ski}{ameryka\'{n}ski}},
   langbrazilian    = {{brazylijski}{brazylijski}},
-% langbulgarian    = {{}{}},% FIXME: missing
 % langcatalan      = {{}{}},% FIXME: missing
   langcroatian     = {{chorwacki}{chorwacki}},
 % langczech        = {{}{}},% FIXME: missing
@@ -469,7 +453,6 @@
 %  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{fi\'{n}ski}{fi\'{n}ski}},
   langfrench       = {{francuski}{francuski}},
-  langgalician     = {{galicyjski}{galicyjski}},
   langgerman       = {{niemiecki}{niemiecki}},
   langgreek        = {{grecki}{grecki}},
   langitalian      = {{w\l oski}{w\l oski}},
@@ -483,7 +466,6 @@
   langswedish      = {{szwedzki}{szwedzki}},
   fromamerican     = {{z ameryka\'{n}skiego}{z amer\adddot}},
   frombrazilian    = {{z brazylijskiego}{z braz\adddot}},
-% frombulgarian    = {{}{}},% FIXME: missing
 % fromcatalan      = {{}{}},% FIXME: missing
   fromcroatian     = {{z chorwackiego}{z chorw\adddot}},
 % fromczech        = {{}{}},% FIXME: missing
@@ -493,7 +475,6 @@
 %  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{z fi\'{n}skiego}{z fi\'{n}\adddot}},
   fromfrench       = {{z francuzkiego}{z fran\adddot}},
-  fromgalician     = {{z galicyjzkiego}{z gal\adddot}},
   fromgerman       = {{z niemieckiego}{z niem\adddot}},
   fromgreek        = {{z greckiego}{z grec\adddot}},
   fromitalian      = {{z w\l oskiego}{z w\l os\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
index cefaa1de8f1..929fd5eac65 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -92,19 +92,19 @@
   redactor         = {{redator}{red\adddot}},
   redactors        = {{redatores}{red\adddot}},
   reviser          = {{revisor}{rev\adddot}},
-  revisers         = {{revisores}{rev\adddot}},
+  revisers         = {{revisores}{revs\adddot}},
   founder          = {{fundador}{fund\adddot}},
   founders         = {{fundadores}{fund\adddot}},
   continuator      = {{continuador}{cont\adddot}},
   continuators     = {{continuadores}{cont\adddot}},
   collaborator     = {{colaborador}{col\adddot}},
-  collaborators    = {{colaboradores}{col\adddot}},
+  collaborators    = {{colaboradores}{cols\adddot}},
   translator       = {{tradutor}{trad\adddot}},
-  translators      = {{tradutores}{trad\adddot}},
+  translators      = {{tradutores}{trads\adddot}},
   commentator      = {{comentador}{coment\adddot}},
-  commentators     = {{comentadores}{coment\adddot}},
+  commentators     = {{comentadores}{coments\adddot}},
   annotator        = {{anotador}{anot\adddot}},
-  annotators       = {{anotadores}{anot\adddot}},
+  annotators       = {{anotadores}{anots\adddot}},
   commentary       = {{coment\'ario}{coment\adddot}},
   annotations      = {{notas}{notas}},
   introduction     = {{introdu\c{c}\~ao}{introd\adddot}},
@@ -113,15 +113,15 @@
   editortr         = {{editor e tradutor}%
                       {ed\adddotspace e trad\adddot}},
   editorstr        = {{editores e tradutores}%
-                      {eds\adddotspace e trad\adddot}},
+                      {eds\adddotspace e trads\adddot}},
   editorco         = {{editor e comentador}%
                       {ed\adddotspace e coment\adddot}},
   editorsco        = {{editores e comentadores}%
-                      {eds\adddotspace e coment\adddot}},
+                      {eds\adddotspace e coments\adddot}},
   editoran         = {{editor e anotador}%
                       {ed\adddotspace e anot\adddot}},
   editorsan        = {{editores e anotadores}%
-                      {eds\adddotspace e anot\adddot}},
+                      {eds\adddotspace e anots\adddot}},
   editorin         = {{editor e introdu\c{c}\~ao}%
                       {ed\adddotspace e introd\adddot}},
   editorsin        = {{editores e introdu\c{c}\~ao}%
@@ -137,79 +137,79 @@
   editortrco       = {{editor, tradutor e comentador}%
                       {ed., trad\adddot\ e coment\adddot}},
   editorstrco      = {{editores, tradutores e comentadores}%
-                      {eds., trad\adddot\ e coment\adddot}},
+                      {eds., trads\adddot\ e coments\adddot}},
   editortran       = {{editor, tradutor e anotador}%
                       {ed., trad\adddot\ e anot\adddot}},
   editorstran      = {{editores, tradutores e anotadores}%
-                      {eds., trad\adddot\ e anot\adddot}},
+                      {eds., trads\adddot\ e anots\adddot}},
   editortrin       = {{editor, tradutor e introdu\c{c}\~ao}%
                       {ed., trad\adddot\ e introd\adddot}},
   editorstrin      = {{editores, tradutores e introdu\c{c}\~ao}%
-                      {eds., trad\adddot\ e introd\adddot}},
+                      {eds., trads\adddot\ e introd\adddot}},
   editortrfo       = {{editor, tradutor e pref\'acio}%
                       {ed., trad\adddot\ e pref\adddot}},
   editorstrfo      = {{editores, tradutores e pref\'acio}%
-                      {eds., trad\adddot\ e pref\adddot}},
+                      {eds., trads\adddot\ e pref\adddot}},
   editortraf       = {{editor, tradutor e posf\'acio}%
                       {ed., trad\adddot\ e posf\adddot}},
   editorstraf      = {{editores, tradutores e posf\'acio}%
-                      {eds., trad\adddot\ e posf\adddot}},
+                      {eds., trads\adddot\ e posf\adddot}},
   editorcoin       = {{editor, comentador e introdu\c{c}\~ao}%
                       {ed., coment\adddot\ e introd\adddot}},
   editorscoin      = {{editores, comentadores e introdu\c{c}\~ao}%
-                      {eds., coment\adddot\ e introd\adddot}},
+                      {eds., coments\adddot\ e introd\adddot}},
   editorcofo       = {{editor, comentador e pref\'acio}%
                       {ed., coment\adddot\ e pref\adddot}},
   editorscofo      = {{editores, comentadores e pref\'acio}%
-                      {eds., coment\adddot\ e pref\adddot}},
+                      {eds., coments\adddot\ e pref\adddot}},
   editorcoaf       = {{editor, comentador e posf\'acio}%
                       {ed., coment\adddot\ e posf\adddot}},
   editorscoaf      = {{editores, comentadores e posf\'acio}%
-                      {eds., coment\adddot\ e posf\adddot}},
+                      {eds., coments\adddot\ e posf\adddot}},
   editoranin       = {{editor, anotador e introdu\c{c}\~ao}%
                       {ed., anot\adddot\ e introd\adddot}},
   editorsanin      = {{editores, anotadores e introdu\c{c}\~ao}%
-                      {eds., anot\adddot\ e introd\adddot}},
+                      {eds., anots\adddot\ e introd\adddot}},
   editoranfo       = {{editor, anotador e pref\'acio}%
                       {ed., anot\adddot\ e pref\adddot}},
   editorsanfo      = {{editores, anotadores e pref\'acio}%
-                      {eds., anot\adddot\ e pref\adddot}},
+                      {eds., anots\adddot\ e pref\adddot}},
   editoranaf       = {{editor, anotador e posf\'acio}%
                       {ed., anot\adddot\ e posf\adddot}},
   editorsanaf      = {{editores, anotadores e posf\'acio}%
-                      {eds., anot\adddot\ e posf\adddot}},
+                      {eds., anots\adddot\ e posf\adddot}},
   editortrcoin     = {{editor, tradutor, comentador e introdu\c{c}\~ao}%
                       {ed., trad., coment\adddot\ e introd\adddot}},
   editorstrcoin    = {{editores, tradutores, comentadores e introdu\c{c}\~ao}%
-                      {eds., trad., coment\adddot\ e introd\adddot}},
+                      {eds., trads., coments\adddot\ e introd\adddot}},
   editortrcofo     = {{editor, tradutor, comentador e pref\'acio}%
                       {ed., trad., coment\adddot\ e pref\adddot}},
   editorstrcofo    = {{editores, tradutores, comentadores e pref\'acio}%
-                      {eds., trad., coment\adddot\ e pref\adddot}},
+                      {eds., trads., coments\adddot\ e pref\adddot}},
   editortrcoaf     = {{editor, tradutor, comentador e posf\'acio}%
                       {ed., trad., coment\adddot\ e posf\adddot}},
   editorstrcoaf    = {{editores, tradutores, comentadores e posf\'acio}%
-                      {eds., trad., coment\adddot\ e posf\adddot}},
+                      {eds., trads., coments\adddot\ e posf\adddot}},
   editortranin     = {{editor, tradutor, anotador e introdu\c{c}\~ao}%
                       {ed., trad., anot\adddot\ e introd\adddot}},
   editorstranin    = {{editores, tradutores, anotadores e introdu\c{c}\~ao}%
-                      {eds., trad., anot\adddot\ e introd\adddot}},
+                      {eds., trads., anots\adddot\ e introd\adddot}},
   editortranfo     = {{editor, tradutor, anotador e pref\'acio}%
                       {ed., trad., anot\adddot\ e pref\adddot}},
   editorstranfo    = {{editores, tradutores, anotadores e pref\'acio}%
-                      {eds., trad., anot\adddot\ e pref\adddot}},
+                      {eds., trads., anots\adddot\ e pref\adddot}},
   editortranaf     = {{editor, tradutor, anotador e posf\'acio}%
                       {ed., trad., anot\adddot\ e posf\adddot}},
   editorstranaf    = {{editores, tradutores, anotadores e posf\'acio}%
-                      {eds., trad., anot\adddot\ e posf\adddot}},
+                      {eds., trads., anots\adddot\ e posf\adddot}},
   translatorco     = {{tradutor e comentador}%
                       {trad\adddot\ e coment\adddot}},
   translatorsco    = {{tradutores e comentadores}%
-                      {trad\adddot\ e coment\adddot}},
+                      {trads\adddot\ e coments\adddot}},
   translatoran     = {{tradutor e anotador}%
                       {trad\adddot\ e anot\adddot}},
   translatorsan    = {{tradutores e anotadores}%
-                      {trad\adddot\ e anot\adddot}},
+                      {trads\adddot\ e anots\adddot}},
   translatorin     = {{tradu\c{c}\~ao e introdu\c{c}\~ao}%
                       {trad\adddot\ e introd\adddot}},
   translatorsin    = {{tradu\c{c}\~ao e introdu\c{c}\~ao}%
@@ -246,21 +246,18 @@
                       {trad., notas e posf\adddot}},
   translatorsanaf  = {{tradu\c{c}\~ao, notas e posf\'acio}%
                       {trad., notas e posf\adddot}},
-  organizer        = {{organizador}{org\adddot}},
-  organizers       = {{organizadores}{orgs\adddot}},
-  byorganizer      = {{organizado por}{org\adddotspace por}},
   byauthor         = {{por}{por}},
   byeditor         = {{editado por}{ed\adddotspace por}},
   bycompiler       = {{compilado por}{comp\adddotspace por}},
   byredactor       = {{redigido por}{red\adddotspace por}},
   byreviser        = {{revisto por}{rev\adddotspace por}},
-  byreviewer       = {{resenhado por}{res\adddotspace por}},% FIXME: check
+  byreviewer       = {{avaliado por}{aval\adddotspace por}},
   byfounder        = {{fundado por}{fund\adddotspace por}},
   bycontinuator    = {{continuado por}{cont\adddotspace por}},
-  bycollaborator   = {{em colabora\c{c}\~ao com}{em col\adddotspace com}},
+  bycollaborator   = {{em colabora\c{a}\~o com}{em col\adddotspace com}},
   bytranslator     = {{traduzido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}},
-  bycommentator    = {{comentado por}{coment\adddot\ por}},
-  byannotator      = {{notas de}{notas de}},
+  bycommentator    = {{comentado por}{com\adddot\ por}},
+  byannotator      = {{notas de}{not\adddot\ de}},
   withcommentator  = {{com coment\'arios de}{com coment\adddot\ de}},
   withannotator    = {{com notas de}{com notas de}},
   withintroduction = {{com introdu\c{c}\~ao de}{com introd\adddot\ de}},
@@ -269,7 +266,7 @@
   byeditortr       = {{editado e traduzido \lbx@lfromlang\ por}%
                       {ed\adddotspace e trad\adddot\ \lbx@sfromlang\ por}},
   byeditorco       = {{editado e comentado por}%
-                      {ed\adddotspace e coment\adddot\ por}},
+                      {ed\adddotspace e com\adddot\ por}},
   byeditoran       = {{editado e anotado por}%
                       {ed\adddotspace e anot\adddot\ por}},
   byeditorin       = {{editado e introduzido por}%
@@ -279,7 +276,7 @@
   byeditoraf       = {{editado e posfaciado por}%
                       {ed\adddotspace e posf\adddot\ por}},
   byeditortrco     = {{editado, traduzido \lbx@lfromlang\ e comentado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e coment\adddot\ por}},
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
   byeditortran     = {{editado, traduzido \lbx@lfromlang\ e anotado por}%
                       {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
   byeditortrin     = {{editado, traduzido \lbx@lfromlang\ e introduzido por}%
@@ -289,11 +286,11 @@
   byeditortraf     = {{editado, traduzido \lbx@lfromlang\ e posfaciado por}%
                       {ed.,\addabbrvspace trad. \lbx@sfromlang\ e posf\adddot\ por}},
   byeditorcoin     = {{editado, comentado e introduzido por}%
-                      {ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}},
+                      {ed.,\addabbrvspace com\adddot\ e introd\adddot\ por}},
   byeditorcofo     = {{editado, comentado e prefaciado por}%
-                      {ed.,\addabbrvspace coment\adddot\ e pref\adddot\ por}},
+                      {ed.,\addabbrvspace com\adddot\ e pref\adddot\ por}},
   byeditorcoaf     = {{editado, comentado e posfaciado por}%
-                      {ed.,\addabbrvspace coment\adddot\ e posf\adddot\ por}},
+                      {ed.,\addabbrvspace com\adddot\ e posf\adddot\ por}},
   byeditoranin     = {{editado, anotado e introduzido por}%
                       {ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}},
   byeditoranfo     = {{editado, anotado e prefaciado por}%
@@ -301,11 +298,11 @@
   byeditoranaf     = {{editado, anotado e posfaciado por}%
                       {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}},
   byeditortrcoin   = {{editado, traduzido \lbx@lfromlang, comentado e introduzido por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e introd\adddot\ por}},
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
   byeditortrcofo   = {{editado, traduzido \lbx@lfromlang, comentado e prefaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e pref\adddot\ por}},
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
   byeditortrcoaf   = {{editado, traduzido \lbx@lfromlang, comentado e posfaciado por}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, coment\adddot\ e posf\adddot\ por}},
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
   byeditortranin   = {{editado, traduzido \lbx@lfromlang, anotado e introduzido por}%
                       {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
   byeditortranfo   = {{editado, traduzido \lbx@lfromlang, anotado e prefaciado por}%
@@ -313,7 +310,7 @@
   byeditortranaf   = {{editado, traduzido \lbx@lfromlang, anotado e posfaciado por}%
                       {ed.,\addabbrvspace trad\adddot\ \lbx@sfromlang, anot\adddot\ e posf\adddot\ por}},
   bytranslatorco   = {{traduzido \lbx@lfromlang\ e comentado por}%
-                      {trad\adddot\ \lbx@sfromlang\ e coment\adddot\ por}},
+                      {trad\adddot\ \lbx@sfromlang\ e com\adddot\ por}},
   bytranslatoran   = {{traduzido \lbx@lfromlang\ e anotado por}%
                       {trad\adddot\ \lbx@sfromlang\ e anot\adddot\ por}},
   bytranslatorin   = {{traduzido \lbx@lfromlang\ e introduzido por}%
@@ -323,11 +320,11 @@
   bytranslatoraf   = {{traduzido \lbx@lfromlang\ e posfaciado por}%
                       {trad\adddot\ \lbx@sfromlang\ e posf\adddot\ por}},
   bytranslatorcoin = {{traduzido \lbx@lfromlang, comentado e introduzido por}%
-                      {trad\adddot\ \lbx@sfromlang, coment\adddot\ e introd\adddot\ por}},
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e introd\adddot\ por}},
   bytranslatorcofo = {{traduzido \lbx@lfromlang, comentado e prefaciado por}%
-                      {trad\adddot\ \lbx@sfromlang, coment\adddot\ e pref\adddot\ por}},
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e pref\adddot\ por}},
   bytranslatorcoaf = {{traduzido \lbx@lfromlang, comentado e posfaciado por}%
-                      {trad\adddot\ \lbx@sfromlang, coment\adddot\ e posf\adddot\ por}},
+                      {trad\adddot\ \lbx@sfromlang, com\adddot\ e posf\adddot\ por}},
   bytranslatoranin = {{traduzido \lbx@lfromlang, anotado e introduzido por}%
                       {trad\adddot\ \lbx@sfromlang, anot\adddot\ e introd\adddot\ por}},
   bytranslatoranfo = {{traduzido \lbx@lfromlang, anotado e prefaciado por}%
@@ -355,36 +352,24 @@
   translationof    = {{tradu\c{c}\~ao de}{trad\adddotspace de}},% FIXME: check
   translationas    = {{traduzido como}{trad\adddotspace como}},% FIXME: check
   translationfrom  = {{traduzido do}{trad\adddotspace do}},% FIXME: check
-  reviewof         = {{resenha de}{res\adddotspace de}},% FIXME: check
+  reviewof         = {{avaliação de}{aval\adddotspace de}},
   origpubas        = {{originalmente publicado como}{orig\adddotspace pub\adddotspace como}},% FIXME: check
   origpubin        = {{originalmente publicado em}{orig\adddotspace pub\adddotspace em}},% FIXME: check
   astitle          = {{como}{como}},% FIXME: check
   bypublisher      = {{por}{por}},% FIXME: check
-  nodate           = {{sem data}{s\adddot d\adddot}},% FIXME: latin: sine die
   page             = {{p\'agina}{p\adddot}},
   pages            = {{p\'aginas}{pp\adddot}},
   column           = {{coluna}{col\adddot}},
   columns          = {{colunas}{cols\adddot}},
   line             = {{linha}{l\adddot}},
   lines            = {{linhas}{ll\adddot}},% FIXME: check
+  nodate           = {{sem data}{s\adddot d\adddot}},% FIXME: latin: sine die
   verse            = {{verso}{v\adddot}},
   verses           = {{versos}{vv\adddot}},% FIXME: check
   section          = {{se\c{c}\~ao}{\S}},
   sections         = {{se\c{c}\~oes}{\S\S}},
   paragraph        = {{par\'agrafo}{par\adddot}},
-  paragraphs       = {{par\'agrafo}{par\adddot}},
-  pagetotal        = {{p\'agina}{p\adddot}},
-  pagetotals       = {{p\'aginas}{pp\adddot}},
-  columntotal      = {{coluna}{col\adddot}},
-  columntotals     = {{colunas}{cols\adddot}},
-  linetotal        = {{linha}{l\adddot}},
-  linetotals       = {{linhas}{ll\adddot}},% FIXME: check
-  versetotal       = {{verso}{v\adddot}},
-  versetotals      = {{versos}{vv\adddot}},% FIXME: check
-  sectiontotal     = {{se\c{c}\~ao}{\S}},
-  sectiontotals    = {{se\c{c}\~oes}{\S\S}},
-  paragraphtotal   = {{par\'agrafo}{par\adddot}},
-  paragraphtotals  = {{par\'agrafo}{par\adddot}},
+  paragraphs       = {{par\'agrafo}{pars\adddot}},
   in               = {{em}{em}},
   inseries         = {{em}{em}},
   ofseries         = {{de}{de}},
@@ -402,13 +387,12 @@
   url              = {{URL}{URL}},
   urlfrom          = {{URL}{URL}},
   urlseen          = {{acedido em}{acedido em}},
-  inpreparation    = {{em prepara\c{c}\~ao}{em prep\adddot}},
+  inpreparation    = {{em preparação}{em prep\adddot}},
   submitted        = {{submetido}{subm\adddot}},
   forthcoming      = {{no prelo}{no prelo}},
   inpress          = {{no prelo}{no prelo}},
-  prepublished     = {{pr\'e publicado}{pr\'e pub\adddot}},% FIXME: check
+  prepublished     = {{pr\'e publicada}{pr\'e pub\adddot}},
   citedas          = {{doravante citado como}{doravante citado como}},
-  thiscite         = {{especialmente}{esp\adddot}},% FIXME: check
   seenote          = {{ver nota}{ver nota}},
   quotedin         = {{apud}{apud}},
   idem             = {{idem}{idem}},
@@ -444,66 +428,58 @@
   december         = {{dezembro}{dez\adddot}},
   langamerican     = {{ingl\^es}{ingl\^es}},
   langbrazilian    = {{portugu{\^e}s}{portugu{\^e}s}},
-  langbulgarian    = {{b\'ulgaro}{b\'ulgaro}},
   langcatalan      = {{catal\~ao}{catal\~ao}},
   langcroatian     = {{croata}{croata}},
   langczech        = {{checo}{checo}},
   langdanish       = {{dinamarqu\^es}{dinamarqu\^es}},
   langdutch        = {{holand{\^e}s}{holand{\^e}s}},
   langenglish      = {{ingl\^es}{ingl\^es}},
-  langestonian     = {{est\'onio}{est\'onio}},% FIXME: check
+  langestonian     = {{estoniano}{estoniano}},
   langfinnish      = {{finland\^es}{finland\^es}},
   langfrench       = {{franc\^es}{franc\^es}},
-  langgalician     = {{galego}{galego}},
   langgerman       = {{alem\~ao}{alem\~ao}},
   langgreek        = {{grego}{grego}},
   langitalian      = {{italiano}{italiano}},
-  langjapanese     = {{japon\^es}{japon\^es}},
   langlatin        = {{latim}{latim}},
   langnorwegian    = {{noruegu\^es}{noruegu\^es}},
   langpolish       = {{polaco}{polaco}},
   langportuguese   = {{portugu{\^e}s}{portugu{\^e}s}},
   langrussian      = {{russo}{russo}},
-  langslovak       = {{eslovaco}{eslovaco}},
   langslovene      = {{esloveno}{esloveno}},
   langspanish      = {{espanhol}{espanhol}},
   langswedish      = {{sueco}{sueco}},
   fromamerican     = {{do ingl\^es}{do ingl\^es}},
   frombrazilian    = {{do portugu{\^e}s}{do portugu{\^e}s}},
-  frombulgarian    = {{do b\'ulgaro}{do b\'ulgaro}},
   fromcatalan      = {{do catal\~ao}{do catal\~ao}},
   fromcroatian     = {{do croata}{do croata}},
   fromczech        = {{do checo}{do checo}},
   fromdanish       = {{do dinamarqu\^es}{do dinamarqu\^es}},
   fromdutch        = {{do holand{\^e}s}{do holand{\^e}s}},
   fromenglish      = {{do ingl\^es}{do ingl\^es}},
-  fromestonian     = {{do est\'onio}{do est\'onio}},% FIXME: check
+  fromestonian     = {{da est\'onia}{da est\'onia}},
   fromfinnish      = {{do finland\^es}{do finland\^es}},
   fromfrench       = {{do franc\^es}{do franc\^es}},
-  fromgalician     = {{do galego}{do galego}},
   fromgerman       = {{do alem\~ao}{do alem\~ao}},
   fromgreek        = {{do grego}{do grego}},
   fromitalian      = {{do italiano}{do italiano}},
-  fromjapanese     = {{do japon\^es}{do japon\^es}},
   fromlatin        = {{do latim}{do latim}},
   fromnorwegian    = {{do noruegu\^es}{do noruegu\^es}},
   frompolish       = {{do polaco}{do polaco}},
   fromportuguese   = {{do portugu{\^e}s}{do portugu{\^e}s}},
   fromrussian      = {{do russo}{do russo}},
-  fromslovak       = {{do eslovaco}{do eslovaco}},
   fromslovene      = {{do esloveno}{do esloveno}},
   fromspanish      = {{do espanhol}{do espanhol}},
   fromswedish      = {{do sueco}{do sueco}},
   countryde        = {{Alemanha}{DE}},% FIXME: abbrev.: ISO 3166 or translated?
   countryeu        = {{Uni\~ao Europeia}{EU}},% FIXME: abbrev.: ISO 3166 or translated?
-  countryep        = {{Uni\~ao Europeia}{EP}},% FIXME: check
+% countryep        = {{}{}},% FIXME: missing https://en.wikipedia.org/wiki/ISO_3166-1
   countryfr        = {{Fran\c{c}a}{FR}},% FIXME: abbrev.: ISO 3166 or translated?
   countryuk        = {{Reino Unido}{GB}},% FIXME: abbrev.: ISO 3166 or translated?
   countryus        = {{Estados Unidos da Am\'erica}{US}},% FIXME: abbrev.: ISO 3166 or translated?
   patent           = {{patente}{pat\adddot}},
   patentde         = {{patente alem\~a}{pat\adddot\ alem\~a}},
   patenteu         = {{patente europeia}{pat\adddot\ europeia}},
-  patentfr         = {{patente francesa}{pat\adddot\ francesa}},
+  patentfr         = {{patente francesa}{pat\adddot francesa}},
   patentuk         = {{patente brit\^anica}{pat\adddot\ brit\^anica}},
   patentus         = {{patente americana}{pat\adddot\ americana}},
   patreq           = {{pedido de patente}{ped\adddot\ de pat\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
index d8b3832f4aa..0c1bde1261a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
@@ -273,9 +273,6 @@
                       {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
   translatorsanaf  = {{переводчики, авторы комментариев и послесловия}%
                       {пер.,\addabbrvspace авт\adddotspace коммент\adddotspace и послесл\adddot}},
-  organizer        = {{организатор}{орг\adddot}},
-  organizers       = {{организаторы}{орг\adddot}},
-  byorganizer      = {{организатор}{орг\adddot}},% FIXME: unsure
   byauthor         = {{}{}},
   byeditor         = {{под редакцией}{под\addabbrvspace ред\adddot}},
   bycompiler       = {{составитель}{сост\adddot}},
@@ -389,31 +386,19 @@
                       {перв\adddotspace публ\adddotspace в}},
   astitle          = {{\addcolon}{\addcolon}},% FIXME: unsure
   bypublisher      = {{\addcomma}{\addcomma}},% FIXME: unsure
-  nodate           = {{б\adddot г\adddot}{б\adddot г\adddot}},
   page             = {{страница}{с\adddot}},
   pages            = {{страницы}{с\adddot}},
   column           = {{колонка}{кол\adddot}},
   columns          = {{колонки}{кол\adddot}},
   line             = {{строка}{строка}},
   lines            = {{строки}{строка}},
+  nodate           = {{б\adddot г\adddot}{б\adddot г\adddot}},
   verse            = {{стих}{стих}},
   verses           = {{стихи}{стихи}},
   section          = {{параграф}{\S}},
   sections         = {{параграфы}{\S\S}},
   paragraph        = {{абзац}{абз\adddot}},
   paragraphs       = {{абзацы}{абз\adddot}},
-  pagetotal        = {{страница}{с\adddot}},
-  pagetotals       = {{страницы}{с\adddot}},
-  columntotal      = {{колонка}{кол\adddot}},
-  columntotals     = {{колонки}{кол\adddot}},
-  linetotal        = {{строка}{строка}},    
-  linetotals       = {{строки}{строка}},    
-  versetotal       = {{стих}{стих}},        
-  versetotals      = {{стихи}{стихи}},      
-  sectiontotal     = {{параграф}{\S}},      
-  sectiontotals    = {{параграфы}{\S\S}},   
-  paragraphtotal   = {{абзац}{абз\adddot}}, 
-  paragraphtotals  = {{абзацы}{абз\adddot}},
   in               = {{в}{в}},
   inseries         = {{в}{в}},
   ofseries         = {{из}{из}},
@@ -488,7 +473,6 @@
   datedecember     = {{декабря}{дек\adddot}},
   langamerican     = {{американский}{амер\adddot}},
   langbrazilian    = {{бразильский}{браз\adddot}},
-  langbulgarian    = {{болгарский}{болг\adddot}},
   langcatalan      = {{каталонский}{катал\adddot}},
   langcroatian     = {{хорватский}{хорв\adddot}},
   langczech        = {{чешский}{чеш\adddot}},
@@ -498,7 +482,6 @@
   langestonian     = {{эстонский}{эст\adddot}},
   langfinnish      = {{финский}{фин\adddot}},
   langfrench       = {{французский}{фр\adddot}},
-  langgalician     = {{галисийский}{гал\adddot}},
   langgerman       = {{немецкий}{нем\adddot}},
   langgreek        = {{греческий}{греч\adddot}},
   langitalian      = {{итальянский}{итал\adddot}},
@@ -511,10 +494,8 @@
   langslovene      = {{словенский}{слов\adddot}},
   langspanish      = {{испанский}{исп\adddot}},
   langswedish      = {{шведский}{швед\adddot}},
-  langukrainian    = {{украинский}{укр\adddot}},
   fromamerican     = {{с американского}{с\addabbrvspace амер\adddot}},
   frombrazilian    = {{с бразильского}{с\addabbrvspace браз\adddot}},
-  frombulgarian    = {{с болгарского}{с\addabbrvspace болг\adddot}},
   fromcatalan      = {{с каталонского}{с\addabbrvspace катал\adddot}},
   fromcroatian     = {{с хорватского}{с\addabbrvspace хорв\adddot}},
   fromczech        = {{с чешского}{с\addabbrvspace чеш\adddot}},
@@ -524,7 +505,6 @@
   fromestonian     = {{с эстонского}{с\addabbrvspace эст\adddot}},
   fromfinnish      = {{с финского}{с\addabbrvspace фин\adddot}},
   fromfrench       = {{с французского}{с\addabbrvspace фр\adddot}},
-  fromgalician     = {{c галисийского}{c\addabbrvspace гал\adddot}},
   fromgerman       = {{с немецкого}{с\addabbrvspace нем\adddot}},
   fromgreek        = {{с греческого}{с\addabbrvspace греч\adddot}},
   fromitalian      = {{с итальянского}{с\addabbrvspace итал\adddot}},
@@ -537,7 +517,6 @@
   fromslovene      = {{со словенского}{со\addabbrvspace слов\adddot}},
   fromspanish      = {{с испанского}{с\addabbrvspace исп\adddot}},
   fromswedish      = {{со шведского}{со\addabbrvspace швед\adddot}},
-  fromukrainian    = {{с украинского}{с\addabbrvspace укр\adddot}},
   countryde        = {{Германия}{Германия}},
   countryeu        = {{Европейский Союз}{ЕС}},
   countryep        = {{Европейский Союз}{ЕС}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx
index a30ec7018bc..4cb194af110 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovak.lbx
@@ -34,8 +34,8 @@
       {}
       {\mkmonthzeros{\thefield{#2}}%
        \iffieldundef{#1}
-         {}
-         {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
+	       {}
+	       {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
           \iffieldbibstring{#1}
             {\bibstring{\thefield{#1}}}
             {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
@@ -266,9 +266,6 @@
                       {prekl., anot\adddot\ a dosl\adddot}},
   translatorsanaf  = {{prekladatelia, anot\'{a}tori\ a doslov}%
                       {prekl., anot\adddot\ a dosl\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{}%
                       {}},
   byeditor         = {{editovan\'{e}}%
@@ -306,7 +303,7 @@
   byeditoran       = {{editovan\'{e} a anotovan\'{e}}%
                       {ed\adddotspace a anot\adddot\ }},
   byeditorin       = {{editovan\'{e}, s\addnbspace \'{u}vodom}%
-                      {ed.,\addabbrvspace s\addnbspace \'{u}v\adddot}},
+                      {ed.,\addabbrvspace s\addnbspace \'{u}v\addot}},
   byeditorfo       = {{editovan\'{e}, s\addnbspace predhovorom}%
                       {ed.,\addabbrvspace s\addnbspace predh.,}},
   byeditoraf       = {{editovan\'{e}, s\addnbspace doslovom}%
@@ -316,31 +313,31 @@
   byeditortran     = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}}%
                       {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a anot\adddot\ }},
   byeditortrin     = {{editovan\'{e} a prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace \'{u}vodom}%
-                      {ed\adddotspace a prel\adddot\ \lbx@sfromlang, s\addnbspace \'{u}v\adddot}},
+                      {ed\adddotspace a prel\adddot\ \lbx@sfromlang, s\addnbspace \'{u}v\addot}},
   byeditortrfo     = {{editovan\'{e} a prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace predhovorom}%
                       {ed\adddotspace a prel\adddot\ \lbx@sfromlang, s\addnbspace predh\adddot}},
   byeditortraf     = {{editovan\'{e} a prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace doslovom}%
                       {ed\adddotspace a prekl\adddot\ \lbx@sfromlang, s\addnbspace dosl\adddot}},
   byeditorcoin     = {{editovan\'{e} a komentovan\'{e}, s\addnbspace \'{u}vodom}%
-                      {ed\adddotspace a kom., s\addnbspace \'{u}v\adddot}},
+                      {ed\adddotspace a kom., s\addnbspace \'{u}v\addot}},
   byeditorcofo     = {{editovan\'{e} a komentovan\'{e}, s\addnbspace predhovorom}%
                       {ed\adddotspace a kom., s\addnbspace predh\adddot}},
   byeditorcoaf     = {{editovan\'{e} a komentovan\'{e}, s\addnbspace doslovom}%
                       {ed\adddotspace a kom., s\addnbspace dosl\adddot}},
   byeditoranin     = {{editovan\'{e} a anotovan\'{e}, s\addnbspace \'{u}vodom}%
-                      {ed\adddotspace a anot., s\addnbspace \'{u}v\adddot}},
+                      {ed\adddotspace a anot., s\addnbspace \'{u}v\addot}},
   byeditoranfo     = {{editovan\'{e} a anotovan\'{e}, s\addnbspace predhovorom}%
                       {ed\adddotspace a anot., s\addnbspace predh\adddot}},
   byeditoranaf     = {{editovan\'{e} a anotovan\'{e}, s\addnbspace doslovom}%
                       {ed\adddotspace a anot., s\addnbspace dosl\adddot}},
   byeditortrcoin   = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace \'{u}vodom}%
-                      {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace \'{u}v\adddot}},
+                      {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace \'{u}v\addot}},
   byeditortrcofo   = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace predhovorom}%
                       {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace predh\adddot}},
   byeditortrcoaf   = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace doslovom}%
                       {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace dosl\adddot}},
   byeditortranin   = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace \'{u}vodom}%
-                      {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a anot\adddot, s\addnbspace \'{u}v\adddot}},
+                      {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a anot\adddot, s\addnbspace \'{u}v\addot}},
   byeditortranfo   = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace predhovorom}%
                       {ed.,\addabbrvspace prel\adddot\ \lbx@sfromlang\ a anot\adddot, s\addnbspace predh\adddot}},
   byeditortranaf   = {{editovan\'{e}, prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace doslovom}%
@@ -350,19 +347,19 @@
   bytranslatoran   = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}}%
                       {prel\adddot\ \lbx@sfromlang\ a anot\adddot}},
   bytranslatorin   = {{prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace \'{u}vodom}%
-                      {prel\adddot\ \lbx@sfromlang, s\addnbspace \'{u}v\adddot}},
+                      {prel\adddot\ \lbx@sfromlang, s\addnbspace \'{u}v\addot}},
   bytranslatorfo   = {{prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace predhovorom}%
                       {prel\adddot\ \lbx@sfromlang, s\addnbspace predh\adddot}},
   bytranslatoraf   = {{prelo\v{z}en\'{e} \lbx@lfromlang, s\addnbspace doslovom}%
                       {prel\adddot\ \lbx@sfromlang, s\addnbspace dosl\adddot}},
   bytranslatorcoin = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace \'{u}vodom}%
-                      {prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace \'{u}v\adddot}},
+                      {prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace \'{u}v\addot}},
   bytranslatorcofo = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace predhovorom}%
                       {prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace predh\adddot}},
   bytranslatorcoaf = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a komentovan\'{e}, s\addnbspace doslovom}%
                       {prel\adddot\ \lbx@sfromlang\ a kom., s\addnbspace dosl\adddot}},
   bytranslatoranin = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace \'{u}vodom}%
-                      {prel\adddot\ \lbx@sfromlang\ a anot., s\addnbspace \'{u}v\adddot}},
+                      {prel\adddot\ \lbx@sfromlang\ a anot., s\addnbspace \'{u}v\addot}},
   bytranslatoranfo = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace predhovorom}%
                       {prel\adddot\ \lbx@sfromlang\ a anot., s\addnbspace predh\adddot}},
   bytranslatoranaf = {{prelo\v{z}en\'{e} \lbx@lfromlang\ a anotovan\'{e}, s\addnbspace doslovom}%
@@ -392,7 +389,7 @@
   newseries        = {{nov\'{a} ed\'{i}cia}%          % ISO 690 -- section 2.17
                       {n\adddotspace ed\adddot}},
   oldseries        = {{star\'{a} ed\'{i}cia}%         % ISO 690 -- section 2.17
-                      {st\adddotspace ed\adddot}},
+                      {st\adddotspace ed\addot}},
   edition          = {{vydanie}%
                       {vyd\adddot}},
   reprint          = {{dotla\v{c}}%
@@ -563,7 +560,6 @@
                       {am\adddot angl\adddot}},
   langbrazilian    = {{braz\'{i}lska portugal\v{c}ina}%
                       {braz\adddot portugal\adddot}},
-% langbulgarian    = {{}{}},% FIXME: missing
   langcatalan      = {{katal\'{a}n\v{c}ina}%
                       {katal\adddot}},
   langcroatian     = {{chorv\'{a}t\v{c}ina}%
@@ -576,13 +572,11 @@
                       {hol\adddot}},
   langenglish      = {{angli\v{c}tina}%
                       {angl\adddot}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{f\'{i}n\v{c}ina}%
                       {f\'{i}n\adddot}},
   langfrench       = {{franc\'{u}z\v{s}tina}%
                       {franc\adddot}},
-  langgalician     = {{gal\'icij\v{c}ina}%
-                      {gal\adddot}},
   langgerman       = {{nem\v{c}ina}%
                       {nem\adddot}},
   langgreek        = {{gr\'{e}\v{c}tina}%
@@ -613,7 +607,6 @@
                       {z\addnbspace amer\adddot angl\adddot}},
   frombrazilian    = {{z\addnbspace braz\'{i}lskej portugal\v{c}iny}%
                       {z\addnbspace braz\adddotspace portugal\adddot}},
-% frombulgarian    = {{}{}},% FIXME: missing
   fromcatalan      = {{z\addnbspace katal\'{a}n\v{c}iny}%
                       {z\addnbspace katal\adddot}},
   fromcroatian     = {{z\addnbspace chorvat\v{c}iny}%
@@ -626,13 +619,11 @@
                       {z\addnbspace hol\adddot}},
   fromenglish      = {{z\addnbspace angli\v{c}tiny}%
                       {z\addnbspace angl\adddot}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{z\addnbspace f\'{i}n\v{c}iny}%
                       {z\addnbspace f\'{i}n\adddot}},
   fromfrench       = {{z\addnbspace franc\'{u}z\v{s}tiny}%
                       {z\addnbspace franc\adddot}},
-  fromgalician     = {{z\addnbspace gal\'icij\v{c}ina}%
-                      {z\addbnspace gal\adddot}},
   fromgerman       = {{z\addnbspace nem\v{c}iny}%
                       {z\addnbspace nem\adddot}},
   fromgreek        = {{z\addnbspace gr\'{e}\v{c}tiny}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx
index e165cd6dc73..1eb41919233 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/slovene.lbx
@@ -1,7 +1,7 @@
 \ProvidesFile{slovene.lbx}
 [\abx@lbxid]
 
-\DeclareRedundantLanguages{slovene}{slovene,slovenian}
+\DeclareRedundantLanguages{slovene}{slovene}
 
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}%
@@ -243,9 +243,6 @@
                       {avt\adddotspace prev\adddotspace, opomb in spr\adddotspace b\adddot}},
   translatorsanaf  = {{avtorji prevoda, opomb in spremne besede}%
                       {avt\adddotspace prev\adddotspace, opomb in spr\adddotspace b\adddot}},
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{}{}},
   byeditor         = {{uredil}{ur\adddot}},% FIXME: unsure
   bycompiler       = {{sestavil}{sest\adddot}},% FIXME: unsure
@@ -357,31 +354,19 @@
   origpubin        = {{izvirno izdano v}{izvirno izdano v}},
   astitle          = {{}{}},
   bypublisher      = {{}{}},
-  nodate           = {{brez datuma}{b\adddot d\adddot}},
   page             = {{stran}{str\adddot}},
   pages            = {{strani}{str\adddot}},
   column           = {{stolpec}{st\adddot}},
   columns          = {{stolpci}{st\adddot}},
   line             = {{vrstica}{v\adddot}},
   lines            = {{vrstice}{v\adddot}},
+  nodate           = {{brez datuma}{b\adddot d\adddot}},
   verse            = {{verz}{v\adddot}},
   verses           = {{verzi}{v\adddot}},
   section          = {{razdelek}{\S}},
   sections         = {{razdelek}{\S\S}},
   paragraph        = {{odstavek}{odstavek}},
   paragraphs       = {{odstavki}{odstavki}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{v}{v}},
   inseries         = {{v zbirki}{v zbirki}},
   ofseries         = {{iz zbirke}{iz zbirke}},
@@ -389,7 +374,7 @@
   chapter          = {{poglavje}{pogl\adddot}},
   mathesis         = {{Magistrsko delo}{Magistrsko delo}},
   phdthesis        = {{Doktorska disertacija}{Doktorska disertacija}},
-% candthesis       = {{Candidate thesis}{Cand\adddotspace thesis}},% FIXME: don't know
+  %candthesis       = {{Candidate thesis}{Cand\adddotspace thesis}},% FIXME: don't know
   resreport        = {{Raziskovalno poro\v{c}ilo}{Razisk\adddotspace poro\v{c}ilo}},
   techreport       = {{Tehni\v{c}no poro\v{c}ilo}{Teh\adddotspace poro\v{c}ilo}},
   software         = {{Ra\v{c}unalni\v{s}ki program}{Ra\v{c}\adddotspace prog\adddot}},
@@ -417,12 +402,12 @@
   idempn           = {{ista}{id\adddot}},
   idempp           = {{isti}{id\adddot}},
   ibidem           = {{prav tam}{ibid\adddot}},
-% opcit            = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},% FIXME: don't know
-% loccit           = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},% FIXME: don't know
+  %opcit            = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},% FIXME: don't know
+  %loccit           = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},% FIXME: don't know
   confer           = {{primerjaj}{prim\adddot}},
-% sequens          = {{sq\adddot}{sq\adddot}},% FIXME: don't know
-% sequentes        = {{sqq\adddot}{sqq\adddot}},% FIXME: don't know
-% passim           = {{passim}{pass\adddot}},% FIXME: don't know
+  %sequens          = {{sq\adddot}{sq\adddot}},% FIXME: don't know
+  %sequentes        = {{sqq\adddot}{sqq\adddot}},% FIXME: don't know
+  %passim           = {{passim}{pass\adddot}},% FIXME: don't know
   see              = {{glej}{gl\adddot}},
   seealso          = {{glej tudi}{gl\adddotspace tudi}},
   backrefpage      = {{citirano na strani}{cit\adddotspace na str\adddot}},
@@ -441,17 +426,15 @@
   december         = {{december}{dec\adddot}},
   langamerican     = {{angle\v{s}\v{c}ina}{angl\adddot}},
   langbrazilian    = {{brazil\v{s}\v{c}ina}{braz\adddot}},
-% langbulgarian    = {{}{}},% FIXME: missing
   langcatalan      = {{katalon\v{s}\v{c}ina}{kat\adddot}},
   langcroatian     = {{hrva\v{s}\v{c}ina}{hrv\adddot}},
   langczech        = {{\v{c}e\v{s}\v{c}ina}{\v{c}e\v{s}\adddot}},
   langdanish       = {{dan\v{s}\v{c}ina}{dan\adddot}},
   langdutch        = {{nizozem\v{s}\v{c}ina}{niz\adddot}},
   langenglish      = {{angle\v{s}\v{c}ina}{angl\adddot}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{fin\v{s}\v{c}ina}{fin\adddot}},
   langfrench       = {{franco\v{s}\v{c}ina}{fr\adddot}},
-  langgalician     = {{galicij\v{s}\v{c}ina}{gal\adddot}},
   langgerman       = {{nem\v{s}\v{c}ina}{nem\adddot}},
   langgreek        = {{gr\v{s}\v{c}ina}{gr\adddot}},
   langitalian      = {{italijan\v{s}\v{c}ina}{it\adddot}},
@@ -465,17 +448,15 @@
   langswedish      = {{\v{s}ved\v{s}\v{c}ina}{\v{s}ved\adddot}},
   fromamerican     = {{iz angle\v{s}\v{c}ine}{iz angl\adddot}},
   frombrazilian    = {{iz brazil\v{s}\v{c}ine}{iz braz\adddot}},
-% frombulgarian    = {{}{}},% FIXME: missing
   fromcatalan      = {{iz katalon\v{s}\v{c}ine}{iz kat\adddot}},
   fromcroatian     = {{iz hrva\v{s}\v{c}ine}{iz hrv\adddot}},
   fromczech        = {{iz \v{c}e\v{s}\v{c}ine}{iz \v{c}e\v{s}\adddot}},
   fromdanish       = {{iz dan\v{s}\v{c}ine}{iz dan\adddot}},
   fromdutch        = {{iz nizozem\v{s}\v{c}ine}{iz niz\adddot}},
   fromenglish      = {{iz angle\v{s}\v{c}ine}{iz angl\adddot}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{iz fin\v{s}\v{c}ine}{iz fin\adddot}},
   fromfrench       = {{iz franco\v{s}\v{c}ine}{iz fr\adddot}},
-  fromgalician     = {{iz galicij\v{s}\v{c}ine}{iz gal\adddot}}
   fromgerman       = {{iz nem\v{s}\v{c}ine}{iz nem\adddot}},
   fromgreek        = {{iz gr\v{s}\v{c}ine}{iz gr\adddot}},
   fromitalian      = {{iz italijan\v{s}\v{c}ine}{iz it\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/slovenian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/slovenian.lbx
deleted file mode 100644
index 69214d40324..00000000000
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/slovenian.lbx
+++ /dev/null
@@ -1,7 +0,0 @@
-\ProvidesFile{slovenian.lbx}
-[\abx@lbxid]
-
-\InheritBibliographyExtras{slovene}
-\InheritBibliographyStrings{slovene}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index ffdf2fcae0d..e6fbf676755 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
@@ -179,21 +179,18 @@
   translatorsfo    = {{traducc\'{\i}on \lbx@sfromlang y pr\'{o}logo}{trads\adddotspace \lbx@sfromlang\ y pr\'{o}l\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y pr\'{o}logo} instead of {traductores \lbx@sfromlang y prologuistas} or {traductoras \lbx@sfromlang y prologuistas}
   translatoraf     = {{traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo}{trad\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo} instead of {traductor \lbx@sfromlang y epiloguista} or {traductora \lbx@sfromlang y epiloguista}
   translatorsaf    = {{traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo}{trads\adddotspace \lbx@sfromlang\ y ep\'{\i}l\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang y ep\'{\i}logo} instead of {traductores \lbx@sfromlang y epiloguistas} or {traductoras \lbx@sfromlang y epiloguistas}
-  translatorcoin   = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario}{trad\adddotspace \lbx@sfromlang, intr\adddotspace y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario} instead of {traductor \lbx@sfromlang, introducci\'{o}n y comentario} or {traductora \lbx@sfromlang, introducci\'{o}n y comentario}
-  translatorscoin  = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios}{trads\adddotspace \lbx@sfromlang, intr\adddotspace y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, introducci\'{o}n y comentarios} or {traductoras \lbx@sfromlang, introducci\'{o}n y comentarios}
-  translatorcofo   = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y comentario}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario} instead of {traductor \lbx@sfromlang, pr\'{o}logo y comentario} or {traductora \lbx@sfromlang, pr\'{o}logo y comentario}
-  translatorscofo  = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y comentarios}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, pr\'{o}logo y comentarios} or {traductoras \lbx@sfromlang, pr\'{o}logo y comentarios}
-  translatorcoaf   = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y comentario}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductor \lbx@sfromlang, ep\'{\i}logo y comentario} or {traductora \lbx@sfromlang, ep\'{\i}logo y comentario}
-  translatorscoaf  = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y comentarios}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, ep\'{\i}logo y comentarios} or {traductoras \lbx@sfromlang, ep\'{\i}logo y comentarios}
-  translatoranin   = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{trad\adddotspace \lbx@sfromlang, intr\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {traductor \lbx@sfromlang, introducci\'{o}n y notas} or {traductora \lbx@sfromlang, introducci\'{o}n y notas}
-  translatorsanin  = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{trads\adddotspace \lbx@sfromlang, intr\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {traductores \lbx@sfromlang, introducci\'{o}n y notas} or {traductoras \lbx@sfromlang, introducci\'{o}n y notas}
-  translatoranfo   = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {traductor \lbx@sfromlang, pr\'{o}logo y notas} or {traductora \lbx@sfromlang, pr\'{o}logo y notas}
-  translatorsanfo  = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {traductores \lbx@sfromlang, pr\'{o}logo y notas} or {traductoras \lbx@sfromlang, pr\'{o}logo y notas}
-  translatoranaf   = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {traductor \lbx@sfromlang, ep\'{\i}logo y notas} or {traductora \lbx@sfromlang, ep\'{\i}logo y notas}
-  translatorsanaf  = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\adddotspace y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {traductores \lbx@sfromlang, ep\'{\i}logo y notas} or {traductora \lbx@sfromlang, ep\'{\i}logo y notas}
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
+  translatorcoin   = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario}{trad\adddotspace \lbx@sfromlang, intr\addot y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario} instead of {traductor \lbx@sfromlang, introducci\'{o}n y comentario} or {traductora \lbx@sfromlang, introducci\'{o}n y comentario}
+  translatorscoin  = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios}{trads\adddotspace \lbx@sfromlang, intr\addot y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, introducci\'{o}n y comentarios} or {traductoras \lbx@sfromlang, introducci\'{o}n y comentarios}
+  translatorcofo   = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y comentario}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\addot y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentario} instead of {traductor \lbx@sfromlang, pr\'{o}logo y comentario} or {traductora \lbx@sfromlang, pr\'{o}logo y comentario}
+  translatorscofo  = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y comentarios}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\addot y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, pr\'{o}logo y comentarios} or {traductoras \lbx@sfromlang, pr\'{o}logo y comentarios}
+  translatorcoaf   = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y comentario}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\addot y com\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductor \lbx@sfromlang, ep\'{\i}logo y comentario} or {traductora \lbx@sfromlang, ep\'{\i}logo y comentario}
+  translatorscoaf  = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y comentarios}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\addot y coms\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y comentarios} instead of {traductores \lbx@sfromlang, ep\'{\i}logo y comentarios} or {traductoras \lbx@sfromlang, ep\'{\i}logo y comentarios}
+  translatoranin   = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{trad\adddotspace \lbx@sfromlang, intr\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {traductor \lbx@sfromlang, introducci\'{o}n y notas} or {traductora \lbx@sfromlang, introducci\'{o}n y notas}
+  translatorsanin  = {{traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas}{trads\adddotspace \lbx@sfromlang, intr\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, introducci\'{o}n y notas} instead of {traductores \lbx@sfromlang, introducci\'{o}n y notas} or {traductoras \lbx@sfromlang, introducci\'{o}n y notas}
+  translatoranfo   = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{trad\adddotspace \lbx@sfromlang, pr\'{o}l\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {traductor \lbx@sfromlang, pr\'{o}logo y notas} or {traductora \lbx@sfromlang, pr\'{o}logo y notas}
+  translatorsanfo  = {{traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas}{trads\adddotspace \lbx@sfromlang, pr\'{o}l\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, pr\'{o}logo y notas} instead of {traductores \lbx@sfromlang, pr\'{o}logo y notas} or {traductoras \lbx@sfromlang, pr\'{o}logo y notas}
+  translatoranaf   = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{trad\adddotspace \lbx@sfromlang, ep\'{\i}l\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {traductor \lbx@sfromlang, ep\'{\i}logo y notas} or {traductora \lbx@sfromlang, ep\'{\i}logo y notas}
+  translatorsanaf  = {{traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas}{trads\adddotspace \lbx@sfromlang, ep\'{\i}l\addot y anot\adddot}}, %% {traducc\'{\i}on \lbx@sfromlang, ep\'{\i}logo y notas} instead of {traductores \lbx@sfromlang, ep\'{\i}logo y notas} or {traductora \lbx@sfromlang, ep\'{\i}logo y notas}
   byauthor         = {{de}{de}},
   byeditor         = {{editado por}{ed\adddotspace por}},
   bycompiler       = {{compilado por}{comp\adddotspace por}},
@@ -305,31 +302,19 @@
   origpubin        = {{publicado originalmente en}{pub\adddot orig\adddot en}},% FIXME: check
   astitle          = {{con el t\'{\i}tulo}{con el t\'{\i}t\adddot}},% FIXME: check
   bypublisher      = {{por la editorial}{por la ed\adddot}},
-  nodate           = {{sin fecha}{{}s\adddot f\adddot}},
   page             = {{p\'agina}{p\'ag\adddot}},
   pages            = {{p\'aginas}{p\'ags\adddot}},
   column           = {{columna}{col\adddot}},
   columns          = {{columnas}{cols\adddot}},
   line             = {{l\'{\i}nea}{l\adddot}},% FIXME: abbrev. unsure. There is no standard
   lines            = {{l\'{\i}neas}{ll\adddot}},% FIXME: abbrev. unsure. There is no standard
+  nodate           = {{sin fecha}{{}s\adddot f\adddot}},
   verse            = {{verso}{v\adddot}},
   verses           = {{versos}{vv\adddot}},
   section          = {{secci\'{o}}{sec\adddot}},
   sections         = {{secciones}{secs\adddot}},
   paragraph        = {{p\'{a}rrafo}{p\'{a}rr\adddot}},
   paragraphs       = {{p\'{a}rrafos}{p\'{a}rrs\adddot}},
-% pagetotal        = {{}{}},% FIXME: missing
-% pagetotals       = {{}{}},% FIXME: missing
-% columntotal      = {{}{}},% FIXME: missing
-% columntotals     = {{}{}},% FIXME: missing
-% linetotal        = {{}{}},% FIXME: missing
-% linetotals       = {{}{}},% FIXME: missing
-% versetotal       = {{}{}},% FIXME: missing
-% versetotals      = {{}{}},% FIXME: missing
-% sectiontotal     = {{}{}},% FIXME: missing
-% sectiontotals    = {{}{}},% FIXME: missing
-% paragraphtotal   = {{}{}},% FIXME: missing
-% paragraphtotals  = {{}{}},% FIXME: missing
   in               = {{en}{en}},
   inseries         = {{en}{en}},
   ofseries         = {{de}{de}},
@@ -389,17 +374,15 @@
   december         = {{diciembre}{dic\adddot}},
   langamerican     = {{ingl\'{e}s americano}{ingl\'{e}s americano}},
   langbrazilian    = {{brasile\~no}{brasile\~no}},
-% langbulgarian    = {{}{}},% FIXME: missing
   langcatalan      = {{catal\'{a}n}{catal\'{a}n}},
   langcroatian     = {{croata}{croata}},
   langczech        = {{checo}{checo}},
   langdanish       = {{dan\'es}{dan\'es}},
   langdutch        = {{neerland\'es}{neerland\'es}},
   langenglish      = {{ingl\'es}{ingl\'es}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{fin\'{e}s}{fin\'{e}s}},
   langfrench       = {{franc\'es}{franc\'es}},
-  langgalician     = {{gallego}{gallego}},
   langgerman       = {{alem\'an}{alem\'an}},
   langgreek        = {{griego}{griego}},
   langitalian      = {{italiano}{italiano}},
@@ -413,17 +396,15 @@
   langswedish      = {{sueco}{sueco}},
   fromamerican     = {{del ingl\'{e}s americano}{del ingl\'{e}s americano}},
   frombrazilian    = {{del brasile\~no}{del brasile\~no}},
-% frombulgarian    = {{}{}},% FIXME: missing
   fromcatalan      = {{del catal\'{a}n}{del catal\'{a}n}},
   fromcroatian     = {{del croata}{del croata}},
   fromczech        = {{del checo}{del checo}},
   fromdanish       = {{del dan\'es}{del dan\'es}},
   fromdutch        = {{del neerland\'es}{del neerland\'es}},
   fromenglish      = {{del ingl\'es}{del ingl\'es}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{del fin\'{e}s}{del fin\'{e}s}},
   fromfrench       = {{del franc\'es}{del franc\'es}},
-  fromgalician     = {{del gallego}{del gallego}},
   fromgerman       = {{del alem\'an}{del alem\'an}},
   fromgreek        = {{del griego}{del griego}},
   fromitalian      = {{del italiano}{del italiano}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index b9fd68b89e0..6413918075a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
@@ -212,9 +212,6 @@
 % translatorsanfo  = {{}{}},% FIXME: missing
 % translatoranaf   = {{}{}},% FIXME: missing
 % translatorsanaf  = {{}{}},% FIXME: missing
-% organizer        = {{}{}},% FIXME: missing
-% organizers       = {{}{}},% FIXME: missing
-% byorganizer      = {{}{}},% FIXME: missing
   byauthor         = {{av}{av}},
   byeditor         = {{utgiven av}{utg\adddotspace av}},
   bycompiler       = {{sammanst\"alld av}{sammanst\adddotspace av}},
@@ -332,13 +329,13 @@
   origpubin        = {{ursprungligen publicerad}{ursprungligen publ\adddot}},
   astitle          = {{som}{som}},
   bypublisher      = {{av}{av}},
-  nodate           = {{u\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   page             = {{sidan}{s\adddot}},
   pages            = {{sidorna}{s\adddot}},
   column           = {{spalt}{sp\adddot}},
   columns          = {{spalterna}{sp\adddot}},
   line             = {{rad}{r\adddot}},
   lines            = {{raderna}{r\adddot}},
+  nodate           = {{u\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   verse            = {{vers}{v\adddot}},
   verses           = {{verserna}{v\adddot}},
   section          = {{paragraf}{\S}},
@@ -347,18 +344,6 @@
   % more suitable for works referenced by paragraphs
   paragraph        = {{paragraf}{\S}},
   paragraphs       = {{paragraferna}{\S}},
-  pagetotal        = {{sida}{s\adddot}},
-  pagetotals       = {{sidor}{s\adddot}},
-  columntotal      = {{spalt}{sp\adddot}},
-  columntotals     = {{spalter}{sp\adddot}},
-  linetotal        = {{rad}{r\adddot}},
-  linetotals       = {{rader}{r\adddot}},
-  versetotal       = {{vers}{v\adddot}},
-  versetotals      = {{verser}{v\adddot}},
-  sectiontotal     = {{paragraf}{\S}},
-  sectiontotals    = {{paragrafer}{\S}},
-  paragraphtotal   = {{paragraf}{\S}},
-  paragraphtotals  = {{paragrafer}{\S}},
   in               = {{i}{i}},
   inseries         = {{i}{i}},
   ofseries         = {{i}{i}},
@@ -420,17 +405,15 @@
   december         = {{december}{dec\adddot}},
   langamerican     = {{amerikanska}{amerikanska}},
 % langbrazilian    = {{}{}},% FIXME: missing
-% langbulgarian    = {{}{}},% FIXME: missing
   langcatalan      = {{katalanska}{katalanska}},
   langcroatian     = {{kroatiska}{kroatiska}},
   langczech        = {{tjeckiska}{tjeckiska}},
   langdanish       = {{danska}{danska}},
   langdutch        = {{nederl\"andska}{nederl\"andska}},
   langenglish      = {{engelska}{engelska}},
-% langestonian     = {{}{}},% FIXME: missing
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{finska}{finska}},
   langfrench       = {{franska}{franska}},
-  langgalician     = {{galiciska}{galiciska}},
   langgerman       = {{tyska}{tyska}},
   langgreek        = {{grekiska}{grekiska}},
   langitalian      = {{italienska}{italienska}},
@@ -444,17 +427,15 @@
   langswedish      = {{svenska}{svenska}},
   fromamerican     = {{fr\aa n amerikanska}{fr\aa n amerikanska}},
 % frombrazilian    = {{}{}},% FIXME: missing
-% frombulgarian    = {{}{}},% FIXME: missing
   fromcatalan      = {{fr\aa n katalanska}{fr\aa n katalanska}},
   fromcroatian     = {{fr\aa n kroatiska}{fr\aa n kroatiska}},
   fromczech        = {{fr\aa n tjeckiska}{fr\aa n tjeckiska}},
   fromdanish       = {{fr\aa n danska}{fr\aa n danska}},
   fromdutch        = {{fr\aa n nederl\"andska}{fr\aa n nederl\"andska}},
   fromenglish      = {{fr\aa n engelska}{fr\aa n engelska}},
-% fromestonian     = {{}{}},% FIXME: missing
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{fr\aa n finska}{fr\aa n finska}},
   fromfrench       = {{fr\aa n franska}{fr\aa n franska}},
-  fromgalician     = {{fr\aa n galiciska}{fr\aa n galiciska}},
   fromgerman       = {{fr\aa n tyska}{fr\aa n tyska}},
   fromgreek        = {{fr\aa n grekiska}{fr\aa n grekiska}},
   fromitalian      = {{fr\aa n italienska}{fr\aa n italienska}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx
index f82ad9b0570..3ed0714388d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swissgerman.lbx
@@ -5,7 +5,7 @@
 
 % Swiss time sep is a dot
 \DeclareBibliographyExtras{%
-  \protected\def\bibtimesep{.}%
+  \protected\def\bibtimesep{.}
 }
 
 % One point where Swiss German spelling
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx
deleted file mode 100644
index 340e2b73f1b..00000000000
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/ukrainian.lbx
+++ /dev/null
@@ -1,595 +0,0 @@
-\ProvidesFile{ukrainian.lbx}
-[\abx@lbxid]
-
-\DeclareRedundantLanguages{ukrainian}{ukrainian}
-
-% This file requires UTF-8 support!
-
-\lbx@ifutfinput
-  {}
-  {\PackageError{biblatex}
-     {Ukrainian requires UTF-8 support}
-     {The 'ukrainian.lbx' file requires UTF-8 encoding but you
-      seem\MessageBreak to be using a different encoding.
-      This is a fatal error. I will\MessageBreak abort loading
-      ukrainian.lbx now.}%
-   \endinput}
-
-\NewBibliographyString{% Used only Ukrainian for month checks
-  datejanuary,
-  datefebruary,
-  datemarch,
-  dateapril,
-  datemay,
-  datejune,
-  datejuly,
-  dateaugust,
-  dateseptember,
-  dateoctober,
-  datenovember,
-  datedecember%
-}
-
-\DeclareBibliographyExtras{%
-  \protected\def\bibrangedash{%
-    \textemdash\penalty\hyphenpenalty}% breakable dash
-  \let\finalandcomma=\empty
-  \let\finalandsemicolon=\empty
-  \protected\def\mkbibordinal#1{\mkbibmascord}%
-  \protected\def\mkbibmascord#1{#1-й}%
-  \protected\def\mkbibfemord#1{#1-я}%
-  \protected\def\mkbibneutord#1{#1-е}%
-  \protected\def\mkbibdatelong#1#2#3{%
-    \iffieldundef{#3}
-      {}
-      {\stripzeros{\thefield{#3}}%
-       \iffieldundef{#2}{}{\nobreakspace}}%
-    \iffieldundef{#2}
-      {}
-      {\iffieldundef{#3}
-         {\mkbibmonth{\thefield{#2}}}
-         {\lbx@ru@mkbibdatemonth{\thefield{#2}}}%
-       \iffieldundef{#1}{}{\space}}%
-    \iffieldbibstring{#1}
-      {\bibstring{\thefield{#1}}}
-      {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
-  \protected\def\mkbibdateshort#1#2#3{%
-    \iffieldundef{#3}
-      {}
-      {\mkdayzeros{\thefield{#3}}%
-       \iffieldundef{#2}{}{\adddot}}%
-    \iffieldundef{#2}
-      {}
-      {\mkmonthzeros{\thefield{#2}}%
-       \iffieldundef{#1}{}{\adddot}}%
-    \iffieldbibstring{#1}
-      {\bibstring{\thefield{#1}}}
-      {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
-  \savecommand\mkbibordedition
-  \savecommand\mkbibordseries
-  \def\mkbibordedition{\mkbibneutord}%
-  \def\mkbibordseries{\mkbibfemord}%
-  \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{%
-      \iffieldundef{#1}{}
-        {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}%
-      \iffieldundef{#2}{}
-        {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}%
-      \iffieldundef{#3}{}
-        {\printtext{\mktimezeros{\thefield{#3}}}}%
-      \setunit{}%
-      \iffieldundef{#4}{}
-        {\bibtimezonesep
-         \mkbibtimezone{\thefield{#4}}}}%
-  \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{%
-      \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep
-      \forcezerosmdt{\thefield{#2}}%
-      \iffieldundef{#3}{}
-        {\bibtimesep
-         \forcezeros{\thefield{#3}}}%
-       \space
-       \ifnumless{\thefield{#1}}{12}
-         {\bibstring{am}}
-         {\bibstring{pm}}%
-      \iffieldundef{#4}{}
-       {\space\bibtimezonesep
-        \parentext{\mkbibtimezone{\thefield{#4}}}}}%
-  \protected\def\mkbibseasondateshort#1#2{%
-    \mkbibseason{\thefield{#2}}%
-    \iffieldundef{#1}{}{\space}%
-    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
-  \protected\def\mkbibseasondatelong#1#2{%
-    \mkbibseason{\thefield{#2}}%
-    \iffieldundef{#1}{}{\space}%
-    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
-}
-
-\UndeclareBibliographyExtras{%
-  \restorecommand\mkbibordedition
-  \restorecommand\mkbibordseries
-}
-
-\DeclareBibliographyStrings{%
-  bibliography     = {{Перелік літератури}{Література}},%book-like (chapter)
-  references       = {{Перелік літератури}{Література}},%article-like (section)
-  shorthands       = {{Перелік скорочень}{Скорочення}},
-  editor           = {{редактор}{ред\adddot}},
-  editors          = {{редактори}{ред\adddot}},
-  compiler         = {{укладач}{уклад\adddot}},
-  compilers        = {{укладачі}{уклад\adddot}},
-  redactor         = {{редактор}{ред\adddot}},% FIXME: unsure
-  redactors        = {{редактори}{ред\adddot}},% FIXME: unsure
-  reviser          = {{ревізійний коректор}{ревіз\adddotspace кор\adddot}},
-  revisers         = {{ревізійні коректори}{ревіз\adddotspace кор\adddot}},
-  founder          = {{засновник}{засн\adddot}},
-  founders         = {{засновник}{засн\adddot}},
-  continuator      = {{продовжувач}{прод\adddot}},% FIXME: unsure
-  continuators     = {{продовжувачі}{прод\adddot}},% FIXME: unsure
-  collaborator     = {{учасник}{учас\adddot}},% FIXME: unsure
-  collaborators    = {{учасники}{учас\adddot}},% FIXME: unsure
-  translator       = {{перекладач}{пер\adddot}},
-  translators      = {{перекладачі}{пер\adddot}},
-  commentator      = {{коментатор}{комент\adddot}},
-  commentators     = {{коментатори}{комент\adddot}},
-  annotator        = {{примітки}{прим\adddot}},
-  annotators       = {{примітки}{прим\adddot}},
-  commentary       = {{коментар}{комент\adddot}},
-  annotations      = {{примітки}{прим\adddot}},
-  introduction     = {{вступна стаття}{вступ\adddotspace ст\adddot}},
-  foreword         = {{передмова}{передм\adddot}},
-  afterword        = {{післямова}{післям\adddot}},
-  editortr         = {{редактор та перекладач}%
-                      {ред\adddotspace та пер\adddot}},
-  editorstr        = {{редактори та перекладачі}%
-                      {ред\adddotspace та пер\adddot}},
-  editorco         = {{редактор та коментатор}%
-                      {ред\adddotspace та комент\adddot}},
-  editorsco        = {{редактори та коментатори}%
-                      {ред\adddotspace та комент\adddot}},
-  editoran         = {{редактор та укладач приміток}%
-                      {ред\adddotspace та укл\adddotspace прим\adddot}},
-  editorsan        = {{редактори та укладачі приміток}%
-                      {ред\adddotspace та укл\adddotspace прим\adddot}},
-  editorin         = {{редактор та автор вступної статті}%
-                      {ред\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  editorsin        = {{редактори та автори вступної статті}%
-                      {ред\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  editorfo         = {{редактор та автор передмови}%
-                      {ред\adddotspace та авт\adddotspace передм\adddot}},
-  editorsfo        = {{редактори та автори передмови}%
-                      {ред\adddotspace та авт\adddotspace передм\adddot}},
-  editoraf         = {{редактор та автор післямови}%
-                      {ред\adddotspace та авт\adddotspace післям\adddot}},
-  editorsaf        = {{редактори та автори післямови}%
-                      {ред\adddotspace та авт\adddotspace післям\adddot}},
-  editortrco       = {{редактор, перекладач та автор коментарів}%
-                      {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace комент\adddot}},
-  editorstrco      = {{редактори, перекладачі та автори коментарів}%
-                      {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace комент\adddot}},
-  editortran       = {{редактор, перекладач та укладач приміток}%
-                      {ред.,\addabbrvspace пер\adddotspace та укл\adddotspace прим\adddot}},
-  editorstran      = {{редактори, перекладачі та укладачі приміток}%
-                      {ред.,\addabbrvspace пер\adddotspace та укл\adddotspace прим\adddot}},
-  editortrin       = {{редактор, перекладач та автор вступної статті}%
-                      {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  editorstrin      = {{редактори, перекладачі та автори вступної статті}%
-                      {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  editortrfo       = {{редактор, перекладач та автор передмови}%
-                      {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace передм\adddot}},
-  editorstrfo      = {{редактори, перекладачі та автори передмови}%
-                      {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace передм\adddot}},
-  editortraf       = {{редактор, перекладач та автор післямови}%
-                      {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace післямови\adddot}},
-  editorstraf      = {{редактори, перекладачі та автори післямови}%
-                      {ред.,\addabbrvspace пер\adddotspace та авт\adddotspace післям\adddot}},
-  editorcoin       = {{редактор, автор коментарів та вступної статті}%
-                      {ред.,\addabbrvspace авт\adddotspace комент\adddotspace та вступ\adddotspace ст\adddot}},
-  editorscoin      = {{редактори, автори коментарів та вступної статті}%
-                      {ред.,\addabbrvspace авт\adddotspace комент\adddotspace та вступ\adddotspace ст\adddot}},
-  editorcofo       = {{редактор, автор коментарів та передмови}%
-                      {ред.,\addabbrvspace авт\adddotspace комент\adddotspace та передм\adddot}},
-  editorscofo      = {{редактори, автори коментарів та передмови}%
-                      {ред.,\addabbrvspace авт\adddotspace комент\adddotspace та передм\adddot}},
-  editorcoaf       = {{редактор, автор коментарів та післямови}%
-                      {ред.,\addabbrvspace авт\adddotspace комент\adddotspace та післям\adddot}},
-  editorscoaf      = {{редактори, автори коментарів та післямови}%
-                      {ред.,\addabbrvspace авт\adddotspace комент\adddotspace та післям\adddot}},
-  editoranin       = {{редактор, укладач приміток та автор вступної статті}%
-                      {ред.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  editorsanin      = {{редактори, укладачі приміток та автори вступної статті}%
-                      {ред.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  editoranfo       = {{редактор, укладач приміток та автор передмови}%
-                      {ред.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace передм\adddot}},
-  editorsanfo      = {{редактори, укладачі приміток та автори передмови}%
-                      {ред.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace передм\adddot}},
-  editoranaf       = {{редактор, укладач приміток та автор післямови}%
-                      {ред.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace післям\adddot}},
-  editorsanaf      = {{редактори, укладачі приміток та автори післямови}%
-                      {ред.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace післям\adddot}},
-  editortrcoin     = {{редактор, перекладач, автор коментарів та вступної статті}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace комент\adddotspace та вступ\adddotspace ст\adddot}},
-  editorstrcoin    = {{редактори, перекладачі, автори коментарів та вступної статті}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace комент\adddotspace та вступ\adddotspace ст\adddot}},
-  editortrcofo     = {{редактор, перекладач, автор коментарів та передмови}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace комент\adddotspace та передм\adddot}},
-  editorstrcofo    = {{редактори, перекладачі, автори коментарів та передмови}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace комент\adddotspace та передм\adddot}},
-  editortrcoaf     = {{редактор, перекладач, автор коментарів та післямови}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace комент\adddotspace та післям\adddot}},
-  editorstrcoaf    = {{редактори, перекладачі, автори коментарів та післямови}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace авт\adddotspace комент\adddotspace та післям\adddot}},
-  editortranin     = {{редактор, перекладач, укладач приміток та автор вступної статті}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  editorstranin    = {{редактори, перекладачі, укладачі приміток та автори вступної статті}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  editortranfo     = {{редактор, перекладач, укладач приміток та автор передмови}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace передм\adddot}},
-  editorstranfo    = {{редактори, перекладачі, укладачі приміток та автори передмови}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace передм\adddot}},
-  editortranaf     = {{редактор, перекладач, укладач приміток та автор післямови}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace післям\adddot}},
-  editorstranaf    = {{редактори, перекладачі, укладачі приміток та автори післямови}%
-                      {ред.,\addabbrvspace пер.,\addabbrvspace укл\adddotspace прим\adddotspace та авт\adddotspace післям\adddot}},
-  translatorco     = {{перекладач та автор коментарів}%
-                      {пер\adddotspace та авт\adddotspace комент\adddot}},
-  translatorsco    = {{перекладачі та автор коментарів}%
-                      {пер\adddotspace та авт\adddotspace комент\adddot}},
-  translatoran     = {{перекладач та автор приміток}%
-                      {пер\adddotspace та укл\adddotspace прим\adddot}},
-  translatorsan    = {{перекладачі та укладачі приміток}%
-                      {пер\adddotspace та уклад\adddotspace прим\adddot}},
-  translatorin     = {{перекладач та автор вступної статті}%
-                      {пер\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  translatorsin    = {{перекладачі та автори вступної статті}%
-                      {пер\adddotspace та авт\adddotspace вступ\adddotspace ст\adddot}},
-  translatorfo     = {{перекладач та автор передмови}%
-                      {пер\adddotspace та авт\adddotspace передм\adddot}},
-  translatorsfo    = {{перекладачі та автори передмови}%
-                      {пер\adddotspace та авт\adddotspace передм\adddot}},
-  translatoraf     = {{перекладач та автор післямови}%
-                      {пер\adddotspace та авт\adddotspace післям\adddot}},
-  translatorsaf    = {{перекладачі та автори післямови}%
-                      {пер\adddotspace та авт\adddotspace післям\adddot}},
-  translatorcoin   = {{перекладач, автор коментарів та вступної статті}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та вступ\adddotspace ст\adddot}},
-  translatorscoin  = {{перекладачі, автори коментарів та вступної статті}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та вступ\adddotspace ст\adddot}},
-  translatorcofo   = {{перекладач, автор коментарів та передмови}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та передм\adddot}},
-  translatorscofo  = {{перекладачі, автори коментарів та передмови}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та передм\adddot}},
-  translatorcoaf   = {{перекладач, автор коментарів та післямови}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та післям\adddot}},
-  translatorscoaf  = {{перекладачі, автори коментарів та післямови}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та післям\adddot}},
-  translatoranin   = {{перекладач, автор коментарів та вступної статті}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та вступ\adddotspace ст\adddot}},
-  translatorsanin  = {{перекладачі, автори коментарів та вступної статті}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та вступ\adddotspace ст\adddot}},
-  translatoranfo   = {{перекладач, автор коментарів та передмови}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та передм\adddot}},
-  translatorsanfo  = {{перекладачі, автори коментарів та передмови}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та передм\adddot}},
-  translatoranaf   = {{перекладач, автор коментарів та післямови}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та післям\adddot}},
-  translatorsanaf  = {{перекладачі, автори коментарів та післямови}%
-                      {пер.,\addabbrvspace авт\adddotspace комент\adddotspace та післям\adddot}},
-  organizer        = {{організатор}{орг\adddot}},
-  organizers       = {{організатори}{орг\adddot}},
-  byorganizer      = {{організатор}{орг\adddot}},% FIXME: unsure
-  byauthor         = {{згідно автора}{згідн\adddot авт\adddot}},
-  byeditor         = {{за редакцією}{за\addabbrvspace ред\adddot}},
-  bycompiler       = {{укладач}{уклад\adddot}},
-  byredactor       = {{за редакцією}{за\addabbrvspace ред\adddot}},
-  byreviser        = {{виправлено}{випр\adddot}},
-  byreviewer       = {{рецензія}{рец\adddot}},
-  byfounder        = {{засновник}{засн\adddot}},% FIXME: unsure
-  bycontinuator    = {{продовження}{продовж\adddot}},% FIXME: unsure
-  bycollaborator   = {{за участю}{за\addabbrvspace уч\adddot}},
-  bytranslator     = {{переклад \lbx@lfromlang}{пер\adddot\ \lbx@sfromlang}},
-  bycommentator    = {{коментарі}{комент\adddot}},
-  byannotator      = {{примітки}{прим\adddot}},
-  withcommentator  = {{коментарі}{комент\adddot}},
-  withannotator    = {{примітки}{прим\adddot}},
-  withintroduction = {{вступна стаття}{вступ\adddotspace ст\adddot}},
-  withforeword     = {{передмовие}{передм\adddot}},
-  withafterword    = {{післямовие}{післям\adddot}},
-  byeditortr       = {{переклад \lbx@lfromlang, за редакцією}%
-                      {пер\adddot\ \lbx@sfromlang, за\addabbrvspace ред\adddot}},
-  byeditorco       = {{за редакцією, коментарі}%
-                      {за ред.,\addabbrvspace комент\adddot}},
-  byeditoran       = {{за редакцією, примітки}%
-                      {за ред.,\addabbrvspace прим\adddot}},
-  byeditorin       = {{за редакцією, вступна стаття}%
-                      {за ред.,\addabbrvspace вступ\adddotspace ст\adddot}},
-  byeditorfo       = {{за редакцією, передмова}%
-                      {за ред.,\addabbrvspace передм\adddot}},
-  byeditoraf       = {{за редакцією, післямова}%
-                      {за ред.,\addabbrvspace післям\adddot}},
-  byeditortrco     = {{за редакцією, переклад \lbx@lfromlang\ та коментарі}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang\ та комент\adddot}},
-  byeditortran     = {{за редакцією, переклад \lbx@lfromlang\ та примітки}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang\ та прим\adddot}},
-  byeditortrin     = {{за редакцією, переклад \lbx@lfromlang, вступна стаття}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, вступ\adddotspace ст\adddot}},
-  byeditortrfo     = {{за редакцією, переклад \lbx@lfromlang, передмовие}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, передм\adddot}},
-  byeditortraf     = {{за редакцією, переклад \lbx@lfromlang, післямова}%
-                      {за ред\adddotspace та пер\adddot\ \lbx@sfromlang, післям\adddot}},
-  byeditorcoin     = {{за редакцією, коментарі та вступна стаття}%
-                      {за ред.,\addabbrvspace комент\adddotspace та вступ\adddotspace ст\adddot}},
-  byeditorcofo     = {{за редакцією, коментарі та передмова}%
-                      {за ред.,\addabbrvspace комент\adddotspace та передм\adddot}},
-  byeditorcoaf     = {{за редакцією, коментарі та післямова}%
-                      {за ред.,\addabbrvspace комент\adddotspace та післям\adddot}},
-  byeditoranin     = {{за редакцією, примітки та вступна стаття}%
-                      {за ред.,\addabbrvspace приміт\adddotspace та вступ\adddotspace ст\adddot}},
-  byeditoranfo     = {{за редакцією, примітки та передмова}%
-                      {за ред.,\addabbrvspace приміт\adddotspace та передм\adddot}},
-  byeditoranaf     = {{за редакцією, примітки та післямова}%
-                      {за ред.,\addabbrvspace приміт\adddotspace та післям\adddot}},
-  byeditortrcoin   = {{за редакцією, переклад \lbx@lfromlang, коментарі та вступна стаття}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, комент\adddotspace та вступ\adddotspace ст\adddot}},
-  byeditortrcofo   = {{за редакцією, переклад \lbx@lfromlang, коментарі та передмова}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, комент\adddotspace та передм\adddot}},
-  byeditortrcoaf   = {{за редакцією, переклад \lbx@lfromlang, коментарі та післямова}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, комент\adddotspace та післям\adddot}},
-  byeditortranin   = {{за редакцією, переклад \lbx@lfromlang, примітки та вступна стаття}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, прим\adddotspace та вступ\adddotspace ст\adddot}},
-  byeditortranfo   = {{за редакцією, переклад \lbx@lfromlang, примітки та передмова}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, прим\adddotspace та передм\adddot}},
-  byeditortranaf   = {{за редакцією, переклад \lbx@lfromlang, примітки та післямова}%
-                      {за ред.,\addabbrvspace пер\adddot\ \lbx@sfromlang, прим\adddotspace та післям\adddot}},
-  bytranslatorco   = {{переклад \lbx@lfromlang\ та коментарі}%
-                      {пер\adddot\ \lbx@sfromlang\ та комент\adddot}},
-  bytranslatoran   = {{переклад \lbx@lfromlang\ та примітки}%
-                      {пер\adddot\ \lbx@sfromlang\ та прим\adddot}},
-  bytranslatorin   = {{переклад \lbx@lfromlang\ та вступна стаття}%
-                      {пер\adddot\ \lbx@sfromlang\ та вступ\adddotspace ст\adddot}},
-  bytranslatorfo   = {{переклад \lbx@lfromlang\ та передмова}%
-                      {пер\adddot\ \lbx@sfromlang\ та передм\adddot}},
-  bytranslatoraf   = {{переклад \lbx@lfromlang\ та післямова}%
-                      {пер\adddot\ \lbx@sfromlang\ та післям\adddot}},
-  bytranslatorcoin = {{переклад \lbx@lfromlang, коментарі та вступна стаття}%
-                      {пер\adddot\ \lbx@sfromlang, комент\adddotspace та вступ\adddotspace ст\adddot}},
-  bytranslatorcofo = {{переклад \lbx@lfromlang, коментарі та передмова}%
-                      {пер\adddot\ \lbx@sfromlang, комент\adddotspace та передм\adddot}},
-  bytranslatorcoaf = {{переклад \lbx@lfromlang, коментарі та післямова}%
-                      {пер\adddot\ \lbx@sfromlang, комент\adddotspace та післям\adddot}},
-  bytranslatoranin = {{переклад \lbx@lfromlang, примітки та вступна стаття}%
-                      {пер\adddot\ \lbx@sfromlang, прим\adddotspace та вступ\adddotspace ст\adddot}},
-  bytranslatoranfo = {{переклад \lbx@lfromlang, примітки та передмова}%
-                      {пер\adddot\ \lbx@sfromlang, прим\adddotspace та передм\adddot}},
-  bytranslatoranaf = {{переклад \lbx@lfromlang, примітки та післямова}%
-                      {пер\adddot\ \lbx@sfromlang, прим\adddotspace та післям\adddot}},
-  and              = {{та}{та}},
-  andothers        = {{та\addabbrvspace ін\adddot}{та\addabbrvspace ін\adddot}},
-  andmore          = {{та\addabbrvspace ін\adddot}{та\addabbrvspace ін\adddot}},
-  volume           = {{том}{т\adddot}},
-  volumes          = {{томах}{т\adddot}},
-  involumes        = {{в}{в}},
-  jourvol          = {{том}{т\adddot}},
-  jourser          = {{серія}{сер\adddot}},
-  book             = {{книга}{кн\adddot}},
-  part             = {{частина}{ч\adddot}},
-  issue            = {{випуск}{вип\adddot}},
-  newseries        = {{нова серія}{нов\adddotspace сер\adddot}},
-  oldseries        = {{стара серія}{стар\adddotspace сер\adddot}},
-  edition          = {{видання}{вид\adddot}},
-  reprint          = {{перевидання}{перевид\adddot}},
-  reprintof        = {{перевидання}{перевид\adddot}},
-  reprintas        = {{перевидано як}{перевид\adddotspace як}},
-  reprintfrom      = {{перевидано з}{перевид\adddotspace з}},
-  translationof    = {{переклад по виданню\addcolon}{пер\adddotspace по вид\adddot\addcolon}},
-  translationas    = {{переклад\addcolon}{пер\adddot\addcolon}},
-  translationfrom  = {{переклад з}{пер\adddotspace з}},
-  reviewof         = {{рецензія на\addcolon}{рец\adddotspace на\addcolon}},% FIXME: unsure
-  origpubas        = {{перша публикація\addcolon}%
-                      {перш\adddotspace публ\adddot\addcolon}},
-  origpubin        = {{перша публікация в}%
-                      {перш\adddotspace публ\adddotspace в}},
-  astitle          = {{\addcolon}{\addcolon}},% FIXME: unsure
-  bypublisher      = {{\addcomma}{\addcomma}},% FIXME: unsure
-  nodate           = {{б\adddot р\adddot}{б\adddot р\adddot}},
-  page             = {{сторінка}{с\adddot}},
-  pages            = {{сторінки}{с\adddot}},
-  column           = {{колонка}{кол\adddot}},
-  columns          = {{колонки}{кол\adddot}},
-  line             = {{рядок}{рядок}},
-  lines            = {{рядки}{рядки}},
-  verse            = {{вірш}{вірш}},
-  verses           = {{вірші}{вірші}},
-  section          = {{параграф}{\S}},
-  sections         = {{параграфи}{\S\S}},
-  paragraph        = {{абзац}{абз\adddot}},
-  paragraphs       = {{абзаци}{абз\adddot}},
-  pagetotal        = {{сторінка}{с\adddot}},
-  pagetotals       = {{сторінки}{с\adddot}},
-  columntotal      = {{колонка}{кол\adddot}},
-  columntotals     = {{колонки}{кол\adddot}},
-  linetotal        = {{рядок}{рядок}},
-  linetotals       = {{рядки}{рядки}},
-  versetotal       = {{вірш}{вірш}},
-  versetotals      = {{вірші}{вірші}},
-  sectiontotal     = {{параграф}{\S}},
-  sectiontotals    = {{параграфи}{\S\S}},
-  paragraphtotal   = {{абзац}{абз\adddot}},
-  paragraphtotals  = {{абзаци}{абз\adddot}},
-  in               = {{в}{в}},
-  inseries         = {{в}{в}},
-  ofseries         = {{із}{із}},
-  number           = {{номер}{№}},
-  chapter          = {{глава}{гл\adddot}},
-  mathesis         = {{дис\adddotspace\textellipsis\ маг\adddot}
-                      {дис\adddotspace\textellipsis\ маг\adddot}},
-  phdthesis        = {{дис\adddotspace\textellipsis\ док\adddot}
-                      {дис\adddotspace\textellipsis\ док\adddot}},
-  candthesis       = {{дис\adddotspace\textellipsis\ канд\adddot}
-                      {дис\adddotspace\textellipsis\ канд\adddot}},
-  resreport        = {{науковий звіт}{наук\adddotspace звіт\adddot}},
-  techreport       = {{технічний звіт}{тех\adddotspace звіт\adddot}},
-  software         = {{програмне забезпечення}{прогр\adddotspace забезп\adddot}},
-  datacd           = {{CD-ROM}{CD-ROM}},
-  audiocd          = {{audio CD}{audio CD}},
-  version          = {{версія}{вер\adddot}},
-  url              = {{url}{url}},
-  urlfrom          = {{режим доступу}{режим доступу}},
-  urlseen          = {{дата звернення}{дата\addabbrvspace зверн\adddot}},
-  inpreparation    = {{в\addabbrvspace підготовці}{в підг\adddot}},
-  submitted        = {{представлено}{предст\adddot}},
-  forthcoming      = {{в друці}{в друц\adddot}},
-  inpress          = {{в\addabbrvspace друці}{в друці\adddot}},
-  prepublished     = {{попередня публікация}{попер\adddotspace пуб\adddot}},% FIXME: unsure
-  citedas          = {{далі цитується як}{далі цит\addabbrvspace як}},
-  thiscite         = {{тут}{тут}},
-  seenote          = {{дивись зноску}{див\adddotspace зн\adddot}},
-  quotedin         = {{цитується за}{цит\adddotspace за}},
-  idem             = {{він\addabbrvspace же}{він\addabbrvspace же}},
-  idemsm           = {{він\addabbrvspace же}{він\addabbrvspace же}},
-  idemsf           = {{вона\addabbrvspace же}{вона\addabbrvspace же}},
-  idemsn           = {{він\addabbrvspace же}{він\addabbrvspace же}},
-  idempm           = {{вони\addabbrvspace ж}{вони\addabbrvspace ж}},
-  idempf           = {{вони\addabbrvspace ж}{вони\addabbrvspace ж}},
-  idempn           = {{вони\addabbrvspace ж}{вони\addabbrvspace ж}},
-  idempp           = {{вони\addabbrvspace ж}{вони\addabbrvspace ж}},
-  ibidem           = {{там\addabbrvspace же}{там\addabbrvspace же}},
-  opcit            = {{вказ\adddotspace твор\adddot}{вказ\adddotspace твор\adddot}},
-  loccit           = {{вказ\adddotspace місце}{вказ\adddotspace місце}},
-  confer           = {{порівняй}{порівн\adddot}},
-  sequens          = {{та наступна}{та\addabbrvspace наст\adddot}},
-  sequentes        = {{та наступні}{и\addabbrvspace наст\adddot}},
-  passim           = {{всюди}{всюди}},
-  see              = {{дивись}{див\adddot}},
-  seealso          = {{дивись також}{див\adddotspace також}},
-  backrefpage      = {{цитується на сторінці}{цит\adddotspace на\addabbrvspace с\adddot}},
-  backrefpages     = {{цитується на сторінках}{цит\adddotspace на\addabbrvspace с\adddot}},
-  january          = {{січень}{січ\adddot}},
-  february         = {{лютий}{лют\adddot}},
-  march            = {{березень}{бер\adddot}},
-  april            = {{квітень}{квіт\adddot}},
-  may              = {{травень}{трав\adddot}},
-  june             = {{червень}{черв\adddot}},
-  july             = {{липень}{лип\adddot}},
-  august           = {{серпень}{серп\adddot}},
-  september        = {{вересень}{вер\adddot}},
-  october          = {{жовтень}{жовт\adddot}},
-  november         = {{листопад}{листоп\adddot}},
-  december         = {{грудень}{груд\adddot}},
-  datejanuary      = {{січня}{січ\adddot}},
-  datefebruary     = {{лютого}{лют\adddot}},
-  datemarch        = {{березня}{бер\adddot}},
-  dateapril        = {{квітня}{квіт\adddot}},
-  datemay          = {{травня}{трав\adddot}},
-  datejune         = {{червня}{черв\adddot}},
-  datejuly         = {{липня}{лип\adddot}},
-  dateaugust       = {{серпня}{серп\adddot}},
-  dateseptember    = {{вересня}{вер\adddot}},
-  dateoctober      = {{жовтня}{жовт\adddot}},
-  datenovember     = {{листопда}{листоп\adddot}},
-  datedecember     = {{грудня}{груд\adddot}},
-  langamerican     = {{американський}{амер\adddot}},
-  langbrazilian    = {{бразильський}{браз\adddot}},
-  langbulgarian    = {{болгарська}{болг\adddot}},
-  langcatalan      = {{каталонська}{катал\adddot}},
-  langcroatian     = {{хорватська}{хорв\adddot}},
-  langczech        = {{чеська}{чеськ\adddot}},
-  langdanish       = {{датська}{дат\adddot}},
-  langdutch        = {{нідерландська}{нід\adddot}},
-  langenglish      = {{англійська}{англ\adddot}},
-  langestonian     = {{естонська}{ест\adddot}},
-  langfinnish      = {{фінська}{фін\adddot}},
-  langfrench       = {{французька}{фр\adddot}},
-  langgalician     = {{галісійський}{гал\adddot}},
-  langgerman       = {{німецька}{нім\adddot}},
-  langgreek        = {{грецька}{грець\adddot}},
-  langitalian      = {{італійська}{італ\adddot}},
-  langjapanese     = {{японська}{яп\adddot}},
-  langlatin        = {{латинська}{лат\adddot}},
-  langnorwegian    = {{норвезька}{норв\adddot}},
-  langpolish       = {{польська}{пол\adddot}},
-  langportuguese   = {{португальська}{порт\adddot}},
-  langrussian      = {{російська}{рос\adddot}},
-  langslovene      = {{словенська}{слов\adddot}},
-  langspanish      = {{іспанська}{ісп\adddot}},
-  langswedish      = {{шведська}{швед\adddot}},
-  langukrainian    = {{українська}{укр\adddot}},
-  fromamerican     = {{з американської}{з\addabbrvspace амер\adddot}},
-  frombrazilian    = {{з бразильської}{з\addabbrvspace браз\adddot}},
-  frombulgarian    = {{з болгарскої}{з\addabbrvspace болг\adddot}},
-  fromcatalan      = {{з каталонської}{з\addabbrvspace катал\adddot}},
-  fromcroatian     = {{з хорватської}{з\addabbrvspace хорв\adddot}},
-  fromczech        = {{з чеської}{з\addabbrvspace чеськ\adddot}},
-  fromdanish       = {{з датської}{з\addabbrvspace дат\adddot}},
-  fromdutch        = {{з нідерландської}{з\addabbrvspace нід\adddot}},
-  fromenglish      = {{з англійскої}{з\addabbrvspace англ\adddot}},
-  fromestonian     = {{з естонської}{з\addabbrvspace ест\adddot}},
-  fromfinnish      = {{з фінської}{з\addabbrvspace фін\adddot}},
-  fromfrench       = {{з французької}{з\addabbrvspace фр\adddot}},
-  fromgalician     = {{з галісійської}{з\addabbrvspace гал\adddot}},
-  fromgerman       = {{з німецької}{з\addabbrvspace нім\adddot}},
-  fromgreek        = {{з грецької}{з\addabbrvspace грец\adddot}},
-  fromitalian      = {{з італійської}{з\addabbrvspace італ\adddot}},
-  fromjapanese     = {{з японської}{з\addabbrvspace яп\adddot}},
-  fromlatin        = {{з латинської}{з\addabbrvspace лат\adddot}},
-  fromnorwegian    = {{з норвезької}{з\addabbrvspace норв\adddot}},
-  frompolish       = {{з польської}{з\addabbrvspace пол\adddot}},
-  fromportuguese   = {{з португальської}{з\addabbrvspace порт\adddot}},
-  fromrussian      = {{з російської}{з\addabbrvspace рос\adddot}},
-  fromslovene      = {{зі словенської}{зі\addabbrvspace слов\adddot}},
-  fromspanish      = {{з іспанської}{з\addabbrvspace ісп\adddot}},
-  fromswedish      = {{з шведської}{з\addabbrvspace швед\adddot}},
-  fromukrainian    = {{з української}{з\addabbrvspace укр\adddot}},
-  countryde        = {{Німеччина}{Німеччина}},
-  countryeu        = {{Європейський Союз}{ЄС}},
-  countryep        = {{Європейський Союз}{ЄС}},
-  countryfr        = {{Франція}{Франція}},
-  countryuk        = {{Великобританія}{Великобританія}},
-  countryus        = {{Сполучені Штати Америки}{США}},
-  patent           = {{патент}{пат\adddot}},
-  patentde         = {{патент Німеччини}{пат\adddotspace Німеччини}},
-  patenteu         = {{патент Європи}{пат\adddotspace Європи}},
-  patentfr         = {{патент Франції}{пат\adddotspace Франції}},
-  patentuk         = {{патент Великобританії}{пат\adddotspace Великобританії}},
-  patentus         = {{патент США}{пат\adddotspace США}},
-  patreq           = {{заявка}{заявка}},
-  patreqde         = {{заявка на патент Німеччини}{заявка на пат\adddotspace Німеччини}},
-  patreqeu         = {{заявка на патент Європи}{заявка на пат\adddotspace Європи}},
-  patreqfr         = {{заявка на патент Франції}{заявка на пат\adddotspace Франції}},
-  patrequk         = {{заявка на патент Великобританії}{заявка на пат\adddotspace Великобританії}},
-  patrequs         = {{заявка на патент США}{заявка на пат\adddotspace США}},
-  file             = {{файл}{файл}},
-  library          = {{бібліотека}{б-ка}},
-  abstract         = {{резюме}{рез\adddot}},
-  annotation       = {{анотація}{анот\adddot}},
-  commonera        = {{нашої ери}{н\adddotspace е\adddot}},
-  beforecommonera  = {{до нашої ери}{до н\adddotspace е\adddot}},
-  annodomini       = {{від Різдва Христового}{від Р\adddotspace Х\adddot}},
-  beforechrist     = {{до Різдва Христового}{до Р\adddotspace Х\adddot}},
-  circa            = {{близько}{бл\adddot}},
-  spring           = {{весна}{весна}},
-  summer           = {{літо}{літо}},
-  autumn           = {{осінь}{осінь}},
-  winter           = {{зима}{зима}},
-  am               = {{ДП}{ДП}},
-  pm               = {{ПП}{ПП}},
-}
-
-\protected\gdef\lbx@ru@mkbibdatemonth#1{%
-  \ifcase0#1\relax
-    #1\BibliographyWarning{Month out of range}%
-  \or\abx@bibmonth{datejanuary}%
-  \or\abx@bibmonth{datefebruary}%
-  \or\abx@bibmonth{datemarch}%
-  \or\abx@bibmonth{dateapril}%
-  \or\abx@bibmonth{datemay}%
-  \or\abx@bibmonth{datejune}%
-  \or\abx@bibmonth{datejuly}%
-  \or\abx@bibmonth{dateaugust}%
-  \or\abx@bibmonth{dateseptember}%
-  \or\abx@bibmonth{dateoctober}%
-  \or\abx@bibmonth{datenovember}%
-  \or\abx@bibmonth{datedecember}%
-  \else
-    #1\BibliographyWarning{Month out of range}%
-  \fi}%
-
-\endinput