biblatex (1aug12)

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

13 files changed, 758 insertions, 359 deletions

diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index ed1a98d21cf..4cfb357ddeb 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -173,7 +173,7 @@ STRINGS  { ctrl.alphaothers templist tempstrga tempstrgb resvstrga
            last.name last.hash last.year last.extra }
 
 FUNCTION {initialize} {
-  "$Revision: 2.0 $"
+  "$Revision: 2.1 $"
   #12 entry.max$ substring$
   #-3 entry.max$ substring$
   "Biblatex version: " swap$ * top$
@@ -1760,7 +1760,7 @@ FUNCTION {input:control:options} {
 
 FUNCTION {input:control:version} {
   input:control:parse
-  "$Revision: 2.0 $"
+  "$Revision: 2.1 $"
   #12 entry.max$ substring$
   #-3 entry.max$ substring$
   'tempstrga :=
@@ -2583,7 +2583,7 @@ SORT
 
 FUNCTION {output:main:begin} {
   "% $ biblatex auxiliary file $"                               write$ newline$
-  "% $ biblatex version " "$Revision: 2.0 $"
+  "% $ biblatex version " "$Revision: 2.1 $"
   #12 entry.max$ substring$ #-3 entry.max$ substring$ * " $" *  write$ newline$
   "% Do not modify the above lines!"                            write$ newline$
   "%"                                                           write$ newline$
diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE
index edf961626e5..a14d8242505 100644
--- a/Master/texmf-dist/doc/latex/biblatex/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE
@@ -1,3 +1,12 @@
+RELEASE NOTES FOR VERSION 2.1
+
+*  Biber version 1.1 is required for biblatex 2.1
+
+*  Custom data models is now looked for in more places. See PDF
+   documentation. Custom data model conflicts are now better processed by
+   biber.
+*  Some improved localisation (Norwegian) and doc fixes.
+
 RELEASE NOTES FOR VERSION 2.0
 
 *  Biber is now the default backend. Biblatex 2.0 requires biber
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index faf1c40c0c5..074f1392cfc 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 6516124f689..babaded2a03 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -42,7 +42,7 @@
   url={\biblatexhome},
   author={Philipp Lehman (with Audrey Boruvka, Philip Kime and Joseph Wright)},
   email={},
-  revision={2.0},
+  revision={2.1},
   date={07/2012}}
 
 \hypersetup{%
@@ -154,7 +154,7 @@ Please use the \sty{biblatex} project page on GitHub to report bugs and submit f
 The language modules of this package include contributions by the following contributors (in the order of submission):
 Ignacio Fernández Galván (Spanish),
 Enrico Gregorio (Italian),
-Johannes Wilm (Danish\slash Norwegian),
+Johannes Wilm, Hĺkon Malmedal (Danish\slash Norwegian),
 Per Starbäck, Carl-Gustav Werner, Filip Ĺsblom (Swedish),
 Augusto Ritter Stoffel (Brazilian),
 Alexander van Loon (Dutch),
@@ -304,7 +304,7 @@ The \sty{ucs} package provides support for \utf encoded input. Either use \sty{i
 
 It is important to distinguish between \bibtex the program and \bibtex the file format. \sty{biblatex} can be used with or without \bibtex the program since its default backend \biber uses fully supports the \bibtex file format (\file{bib}) and users should be able to move to \sty{biblatex} will little or no changes to their \bibtex data files when using \biber as a backend. If using \bibtex as the data backend, note that you cannot use arbitrary \file{bst} files because the package depends on a special \bibtex interface. When using \bibtex as a backend, \sty{biblatex} uses its own special \file{bst} file only. The entry guide below is backend agnostic unless otherwise stated.
 
-This section describes the default data model defined in the \file{blx-dm.def} file which is part of \path{biblatex}. The data model is defined using the macros documented in \secref{aut:ctm:dm}. It is possible to redefine the data model which both \sty{biblatex} and \biber use so that datasources can contain new entrytypes and fields (which of course will need style support). The data model specfication also allows for constraints to be defined so that data sources can be validated against the data model (using \biber's \path{--validate_datamodel} option). Users who want to customise the data model need to look at the \file{blx-dm.def} file and to read \secref{aut:ctm:dm}.
+This section describes the default data model defined in the \file{blx-dm.def} file which is part of \path{biblatex}. The data model is defined using the macros documented in \secref{aut:ctm:dm}. It is possible to redefine the data model which both \sty{biblatex} and \biber use so that datasources can contain new entrytypes and fields (which of course will need style support). The data model specification also allows for constraints to be defined so that data sources can be validated against the data model (using \biber's \path{--validate_datamodel} option). Users who want to customise the data model need to look at the \file{blx-dm.def} file and to read \secref{aut:ctm:dm}.
 
 \subsection{Entry Types}
 \label{bib:typ}
@@ -402,7 +402,7 @@ A fallback type for entries which do not fit into any other category. Use the fi
 
 \typeitem{online}
 
-An online resource. \bibfield{author}, \bibfield{editor}, and \bibfield{year} are omissible in terms of \secref{bib:use:key}. This entry type is intended for sources such as web sites which are intrinsicly online resources. Note that all entry types support the \bibfield{url} field. For example, when adding an article from an online journal, it may be preferable to use the \bibtype{article} type and its \bibfield{url} field.
+An online resource. \bibfield{author}, \bibfield{editor}, and \bibfield{year} are omissible in terms of \secref{bib:use:key}. This entry type is intended for sources such as web sites which are intrinsically online resources. Note that all entry types support the \bibfield{url} field. For example, when adding an article from an online journal, it may be preferable to use the \bibtype{article} type and its \bibfield{url} field.
 
 \reqitem{author/editor, title, year/date, url}
 \optitem{subtitle, titleaddon, language, version, note, organization, date, month, year, addendum, pubstate, urldate}
@@ -529,7 +529,7 @@ Works of the visual arts such as paintings, sculpture, and installations.
 
 \typeitem{audio}
 
-Audio recordings, typically on audio \acr{CD}, \acr{DVD}, audio casette, or similar media. See also \bibtype{music}.
+Audio recordings, typically on audio \acr{CD}, \acr{DVD}, audio cassette, or similar media. See also \bibtype{music}.
 
 \typeitem{bibnote}
 
@@ -585,7 +585,7 @@ National and international standards issued by a standards body such as the Inte
 
 \typeitem{video}
 
-Audiovisual recordings, typically on \acr{DVD}, \acr{VHS} casette, or similar media. See also \bibtype{movie}.
+Audiovisual recordings, typically on \acr{DVD}, \acr{VHS} cassette, or similar media. See also \bibtype{movie}.
 
 \end{typelist}
 
@@ -718,19 +718,19 @@ The edition of a printed publication. This must be an integer, not an ordinal. D
 
 \listitem{editor}{name}
 
-The editor(s) of the \bibfield{title}, \bibfield{booktitle}, or \bibfield{maintitle}, depending on the entry type. Use the \bibfield{editortype} field to specifiy the role if it is different from <\texttt{editor}>. See \secref{bib:use:edr} for further hints.
+The editor(s) of the \bibfield{title}, \bibfield{booktitle}, or \bibfield{maintitle}, depending on the entry type. Use the \bibfield{editortype} field to specify the role if it is different from <\texttt{editor}>. See \secref{bib:use:edr} for further hints.
 
 \listitem{editora}{name}
 
-A secondary editor performing a different editorial role, such as compiling, redacting, etc. Use the \bibfield{editoratype} field to specifiy the role. See \secref{bib:use:edr} for further hints.
+A secondary editor performing a different editorial role, such as compiling, redacting, etc. Use the \bibfield{editoratype} field to specify the role. See \secref{bib:use:edr} for further hints.
 
 \listitem{editorb}{name}
 
-Another secondary editor performing a different role. Use the \bibfield{editorbtype} field to specifiy the role. See \secref{bib:use:edr} for further hints.
+Another secondary editor performing a different role. Use the \bibfield{editorbtype} field to specify the role. See \secref{bib:use:edr} for further hints.
 
 \listitem{editorc}{name}
 
-Another secondary editor performing a different role. Use the \bibfield{editorctype} field to specifiy the role. See \secref{bib:use:edr} for further hints.
+Another secondary editor performing a different role. Use the \bibfield{editorctype} field to specify the role. See \secref{bib:use:edr} for further hints.
 
 \fielditem{editortype}{key}
 
@@ -1498,7 +1498,7 @@ This entry will be printed as «\emph{Journal Name}. New ser. 9 (1998)». See \sec
 \label{bib:use:tab1}
 \end{table}
 
-The date fields \bibfield{date}, \bibfield{origdate}, \bibfield{eventdate}, and \bibfield{urldate} require a date specification in \texttt{yyyy-mm-dd} format. Date ranges are given as \texttt{yyyy-mm-dd\slash yyyy-mm-dd}. Partial dates are valid provided that date components are omitted at the end only. You may specify an open ended date range by giving the range separator and omitting the end date (\eg \texttt{yyyy/}). See \tabref{bib:use:tab1} for some examples of valid date specifications and the formatted date autmatically generated by \sty{biblatex}. The formatted date is language specific and will be adapted automatically. If there is no \bibfield{date} field in an entry, \sty{biblatex} will also consider the fields \bibfield{year} and \bibfield{month} for backwards compatibility with traditional \bibtex. Style author 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 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.
+The date fields \bibfield{date}, \bibfield{origdate}, \bibfield{eventdate}, and \bibfield{urldate} require a date specification in \texttt{yyyy-mm-dd} format. Date ranges are given as \texttt{yyyy-mm-dd\slash yyyy-mm-dd}. Partial dates are valid provided that date components are omitted at the end only. You may specify an open ended date range by giving the range separator and omitting the end date (\eg \texttt{yyyy/}). See \tabref{bib:use:tab1} for some examples of valid date specifications and the formatted date automatically generated by \sty{biblatex}. The formatted date is language specific and will be adapted automatically. If there is no \bibfield{date} field in an entry, \sty{biblatex} will also consider the fields \bibfield{year} and \bibfield{month} for backwards compatibility with traditional \bibtex. Style author 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 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.
 
 \subsubsection{Months and Journal Issues}
 \label{bib:use:iss}
@@ -2093,7 +2093,7 @@ This option controls how sequences of consecutive pages in the list of back refe
 
 \item[two] Compress any sequence of two or more consecutive pages to a range, \eg the above list is compressed to <1--2, 11--13, 21--24>.
 
-\item[two+] Similar in concept to \opt{two} but a sequence of exactely two consecutive pages is printed using the starting page and the localization string \texttt{sequens}, \eg the above list is compressed to <1\,sq., 11--13, 21--24>.
+\item[two+] Similar in concept to \opt{two} but a sequence of exactly two consecutive pages is printed using the starting page and the localization string \texttt{sequens}, \eg the above list is compressed to <1\,sq., 11--13, 21--24>.
 
 \item[three+] Similar in concept to \opt{two+} but a sequence of exactly three consecutive pages is printed using the starting page and the localization string \texttt{sequentes}, \eg the above list is compressed to <1\,sq., 11\,sqq., 21--24>.
 
@@ -2105,7 +2105,7 @@ All styles support both Arabic and Roman numerals. In order to avoid potentially
 
 \optitem[setonly]{backrefsetstyle}{\opt{setonly}, \opt{memonly}, \opt{setormem}, \opt{setandmem}, \opt{memandset}, \opt{setplusmem}}
 
-This option controls how back references to \bibtype{set} entires and their members are handled. The following options are available:
+This option controls how back references to \bibtype{set} entries and their members are handled. The following options are available:
 
 \begin{valuelist}
 
@@ -2267,7 +2267,7 @@ See \secref{bib:cav:enc} for further instructions concerning the encoding of \fi
 
 \optitem[auto]{texencoding}{\opt{auto}, \prm{encoding}}
 
-Specifies the encoding of the \file{tex} file. This option affects the data transfered from the backend to \sty{biblatex}. When using \biber, this corresponds to \biber's |--bblencoding| option. The following choices are available:
+Specifies the encoding of the \file{tex} file. This option affects the data transferred from the backend to \sty{biblatex}. When using \biber, this corresponds to \biber's |--bblencoding| option. The following choices are available:
 
 \begin{valuelist}
 
@@ -2450,7 +2450,7 @@ When enabled, sorting names will only use their initials. \BiberOnlyMark This is
 
 \boolitem[false]{terseinits}
 
-This option controls the format of initials generated by \sty{biblatex}. If enabled, initals are rendered using a terse format without dots and spaces. For example, the initials of Donald Ervin Knuth would be rendered as <D.~E.> by default, and as <DE> if this option is enabled. \BiberOnlyMark With \biber, the option works by redefining some macros which control the format of initials. See \secref{use:cav:nam} for details.
+This option controls the format of initials generated by \sty{biblatex}. If enabled, initials are rendered using a terse format without dots and spaces. For example, the initials of Donald Ervin Knuth would be rendered as <D.~E.> by default, and as <DE> if this option is enabled. \BiberOnlyMark With \biber, the option works by redefining some macros which control the format of initials. See \secref{use:cav:nam} for details.
 
 \boolitem[false]{labelalpha}
 
@@ -2751,7 +2751,7 @@ This style prints the entry key rather than some kind of label. It is intended f
 \subsubsection{Bibliography Styles}
 \label{use:xbx:bbx}
 
-All bibliography styles which come with this package use the same basic format for the individual bibliography entries. They only differ in the kind of label printed in the bibliography and the overall formatting of the list of references. There is a matching bibliography style for every citation style. Note that some bibliography styles are not mentioned below because they simply load a more generic style. For example, the bibligraphy style \texttt{authortitle-comp} will load the \texttt{authortitle} style.
+All bibliography styles which come with this package use the same basic format for the individual bibliography entries. They only differ in the kind of label printed in the bibliography and the overall formatting of the list of references. There is a matching bibliography style for every citation style. Note that some bibliography styles are not mentioned below because they simply load a more generic style. For example, the bibliography style \texttt{authortitle-comp} will load the \texttt{authortitle} style.
 
 \begin{marglist}
 
@@ -2780,7 +2780,7 @@ The following bibliography styles are special purpose styles. They are not inten
 \begin{marglist}
 
 \item[draft]
-This draft style includes the entry keys in the bibliography. The bibligraphy will be sorted by entry key. The style will set the following package options at load time: \kvopt{sorting}{debug}.
+This draft style includes the entry keys in the bibliography. The bibliography will be sorted by entry key. The style will set the following package options at load time: \kvopt{sorting}{debug}.
 
 \item[debug]
 This style prints all bibliographic data in tabular format. It is intended for debugging only and will set the following package options at load time: \kvopt{sorting}{debug}.
@@ -2790,7 +2790,7 @@ This style prints all bibliographic data in tabular format. It is intended for d
 \subsection{Related Entries}
 \label{use:rel}
 
-Almost all bibliography styles require authors to specify certain types of relationship between entries such as «Reprint of», «Reprinted in» etc. It is impossible to provide data fields to cover all of these relationships and so \sty{biblatex} provides a general mechanism for this using the entry fields \bibfield{related}, \bibfield{relatedtype} and \bibfield{relatedstring}. A related entry does not need to be cited and does not appear in the bibliography itself (unless of course it is also cited itseld independently). The \bibfield{relatedtype} field should specify a localization string which will be printed before the information from the related entries is printed, for example «Orig. Pub. as». The \bibfield{relatedstring} field can be used to override the string determined via \bibfield{relatedtype}. Some examples:
+Almost all bibliography styles require authors to specify certain types of relationship between entries such as «Reprint of», «Reprinted in» etc. It is impossible to provide data fields to cover all of these relationships and so \sty{biblatex} provides a general mechanism for this using the entry fields \bibfield{related}, \bibfield{relatedtype} and \bibfield{relatedstring}. A related entry does not need to be cited and does not appear in the bibliography itself (unless of course it is also cited itself independently). The \bibfield{relatedtype} field should specify a localization string which will be printed before the information from the related entries is printed, for example «Orig. Pub. as». The \bibfield{relatedstring} field can be used to override the string determined via \bibfield{relatedtype}. Some examples:
 
 \begin{lstlisting}[style=bibtex]{}
 @Book{key1,
@@ -2947,7 +2947,7 @@ This command prints the bibliography. It takes one optional argument, which is a
 
 \valitem[bibliography/shorthands]{env}{name}
 
-The <high-level> layout of the bibliography and the list of shorthands is controlled by enviroments defined with \cmd{defbibenvironment}. This option selects an environment. The \prm{name} corresponds to the identifier used when defining the environment with \cmd{defbibenvironment}. By default, the \cmd{printbibliography} command uses the identifier \texttt{bibliography}; \cmd{printshorthands} uses \texttt{shorthands}. See also \secref{use:bib:los,use:bib:hdg}.
+The <high-level> layout of the bibliography and the list of shorthands is controlled by environments defined with \cmd{defbibenvironment}. This option selects an environment. The \prm{name} corresponds to the identifier used when defining the environment with \cmd{defbibenvironment}. By default, the \cmd{printbibliography} command uses the identifier \texttt{bibliography}; \cmd{printshorthands} uses \texttt{shorthands}. See also \secref{use:bib:los,use:bib:hdg}.
 
 \valitem[bibliography/shorthands]{heading}{name}
 
@@ -3293,7 +3293,7 @@ See the author guide, in particular \secref{aut:aux:tst,aut:aux:ife}, for furthe
 \subsubsection{Dynamic Entry Sets}
 \label{use:bib:set}
 
-In addition to the \bibtype{set} entry type, \sty{biblatex} also supports dynamic entry sets defined on a per-document\slash per-refsection basis. The following command, which may be used in the dcument preamble or the document body, defines the set \prm{key}:
+In addition to the \bibtype{set} entry type, \sty{biblatex} also supports dynamic entry sets defined on a per-document\slash per-refsection basis. The following command, which may be used in the document preamble or the document body, defines the set \prm{key}:
 
 \begin{ltxsyntax}
 
@@ -4304,7 +4304,7 @@ Whenever a reference to a work which has not been cited before is added, this pr
 
 \paragraph{\biber}
 
-The \sty{biblatex} package uses one auxilliary \file{bcf} file only. Even if there are citation commands in a file included via \cmd{include}, you only need to run \biber on the main \file{bcf} file. All information \biber needs is in the \file{bcf} file, including information about all refsections if using mutiple \env{refsection} environments (see \secref{use:use:mlt}).
+The \sty{biblatex} package uses one auxiliary \file{bcf} file only. Even if there are citation commands in a file included via \cmd{include}, you only need to run \biber on the main \file{bcf} file. All information \biber needs is in the \file{bcf} file, including information about all refsections if using multiple \env{refsection} environments (see \secref{use:use:mlt}).
 
 \paragraph{\bibtex}
 
@@ -4761,7 +4761,7 @@ Expands to \prm{true} if the class would add the bibliography to the table of co
 \subsubsection{Usage with the Memoir Class}
 \label{use:cav:mem}
 
-When using \sty{biblatex} with the \sty{memoir} class, most class facilites for adapting the bibliography have no effect. Use the corresponding facilities of this package instead (\secref{use:bib:bib, use:bib:hdg, use:bib:nts}). Instead of redefining \sty{memoir}'s \cmd{bibsection}, use the \opt{heading} option of \cmd{printbibliography} and \cmd{defbibheading} (\secref{use:bib:bib, use:bib:hdg}). Instead of \cmd{prebibhook} and \cmd{postbibhook}, use the \opt{prenote} and \opt{postnote} options of \cmd{printbibliography} and \cmd{defbibnote} (\secref{use:bib:bib, use:bib:nts}). All default headings are adapted at load-time such that they blend well with the default layout of this class. The default headings \texttt{bibliography} and \texttt{shorthands} (\secref{use:bib:hdg}) are also responsive to \sty{memoir}'s \cmd{bibintoc} and \cmd{nobibintoc} switches. The length register \len{bibitemsep} is used by \sty{biblatex} in a way similar to \sty{memoir} (\secref{use:fmt:len}). This section also introduces some additional length registers which correspond to \sty{memoir}'s \cmd{biblistextra}. Lastly, \cmd{setbiblabel} does not map to a single facility of the \sty{biblatex} package since the style of all labels in the bibliography is controlled by the bibliography style. See \secref{aut:bbx:env} in the author section of this manual for details. If the \sty{memoir} class is detected, \sty{biblatex} will also provide the following additional test which may be useful in custom heading definitions:
+When using \sty{biblatex} with the \sty{memoir} class, most class facilities for adapting the bibliography have no effect. Use the corresponding facilities of this package instead (\secref{use:bib:bib, use:bib:hdg, use:bib:nts}). Instead of redefining \sty{memoir}'s \cmd{bibsection}, use the \opt{heading} option of \cmd{printbibliography} and \cmd{defbibheading} (\secref{use:bib:bib, use:bib:hdg}). Instead of \cmd{prebibhook} and \cmd{postbibhook}, use the \opt{prenote} and \opt{postnote} options of \cmd{printbibliography} and \cmd{defbibnote} (\secref{use:bib:bib, use:bib:nts}). All default headings are adapted at load-time such that they blend well with the default layout of this class. The default headings \texttt{bibliography} and \texttt{shorthands} (\secref{use:bib:hdg}) are also responsive to \sty{memoir}'s \cmd{bibintoc} and \cmd{nobibintoc} switches. The length register \len{bibitemsep} is used by \sty{biblatex} in a way similar to \sty{memoir} (\secref{use:fmt:len}). This section also introduces some additional length registers which correspond to \sty{memoir}'s \cmd{biblistextra}. Lastly, \cmd{setbiblabel} does not map to a single facility of the \sty{biblatex} package since the style of all labels in the bibliography is controlled by the bibliography style. See \secref{aut:bbx:env} in the author section of this manual for details. If the \sty{memoir} class is detected, \sty{biblatex} will also provide the following additional test which may be useful in custom heading definitions:
 
 \begin{ltxsyntax}
 
@@ -4888,7 +4888,7 @@ The delimiters:
       La\delim{~}{a}Vallée\delim{~}{a}Poussin
 \end{namesample}
 %
-Note that \cmd{bibnamedelima/b/i} are inserted by the backend. The backend processes the name parts and takes care of the delimiters between the elements that make up a name part, processing each part individually. In contrast to that, the delimiters between the parts of the complete name (\cmd{bibnamedelimc/d}) are added by name formatting directives at a later point in the processing chain. The spacing and punctuation of initals is also handled by the backend and may be customized by redefining the following three macros:
+Note that \cmd{bibnamedelima/b/i} are inserted by the backend. The backend processes the name parts and takes care of the delimiters between the elements that make up a name part, processing each part individually. In contrast to that, the delimiters between the parts of the complete name (\cmd{bibnamedelimc/d}) are added by name formatting directives at a later point in the processing chain. The spacing and punctuation of initials is also handled by the backend and may be customized by redefining the following three macros:
 
 \begin{namedelims}
 a & \cmd{bibinitperiod} & Inserted by the backend after initials.\\
@@ -4935,7 +4935,7 @@ This part of the manual documents the author interface of the \sty{biblatex} pac
 \subsection{Overview}
 \label{aut:int}
 
-Before we get to the commands and facilities provided by \sty{biblatex}, we will have a look at some of its fundamental concepts. The \sty{biblatex} package uses auxilliary files in a specia way. Most notably, the \file{bbl} file is used differently and when using \bibtex as the backend, there is only one \file{bst} file which implements a structured data interface rather than exporting printable data. With \latex's standard bibliographic facilities, a document includes any number of citation commands in the document body plus \cmd{bibliographystyle} and \cmd{bibliography}, usually towards the end of the document. The location of the former is arbitrary, the latter marks the spot where the list of references is to be printed:
+Before we get to the commands and facilities provided by \sty{biblatex}, we will have a look at some of its fundamental concepts. The \sty{biblatex} package uses auxiliary files in a special way. Most notably, the \file{bbl} file is used differently and when using \bibtex as the backend, there is only one \file{bst} file which implements a structured data interface rather than exporting printable data. With \latex's standard bibliographic facilities, a document includes any number of citation commands in the document body plus \cmd{bibliographystyle} and \cmd{bibliography}, usually towards the end of the document. The location of the former is arbitrary, the latter marks the spot where the list of references is to be printed:
 
 \begin{ltxexample}
 \documentclass{...}
@@ -5028,9 +5028,9 @@ In order to streamline the whole procedure, \sty{biblatex} essentially employs t
 
 \item Run \bin{latex}: The first step is similar to the traditional procedure described above: \cmd{bibstyle} and \cmd{bibdata} commands are written to the \file{aux} file (\bibtex backend) or \file{bcf} file (\biber backend), along with \cmd{citation} commands for all citations. We then wait for the backend to supply the required data. With \bibtex as a backend, since \sty{biblatex} uses a special \file{bst} file which implements its data interface on the \bibtex end, the \cmd{bibstyle} command is always |\bibstyle{biblatex}|.
 
-\item Run \bin{biber} or \bin{bibtex}: The backend supplies those entries from the \file{bib} file which were requested by the \cmd{citation} commands in the auxilliary file. However, it does not write a printable bibliography to the \file{bbl} file, but rather a structured representation of the bibliographic data. Just like an \file{aux} file, this \file{bbl} file does not print anything when read in. It merely puts data in memory.
+\item Run \bin{biber} or \bin{bibtex}: The backend supplies those entries from the \file{bib} file which were requested by the \cmd{citation} commands in the auxiliary file. However, it does not write a printable bibliography to the \file{bbl} file, but rather a structured representation of the bibliographic data. Just like an \file{aux} file, this \file{bbl} file does not print anything when read in. It merely puts data in memory.
 
-\item Run \bin{latex}: Starting with the second run, the \file{bbl} file is processed right at the beginning of the document body, just like an \file{aux} file. From this point on, all bibliographic data is available in memory so that all citations can be printed right away.\footnote{If the \opt{defernumbers} package option is enabled \sty{biblatex} uses an alogrithm similar to the traditional procedure to generate numeric lables. In this case, the numbers are assigned as the bibliography is printed and then cycled through the backend auzilliary file. It will take an additional \latex run for them to be picked up in citations.} The citation commands have access to the complete bibliographic data, not only to a predefined label. The bibliography is generated from memory using the same data and may be filtered or split as required.
+\item Run \bin{latex}: Starting with the second run, the \file{bbl} file is processed right at the beginning of the document body, just like an \file{aux} file. From this point on, all bibliographic data is available in memory so that all citations can be printed right away.\footnote{If the \opt{defernumbers} package option is enabled \sty{biblatex} uses an algorithm similar to the traditional procedure to generate numeric labels. In this case, the numbers are assigned as the bibliography is printed and then cycled through the backend auxiliary file. It will take an additional \latex run for them to be picked up in citations.} The citation commands have access to the complete bibliographic data, not only to a predefined label. The bibliography is generated from memory using the same data and may be filtered or split as required.
 
 \end{enumerate}
 
@@ -5217,7 +5217,7 @@ At this point, there is still one piece missing: the formatting directives used
 \DeclareFieldFormat{title}{\emph{#1}}
 \end{lstlisting}
 %
-List formats are slightly more complex. After splitting up the list into individual items, \sty{biblatex} will execute the formatting directive once for every item in the list. The item is passed to the directive as an argument. The separator to be inserted between the indivdual items in the list is also handled by the corresponding directive, hence we have to check whether we are in the middle of the list or at the end when inserting it.
+List formats are slightly more complex. After splitting up the list into individual items, \sty{biblatex} will execute the formatting directive once for every item in the list. The item is passed to the directive as an argument. The separator to be inserted between the individual items in the list is also handled by the corresponding directive, hence we have to check whether we are in the middle of the list or at the end when inserting it.
 
 \begin{lstlisting}[style=latex]{}
 \DeclareListFormat{location}{%
@@ -5241,7 +5241,7 @@ Formatting directives for names are similar to those for literal lists, but the
     {}}
 \end{lstlisting}
 %
-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 component of a name is not available, the corresponding argument will be blank. As with directives for literal lists, the separator to be inserted between the indivdual items in the 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 component of a name is not available, the corresponding argument will be blank. As with directives for literal lists, the separator to be inserted between the individual items in the 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}
@@ -5279,7 +5279,7 @@ 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 wich 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}.
+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{fullhash}{string}
 
@@ -5725,7 +5725,7 @@ Note that name affixes are referred to as the <junior part> of the name in the \
 \item[\#8] The name affixes, given as initials.
 \end{argumentlist}
 %
-If a certain part of a name is not available, the corresponding argument will be empty, hence you may use \cmd{ifblank} tests to check for the inidividual 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.
+If a certain part of a name is not available, the corresponding argument will be empty, hence you may use \cmd{ifblank} tests 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}
@@ -6129,12 +6129,14 @@ Validation against the data model means that after mapping your data sources int
 \item Whether the fields obey various constraints on their format which you specify
 \end{itemize}
 %
-Redefining the data model can be done in several places. Style authors can create a \file{.dbx} file which contains the data model macros required and this will be loaded automatically when using the \sty{biblatex} package \opt{style} option by looking for a file named afer the style with a \file{.dbx} (just like the \file{.cbx} and \file{.bbx} files for a style). Alternatively, the name of the data model file can be different from the style name by specifying the name (without \file{.dbx} extension) to the package \opt{datamodel} option. After loading the style data model file, \sty{biblatex} then loads, if present, a users \file{biblatex-dm.cfg} which should be put somewhere \sty{biblatex} can find it, just like the main configuration file \sty{biblatex.cfg}. To summarise, the data model is determined by adding to the data model from each of these locations, in order:\\
+Redefining the data model can be done in several places. Style authors can create a \file{.dbx} file which contains the data model macros required and this will be loaded automatically when using the \sty{biblatex} package \opt{style} option by looking for a file named after the style with a \file{.dbx} extension (just like the \file{.cbx} and \file{.bbx} files for a style). If the \opt{style} option is not used but rather the \opt{citestyle} and \opt{bibstyle} options, then the package will try to load \file{.dbx} files called \file{<citestyle>.dbx} and \file{<bibstyle>.dbx}.
+Alternatively, the name of the data model file can be different from any of the style option names by specifying the name (without \file{.dbx} extension) to the package \opt{datamodel} option. After loading the style data model file, \sty{biblatex} then loads, if present, a users \file{biblatex-dm.cfg} which should be put somewhere \sty{biblatex} can find it, just like the main configuration file \sty{biblatex.cfg}. To summarise, the data model is determined by adding to the data model from each of these locations, in order:\\
 
 \noindent\file{blx-dm.def}$\rightarrow$\\
 \hspace*{1em}\file{<datamodel option>.dbx} $\rightarrow$\\
 \hspace*{2em}\file{<style option>.dbx} $\rightarrow$\\
-\hspace*{3em}\file{biblatex-dm.cfg}\\
+\hspace*{3em}\file{<citestyle option>.dbx} and \file{<bibstyle option>.dbx} $\rightarrow$\\
+\hspace*{4em}\file{biblatex-dm.cfg}\\
 
 \noindent The data model is defined using the following macros:
 
@@ -6364,7 +6366,7 @@ Forces the label part derived from the field to uppercase. By default, the case
 
 \boolitem[false]{varwidth}
 
-Use a variable width, left-side substring of characters from the \prm{field} (each lastname in name list fields). The length of the string is determined by the minimum length needed to disambiguate the substring from all other \prm{field} elements in the same position in the label. For name list fields, this means that each name substring is disambigated from all other name substrings which occur in the sme position in the name list (see examples below). This option overrides \texttt{strwidth} if both are used. The short form \opt{varwidth} is equivalent to \kvopt{varwidth}{true}. For name list fields, if \kvopt{useprefix}{true}, the first character of the name prefix is prepended to the substring.
+Use a variable width, left-side substring of characters from the \prm{field} (each lastname in name list fields). The length of the string is determined by the minimum length needed to disambiguate the substring from all other \prm{field} elements in the same position in the label. For name list fields, this means that each name substring is disambiguated from all other name substrings which occur in the same position in the name list (see examples below). This option overrides \texttt{strwidth} if both are used. The short form \opt{varwidth} is equivalent to \kvopt{varwidth}{true}. For name list fields, if \kvopt{useprefix}{true}, the first character of the name prefix is prepended to the substring.
 
 \boolitem[false]{varwidthnorm}
 
@@ -6636,7 +6638,7 @@ The \cmd{citeorder} element has a special meaning. It requests a sort based on t
 \cite{one,two}
 \end{lstlisting}
 %
-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):
+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{lstlisting}[style=latex]{}
 \DeclareSortingScheme{none}{
@@ -7687,7 +7689,7 @@ The \cmd{setunit} command is similar to \cmd{newunit} except that it uses \prm{p
 
 \cmditem{setpunctfont}{command}
 
-This command, which is intended for use in field formatting directives, provides an alternative way of dealing with unit punctuation after a field printed in a different font (for example, a title printed in italics). The standard \latex way of dealing with this is adding a small amount of space, the so-called italic correction. This command allows adapting the punctuation to the font of the preceeding field. The \prm{command} should be a text font command which takes one argument, such as \cmd{emph} or \cmd{textbf}. This command will only affect punctuation marks inserted by one of the commands from \secref{aut:pct:pct}. The font adaption is applied to the next punctuation mark only and will be reset automatically thereafter. If you want to reset it manually before it takes effect, issue \cmd{resetpunctfont}. If the \opt{punctfont} package option is disabled, this command does nothing. Note that the \cmd{mkbibemph} and \cmd{mkbibbold} wrappers from \secref{aut:fmt:ich} incorporate this feature by default.
+This command, which is intended for use in field formatting directives, provides an alternative way of dealing with unit punctuation after a field printed in a different font (for example, a title printed in italics). The standard \latex way of dealing with this is adding a small amount of space, the so-called italic correction. This command allows adapting the punctuation to the font of the preceding field. The \prm{command} should be a text font command which takes one argument, such as \cmd{emph} or \cmd{textbf}. This command will only affect punctuation marks inserted by one of the commands from \secref{aut:pct:pct}. The font adaption is applied to the next punctuation mark only and will be reset automatically thereafter. If you want to reset it manually before it takes effect, issue \cmd{resetpunctfont}. If the \opt{punctfont} package option is disabled, this command does nothing. Note that the \cmd{mkbibemph} and \cmd{mkbibbold} wrappers from \secref{aut:fmt:ich} incorporate this feature by default.
 
 \csitem{resetpunctfont}
 
@@ -7895,7 +7897,7 @@ Undoes the settings applied by \cmd{uspunctuation}, restoring standard punctuati
 \subsubsection{Correcting Punctuation Tracking}
 \label{aut:pct:ctr}
 
-The facilities for punctuation tracking and automatic capitalization are very reliable under normal circumstances, but there are always marginal cases which may require manual intervention. Typical cases are localization strings printed as the first word in a footnote (which is usually treated as the beginning of a paragaph as far as capitalization is concerned, but \tex is not in vertical mode at this point) or punctuation after periods which are not really end"=of"=sentence periods (for example, after an ellipsis like «[\dots\unkern]» a command such as \cmd{addperiod} would do nothing since parentheses and brackets are transparent to the punctuation tracker). In such cases, use the following commands in bibliography and citation styles to mark the beginning or middle of a sentence if and where required:
+The facilities for punctuation tracking and automatic capitalization are very reliable under normal circumstances, but there are always marginal cases which may require manual intervention. Typical cases are localization strings printed as the first word in a footnote (which is usually treated as the beginning of a paragraph as far as capitalization is concerned, but \tex is not in vertical mode at this point) or punctuation after periods which are not really end"=of"=sentence periods (for example, after an ellipsis like «[\dots\unkern]» a command such as \cmd{addperiod} would do nothing since parentheses and brackets are transparent to the punctuation tracker). In such cases, use the following commands in bibliography and citation styles to mark the beginning or middle of a sentence if and where required:
 
 \begin{ltxsyntax}
 
@@ -8018,7 +8020,7 @@ The first value is the long, written out expression, the second one is an abbrev
 }
 \end{lstlisting}
 
-The above examples are slightly simplified. Real localization files should use the punctuation and formatting commands discussed in \secref{aut:pct:pct, use:fmt} instead of literal puntuation. Here is an excerpt from a real localization file:
+The above examples are slightly simplified. Real localization files should use the punctuation and formatting commands discussed in \secref{aut:pct:pct, use:fmt} instead of literal punctuation. Here is an excerpt from a real localization file:
 
 \begin{lstlisting}[style=latex]{}
   bibliography     = {{Bibliography}{Bibliography}},
@@ -8924,7 +8926,7 @@ Alternative syntax for \cmd{mkbibbrackets}. This will also work across groups. N
 
 \cmditem{mkbibfootnote}{text}
 
-A generic command which prints its argument as a footnote. This is a wrapper around the standard \latex \cmd{footnote} command which removes spurious whitespace preceeding the footnote mark and prevents nested footnotes. By default, \cmd{mkbibfootnote} requests capitalization at the beginning of the note and automatically adds a period at the end. You may change this behavior by redefining the \cmd{bibfootnotewrapper} macro introduced below.
+A generic command which prints its argument as a footnote. This is a wrapper around the standard \latex \cmd{footnote} command which removes spurious whitespace preceding the footnote mark and prevents nested footnotes. By default, \cmd{mkbibfootnote} requests capitalization at the beginning of the note and automatically adds a period at the end. You may change this behavior by redefining the \cmd{bibfootnotewrapper} macro introduced below.
 
 \cmditem{mkbibfootnotetext}{text}
 
@@ -8932,7 +8934,7 @@ Similar to \cmd{mkbibfootnote} but uses the \cmd{footnotetext} command.
 
 \cmditem{mkbibendnote}{text}
 
-Similar in concept to \cmd{mkbibfootnote} execept that it prints its argument as an endnote. \cmd{mkbibendnote} removes spurious whitespace preceeding the endnote mark and prevents nested notes. It supports the \cmd{endnote} command provided by the \sty{endnotes} package as well as the \cmd{pagenote} command provided by the \sty{pagenote} package and the \sty{memoir} class. If both commands are available, \cmd{endnote} takes precedence. If no endnote support is available, \cmd{mkbibendnote} issues an error and falls back to \cmd{footnote}. By default, \cmd{mkbibendnote} requests capitalization at the beginning of the note and automatically adds a period at the end. You may change this behavior by redefining the \cmd{bibendnotewrapper} macro introduced below.
+Similar in concept to \cmd{mkbibfootnote} except that it prints its argument as an endnote. \cmd{mkbibendnote} removes spurious whitespace preceding the endnote mark and prevents nested notes. It supports the \cmd{endnote} command provided by the \sty{endnotes} package as well as the \cmd{pagenote} command provided by the \sty{pagenote} package and the \sty{memoir} class. If both commands are available, \cmd{endnote} takes precedence. If no endnote support is available, \cmd{mkbibendnote} issues an error and falls back to \cmd{footnote}. By default, \cmd{mkbibendnote} requests capitalization at the beginning of the note and automatically adds a period at the end. You may change this behavior by redefining the \cmd{bibendnotewrapper} macro introduced below.
 
 \cmditem{mkbibendnotetext}{text}
 
@@ -8960,7 +8962,7 @@ Similar in concept to \cmd{bibfootnotewrapper} but related to the \cmd{mkbibendn
 
 \cmditem{mkbibsuperscript}{text}
 
-A generic command which prints its argument as superscripted text. This is a simple wrapper around the standard \latex \cmd{textsuperscript} command which removes spurious whitespace and allows hyphenation of the preceeding word.
+A generic command which prints its argument as superscripted text. This is a simple wrapper around the standard \latex \cmd{textsuperscript} command which removes spurious whitespace and allows hyphenation of the preceding word.
 
 \cmditem{mkbibmonth}{integer}
 
@@ -9565,7 +9567,7 @@ When defining \cmd{bbx@xref}, the \prm{precode}, \prm{postcode}, and \prm{sepcod
 
 \paragraph{The Basics}
 
-There is one fundamental principle style authors should keep in mind when designing a bibligraphy driver: block and unit punctuation is handled asynchronously. This is best explained by way of example. Consider the following code snippet:
+There is one fundamental principle style authors should keep in mind when designing a bibliography driver: block and unit punctuation is handled asynchronously. This is best explained by way of example. Consider the following code snippet:
 
 \begin{lstlisting}[style=latex]{}
 \printfield{title}% 
@@ -9609,7 +9611,7 @@ Block and unit punctuation will only be inserted if \emph{all} of these conditio
 \printfield{note}% 
 \end{lstlisting}
 %
-Here's what happens if the \bibfield{edition} field is undefined. The first \cmd{printfield} command prints the title and sets an internal <new~text> flag. The first \cmd{newunit} sets an interal <new~unit> flag. No punctuation has been printed at this point. The second \cmd{printfield} does nothing because the \bibfield{edition} field is undefined. The next \cmd{newunit} command sets the interal flag <new unit> again. Still no punctuation has been printed. The third \cmd{printfield} checks if the \bibfield{note} field is defined. If so, it looks at the <new~text> and <new~unit> flags. If both are set, it inserts the punctuation buffer before printing the note. It then clears the <new~unit> flag and sets the <new~text> flag again.
+Here's what happens if the \bibfield{edition} field is undefined. The first \cmd{printfield} command prints the title and sets an internal <new~text> flag. The first \cmd{newunit} sets an internal <new~unit> flag. No punctuation has been printed at this point. The second \cmd{printfield} does nothing because the \bibfield{edition} field is undefined. The next \cmd{newunit} command sets the internal flag <new unit> again. Still no punctuation has been printed. The third \cmd{printfield} checks if the \bibfield{note} field is defined. If so, it looks at the <new~text> and <new~unit> flags. If both are set, it inserts the punctuation buffer before printing the note. It then clears the <new~unit> flag and sets the <new~text> flag again.
 
 This may all sound more complicated than it is. In practice, it means that it is possible to write large parts of a bibliography driver in a sequential way. The advantage of this approach becomes obvious when trying to write the above code without using the punctuation tracker. Such an attempt will lead to a rather convoluted set of \cmd{iffieldundef} tests required to check for all possible field combinations (note that the code below handles three fields; a typical driver may need to cater for some two dozen fields):
 
@@ -9882,7 +9884,7 @@ The \opt{bibtex} driver is of course the most comprehensive and mature of the \b
 
 \subsection{\opt{endnotexml}}
 
-The \opt{endnotexml} driver for \biber uses the following mappings. This format is quite messy and not well suited to robust typsetting of bibliographic data. It is presented largely as an example of \biber's modular datasource abilities and also of how to map foreign data models into the \biblatex data model. Mappings from such messy and relatively simple data models are inevitably fragile and are of limited use.
+The \opt{endnotexml} driver for \biber uses the following mappings. This format is quite messy and not well suited to robust typesetting of bibliographic data. It is presented largely as an example of \biber's modular datasource abilities and also of how to map foreign data models into the \biblatex data model. Mappings from such messy and relatively simple data models are inevitably fragile and are of limited use.
 
 \begin{lstlisting}[style=latex]{}
 \DeclareDefaultSourcemap[datatype=endnotexml]{
@@ -10518,6 +10520,12 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.1}{2012-08-01}
+\item Misc bug fixes
+\item Added better Norwegian localization
+\item Increased data model auto-loading possibilities\see{aut:ctm:dm}\BiberOnlyMark
+\end{release}
+
 \begin{release}{2.0}{2012-07-01}
 \item Misc bug fixes
 \item Generalised \opt{singletitle} test a little\see{aut:aux:tst}\BiberOnlyMark
diff --git a/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib b/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib
index b979e19006e..2b1cc3178a5 100644
--- a/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib
+++ b/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib
@@ -629,6 +629,7 @@
   hyphenation = {american},
   sortyear = {1986-2},
   sorttitle = {Computers & Typesetting C},
+  author = {Knuth, Donald E.},
   indextitle = {METAFONTbook, The},
   title = {The METAFONTbook},
   shorttitle = {METAFONTbook},
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.pdf
index 95f306a306e..dbea075c7b3 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
index b979e19006e..2b1cc3178a5 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
@@ -629,6 +629,7 @@
   hyphenation = {american},
   sortyear = {1986-2},
   sorttitle = {Computers & Typesetting C},
+  author = {Knuth, Donald E.},
   indextitle = {METAFONTbook, The},
   title = {The METAFONTbook},
   shorttitle = {METAFONTbook},
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 403ef2347f8..649fc0b37de 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -2734,13 +2734,21 @@
     \printfield{part}%
     \setunit{\addcolon\space}%
     \usebibmacro{title}%
-    \ifnamesequal{author}{savedauthor}
+    \ifboolexpr{
+      test {\ifnamesequal{author}{savedauthor}}
+      or
+      test {\ifnameundef{author}}
+    } 
       {}
       {\usebibmacro{bytypestrg}{author}{author}%
        \setunit{\addspace}%
        \printnames[byauthor]{author}
        \newunit\newblock}%
-    \ifnamesequal{editor}{savededitor}
+    \ifboolexpr{
+      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 3ec4ad4da00..19c497dca50 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -3,13 +3,20 @@
 %%
 
 % Set up the version strings here, so they are the same for both branches
-\def\abx@date{2012/07/01}
-\def\abx@version{2.0}
+\def\abx@date{DATE}
+\def\abx@version{VERSION}
 \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)}
 \def\abx@cptid{\abx@date\space v\abx@version\space biblatex compatibility (PK/JW/AB)}
-\def\blx@bblversion{\abx@version}
+% This is not updated by build script as the controlfile version
+% does not necessarily change with the package version.
+% This is used when writing the .bcf
+\def\blx@bcfversion{2.0}
+% 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.1}
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{biblatex}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
index 079897b93e1..c55458a475d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
@@ -436,6 +436,7 @@
 \newtoggle{blx@useeditor}
 \newtoggle{blx@usetranslator}
 \newtoggle{blx@useprefix}
+\newtoggle{blx@addset}
 \newtoggle{blx@setonly}
 \newtoggle{blx@dataonly}
 \newtoggle{blx@skipbib}
@@ -554,7 +555,7 @@
 % resulting number of things in the filtered list. This is
 % because \tempcnta is used to set citetotal - this use
 % of filtering for cite sorting has the side-effect of stripping
-% duplicated like \cite{foo,foo} but we need then to keep citetotal
+% duplicates like \cite{foo,foo} but we need then to keep citetotal
 % in sync.
 
 \protected\def\blx@filtercitesort#1#2{%
@@ -673,7 +674,7 @@
           \ifx\blx@tempb\blx@tempc
           \else
             \blx@warning@noline{%
-              File '#1.#2' created by wrong version}
+              File '#1.#2' is wrong format version - expected \blx@bblversion}
           \fi
         \else
           \blx@error
@@ -690,38 +691,13 @@
   \closein\blx@bcfin
   \expandafter\endgroup\blx@tempa}
 
-\def\blx@sig@bib{@Comment{$ biblatex control file $}}
-\edef\blx@ver@bib{@Comment{$ biblatex version \blx@bblversion\space $}}
-\edef\blx@sig@aux{\@percentchar\space $ biblatex auxiliary file $}
-\edef\blx@ver@aux{\@percentchar\space$ biblatex version \blx@bblversion\space $}
-\let\blx@sig@bbl\blx@sig@aux
-\let\blx@ver@bbl\blx@ver@aux
+\edef\blx@sig@bbl{\@percentchar\space $ biblatex auxiliary file $}
+\edef\blx@ver@bbl{\@percentchar\space $ biblatex bbl format version \blx@bblversion\space $}
 \edef\blx@sig@bcf{\detokenize{<?xml version="1.0" encoding="UTF-8"?>}}
 \edef\blx@ver@bcf{%
-  \detokenize{<bcf:controlfile version="}\blx@bblversion
+  \detokenize{<bcf:controlfile version="}\blx@bcfversion
   \detokenize{" xmlns:bcf="https://sourceforge.net/projects/biblatex">}}
 
-\edef\blx@msg@aux{%
-  \blx@sig@aux\blx@nl
-  \blx@ver@aux\blx@nl
-  \@percentchar\space Do not modify this file!\blx@nl
-  \@percentchar\blx@nl
-  \@percentchar\space This is an auxiliary file
-  used by the 'biblatex' package.\blx@nl
-  \@percentchar\space This file may safely be deleted.
-  It will be recreated as\blx@nl
-  \@percentchar\space required.\blx@nl
-  \@percentchar\blx@nl\string\relax\blx@nl}
-\edef\blx@msg@bib{%
-  \blx@sig@bib\blx@nl
-  \blx@ver@bib\blx@nl
-  Do not modify this file!\blx@nl\blx@nl
-  This is an auxiliary file used
-  by the 'biblatex' package.\blx@nl
-  This file may safely be deleted.
-  It will be recreated as\blx@nl
-  required.\blx@nl\blx@nl}
-
 % {<true>}{<false>}
 
 \newrobustcmd*{\lbx@ifutfinput}{\ifboolexpr{%
@@ -4735,10 +4711,12 @@
 
 % We need to now load any style data model
 % Order of precedence is:
-% <datamodel option>.dbx, <style option>.dbx
+% <datamodel option>.dbx
+%   <style option>.dbx
+%     <citestyle option>.dbx and <bibstyle option>.dbx
 % This has to be done before the real options processing so we need to
-% pick out just these two options to look at. You can't do this with keyval,
-% you have to use kvoptions. So, pick out these two, pass through all
+% pick out just these four options to look at. You can't do this with keyval,
+% you have to use kvoptions. So, pick out these four, pass through all
 % others and delete datamodel option as we don't care about it when we come
 % to really set options below
 \SetupKeyvalOptions{
@@ -4746,10 +4724,23 @@
   prefix=blx@opt@eldt@}
 \DeclareStringOption{datamodel}
 \DeclareStringOption{style}
+\DeclareStringOption{citestyle}
+\DeclareStringOption{bibstyle}
 \DeclareDefaultOption{}
 \ProcessLocalKeyvalOptions{blx@opt@eldt}
 \ifx\blx@opt@eldt@datamodel\@empty
-  \blx@inputonce{\blx@opt@eldt@style.dbx}{biblatex style data model}{}{}{}{}
+  \ifx\blx@opt@eldt@style\@empty
+    \ifx\blx@opt@eldt@citestyle\@empty
+    \else
+      \blx@inputonce{\blx@opt@eldt@citestyle.dbx}{biblatex citestyle data model}{}{}{}{}
+    \fi
+    \ifx\blx@opt@eldt@bibstyle\@empty
+    \else
+      \blx@inputonce{\blx@opt@eldt@bibstyle.dbx}{biblatex bibstyle data model}{}{}{}{}
+    \fi
+  \else
+    \blx@inputonce{\blx@opt@eldt@style.dbx}{biblatex style data model}{}{}{}{}
+  \fi
 \else
   \blx@inputonce{\blx@opt@eldt@datamodel.dbx}{biblatex style data model}{}{}{}{}
 \fi
@@ -5225,7 +5216,8 @@
     {\blx@addpageref{\abx@field@entrykey}}%
   \nottoggle{blx@setonly}
     {\listcsxadd{blx@slists@\the\c@refsection @entry@\blx@slist@name}{\abx@field@entrykey}}
-    {\toggletrue{blx@skipbib}%
+    {\global\toggletrue{blx@addset}%
+     \toggletrue{blx@skipbib}%
      \toggletrue{blx@skiplos}%
      \toggletrue{blx@skiplab}}%
   \nottoggle{blx@skipbib}
@@ -5260,6 +5252,30 @@
   \blx@bbl@hooks
   \endgroup}
 
+% This, at the end of the .bbl, puts any set parents into the
+% global sort list of citations as this is needed for the subentry citing
+% when sortcites is enabled as for sortcites, the global sorting list
+% is used and the parent set of a subentry is not necessarily
+% available in the global sortlist.
+\def\blx@addset{%
+  \begingroup
+  \letcs\blx@tempa{blx@slists@\the\c@refsection @entry@\blx@sorting}%
+  \global\cslet{blx@slists@\the\c@refsection @entry@\blx@sorting}\@empty
+  \forlistloop\blx@addset@i\blx@tempa
+  \endgroup}
+
+\def\blx@addset@i#1{%
+  \listcsgadd{blx@slists@\the\c@refsection @entry@\blx@sorting}{#1}%
+  \ifcsdef{blx@setp@\the\c@refsection @#1}
+    {\expandafter\expandafter\expandafter\forcsvlist
+     \expandafter\expandafter\expandafter\blx@addset@ii
+     \expandafter\expandafter\expandafter{%
+       \csname blx@setp@\the\c@refsection @#1\endcsname}}
+    {}}
+
+\def\blx@addset@ii#1{%
+  \listcsgadd{blx@slists@\the\c@refsection @entry@\blx@sorting}{#1}}
+
 \def\blx@bbl@shorthand{%
   \ifundef\abx@field@shorthand
     {}
@@ -5393,7 +5409,11 @@
   \let\verb\blx@bbl@verbdef
   \let\endverb\blx@bbl@verbend}
 
-\def\blx@bblend{}
+\def\blx@bblend{%
+  \iftoggle{blx@addset}
+    {\blx@addset
+     \global\togglefalse{blx@addset}}
+    {}}
 
 % {<instcount>}{<entrykey>}{<refsection>}{<labelnumber>}
 
@@ -5451,6 +5471,7 @@
   \blx@bbl@addentryfield{\detokenize{#1}}{#2}{prefixnumber}{#3}}
 
 \def\blx@bbl@slist#1#2{%
+  \csnumgdef{blx@labelnumber@\the\c@refsection}{0}%
   \begingroup
   \def\blx@slist@name{#2}%
   % This macro (\key) will only be called in shorthand lists
@@ -10343,9 +10364,7 @@
 \AtBeginDocument{%
   \blx@checkencoding
   \if@filesw
-    \blx@ifsigned{\jobname}{bcf}
-      {\blx@ctrlwrite@biber}
-      {}%
+    \blx@ctrlwrite@biber
     \blx@bblinput
     \blx@maxsection\z@
   \fi
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
index a313bc49401..eca364cc13d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
@@ -36,211 +36,279 @@
 \DeclareBibliographyStrings{%
   bibliography     = {{Bibliografi}{Bibliografi}},
   references       = {{Referanser}{Referanser}},
-  shorthands       = {{Forkortelsesliste}{Liste over forkortelser}},
-  editor           = {{editor}{ed\adddot}},
-  editors          = {{editorere}{ed\adddot}},
-  compiler         = {{sammenstiller}{sammenst\adddot}},
-  compilers        = {{sammenstillere}{sammenst\adddot}},
-  redactor         = {{redakt\o r}{red\adddot}},
-  redactors        = {{redakt\o rer}{red\adddot}},
-% reviser          = {{}{}}, % FIXME: missing
-% revisers         = {{}{}}, % FIXME: missing
-% founder          = {{}{}}, % FIXME: missing
-% founders         = {{}{}}, % FIXME: missing
-% continuator      = {{}{}}, % FIXME: missing
-% continuators     = {{}{}}, % FIXME: missing
-% collaborator     = {{}{}}, % FIXME: missing
-% collaborators    = {{}{}}, % FIXME: missing
+  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      = {{kommentator}{kom\adddot}},
-  commentators     = {{kommentatorer}{kom\adddot}},
-  annotator        = {{forklaring}{forkl\adddot}},
+  commentator      = {{kommentarer}{komm\adddot}},
+  commentators     = {{kommentarer}{komm\adddot}},
+  annotator        = {{forklaringer}{forkl\adddot}},
   annotators       = {{forklaringer}{forkl\adddot}},
-  commentary       = {{kommentar}{komm\adddot}},
-  annotations      = {{forklaring}{forkl\adddot}},
+  commentary       = {{kommentarer}{komm\adddot}},
+  annotations      = {{forklaringer}{forkl\adddot}},
   introduction     = {{innledning}{innl\adddot}},
   foreword         = {{forord}{forord}},
   afterword        = {{etterord}{etterord}},
-% editortr         = {{}{}}, % FIXME: missing
-% editorstr        = {{}{}}, % FIXME: missing
-% editorco         = {{}{}}, % FIXME: missing
-% editorsco        = {{}{}}, % FIXME: missing
-% editoran         = {{}{}}, % FIXME: missing
-% editorsan        = {{}{}}, % FIXME: missing
-% editorin         = {{}{}}, % FIXME: missing
-% editorsin        = {{}{}}, % FIXME: missing
-% editorfo         = {{}{}}, % FIXME: missing
-% editorsfo        = {{}{}}, % FIXME: missing
-% editoraf         = {{}{}}, % FIXME: missing
-% editorsaf        = {{}{}}, % FIXME: missing
-% editortrco       = {{}{}}, % FIXME: missing
-% editorstrco      = {{}{}}, % FIXME: missing
-% editortran       = {{}{}}, % FIXME: missing
-% editorstran      = {{}{}}, % FIXME: missing
-% editortrin       = {{}{}}, % FIXME: missing
-% editorstrin      = {{}{}}, % FIXME: missing
-% editortrfo       = {{}{}}, % FIXME: missing
-% editorstrfo      = {{}{}}, % FIXME: missing
-% editortraf       = {{}{}}, % FIXME: missing
-% editorstraf      = {{}{}}, % FIXME: missing
-% editorcoin       = {{}{}}, % FIXME: missing
-% editorscoin      = {{}{}}, % FIXME: missing
-% editorcofo       = {{}{}}, % FIXME: missing
-% editorscofo      = {{}{}}, % FIXME: missing
-% editorcoaf       = {{}{}}, % FIXME: missing
-% editorscoaf      = {{}{}}, % FIXME: missing
-% editoranin       = {{}{}}, % FIXME: missing
-% editorsanin      = {{}{}}, % FIXME: missing
-% editoranfo       = {{}{}}, % FIXME: missing
-% editorsanfo      = {{}{}}, % FIXME: missing
-% editoranaf       = {{}{}}, % FIXME: missing
-% editorsanaf      = {{}{}}, % FIXME: missing
-% editortrcoin     = {{}{}}, % FIXME: missing
-% editorstrcoin    = {{}{}}, % FIXME: missing
-% editortrcofo     = {{}{}}, % FIXME: missing
-% editorstrcofo    = {{}{}}, % FIXME: missing
-% editortrcoaf     = {{}{}}, % FIXME: missing
-% editorstrcoaf    = {{}{}}, % FIXME: missing
-% editortranin     = {{}{}}, % FIXME: missing
-% editorstranin    = {{}{}}, % FIXME: missing
-% editortranfo     = {{}{}}, % FIXME: missing
-% editorstranfo    = {{}{}}, % FIXME: missing
-% editortranaf     = {{}{}}, % FIXME: missing
-% editorstranaf    = {{}{}}, % FIXME: missing
-% translatorco     = {{}{}}, % FIXME: missing
-% translatorsco    = {{}{}}, % FIXME: missing
-% translatoran     = {{}{}}, % FIXME: missing
-% translatorsan    = {{}{}}, % FIXME: missing
-% translatorin     = {{}{}}, % FIXME: missing
-% translatorsin    = {{}{}}, % FIXME: missing
-% translatorfo     = {{}{}}, % FIXME: missing
-% translatorsfo    = {{}{}}, % FIXME: missing
-% translatoraf     = {{}{}}, % FIXME: missing
-% translatorsaf    = {{}{}}, % FIXME: missing
-% translatorcoin   = {{}{}}, % FIXME: missing
-% translatorscoin  = {{}{}}, % FIXME: missing
-% translatorcofo   = {{}{}}, % FIXME: missing
-% translatorscofo  = {{}{}}, % FIXME: missing
-% translatorcoaf   = {{}{}}, % FIXME: missing
-% translatorscoaf  = {{}{}}, % FIXME: missing
-% translatoranin   = {{}{}}, % FIXME: missing
-% translatorsanin  = {{}{}}, % FIXME: missing
-% translatoranfo   = {{}{}}, % FIXME: missing
-% translatorsanfo  = {{}{}}, % FIXME: missing
-% translatoranaf   = {{}{}}, % FIXME: missing
-% translatorsanaf  = {{}{}}, % FIXME: missing
+  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         = {{utgitt av}{utg\adddotspace av}},
-  bycompiler       = {{sammenstillet av}{sammenst\adddotspace av}},
+  byeditor         = {{redigert av}{red\adddotspace av}},
+  bycompiler       = {{kompilert av}{komp\adddotspace av}},
   byredactor       = {{bearbeidet av}{bearb\adddotspace av}},
-% byreviser        = {{}{}}, % FIXME: missing
-% byreviewer       = {{}{}}, % FIXME: missing
-% byfounder        = {{}{}}, % FIXME: missing
-% bycontinuator    = {{}{}}, % FIXME: missing
-% bycollaborator   = {{}{}}, % FIXME: missing
-  bytranslator     = {{oversatt \lbx@lfromlang\ av}{oversatt \lbx@sfromlang\ 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 en kommentar av}{med en komm\adddot\ av}},
-  withannotator    = {{med forklaring av}{med forkl\adddot\ av}},
-  withintroduction = {{med en innledning av}{med en innl\adddot\ av}},
-  withforeword     = {{med et forord av}{med et forord av}},
-  withafterword    = {{med et etterord av}{med et etterord av}},
-  byeditortr       = {{utgitt og oversatt \lbx@lfromlang\ av}%
-                      {utg\adddotspace og oversatt \lbx@sfromlang\ av}},
-  byeditorco       = {{utgitt og kommentert av}%
-                      {utg\adddotspace og komm\adddot\ av}},
-  byeditoran       = {{utgitt og forklart av}%
-                      {utg\adddotspace og forkl\adddot\ av}},
-  byeditorin       = {{utgitt og med en innledning skrevet av}%
-                      {utg\adddotspace og med en innledning skrev\adddot\ av}},
-  byeditorfo       = {{utgitt og med et forord skrevet av}%
-                      {utg\adddotspace og med et forord skrev\adddot\ av}},
-  byeditoraf       = {{utgitt og med et etterord skrevet av}%
-                      {utg\adddotspace og med et etterord skrev\adddot\ av}},
-  byeditortrco     = {{utgitt, oversatt \lbx@lfromlang\ og kommentert av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og komm\adddot\ av}},
-  byeditortran     = {{utgitt, oversatt \lbx@lfromlang\ og forklart av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og forkl\adddot\ av}},
-  byeditortrin     = {{utgitt, oversatt \lbx@lfromlang\ og med en innledning skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og med en innl\adddot\ skrev\adddot\ av}},
-  byeditortrfo     = {{utgitt, oversatt \lbx@lfromlang\ og med et forord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og med et forord skrev\adddot\ av}},
-  byeditortraf     = {{utgitt, oversatt \lbx@lfromlang\ og med et etterord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang\ og med et etterord skrev\adddot\ av}},
-  byeditorcoin     = {{utgitt, kommentert og med en innledning skrevet av}%
-                      {utg.,\addabbrvspace komm\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
-  byeditorcofo     = {{utgitt, kommentert og med et forord skrevet av}%
-                      {utg.,\addabbrvspace komm\adddot\ og med et forord skrev\adddot\ av}},
-  byeditorcoaf     = {{utgitt, kommentert og med et etterord skrevet av}%
-                      {utg.,\addabbrvspace komm\adddot\ og med et etterord skrev\adddot\ av}},
-  byeditoranin     = {{utgitt, forklart og med en innledning skrevet av}%
-                      {utg.,\addabbrvspace forkl\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
-  byeditoranfo     = {{utgitt, forklart og med et forord skrevet av}%
-                      {utg.,\addabbrvspace forkl\adddot\ og med et forord skrev\adddot\ av}},
-  byeditoranaf     = {{utgitt, forklart og med et etterord skrevet av}%
-                      {utg.,\addabbrvspace forkl\adddot\ og med et etterord skrev\adddot\ av}},
-  byeditortrcoin   = {{utgitt, oversatt \lbx@lfromlang, kommentert og med en innledning skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, komm\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
-  byeditortrcofo   = {{utgitt, oversatt \lbx@lfromlang, kommentert og med et forord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, komm\adddot\ og med et forord skrev\adddot\ av}},
-  byeditortrcoaf   = {{utgitt, oversatt \lbx@lfromlang, kommentert og med et etterord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, komm\adddot\ og med et etterord skrev\adddot\ av}},
-  byeditortranin   = {{utgitt, oversatt \lbx@lfromlang, forklart og med en innledning skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, forkl\adddot\ og med en innl\adddot\ skrev\adddot\ av}}, 
-  byeditortranfo   = {{utgitt, oversatt \lbx@lfromlang, forklart og med et forord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, forkl\adddot\ og med et forord skrev\adddot\ av}},
-  byeditortranaf   = {{utgitt, oversatt \lbx@lfromlang, forklart og med et etterord skrevet av}%
-                      {utg.,\addabbrvspace oversatt \lbx@sfromlang, forkl\adddot\ og med et etterord skrev\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}%
-                      {oversatt \lbx@sfromlang\ og komm\adddot\ av}},
+                      {overs\adddot\ \lbx@sfromlang\ og komm\adddot\ av}},
   bytranslatoran   = {{oversatt \lbx@lfromlang\ og forklart av}%
-                      {oversatt \lbx@sfromlang\ og forkl\adddot\ av}}, 
-  bytranslatorin   = {{oversatt \lbx@lfromlang\ og med en innledning skrevet av}%
-                      {oversatt \lbx@sfromlang\ og med en innl\adddot\ skrev\adddot\ av}},
-  bytranslatorfo   = {{oversatt \lbx@lfromlang\ og med et forord skrevet av}%
-                      {oversatt \lbx@sfromlang\ og med et forord skrev\adddot\ av}},
-  bytranslatoraf   = {{oversatt \lbx@lfromlang\ og med et etterord skrevet av}%
-                      {oversatt \lbx@sfromlang\ og med et etterord skrev\adddot\ av}},
-  bytranslatorcoin = {{oversatt \lbx@lfromlang, kommentert og med en innledning skrevet av}%
-                      {oversatt \lbx@sfromlang, komm\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
-  bytranslatorcofo = {{oversatt \lbx@lfromlang, kommentert og med et forord skrevet av}%
-                      {oversatt \lbx@sfromlang, komm\adddot\ og med et forord skrev\adddot\ av}},
-  bytranslatorcoaf = {{oversatt \lbx@lfromlang, kommentert og med et etterord skrevet av}%
-                      {oversatt \lbx@sfromlang, komm\adddot\ og med et etterord skrev\adddot\ av}},
-  bytranslatoranin = {{oversatt \lbx@lfromlang, forklart og med en innledning skrevet av}%
-                      {oversatt \lbx@sfromlang, forkl\adddot\ og med en innl\adddot\ skrev\adddot\ av}},
-  bytranslatoranfo = {{oversatt \lbx@lfromlang, forklart og med et forord skrevet av}%
-                      {oversatt \lbx@sfromlang, forkl\adddot\ og med et forord skrev\adddot\ av}},
-  bytranslatoranaf = {{oversatt \lbx@lfromlang, forklart og med et etterord skrevet av}%
-                      {oversatt \lbx@sfromlang, forkl\adddot\ og med et etterord skrev\adddot\ 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        = {{bl.\,a\adddot}{bl.\,a\adddot}},
-  andmore          = {{og mer}{og mer}},
+  andothers        = {{med flere}{mfl\adddot}},
+  andmore          = {{med mer}{m.m\adddot}},
   volume           = {{bind}{bd\adddot}},
-  volumes          = {{bind}{bd\adddot}}, 
-  involumes        = {{i}{i}}, % FIXME: unsure
-  jourvol          = {{\aa rgang}{\aa g\adddot}},
+  volumes          = {{bind}{bd\adddot}},
+  involumes        = {{i}{i}},
+  jourvol          = {{{\aa}rgang}{{\aa}rg\adddot}},
   jourser          = {{serie}{ser\adddot}},
-% book             = {{}{}}, % FIXME: missing
-% part             = {{}{}}, % FIXME: missing
-% issue            = {{}{}}, % FIXME: missing
-  newseries        = {{ny serie}{n.\,s\adddot}},
-  oldseries        = {{gammel serie}{g.\,s\adddot}},
+  book             = {{bok}{bok}},
+  part             = {{del}{del}},
+  issue            = {{nummer}{nr\adddot}},
+  newseries        = {{ny serie}{ny ser\adddot}},
+  oldseries        = {{gammel serie}{gml\adddotspace ser\adddot}},
   edition          = {{utgave}{utg\adddot}},
-  reprint          = {{gjenopptrykk}{gjenopptrykk}},
-  reprintof        = {{gjenopptrykk av}{gjenopptrykk av}},
-  reprintas        = {{gjenopptrykk som}{gjenopptrykk som}},
-% reprintfrom      = {{}{}}, % FIXME: missing
-% translationof    = {{}{}}, % FIXME: missing
-% translationas    = {{}{}}, % FIXME: missing
-% translationfrom  = {{}{}}, % FIXME: missing
-% reviewof         = {{}{}}, % FIXME: missing
-% origpubas        = {{opprinnelig publisert som}{oppr\adddot\ pub\adddot\ som}}, % FIXME: check
-  origpubin        = {{opprinnelig utgitt i}{oppr\adddot\ utgitt i}}, % FIXME: check
-% astitle          = {{}{}}, % FIXME: missing
-% bypublisher      = {{}{}}, % FIXME: missing
+  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}},
@@ -249,56 +317,56 @@
   lines            = {{linjer}{l\adddot}},
   verse            = {{vers}{v\adddot}},
   verses           = {{vers}{v\adddot}},
-% section          = {{}{\S}},   % FIXME: missing
-% sections         = {{}{\S\S}}, % FIXME: missing
-% paragraph        = {{}{}}, % FIXME: missing
-% paragraphs       = {{}{}}, % FIXME: missing
+  section          = {{avsnitt}{avsn\adddot}},
+  sections         = {{avsnitt}{avsn\adddot}},
+  paragraph        = {{avsnitt}{avsn\adddot}},
+  paragraphs       = {{avsnitt}{avsn\adddot}},
   in               = {{i}{i}},
-  inseries         = {{rekken}{rekken}},
-  ofseries         = {{av rekken}{av rekken}},
+  inseries         = {{i}{i}},
+  ofseries         = {{av}{av}},
   number           = {{nummer}{nr\adddot}},
   chapter          = {{kapittel}{kap\adddot}},
-  mathesis         = {{masteroppgave}{masteropp\adddot}},
-  phdthesis        = {{PhD avhandling}{PhD avh\adddot}},
-  candthesis       = {{cand\adddot\ avhandling}{cand\adddot\ avh\adddot}}, % FIXME: unsure
-  resreport        = {{forskningsrapport}{forskningsrapport}},
-  techreport       = {{teknisk rapport}{tek\adddot\ rap\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}},
+  datacd           = {{data-cd}{data-cd}},
+  audiocd          = {{lyd-cd}{lyd-cd}},
   version          = {{versjon}{versjon}},
   url              = {{side}{side}},
   urlseen          = {{sjekket}{sjekket}},
-% inpreparation    = {{}{}}, % FIXME: missing
-% submitted        = {{}{}}, % FIXME: missing
-% forthcoming      = {{}{}}, % FIXME: missing
-% inpress          = {{}{}}, % FIXME: missing
-  citedas          = {{fremover sitert som}{fremover sit\adddot\ som}},
-% thiscite         = {{}{}}, % FIXME: missing
-  seenote          = {{se notat}{se notat}},
-  quotedin         = {{sitert i}{sitert i}},
-  idem             = {{den samme}{den~s\adddot}},
-  idemsf           = {{den samme}{den~s\adddot}},
-  idemsm           = {{den samme}{den~s\adddot}},
-  idemsn           = {{det samme}{det~s\adddot}},
-  idempf           = {{de samme}{de~s\adddot}},
-  idempm           = {{de samme}{de~s\adddot}},
-  idempn           = {{de samme}{de~s\adddot}},
-  idempp           = {{de samme}{de~s\adddot}},
-  ibidem           = {{ibidem}{ibid\adddot}},
-  opcit            = {{op.\,cit\adddot}{op.\,cit\adddot}},
-  loccit           = {{loc.\,cit\adddot}{loc.\,cit\adddot}},
-  confer           = {{sammenlikn}{smlk\adddot}},
-  sequens          = {{sq\adddot}{sq\adddot}},
-  sequentes        = {{sqq\adddot}{sqq\adddot}},
+  inpreparation    = {{under utarbeidelse}{under utarb\adddot}},
+  submitted        = {{innsendt}{innsendt}},
+  forthcoming      = {{under utgivelse}{under utgiv\adddot}},
+  inpress          = {{i trykken}{i trykken}},
+  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}{s\adddot}},
-  seealso          = {{se ogs\aa}{s.\,\aa\adddot}},
+  see              = {{se}{se}},
+  seealso          = {{se ogs{\aa}}{se ogs{\aa}}},
   backrefpage      = {{se side}{se s\adddot}},
-  backrefpages     = {{se sider}{se s\adddot}},
+  backrefpages     = {{se sidene}{se s\adddot}},
   january          = {{januar}{jan\adddot}},
   february         = {{februar}{feb\adddot}},
-  march            = {{marts}{mar\adddot}},
+  march            = {{mars}{mar\adddot}},
   april            = {{april}{apr\adddot}},
   may              = {{mai}{mai}},
   june             = {{juni}{jun\adddot}},
@@ -308,62 +376,67 @@
   october          = {{oktober}{okt\adddot}},
   november         = {{november}{nov\adddot}},
   december         = {{desember}{des\adddot}},
-  langamerican     = {{amerikansk}{amerikansk}},
-% langbrazilian    = {{}{}}, % FIXME: missing
-% langcroatian     = {{}{}}, % FIXME: missing
-% langdanish       = {{}{}}, % FIXME: missing
-% langdutch        = {{}{}}, % FIXME: missing
+  langamerican     = {{amerikansk-engelsk}{amerikansk-engelsk}},
+  langbrazilian    = {{brasiliansk-portugisisk}{brasiliansk-portugisisk}},
+  langcroatian     = {{kroatisk}{kroatisk}},
+  langdanish       = {{dansk}{dansk}},
+  langdutch        = {{nederlandsk}{nederlandsk}},
   langenglish      = {{engelsk}{engelsk}},
-% langfinnish      = {{}{}}, % FIXME: missing
+  langfinnish      = {{finsk}{finsk}},
   langfrench       = {{fransk}{fransk}},
   langgerman       = {{tysk}{tysk}},
   langgreek        = {{gresk}{gresk}},
   langitalian      = {{italiensk}{italiensk}},
   langlatin        = {{latin}{latin}},
   langnorwegian    = {{norsk}{norsk}},
-% langportuguese   = {{}{}}, % FIXME: missing
-% langrussian      = {{}{}}, % FIXME: missing
+  langportuguese   = {{portugisisk}{portugisisk}},
+  langrussian      = {{russisk}{russisk}},
   langspanish      = {{spansk}{spansk}},
-% langswedish      = {{}{}}, % FIXME: missing
-  fromamerican     = {{fra amerikansk}{fra amerikansk}},
-% frombrazilian    = {{}{}}, % FIXME: missing
-% fromcroatian     = {{}{}}, % FIXME: missing
-% fromdanish       = {{}{}}, % FIXME: missing
-% fromdutch        = {{}{}}, % FIXME: missing
+  langswedish      = {{svensk}{svensk}},
+  fromamerican     = {{fra amerikansk-engelsk}{fra amerikansk-engelsk}},
+  frombrazilian    = {{fra brasiliansk-portugisisk}{fra brasiliansk-portugisisk}},
+  fromcroatian     = {{fra kroatisk}{fra kroatisk}},
+  fromdanish       = {{fra dansk}{fra dansk}},
+  fromdutch        = {{fra nederlandsk}{fra nederlandsk}},
   fromenglish      = {{fra engelsk}{fra engelsk}},
-% fromfinnish      = {{}{}}, % 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}},
-% fromportuguese   = {{}{}}, % FIXME: missing
-% fromrussian      = {{}{}}, % FIXME: missing
+  fromportuguese   = {{fra portugisisk}{fra portugisisk}},
+  fromrussian      = {{fra russisk}{fra russisk}},
   fromspanish      = {{fra spansk}{fra spansk}},
-% fromswedish      = {{}{}}, % FIXME: missing
+  fromswedish      = {{fra svensk}{fra svensk}},
   countryde        = {{Tyskland}{DE}},
-  countryeu        = {{Europeiske Union}{EU}},
-  countryep        = {{Europeiske Union}{EP}},
+  countryeu        = {{Den europeiske union}{EU}},
+  countryep        = {{Den europeiske union}{EP}},
   countryfr        = {{Frankrike}{FR}},
-  countryuk        = {{Storbritania}{GB}},
+  countryuk        = {{Storbritannia}{GB}},
   countryus        = {{USA}{US}},
   patent           = {{patent}{patent}},
-  patentde         = {{tysk patent}{tys\adddot\ pat\adddot}},
-  patenteu         = {{europeisk patent}{eur\adddot\ pat\adddot}}, 
-  patentfr         = {{fransk patent}{fra\adddot\ pat\adddot}},
-  patentuk         = {{storbritansk patent}{UK pat\adddot}},
-  patentus         = {{US amerikansk patent}{US pat\adddot}},
-  patreq           = {{s\o knad om patent}{pat\adddot\ s\o k\adddot}}, 
-  patreqde         = {{s\o knad om tysk patent}{tys\adddot\ pat\adddot\ s\o k\adddot}},
-  patreqeu         = {{s\o knad om europeisk patent}{eur\adddot\ pat\adddot\ s\o k\adddot}},
-  patreqfr         = {{s\o knad om fransk patent}{fra\adddot\ pat\adddot\ s\o k\adddot}},
-  patrequk         = {{s\o knad om storbritansk patent}{UK pat\adddot\ s\o k\adddot}},
-  patrequs         = {{s\o knad om US amerikansk patent}{US pat\adddot\ s\o k\adddot}},
-% file             = {{}{}}, % FIXME: missing
-% library          = {{}{}}, % FIXME: missing
-% abstract         = {{}{}}, % FIXME: missing
-% annotation       = {{}{}}, % FIXME: missing
+  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}},
 }
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index 40535b9fde4..6919932e93b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
@@ -7,4 +7,280 @@
 \InheritBibliographyExtras{norwegian}
 \InheritBibliographyStrings{norwegian}
 
+\DeclareBibliographyStrings{%
+  inherit          = {norwegian},
+  references       = {{Referansar}{Referansar}},
+  shorthands       = {{Forkortingar}{Forkortingar}},
+  editors          = {{redakt{\o}rar}{red\adddot}},
+  compilers        = {{kompilatorar}{komp\adddot}},
+  redactor         = {{omarbeiding}{omarb\adddot}},
+  redactors        = {{omarbeiding}{omarb\adddot}},
+  founder          = {{grunnleggjar}{grunnl\adddot}},
+  founders         = {{grunnleggjarar}{grunnl\adddot}},
+  continuator      = {{vidaref{\o}ring}{vidaref\adddot}},
+  continuators     = {{vidaref{\o}ring}{vidaref\adddot}},
+  translator       = {{omsetjar}{oms\adddot}},
+  translators      = {{omsetjarar}{oms\adddot}},
+  commentator      = {{kommentarar}{komm\adddot}},
+  commentators     = {{kommentarar}{komm\adddot}},
+  annotator        = {{forklaringar}{forkl\adddot}},
+  annotators       = {{forklaringar}{forkl\adddot}},
+  commentary       = {{kommentarar}{komm\adddot}},
+  annotations      = {{forklaringar}{forkl\adddot}},
+  introduction     = {{innleiing}{innl\adddot}},
+  foreword         = {{f{\o}reord}{f{\o}reord}},
+  editortr         = {{redakt{\o}r og omsetjar}%
+                      {red\adddotspace og oms\adddot}},
+  editorstr        = {{redakt{\o}rar og omsetjarar}%
+                      {red\adddotspace og oms\adddot}},
+  editorco         = {{redakt{\o}r og kommentarar}%
+                      {red\adddotspace og komm\adddot}},
+  editorsco        = {{redakt{\o}rar og kommentarar}%
+                      {red\adddotspace og komm\adddot}},
+  editoran         = {{redakt{\o}r og forklaringar}%
+                      {red\adddotspace og forkl\adddot}},
+  editorsan        = {{redakt{\o}rar og forklaringar}%
+                      {red\adddotspace og forkl\adddot}},
+  editorin         = {{redakt{\o}r og innleiing}%
+                      {red\adddotspace og innl\adddot}},
+  editorsin        = {{redakt{\o}rar og innleiing}%
+                      {red\adddotspace og innl\adddot}},
+  editorfo         = {{redakt{\o}r og f{\o}reord}%
+                      {red\adddotspace og f{\o}reord}},
+  editorsfo        = {{redakt{\o}rar og f{\o}reord}%
+                      {red\adddotspace og f{\o}reord}},
+  editorsaf        = {{redakt{\o}rar og etterord}%
+                      {red\adddotspace og etterord}},
+  editortrco       = {{redakt{\o}r, omsetjar og kommentarar}%
+                      {red.,\addabbrvspace oms\adddotspace og komm\adddot}},
+  editorstrco      = {{redakt{\o}rar, omsetjarar og kommentarar}%
+                      {red.,\addabbrvspace oms\adddotspace og komm\adddot}},
+  editortran       = {{redakt{\o}r, omsetjar og forklaringar}%
+                      {red.,\addabbrvspace oms\adddotspace og forkl\adddot}},
+  editorstran      = {{redakt{\o}rar, omsetjarar og forklaringar}%
+                      {red.,\addabbrvspace oms\adddotspace og forkl\adddot}},
+  editortrin       = {{redakt{\o}r, omsetjar og innleiing}%
+                      {red.,\addabbrvspace oms\adddotspace og innl\adddot}},
+  editorstrin      = {{redakt{\o}rar, omsetjarar og innleiing}%
+                      {red.,\addabbrvspace oms\adddotspace og innl\adddot}},
+  editortrfo       = {{redakt{\o}r, omsetjar og f{\o}reord}%
+                      {red.,\addabbrvspace oms\adddotspace og f{\o}reord}},
+  editorstrfo      = {{redakt{\o}rar, omsetjarar og f{\o}reord}%
+                      {red.,\addabbrvspace oms\adddotspace og f{\o}reord}},
+  editortraf       = {{redakt{\o}r, omsetjar og etterord}%
+                      {red.,\addabbrvspace oms\adddotspace og etterord}},
+  editorstraf      = {{redakt{\o}rar, omsetjarar og etterord}%
+                      {red.,\addabbrvspace oms\adddotspace og etterord}},
+  editorcoin       = {{redakt{\o}r, kommentarar og innleiing}%
+                      {red.,\addabbrvspace komm\adddotspace og innl\adddot}},
+  editorscoin      = {{redakt{\o}rar, kommentarar og innleiing}%
+                      {red.,\addabbrvspace komm\adddotspace og innl\adddot}},
+  editorcofo       = {{redakt{\o}r, kommentarar og f{\o}reord}%
+                      {red.,\addabbrvspace komm\adddotspace og f{\o}reord}},
+  editorscofo      = {{redakt{\o}rar, kommentarar og f{\o}reord}%
+                      {red.,\addabbrvspace komm\adddotspace og f{\o}reord}},
+  editorcoaf       = {{redakt{\o}r, kommentarar og etterord}%
+                      {red.,\addabbrvspace komm\adddotspace og etterord}},
+  editorscoaf      = {{redakt{\o}rar, kommentarar og etterord}%
+                      {red.,\addabbrvspace komm\adddotspace og etterord}},
+  editoranin       = {{redakt{\o}r, forklaringar og innleiing}%
+                      {red.,\addabbrvspace forkl\adddotspace og innl\adddot}},
+  editorsanin      = {{redakt{\o}rar, forklaringar og innleiing}%
+                      {red.,\addabbrvspace forkl\adddotspace og innl\adddot}},
+  editoranfo       = {{redakt{\o}r, forklaringar og f{\o}reord}%
+                      {red.,\addabbrvspace forkl\adddotspace og f{\o}reord}},
+  editorsanfo      = {{redakt{\o}rar, forklaringar og f{\o}reord}%
+                      {red.,\addabbrvspace forkl\adddotspace og f{\o}reord}},
+  editoranaf       = {{redakt{\o}r, forklaringar og etterord}%
+                      {red.,\addabbrvspace forkl\adddotspace og etterord}},
+  editorsanaf      = {{redakt{\o}rar, forklaringar og etterord}%
+                      {red.,\addabbrvspace forkl\adddotspace og etterord}},
+  editortrcoin     = {{redakt{\o}r, omsetjar, kommentarar og innleiing}%
+                      {red.,\addabbrvspace oms., komm\adddotspace og innl\adddot}},
+  editorstrcoin    = {{redakt{\o}rar, omsetjarar, kommentarar og innleiing}%
+                      {red.,\addabbrvspace oms., komm\adddotspace og innl\adddot}},
+  editortrcofo     = {{redakt{\o}r, omsetjar, kommentarar og f{\o}reord}%
+                      {red.,\addabbrvspace oms., komm\adddotspace og f{\o}reord}},
+  editorstrcofo    = {{redakt{\o}rar, omsetjarar, kommentarar og f{\o}reord}%
+                      {red.,\addabbrvspace oms., komm\adddotspace og f{\o}reord}},
+  editortrcoaf     = {{redakt{\o}r, omsetjar, kommentarar og etterord}%
+                      {red.,\addabbrvspace oms., komm\adddotspace og etterord}},
+  editorstrcoaf    = {{redakt{\o}rar, omsetjarar, kommentarar og etterord}%
+                      {red.,\addabbrvspace oms., komm\adddotspace og etterord}},
+  editortranin     = {{redakt{\o}r, omsetjar, forklaringar og innleiing}%
+                      {red.,\addabbrvspace oms., forkl\adddotspace og innl\adddot}},
+  editorstranin    = {{redakt{\o}rar, omsetjarar, forklaringar og innleiing}%
+                      {red.,\addabbrvspace oms., forkl\adddotspace og innl\adddot}},
+  editortranfo     = {{redakt{\o}r, omsetjar, forklaringar og f{\o}reord}%
+                      {red.,\addabbrvspace oms., forkl\adddotspace og f{\o}reord}},
+  editorstranfo    = {{redakt{\o}rar, omsetjarar, forklaringar og f{\o}reord}%
+                      {red.,\addabbrvspace oms., forkl\adddotspace og f{\o}reord}},
+  editortranaf     = {{redakt{\o}r, omsetjar, forklaringar og etterord}%
+                      {red.,\addabbrvspace oms., forkl\adddotspace og etterord}},
+  editorstranaf    = {{redakt{\o}rar, omsetjarar, forklaringar og etterord}%
+                      {red.,\addabbrvspace oms., forkl\adddotspace og etterord}},
+  translatorco     = {{omsetjar og kommentarar}%
+                      {oms\adddotspace og komm\adddot}},
+  translatorsco    = {{omsetjarar og kommentarar}%
+                      {oms\adddotspace og komm\adddot}},
+  translatoran     = {{omsetjar og forklaringar}%
+                      {oms\adddotspace og forkl\adddot}},
+  translatorsan    = {{omsetjarar og forklaringar}%
+                      {oms\adddotspace og forkl\adddot}},
+  translatorin     = {{omsetjar og innleiing}%
+                      {oms\adddotspace og innl\adddot}},
+  translatorsin    = {{omsetjarar og innleiing}%
+                      {oms\adddotspace og innl\adddot}},
+  translatorfo     = {{omsetjar og f{\o}reord}%
+                      {oms\adddotspace og f{\o}reord}},
+  translatorsfo    = {{omsetjarar og f{\o}reord}%
+                      {oms\adddotspace og f{\o}reord}},
+  translatoraf     = {{omsetjar og etterord}%
+                      {oms\adddotspace og etterord}},
+  translatorsaf    = {{omsetjarar og etterord}%
+                      {oms\adddotspace og etterord}},
+  translatorcoin   = {{omsetjar, kommentarar og innleiing}%
+                      {oms., komm\adddotspace og innl\adddot}},
+  translatorscoin  = {{omsetjarar, kommentarar og innleiing}%
+                      {oms., komm\adddotspace og innl\adddot}},
+  translatorcofo   = {{omsetjar, kommentarar og f{\o}reord}%
+                      {oms., komm\adddotspace og f{\o}reord}},
+  translatorscofo  = {{omsetjarar, kommentarar og f{\o}reord}%
+                      {oms., komm\adddotspace og f{\o}reord}},
+  translatorcoaf   = {{omsetjar, kommentarar og etterord}%
+                      {oms., komm\adddotspace og etterord}},
+  translatorscoaf  = {{omsetjarar, kommentarar og etterord}%
+                      {oms., komm\adddotspace og etterord}},
+  translatoranin   = {{omsetjar, forklaringar og innleiing}%
+                      {oms., forkl\adddotspace og innl\adddot}},
+  translatorsanin  = {{omsetjarar, forklaringar og innleiing}%
+                      {oms., forkl\adddotspace og innl\adddot}},
+  translatoranfo   = {{omsetjar, forklaringar og f{\o}reord}%
+                      {oms., forkl\adddotspace og f{\o}reord}},
+  translatorsanfo  = {{omsetjarar, forklaringar og f{\o}reord}%
+                      {oms., forkl\adddotspace og f{\o}reord}},
+  translatoranaf   = {{omsetjar, forklaringar og etterord}%
+                      {oms., forkl\adddotspace og etterord}},
+  translatorsanaf  = {{omsetjarar, forklaringar og etterord}%
+                      {oms., forkl\adddotspace og etterord}},
+  byredactor       = {{omarbeidd av}{omarb\adddotspace av}},
+  bycontinuator    = {{vidaref{\o}rt av}{vidaref\adddotspace av}},
+  bytranslator     = {{omsett \lbx@lfromlang\ av}%
+                      {oms\adddot\ \lbx@sfromlang\ av}},
+  withcommentator  = {{med kommentarar av}{med komm\adddot\ av}},
+  withannotator    = {{med forklaringar av}{med forkl\adddot\ av}},
+  withintroduction = {{med innleiing av}{med innl\adddot\ av}},
+  withforeword     = {{med f{\o}reord av}{med f{\o}reord av}},
+  byeditortr       = {{redigert og omsett \lbx@lfromlang\ av}%
+                      {red\adddotspace og oms\adddot\ \lbx@sfromlang\ av}},
+  byeditorin       = {{redigert, med innleiing, av}%
+                      {red.,\addabbrvspace med innl., av}},
+  byeditorfo       = {{redigert, med f{\o}reord, av}%
+                      {red.,\addabbrvspace med f{\o}reord, av}},
+  byeditortrco     = {{redigert, omsett \lbx@lfromlang\ og kommentert av}%
+                      {red.,\addabbrvspace oms\adddot\ \lbx@sfromlang\ og komm\adddot\ av}},
+  byeditortran     = {{redigert, omsett \lbx@lfromlang\ og forklart av}%
+                      {red.,\addabbrvspace oms\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}},
+  byeditortrin     = {{redigert og omsett \lbx@lfromlang, med innleiing, av}%
+                      {red\adddotspace og oms\adddot\ \lbx@sfromlang, med innl., av}},
+  byeditortrfo     = {{redigert og omsett \lbx@lfromlang, med f{\o}reord, av}%
+                      {red\adddotspace og oms\adddot\ \lbx@sfromlang, med f{\o}reord, av}},
+  byeditortraf     = {{redigert og omsett \lbx@lfromlang, med etterord, av}%
+                      {red\adddotspace og oms\adddot\ \lbx@sfromlang, med etterord, av}},
+  byeditorcoin     = {{redigert og kommentert, med innleiing, av}%
+                      {red\adddotspace og komm., med innl., av}},
+  byeditorcofo     = {{redigert og kommentert, med f{\o}reord, av}%
+                      {red\adddotspace og komm., med f{\o}reord, av}},
+  byeditoranin     = {{redigert og forklart, med innleiing, av}%
+                      {red\adddotspace og forkl., med innl., av}},
+  byeditoranfo     = {{redigert og forklart, med f{\o}reord, av}%
+                      {red\adddotspace og forkl., med f{\o}reord, av}},
+  byeditortrcoin   = {{redigert, omsett \lbx@lfromlang\ og kommentert, med innleiing, av}%
+                      {red.,\addabbrvspace oms\adddot\ \lbx@sfromlang\ og komm., med innl., av}},
+  byeditortrcofo   = {{redigert, omsett \lbx@lfromlang\ og kommentert, med f{\o}reord, av}%
+                      {red.,\addabbrvspace oms\adddot\ \lbx@sfromlang\ og komm., med f{\o}reord, av}},
+  byeditortrcoaf   = {{redigert, omsett \lbx@lfromlang\ og kommentert, med etterord, av}%
+                      {red.,\addabbrvspace oms\adddot\ \lbx@sfromlang\ og komm., med etterord, av}},
+  byeditortranin   = {{redigert, omsett \lbx@lfromlang\ og forklart, med innleiing, av}%
+                      {red.,\addabbrvspace oms\adddot\ \lbx@sfromlang\ og forkl., med innl., av}},
+  byeditortranfo   = {{redigert, omsett \lbx@lfromlang\ og forklart, med f{\o}reord, av}%
+                      {red.,\addabbrvspace oms\adddot\ \lbx@sfromlang\ og forkl., med f{\o}reord, av}},
+  byeditortranaf   = {{redigert, omsett \lbx@lfromlang\ og forklart, med etterord, av}%
+                      {red.,\addabbrvspace oms\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}},
+  bytranslatorco   = {{omsett \lbx@lfromlang\ og kommentert av}%
+                      {oms\adddot\ \lbx@sfromlang\ og komm\adddot\ av}},
+  bytranslatoran   = {{omsett \lbx@lfromlang\ og forklart av}%
+                      {oms\adddot\ \lbx@sfromlang\ og forkl\adddot\ av}},
+  bytranslatorin   = {{omsett \lbx@lfromlang, med innleiing, av}%
+                      {oms\adddot\ \lbx@sfromlang, med innl., av}},
+  bytranslatorfo   = {{omsett \lbx@lfromlang, med f{\o}reord, av}%
+                      {oms\adddot\ \lbx@sfromlang, med f{\o}reord, av}},
+  bytranslatoraf   = {{omsett \lbx@lfromlang, med etterord, av}%
+                      {oms\adddot\ \lbx@sfromlang, med etterord, av}},
+  bytranslatorcoin = {{omsett \lbx@lfromlang\ og kommentert, med innleiing, av}%
+                      {oms\adddot\ \lbx@sfromlang\ og komm., med innl., av}},
+  bytranslatorcofo = {{omsett \lbx@lfromlang\ og kommentert, med f{\o}reord, av}%
+                      {oms\adddot\ \lbx@sfromlang\ og komm., med f{\o}reord, av}},
+  bytranslatorcoaf = {{omsett \lbx@lfromlang\ og kommentert, med etterord, av}%
+                      {oms\adddot\ \lbx@sfromlang\ og komm., med etterord, av}},
+  bytranslatoranin = {{omsett \lbx@lfromlang\ og forklart, med innleiing, av}%
+                      {oms\adddot\ \lbx@sfromlang\ og forkl., med innl., av}},
+  bytranslatoranfo = {{omsett \lbx@lfromlang\ og forklart, med f{\o}reord, av}%
+                      {oms\adddot\ \lbx@sfromlang\ og forkl., med f{\o}reord, av}},
+  bytranslatoranaf = {{omsett \lbx@lfromlang\ og forklart, med etterord, av}%
+                      {oms\adddot\ \lbx@sfromlang\ og forkl., med etterord, av}},
+  andothers        = {{med fleire}{mfl\adddot}},
+  andmore          = {{med meir}{m.m\adddot}},
+  oldseries        = {{gamal serie}{gml\adddotspace ser\adddot}},
+  edition          = {{utg{\aa}ve}{utg\adddot}},
+  reprintfrom      = {{opptrykk fr{\aa}}{opptr\adddotspace fr{\aa}}},
+  translationof    = {{omsetjing av}{oms\adddotspace av}},
+  translationas    = {{omsett som}{oms\adddotspace som}},
+  translationfrom  = {{omsett fr{\aa}}{oms\adddotspace fr{\aa}}},
+  origpubas        = {{opphavleg utgitt som}{opph\adddot\ utg\adddot\ som}},
+  origpubin        = {{opphavleg utgitt i}{opph\adddot\ utg\adddot\ i}},
+  mathesis         = {{masteroppg{\aa}ve}{masteroppg\adddot}},
+  candthesis       = {{hovudoppg{\aa}ve}{hovudoppg\adddot}},
+  urlseen          = {{sjekka}{sjekka}},
+  inpreparation    = {{under utarbeiding}{under utarb\adddot}},
+  forthcoming      = {{under utgiving}{under utgiv\adddot}},
+  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}},
+  idemsm           = {{den same}{d.s\adddot}},
+  idemsn           = {{det same}{d.s\adddot}},
+  idempf           = {{dei same}{d.s\adddot}},
+  idempm           = {{dei same}{d.s\adddot}},
+  idempn           = {{dei same}{d.s\adddot}},
+  idempp           = {{dei same}{d.s\adddot}},
+  ibidem           = {{same staden}{sst\adddot}},
+  opcit            = {{same staden}{sst\adddot}},
+  loccit           = {{same staden}{sst\adddot}},
+  see              = {{sj{\aa}}{sj{\aa}}},
+  seealso          = {{sj{\aa} \`{o}g}{sj{\aa} \`{o}g}},
+  backrefpage      = {{sj{\aa} side}{sj{\aa} s\adddot}},
+  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}},
+  fromcroatian     = {{fr{\aa} kroatisk}{fr{\aa} kroatisk}},
+  fromdanish       = {{fr{\aa} dansk}{fr{\aa} dansk}},
+  fromdutch        = {{fr{\aa} nederlandsk}{fr{\aa} nederlandsk}},
+  fromenglish      = {{fr{\aa} engelsk}{fr{\aa} engelsk}},
+  fromfinnish      = {{fr{\aa} finsk}{fr{\aa} finsk}},
+  fromfrench       = {{fr{\aa} fransk}{fr{\aa} fransk}},
+  fromgerman       = {{fr{\aa} tysk}{fr{\aa} tysk}},
+  fromgreek        = {{fr{\aa} gresk}{fr{\aa} gresk}},
+  fromitalian      = {{fr{\aa} italiensk}{fr{\aa} italiensk}},
+  fromlatin        = {{fr{\aa} latin}{fr{\aa} latin}},
+  fromnorwegian    = {{fr{\aa} norsk}{fr{\aa} norsk}},
+  fromportuguese   = {{fr{\aa} portugisisk}{fr{\aa} portugisisk}},
+  fromrussian      = {{fr{\aa} russisk}{fr{\aa} russisk}},
+  fromspanish      = {{fr{\aa} spansk}{fr{\aa} spansk}},
+  fromswedish      = {{fr{\aa} svensk}{fr{\aa} svensk}},
+  countryeu        = {{Den europeiske unionen}{EU}},
+  countryep        = {{Den europeiske unionen}{EP}},
+  abstract         = {{samandrag}{samandrag}},
+}
+
 \endinput
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 306c3fb0981..48c8eab5f7a 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -149,6 +149,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'bgteubner',	"&MAKEflatten",
  'bib2ml',	"die 'skipping, no self-locate?, etc.'",
  'bib2xhtml',	"die 'skipping, requires PDF::API2'",
+ 'biber',	"&MAKEflatten",
  'bibextract',	"die 'skipping, hardwires nawk cmd name'",
  'biblatex-chicago', "&MAKEflatten",
  'biblatex-contrib',	"die 'skipping, use subdir'",
@@ -2156,7 +2157,6 @@ $standardsfd=NULL;  # subfont definition, not fontforge!
 
 $standardttf = '\.ttf';
 %specialttf = (
- 'biber'	=> 'NULL',	# not unifont.ttf
 );
 
 # packages which have xmltex files
@@ -4642,9 +4642,6 @@ sub POSTbiber {
   # we've started with everything under source/.
   &xchdir ("$DEST/source/bibtex/biber");
   
-  # clean spurious biber/ copy and nonfree font.
-  &SYSTEM ("$RM unifont.ttf");
-  
   # move doc pdf.
   &SYSTEM ("$MV biber.pdf $DOCDIR/");