biblatex 2.6 (9may13)

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

44 files changed, 7469 insertions, 4906 deletions

diff --git a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
index 994b91995db..e2fb9051305 100644
--- a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
+++ b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
@@ -1,1436 +1,1609 @@
-@string{anch-ie = {Angew.~Chem. Int.~Ed.} }
-@string{cup = {Cambridge University Press} }
-@string{dtv = {Deutscher Taschenbuch-Verlag} }
-@string{hup = {Harvard University Press} }
-@string{jams = {J.~Amer. Math. Soc.} }
-@string{jchph = {J.~Chem. Phys.} }
-@string{jomch = {J.~Organomet. Chem.} }
-@string{pup = {Princeton University Press} }
-
-@incollection{westfahl:space,
-  crossref = {westfahl:frontier},
-  hyphenation = {american},
-  author = {Westfahl, Gary},
-  indextitle = {True Frontier, The},
-  title = {The True Frontier},
-  subtitle = {Confronting and Avoiding the Realities of Space in American
-    Science Fiction Films},
-  pages = {55--65},
-  annotation = {A cross-referenced article from a \texttt{collection}. This is
-    an \texttt{incollection} entry with a \texttt{crossref} field. Note the
-    \texttt{subtitle} and \texttt{indextitle} fields}
+@string{ anch-ie = {Angew.~Chem. Int.~Ed.} }
+@string{ cup     = {Cambridge University Press} }
+@string{ dtv     = {Deutscher Taschenbuch-Verlag} }
+@string{ hup     = {Harvard University Press} }
+@string{ jams    = {J.~Amer. Math. Soc.} }
+@string{ jchph   = {J.~Chem. Phys.} }
+@string{ jomch   = {J.~Organomet. Chem.} }
+@string{ pup     = {Princeton University Press} }
+
+@InCollection{westfahl:space,
+  author       = {Westfahl, Gary},
+  title        = {The True Frontier},
+  subtitle     = {Confronting and Avoiding the Realities of Space in American
+                  Science Fiction Films},
+  pages        = {55-65},
+  crossref     = {westfahl:frontier},
+  hyphenation  = {american},
+  indextitle   = {True Frontier, The},
+  annotation   = {A cross-referenced article from a \texttt{collection}. This is
+                  an \texttt{incollection} entry with a \texttt{crossref}
+                  field. Note the \texttt{subtitle} and \texttt{indextitle}
+                  fields},
 }
+
 @set{set,
-  entryset = {herrmann,aksin,yoon},
-  annotation = {A \texttt{set} with three members}
+  entryset     = {herrmann,aksin,yoon},
+  annotation   = {A \texttt{set} with three members},
 }
+
 @set{stdmodel,
-  entryset = {glashow,weinberg,salam},
-  annotation = {A \texttt{set} with three members discussing the standard
-    model of particle physics}
-}
-@article{aksin,
-  author = {Aks{\i}n, {\"O}zge and T{\"u}rkmen, Hayati and Artok, Levent
-    and {\k{C}}etinkaya, Bekir and Ni, Chaoying
-    and B{\"u}y{\"u}kg{\"u}ng{\"o}r, Orhan and {\"O}zkal, Erhan},
-  indextitle = {Effect of immobilization on catalytic characteristics},
-  title = {Effect of immobilization on catalytic characteristics of saturated
-    Pd-N-heterocyclic carbenes in Mizoroki-Heck reactions},
+  entryset     = {glashow,weinberg,salam},
+  annotation   = {A \texttt{set} with three members discussing the standard
+                  model of particle physics},
+}
+
+@Article{aksin,
+  author       = {Aks{\i}n, {\"O}zge and T{\"u}rkmen, Hayati and Artok, Levent
+                  and {\k{C}}etinkaya, Bekir and Ni, Chaoying and
+                  B{\"u}y{\"u}kg{\"u}ng{\"o}r, Orhan and {\"O}zkal, Erhan},
+  title        = {Effect of immobilization on catalytic characteristics of
+                  saturated Pd-N-heterocyclic carbenes in Mizoroki-Heck
+                  reactions},
   journaltitle = jomch,
-  volume = {691},
-  number = {13},
-  date = {2006},
-  pages = {3027--3036}
-}
-@article{angenendt,
-  hyphenation = {german},
-  author = {Angenendt, Arnold},
-  indextitle = {In Honore Salvatoris},
-  title = {In Honore Salvatoris~-- Vom Sinn und Unsinn der Patrozinienkunde},
-  shorttitle = {In Honore Salvatoris},
+  date         = 2006,
+  volume       = 691,
+  number       = 13,
+  pages        = {3027-3036},
+  indextitle   = {Effect of immobilization on catalytic characteristics},
+}
+
+@Article{angenendt,
+  author       = {Angenendt, Arnold},
+  title        = {In Honore Salvatoris~-- Vom Sinn und Unsinn der
+                  Patrozinienkunde},
   journaltitle = {Revue d'Histoire Eccl{\'e}siastique},
-  volume = {97},
-  date = {2002},
-  pages = {431--456, 791--823},
-  annotation = {A German article in a French journal. Apart from that, a
-    typical \texttt{article} entry. Note the \texttt{indextitle} field}
-}
-@article{baez/article,
-  hyphenation = {american},
-  author = {Baez, John C. and Lauda, Aaron D.},
-  title = {Higher-Dimensional Algebra V: 2-Groups},
+  date         = 2002,
+  volume       = 97,
+  pages        = {431--456, 791--823},
+  hyphenation  = {german},
+  indextitle   = {In Honore Salvatoris},
+  shorttitle   = {In Honore Salvatoris},
+  annotation   = {A German article in a French journal. Apart from that, a
+                  typical \texttt{article} entry. Note the \texttt{indextitle}
+                  field},
+}
+
+@Article{baez/article,
+  author       = {Baez, John C. and Lauda, Aaron D.},
+  title        = {Higher-Dimensional Algebra V: 2-Groups},
   journaltitle = {Theory and Applications of Categories},
-  volume = {12},
-  version = {3},
-  date = {2004},
-  pages = {423--491},
-  eprinttype = {arxiv},
-  eprint = {math/0307200v3},
-  annotation = {An \texttt{article} with \texttt{eprint} and
-    \texttt{eprinttype} fields. Note that the arXiv reference is transformed
-    into a clickable link if \texttt{hyperref} support has been enabled.
-    Compare \texttt{baez\slash online}, which is the same item given as an
-    \texttt{online} entry}
-}
-@article{bertram,
-  hyphenation = {american},
-  author = {Bertram, Aaron and Wentworth, Richard},
-  title = {Gromov invariants for holomorphic maps on Riemann surfaces},
-  shorttitle = {Gromov invariants},
+  date         = 2004,
+  volume       = 12,
+  pages        = {423-491},
+  version      = 3,
+  eprint       = {math/0307200v3},
+  eprinttype   = {arxiv},
+  hyphenation  = {american},
+  annotation   = {An \texttt{article} with \texttt{eprint} and
+                  \texttt{eprinttype} fields. Note that the arXiv reference is
+                  transformed into a clickable link if \texttt{hyperref} support
+                  has been enabled.  Compare \texttt{baez\slash online}, which
+                  is the same item given as an \texttt{online} entry},
+}
+
+@Article{bertram,
+  author       = {Bertram, Aaron and Wentworth, Richard},
+  title        = {Gromov invariants for holomorphic maps on Riemann surfaces},
   journaltitle = jams,
-  volume = {9},
-  number = {2},
-  date = {1996},
-  pages = {529--571},
-  annotation = {An \texttt{article} entry with a \texttt{volume} and a
-    \texttt{number} field}
-}
-@article{doody,
-  title = {Hemingway's Style and Jake's Narration},
-  author = {Doody, Terrence},
-  related = {matuz:doody},
-  relatedstring = {\autocap{e}xcerpt in},
-  journal = {The Journal of Narrative Technique},
-  volume = {4},
-  number = {3},
-  pages = {212--225},
-  year = {1974},
-  annotation = {An \texttt{article} entry cited as an excerpt from a
-    \texttt{collection} entry. Note the format of the \texttt{related}
-    and \texttt{relatedstring} fields}
-}
-@collection{matuz:doody,
-  title = {Contemporary Literary Criticism},
-  editor = {Matuz, Roger},
-  volume = {61},
-  location = {Detroit},
-  publisher = {Gale},
-  pages = {204--208},
-  year = {1990},
-  annotation = {A \texttt{collection} entry providing the excerpt information
-    for the \texttt{doody} entry. Note the format of the \texttt{pages} field}
-}
-@article{gillies,
-  hyphenation = {british},
-  author = {Gillies, Alexander},
-  title = {Herder and the Preparation of Goethe's Idea of World Literature},
+  date         = 1996,
+  volume       = 9,
+  number       = 2,
+  pages        = {529-571},
+  hyphenation  = {american},
+  shorttitle   = {Gromov invariants},
+  annotation   = {An \texttt{article} entry with a \texttt{volume} and a
+                  \texttt{number} field},
+}
+
+@Article{doody,
+  author       = {Doody, Terrence},
+  title        = {Hemingway's Style and Jake's Narration},
+  year         = 1974,
+  volume       = 4,
+  number       = 3,
+  pages        = {212-225},
+  hyphenation  = {american},
+  related      = {matuz:doody},
+  relatedstring= {\autocap{e}xcerpt in},
+  journal      = {The Journal of Narrative Technique},
+  annotation   = {An \texttt{article} entry cited as an excerpt from a
+                  \texttt{collection} entry. Note the format of the
+                  \texttt{related} and \texttt{relatedstring} fields},
+}
+
+@Collection{matuz:doody,
+  editor       = {Matuz, Roger},
+  title        = {Contemporary Literary Criticism},
+  year         = 1990,
+  volume       = 61,
+  publisher    = {Gale},
+  location     = {Detroit},
+  pages        = {204-208},
+  hyphenation  = {american},
+  annotation   = {A \texttt{collection} entry providing the excerpt information
+                  for the \texttt{doody} entry. Note the format of the
+                  \texttt{pages} field},
+}
+
+@Article{gillies,
+  author       = {Gillies, Alexander},
+  title        = {Herder and the Preparation of Goethe's Idea of World
+                  Literature},
   journaltitle = {Publications of the English Goethe Society},
-  volume = {9},
-  series = {newseries},
-  date = {1933},
-  pages = {46--67},
-  annotation = {An \texttt{article} entry with a \texttt{series} and a
-    \texttt{volume} field. Note that format of the \texttt{series} field in
-    the database file}
-}
-@article{glashow,
-  author = {Glashow, Sheldon},
-  title = {Partial Symmetries of Weak Interactions},
+  date         = 1933,
+  series       = {newseries},
+  volume       = 9,
+  pages        = {46-67},
+  hyphenation  = {british},
+  annotation   = {An \texttt{article} entry with a \texttt{series} and a
+                  \texttt{volume} field. Note that format of the \texttt{series}
+                  field in the database file},
+}
+
+@Article{glashow,
+  author       = {Glashow, Sheldon},
+  title        = {Partial Symmetries of Weak Interactions},
   journaltitle = {Nucl.~Phys.},
-  volume = {22},
-  date = {1961},
-  pages = {579--588}
-}
-@article{herrmann,
-  author = {Herrmann, Wolfgang A. and {\"O}fele, Karl and Schneider, Sabine K.
-    and Herdtweck, Eberhardt and Hoffmann, Stephan D.},
-  indextitle = {Carbocyclic carbene as an efficient catalyst, A},
-  title = {A carbocyclic carbene as an efficient catalyst ligand for C--C
-    coupling reactions},
+  date         = 1961,
+  volume       = 22,
+  pages        = {579-588},
+}
+
+@Article{herrmann,
+  author       = {Herrmann, Wolfgang A. and {\"O}fele, Karl and Schneider,
+                  Sabine K.  and Herdtweck, Eberhardt and Hoffmann, Stephan D.},
+  title        = {A carbocyclic carbene as an efficient catalyst ligand for C--C
+                  coupling reactions},
   journaltitle = anch-ie,
-  volume = {45},
-  number = {23},
-  date = {2006},
-  pages = {3859--3862}
-}
-@article{kastenholz,
-  hyphenation = {american},
-  author = {Kastenholz, M. A. and H{\"u}nenberger, Philippe H.},
-  indextitle = {Computation of ionic solvation free energies},
-  title = {Computation of methodology\hyphen independent ionic solvation free
-    energies from molecular simulations},
-  subtitle = {I. The electrostatic potential in molecular liquids},
+  date         = 2006,
+  volume       = 45,
+  number       = 23,
+  pages        = {3859-3862},
+  indextitle   = {Carbocyclic carbene as an efficient catalyst, A},
+}
+
+@Article{kastenholz,
+  author       = {Kastenholz, M. A. and H{\"u}nenberger, Philippe H.},
+  title        = {Computation of methodology\hyphen independent ionic solvation
+                  free energies from molecular simulations},
   journaltitle = jchph,
-  volume = {124},
-  eid = {124106},
-  date = {2006},
-  doi = {10.1063/1.2172593},
-  annotation = {An \texttt{article} entry with an \texttt{eid} and a
-    \texttt{doi} field. Note that the \textsc{doi} is transformed into a
-    clickable link if \texttt{hyperref} support has been enabled},
-  abstract = {The computation of ionic solvation free energies from atomistic
-    simulations is a surprisingly difficult problem that has found no
-    satisfactory solution for more than 15 years. The reason is that the
-    charging free energies evaluated from such simulations are affected by
-    very large errors. One of these is related to the choice of a specific
-    convention for summing up the contributions of solvent charges to the
-    electrostatic potential in the ionic cavity, namely, on the basis of point
-    charges within entire solvent molecules (M scheme) or on the basis of
-    individual point charges (P scheme). The use of an inappropriate
-    convention may lead to a charge-independent offset in the calculated
-    potential, which depends on the details of the summation scheme, on the
-    quadrupole-moment trace of the solvent molecule, and on the approximate
-    form used to represent electrostatic interactions in the system. However,
-    whether the M or P scheme (if any) represents the appropriate convention
-    is still a matter of on-going debate. The goal of the present article is
-    to settle this long-standing controversy by carefully analyzing (both
-    analytically and numerically) the properties of the electrostatic
-    potential in molecular liquids (and inside cavities within them).}
-}
-@article{murray,
-  hyphenation = {american},
-  author = {Hostetler, Michael J. and Wingate, Julia E. and Zhong, Chuan-Jian
-    and Harris, Jay E. and Vachet, Richard W. and Clark, Michael R.
-    and Londono, J. David and Green, Stephen J. and Stokes, Jennifer J.
-    and Wignall, George D. and Glish, Gary L. and Porter, Marc D.
-    and Evans, Neal D. and Murray, Royce W.},
-  indextitle = {Alkanethiolate gold cluster molecules},
-  title = {Alkanethiolate gold cluster molecules with core diameters from 1.5
-    to 5.2~nm},
-  subtitle = {Core and monolayer properties as a function of core size},
-  shorttitle = {Alkanethiolate gold cluster molecules},
+  date         = 2006,
+  subtitle     = {I. The electrostatic potential in molecular liquids},
+  volume       = 124,
+  eid          = 124106,
+  doi          = {10.1063/1.2172593},
+  hyphenation  = {american},
+  indextitle   = {Computation of ionic solvation free energies},
+  annotation   = {An \texttt{article} entry with an \texttt{eid} and a
+                  \texttt{doi} field. Note that the \textsc{doi} is transformed
+                  into a clickable link if \texttt{hyperref} support has been
+                  enabled},
+  abstract     = {The computation of ionic solvation free energies from
+                  atomistic simulations is a surprisingly difficult problem that
+                  has found no satisfactory solution for more than 15 years. The
+                  reason is that the charging free energies evaluated from such
+                  simulations are affected by very large errors. One of these is
+                  related to the choice of a specific convention for summing up
+                  the contributions of solvent charges to the electrostatic
+                  potential in the ionic cavity, namely, on the basis of point
+                  charges within entire solvent molecules (M scheme) or on the
+                  basis of individual point charges (P scheme). The use of an
+                  inappropriate convention may lead to a charge-independent
+                  offset in the calculated potential, which depends on the
+                  details of the summation scheme, on the quadrupole-moment
+                  trace of the solvent molecule, and on the approximate form
+                  used to represent electrostatic interactions in the
+                  system. However, whether the M or P scheme (if any) represents
+                  the appropriate convention is still a matter of on-going
+                  debate. The goal of the present article is to settle this
+                  long-standing controversy by carefully analyzing (both
+                  analytically and numerically) the properties of the
+                  electrostatic potential in molecular liquids (and inside
+                  cavities within them).},
+}
+
+@Article{murray,
+  author       = {Hostetler, Michael J. and Wingate, Julia E. and Zhong,
+                  Chuan-Jian and Harris, Jay E. and Vachet, Richard W. and
+                  Clark, Michael R.  and Londono, J. David and Green, Stephen
+                  J. and Stokes, Jennifer J.  and Wignall, George D. and Glish,
+                  Gary L. and Porter, Marc D.  and Evans, Neal D. and Murray,
+                  Royce W.},
+  title        = {Alkanethiolate gold cluster molecules with core diameters from
+                  1.5 to 5.2~nm},
   journaltitle = {Langmuir},
-  volume = {14},
-  number = {1},
-  date = {1998},
-  pages = {17--30},
-  annotation = {An \texttt{article} entry with \arabic{author} authors. By
-    default, long author and editor lists are automatically truncated. This is
-    configurable}
-}
-@article{reese,
-  hyphenation = {american},
-  author = {Reese, Trevor R.},
-  title = {Georgia in Anglo-Spanish Diplomacy, 1736-1739},
+  date         = 1998,
+  subtitle     = {Core and monolayer properties as a function of core size},
+  volume       = 14,
+  number       = 1,
+  pages        = {17-30},
+  hyphenation  = {american},
+  indextitle   = {Alkanethiolate gold cluster molecules},
+  shorttitle   = {Alkanethiolate gold cluster molecules},
+  annotation   = {An \texttt{article} entry with \arabic{author} authors. By
+                  default, long author and editor lists are automatically
+                  truncated. This is configurable},
+}
+
+@Article{reese,
+  author       = {Reese, Trevor R.},
+  title        = {Georgia in Anglo-Spanish Diplomacy, 1736-1739},
   journaltitle = {William and Mary Quarterly},
-  volume = {15},
-  series = {3},
-  date = {1958},
-  pages = {168--190},
-  annotation = {An \texttt{article} entry with a \texttt{series} and a
-    \texttt{volume} field. Note the format of the series. If the value of the
-    \texttt{series} field is an integer, this number is printed as an ordinal
-    and the string \enquote*{series} is appended automatically}
-}
-@article{sarfraz,
-  author = {M. Sarfraz and M. F. A. Razzak},
-  title = {Technical section: {An} algorithm for automatic capturing of the
-    font outlines},
-  journal = {Computers and Graphics},
-  volume = {26},
-  number = {5},
-  pages = {795--804},
-  year = {2002},
-  issn = {0097-8493},
-  annotation = {An \texttt{article} entry with an \texttt{issn} field}
-}
-@article{shore,
-  author = {Shore, Bradd},
-  title = {Twice-Born, Once Conceived},
-  subtitle = {Meaning Construction and Cultural Cognition},
+  date         = 1958,
+  series       = 3,
+  volume       = 15,
+  pages        = {168-190},
+  hyphenation  = {american},
+  annotation   = {An \texttt{article} entry with a \texttt{series} and a
+                  \texttt{volume} field. Note the format of the series. If the
+                  value of the \texttt{series} field is an integer, this number
+                  is printed as an ordinal and the string \enquote*{series} is
+                  appended automatically},
+}
+
+@Article{sarfraz,
+  author       = {M. Sarfraz and M. F. A. Razzak},
+  title        = {Technical section: {An} algorithm for automatic capturing of
+                  the font outlines},
+  year         = 2002,
+  volume       = 26,
+  number       = 5,
+  pages        = {795-804},
+  issn         = {0097-8493},
+  journal      = {Computers and Graphics},
+  annotation   = {An \texttt{article} entry with an \texttt{issn} field},
+}
+
+@Article{shore,
+  author       = {Shore, Bradd},
+  title        = {Twice-Born, Once Conceived},
   journaltitle = {American Anthropologist},
-  volume = {93},
-  series = {newseries},
-  number = {1},
-  date = {1991-03},
-  pages = {9--27},
-  annotation = {An \texttt{article} entry with \texttt{series},
-    \texttt{volume}, and \texttt{number} fields. Note the format of the
-    \texttt{series} which is a localization key}
-}
-@article{sigfridsson,
-  hyphenation = {american},
-  author = {Sigfridsson, Emma and Ryde, Ulf},
-  indextitle = {Methods for deriving atomic charges},
-  title = {Comparison of methods for deriving atomic charges from the
-    electrostatic potential and moments},
+  date         = {1991-03},
+  subtitle     = {Meaning Construction and Cultural Cognition},
+  series       = {newseries},
+  volume       = 93,
+  number       = 1,
+  pages        = {9-27},
+  annotation   = {An \texttt{article} entry with \texttt{series},
+                  \texttt{volume}, and \texttt{number} fields. Note the format
+                  of the \texttt{series} which is a localization key},
+}
+
+@Article{sigfridsson,
+  author       = {Sigfridsson, Emma and Ryde, Ulf},
+  title        = {Comparison of methods for deriving atomic charges from the
+                  electrostatic potential and moments},
   journaltitle = {Journal of Computational Chemistry},
-  volume = {19},
-  number = {4},
-  date = {1998},
-  doi = {10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P},
-  pages = {377--395},
-  annotation = {An \texttt{article} entry with \texttt{volume}, 
-    \texttt{number}, and \texttt{doi} fields. Note that the \textsc{doi} is
-    transformed into a clickable link if \texttt{hyperref} support has been
-    enabled},
-  abstract = {Four methods for deriving partial atomic charges from the
-    quantum chemical electrostatic potential (CHELP, CHELPG, Merz-Kollman, and
-    RESP) have been compared and critically evaluated. It is shown that
-    charges strongly depend on how and where the potential points are
-    selected. Two alternative methods are suggested to avoid the
-    arbitrariness in the point-selection schemes and van der Waals exclusion
-    radii: CHELP-BOW, which also estimates the charges from the electrostatic
-    potential, but with potential points that are Boltzmann-weighted after
-    their occurrence in actual simulations using the energy function of the
-    program in which the charges will be used, and CHELMO, which estimates
-    the charges directly from the electrostatic multipole moments. Different
-    criteria for the quality of the charges are discussed.}
-}
-@article{spiegelberg,
-  hyphenation = {german},
-  sorttitle = {Intention und Intentionalitat in der Scholastik, bei Brentano
-    und Husserl},
-  indexsorttitle = {Intention und Intentionalitat in der Scholastik, bei
-    Brentano und Husserl},
-  author = {Spiegelberg, Herbert},
-  title = {\mkbibquote{Intention} und \mkbibquote{Intentionalit{\"a}t} in der
-    Scholastik, bei Brentano und Husserl},
-  shorttitle = {Intention und Intentionalit{\"a}t},
+  date         = 1998,
+  volume       = 19,
+  number       = 4,
+  pages        = {377-395},
+  doi          = {10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P},
+  hyphenation  = {american},
+  indextitle   = {Methods for deriving atomic charges},
+  annotation   = {An \texttt{article} entry with \texttt{volume},
+                  \texttt{number}, and \texttt{doi} fields. Note that the
+                  \textsc{doi} is transformed into a clickable link if
+                  \texttt{hyperref} support has been enabled},
+  abstract     = {Four methods for deriving partial atomic charges from the
+                  quantum chemical electrostatic potential (CHELP, CHELPG,
+                  Merz-Kollman, and RESP) have been compared and critically
+                  evaluated. It is shown that charges strongly depend on how and
+                  where the potential points are selected. Two alternative
+                  methods are suggested to avoid the arbitrariness in the
+                  point-selection schemes and van der Waals exclusion radii:
+                  CHELP-BOW, which also estimates the charges from the
+                  electrostatic potential, but with potential points that are
+                  Boltzmann-weighted after their occurrence in actual
+                  simulations using the energy function of the program in which
+                  the charges will be used, and CHELMO, which estimates the
+                  charges directly from the electrostatic multipole
+                  moments. Different criteria for the quality of the charges are
+                  discussed.},
+}
+
+@Article{spiegelberg,
+  author       = {Spiegelberg, Herbert},
+  title        = {\mkbibquote{Intention} und \mkbibquote{Intentionalit{\"a}t} in
+                  der Scholastik, bei Brentano und Husserl},
   journaltitle = {Studia Philosophica},
-  volume = {29},
-  date = {1969},
-  pages = {189--216},
-  annotation = {An \texttt{article} entry. Note the \texttt{sorttitle} and
-    \texttt{indexsorttitle} fields and the markup of the quotes in the
-    database file}
-}
-@article{springer,
-  hyphenation = {british},
-  author = {Springer, Otto},
-  title = {Mediaeval Pilgrim Routes from Scandinavia to Rome},
-  shorttitle = {Mediaeval Pilgrim Routes},
+  date         = 1969,
+  volume       = 29,
+  pages        = {189-216},
+  hyphenation  = {german},
+  sorttitle    = {Intention und Intentionalitat in der Scholastik, bei Brentano
+                  und Husserl},
+  indexsorttitle= {Intention und Intentionalitat in der Scholastik, bei Brentano
+                  und Husserl},
+  shorttitle   = {Intention und Intentionalit{\"a}t},
+  annotation   = {An \texttt{article} entry. Note the \texttt{sorttitle} and
+                  \texttt{indexsorttitle} fields and the markup of the quotes in
+                  the database file},
+}
+
+@Article{springer,
+  author       = {Springer, Otto},
+  title        = {Mediaeval Pilgrim Routes from Scandinavia to Rome},
   journaltitle = {Mediaeval Studies},
-  volume = {12},
-  date = {1950},
-  pages = {92--122},
-  annotation = {A plain \texttt{article} entry}
-}
-@article{weinberg,
-  author = {Weinberg, Steven},
-  title = {A Model of Leptons},
+  date         = 1950,
+  volume       = 12,
+  pages        = {92-122},
+  hyphenation  = {british},
+  shorttitle   = {Mediaeval Pilgrim Routes},
+  annotation   = {A plain \texttt{article} entry},
+}
+
+@Article{weinberg,
+  author       = {Weinberg, Steven},
+  title        = {A Model of Leptons},
   journaltitle = {Phys.~Rev.~Lett.},
-  volume = {19},
-  date = {1967},
-  pages = {1264--1266}
-}
-@article{yoon,
-  author = {Yoon, Myeong S. and Ryu, Dowook and Kim, Jeongryul
-    and Ahn, Kyo Han},
-  indextitle = {Palladium pincer complexes},
-  title = {Palladium pincer complexes with reduced bond angle strain:
-    efficient catalysts for the Heck reaction},
+  date         = 1967,
+  volume       = 19,
+  pages        = {1264-1266},
+}
+
+@Article{yoon,
+  author       = {Yoon, Myeong S. and Ryu, Dowook and Kim, Jeongryul and Ahn,
+                  Kyo Han},
+  title        = {Palladium pincer complexes with reduced bond angle strain:
+                  efficient catalysts for the Heck reaction},
   journaltitle = {Organometallics},
-  volume = {25},
-  number = {10},
-  date = {2006},
-  pages = {2409--2411}
-}
-@book{aristotle:anima,
-  keywords = {primary},
-  hyphenation = {british},
-  author = {Aristotle},
-  editor = {Hicks, Robert Drew},
-  title = {De Anima},
-  publisher = cup,
-  location = {Cambridge},
-  date = {1907},
-  annotation = {A \texttt{book} entry with an \texttt{author} and an
-    \texttt{editor}}
-}
-@book{aristotle:physics,
-  keywords = {primary},
-  hyphenation = {american},
-  author = {Aristotle},
-  translator = {Wicksteed, P. H. and Cornford, F. M.},
-  title = {Physics},
-  shorttitle = {Physics},
-  publisher = {G. P. Putnam},
-  location = {New York},
-  date = {1929},
-  annotation = {A \texttt{book} entry with a \texttt{translator} field}
-}
-@book{aristotle:poetics,
-  keywords = {primary},
-  hyphenation = {british},
-  author = {Aristotle},
-  editor = {Lucas, D. W.},
-  title = {Poetics},
-  shorttitle = {Poetics},
-  series = {Clarendon Aristotle},
-  publisher = {Clarendon Press},
-  location = {Oxford},
-  date = {1968},
-  annotation = {A \texttt{book} entry with an \texttt{author} and an
-    \texttt{editor} as well as a \texttt{series} field}
-}
-@book{aristotle:rhetoric,
-  keywords = {primary},
-  hyphenation = {british},
-  sorttitle = {Rhetoric of Aristotle},
-  author = {Aristotle},
-  editor = {Cope, Edward Meredith},
-  commentator = {Cope, Edward Meredith},
-  indextitle = {Rhetoric of Aristotle, The},
-  title = {The Rhetoric of Aristotle with a commentary by the late Edward
-    Meredith Cope},
-  shorttitle = {Rhetoric},
-  volumes = {3},
-  publisher = cup,
-  date = {1877},
-  annotation = {A commented edition. Note the concatenation of the
-    \texttt{editor} and \texttt{commentator} fields as well as the
-    \texttt{volumes}, \texttt{sorttitle}, and \texttt{indextitle} fields}
-}
-@book{augustine,
-  hyphenation = {american},
-  author = {Augustine, Robert L.},
-  title = {Heterogeneous catalysis for the synthetic chemist},
-  shorttitle = {Heterogeneous catalysis},
-  publisher = {Marcel Dekker},
-  location = {New York},
-  date = {1995},
-  annotation = {A plain \texttt{book} entry}
-}
-@book{averroes/bland,
-  keywords = {primary},
-  hyphenation = {american},
-  author = {Averroes},
-  editor = {Bland, Kalman P.},
-  translator = {Bland, Kalman P.},
-  indextitle = {Epistle on the Possibility of Conjunction, The},
-  title = {The Epistle on the Possibility of Conjunction with the Active
-    Intellect by Ibn Rushd with the Commentary of Moses Narboni},
-  shorttitle = {Possibility of Conjunction},
-  series = {Moreshet: Studies in Jewish History, Literature and Thought},
-  number = {7},
-  publisher = {Jewish Theological Seminary of America},
-  location = {New York},
-  date = {1982},
-  annotation = {A \texttt{book} entry with a \texttt{series} and a
-    \texttt{number}. Note the concatenation of the \texttt{editor} and
-    \texttt{translator} fields as well as the \texttt{indextitle} field}
-}
-@book{averroes/hannes,
-  keywords = {primary},
-  hyphenation = {german},
-  sorttitle = {Uber die Moglichkeit der Conjunktion},
-  indexsorttitle = {Uber die Moglichkeit der Conjunktion},
-  author = {Averroes},
-  editor = {Hannes, Ludwig},
-  translator = {Hannes, Ludwig},
-  annotator = {Hannes, Ludwig},
-  indextitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion},
-  title = {Des Averro{\"e}s Abhandlung: \mkbibquote{{\"U}ber die
-    M{\"o}glichkeit der Conjunktion} oder \mkbibquote{{\"U}ber den
-    materiellen Intellekt}},
-  shorttitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion},
-  publisher = {C.~A. Kaemmerer},
-  location = {Halle an der Saale},
-  date = {1892},
-  annotation = {An annotated edition. Note the concatenation of the
-    \texttt{editor}, \texttt{translator}, and \texttt{annotator} fields. Also
-    note the \texttt{shorttitle}, \texttt{indextitle}, \texttt{sorttitle},
-    and \texttt{indexsorttitle} fields}
-}
-@book{averroes/hercz,
-  keywords = {primary},
-  hyphenation = {german},
-  indexsorttitle = {Drei Abhandlungen uber die Conjunction},
-  author = {Averroes},
-  editor = {Hercz, J.},
-  translator = {Hercz, J.},
-  indextitle = {Drei Abhandlungen {\"u}ber die Conjunction},
-  title = {Drei Abhandlungen {\"u}ber die Conjunction des separaten Intellects
-    mit dem Menschen},
-  subtitle = {Von Averroes (Vater und Sohn), aus dem Arabischen {\"u}bersetzt
-    von Samuel Ibn Tibbon},
-  shorttitle = {Drei Abhandlungen},
-  publisher = {S.~Hermann},
-  location = {Berlin},
-  date = {1869},
-  annotation = {A \texttt{book} entry. Note the concatenation of the
-    \texttt{editor} and \texttt{translator} fields as well as the
-    \texttt{indextitle} and \texttt{indexsorttitle} fields}
-}
-@book{cicero,
-  hyphenation = {german},
-  author = {Cicero, Marcus Tullius},
-  editor = {Blank-Sangmeister, Ursula},
-  translator = {Blank-Sangmeister, Ursula},
-  afterword = {Thraede, Klaus},
-  indextitle = {De natura deorum},
-  title = {De natura deorum. {\"U}ber das Wesen der G{\"o}tter},
-  shorttitle = {De natura deorum},
-  language = {langlatin and langgerman},
-  publisher = {Reclam},
-  location = {Stuttgart},
-  date = {1995},
-  annotation = {A bilingual edition of Cicero's \emph{De natura deorum}, with
-    a German translation. Note the format of the \texttt{language} field in
-    the database file, the concatenation of the \texttt{editor} and
-    \texttt{translator} fields, and the \texttt{afterword} field}
-}
-@book{coleridge,
-  hyphenation = {british},
-  author = {Coleridge, Samuel Taylor},
-  editor = {Coburn, Kathleen and Engell, James and Bate, W. Jackson},
-  indextitle = {Biographia literaria},
-  title = {Biographia literaria, or Biographical sketches of my literary life
-    and opinions},
-  shorttitle = {Biographia literaria},
-  maintitle = {The collected works of Samuel Taylor Coleridge},
-  part = {2},
-  volume = {7},
-  series = {Bollingen Series},
-  number = {75},
-  publisher = {Routledge and Kegan Paul},
-  location = {London},
-  date = {1983},
-  annotation = {One (partial) volume of a multivolume book. This is a
-    \texttt{book} entry with a \texttt{volume} and a \texttt{part} field
-    which explicitly refers to the second (physical) part of the seventh
-    (logical) volume. Also note the \texttt{series} and \texttt{number}
-    fields}
-}
-@book{companion,
-  hyphenation = {american},
-  sorttitle = {LaTeX Companion},
-  author = {Goossens, Michel and Mittelbach, Frank and Samarin, Alexander},
-  indextitle = {LaTeX Companion, The},
-  title = {The LaTeX Companion},
-  shorttitle = {LaTeX Companion},
-  edition = {1},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1994},
-  pagetotal = {528},
-  annotation = {A book with three authors. Note the formatting of the author
-    list. By default, only the first name is reversed in the bibliography}
-}
-@book{cotton,
-  hyphenation = {british},
-  author = {Cotton, Frank Albert and Wilkinson, Geoffrey
-    and Murillio, Carlos A. and Bochmann, Manfred},
-  title = {Advanced inorganic chemistry},
-  edition = {6},
-  publisher = {Wiley},
-  location = {Chichester},
-  date = {1999},
-  annotation = {A \texttt{book} entry with \arabic{author} authors and an
-    \texttt{edition} field. By default, long \texttt{author} and
-    \texttt{editor} lists are automatically truncated. This is configurable}
-}
-@book{gerhardt,
-  hyphenation = {american},
-  sorttitle = {Federal Appointments Process},
-  author = {Gerhardt, Michael J.},
-  indextitle = {Federal Appointments Process, The},
-  title = {The Federal Appointments Process},
-  subtitle = {A Constitutional and Historical Analysis},
-  shorttitle = {Federal Appointments Process},
-  publisher = {Duke University Press},
-  location = {Durham and London},
-  date = {2000},
-  annotation = {This is a \texttt{book} entry. Note the format of the
-    \texttt{location} field as well as the \texttt{sorttitle} and
-    \texttt{indextitle} fields}
-}
-@book{gonzalez,
-  hyphenation = {american},
-  sorttitle = {Ghost of John Wayne and Other Stories},
-  author = {Gonzalez, Ray},
-  indextitle = {Ghost of John Wayne and Other Stories, The},
-  title = {The Ghost of John Wayne and Other Stories},
-  shorttitle = {Ghost of John Wayne},
-  publisher = {The University of Arizona Press},
-  location = {Tucson},
-  date = {2001},
-  isbn = {0-816-52066-6},
-  annotation = {A collection of short stories. This is a \texttt{book} entry.
-    Note the \texttt{sorttitle} and \texttt{indextitle} fields in the
-    database file. There's also an \texttt{isbn} field}
-}
-@book{hammond,
-  hyphenation = {british},
-  sorttitle = {Basics of crystallography and diffraction},
-  author = {Hammond, Christopher},
-  indextitle = {Basics of crystallography and diffraction, The},
-  title = {The basics of crystallography and diffraction},
-  shorttitle = {Crystallography and diffraction},
-  publisher = {International Union of Crystallography and Oxford University
-    Press},
-  location = {Oxford},
-  date = {1997},
-  annotation = {A \texttt{book} entry. Note the \texttt{sorttitle} and
-    \texttt{indextitle} fields as well as the format of the
-    \texttt{publisher} field}
-}
-@book{iliad,
-  hyphenation = {german},
-  sorttitle = {Ilias},
-  author = {Homer},
-  translator = {Schadewaldt, Wolfgang},
+  date         = 2006,
+  volume       = 25,
+  number       = 10,
+  pages        = {2409-2411},
+  indextitle   = {Palladium pincer complexes},
+}
+
+@Book{aristotle:anima,
+  author       = {Aristotle},
+  title        = {De Anima},
+  date         = 1907,
+  editor       = {Hicks, Robert Drew},
+  publisher    = cup,
+  location     = {Cambridge},
+  keywords     = {primary},
+  hyphenation  = {british},
+  annotation   = {A \texttt{book} entry with an \texttt{author} and an
+                  \texttt{editor}},
+}
+
+@Book{aristotle:physics,
+  author       = {Aristotle},
+  title        = {Physics},
+  date         = 1929,
+  translator   = {Wicksteed, P. H. and Cornford, F. M.},
+  publisher    = {G. P. Putnam},
+  location     = {New York},
+  keywords     = {primary},
+  hyphenation  = {american},
+  shorttitle   = {Physics},
+  annotation   = {A \texttt{book} entry with a \texttt{translator} field},
+}
+
+@Book{aristotle:poetics,
+  author       = {Aristotle},
+  title        = {Poetics},
+  date         = 1968,
+  editor       = {Lucas, D. W.},
+  series       = {Clarendon Aristotle},
+  publisher    = {Clarendon Press},
+  location     = {Oxford},
+  keywords     = {primary},
+  hyphenation  = {british},
+  shorttitle   = {Poetics},
+  annotation   = {A \texttt{book} entry with an \texttt{author} and an
+                  \texttt{editor} as well as a \texttt{series} field},
+}
+
+@Book{aristotle:rhetoric,
+  author       = {Aristotle},
+  title        = {The Rhetoric of Aristotle with a commentary by the late Edward
+                  Meredith Cope},
+  date         = 1877,
+  editor       = {Cope, Edward Meredith},
+  commentator  = {Cope, Edward Meredith},
+  volumes      = 3,
+  publisher    = cup,
+  keywords     = {primary},
+  hyphenation  = {british},
+  sorttitle    = {Rhetoric of Aristotle},
+  indextitle   = {Rhetoric of Aristotle, The},
+  shorttitle   = {Rhetoric},
+  annotation   = {A commented edition. Note the concatenation of the
+                  \texttt{editor} and \texttt{commentator} fields as well as the
+                  \texttt{volumes}, \texttt{sorttitle}, and \texttt{indextitle}
+                  fields},
+}
+
+@Book{augustine,
+  author       = {Augustine, Robert L.},
+  title        = {Heterogeneous catalysis for the synthetic chemist},
+  date         = 1995,
+  publisher    = {Marcel Dekker},
+  location     = {New York},
+  hyphenation  = {american},
+  shorttitle   = {Heterogeneous catalysis},
+  annotation   = {A plain \texttt{book} entry},
+}
+
+@Book{averroes/bland,
+  author       = {Averroes},
+  title        = {The Epistle on the Possibility of Conjunction with the Active
+                  Intellect by Ibn Rushd with the Commentary of Moses Narboni},
+  date         = 1982,
+  editor       = {Bland, Kalman P.},
+  translator   = {Bland, Kalman P.},
+  series       = {Moreshet: Studies in Jewish History, Literature and Thought},
+  number       = 7,
+  publisher    = {Jewish Theological Seminary of America},
+  location     = {New York},
+  keywords     = {primary},
+  hyphenation  = {american},
+  indextitle   = {Epistle on the Possibility of Conjunction, The},
+  shorttitle   = {Possibility of Conjunction},
+  annotation   = {A \texttt{book} entry with a \texttt{series} and a
+                  \texttt{number}. Note the concatenation of the \texttt{editor}
+                  and \texttt{translator} fields as well as the
+                  \texttt{indextitle} field},
+}
+
+@Book{averroes/hannes,
+  author       = {Averroes},
+  title        = {Des Averro{\"e}s Abhandlung: \mkbibquote{{\"U}ber die
+                  M{\"o}glichkeit der Conjunktion} oder \mkbibquote{{\"U}ber den
+                  materiellen Intellekt}},
+  date         = 1892,
+  editor       = {Hannes, Ludwig},
+  translator   = {Hannes, Ludwig},
+  annotator    = {Hannes, Ludwig},
+  publisher    = {C.~A. Kaemmerer},
+  location     = {Halle an der Saale},
+  keywords     = {primary},
+  hyphenation  = {german},
+  sorttitle    = {Uber die Moglichkeit der Conjunktion},
+  indexsorttitle= {Uber die Moglichkeit der Conjunktion},
+  indextitle   = {{\"U}ber die M{\"o}glichkeit der Conjunktion},
+  shorttitle   = {{\"U}ber die M{\"o}glichkeit der Conjunktion},
+  annotation   = {An annotated edition. Note the concatenation of the
+                  \texttt{editor}, \texttt{translator}, and \texttt{annotator}
+                  fields. Also note the \texttt{shorttitle},
+                  \texttt{indextitle}, \texttt{sorttitle}, and
+                  \texttt{indexsorttitle} fields},
+}
+
+@Book{averroes/hercz,
+  author       = {Averroes},
+  title        = {Drei Abhandlungen {\"u}ber die Conjunction des separaten
+                  Intellects mit dem Menschen},
+  date         = 1869,
+  editor       = {Hercz, J.},
+  translator   = {Hercz, J.},
+  publisher    = {S.~Hermann},
+  location     = {Berlin},
+  keywords     = {primary},
+  hyphenation  = {german},
+  indexsorttitle= {Drei Abhandlungen uber die Conjunction},
+  indextitle   = {Drei Abhandlungen {\"u}ber die Conjunction},
+  subtitle     = {Von Averroes (Vater und Sohn), aus dem Arabischen
+                  {\"u}bersetzt von Samuel Ibn Tibbon},
+  shorttitle   = {Drei Abhandlungen},
+  annotation   = {A \texttt{book} entry. Note the concatenation of the
+                  \texttt{editor} and \texttt{translator} fields as well as the
+                  \texttt{indextitle} and \texttt{indexsorttitle} fields},
+}
+
+@Book{cicero,
+  author       = {Cicero, Marcus Tullius},
+  title        = {De natura deorum. {\"U}ber das Wesen der G{\"o}tter},
+  date         = 1995,
+  editor       = {Blank-Sangmeister, Ursula},
+  translator   = {Blank-Sangmeister, Ursula},
+  afterword    = {Thraede, Klaus},
+  language     = {langlatin and langgerman},
+  publisher    = {Reclam},
+  location     = {Stuttgart},
+  hyphenation  = {german},
+  indextitle   = {De natura deorum},
+  shorttitle   = {De natura deorum},
+  annotation   = {A bilingual edition of Cicero's \emph{De natura deorum}, with
+                  a German translation. Note the format of the \texttt{language}
+                  field in the database file, the concatenation of the
+                  \texttt{editor} and \texttt{translator} fields, and the
+                  \texttt{afterword} field},
+}
+
+@Book{coleridge,
+  author       = {Coleridge, Samuel Taylor},
+  title        = {Biographia literaria, or Biographical sketches of my literary
+                  life and opinions},
+  date         = 1983,
+  editor       = {Coburn, Kathleen and Engell, James and Bate, W. Jackson},
+  maintitle    = {The collected works of Samuel Taylor Coleridge},
+  volume       = 7,
+  part         = 2,
+  series       = {Bollingen Series},
+  number       = 75,
+  publisher    = {Routledge and Kegan Paul},
+  location     = {London},
+  hyphenation  = {british},
+  indextitle   = {Biographia literaria},
+  shorttitle   = {Biographia literaria},
+  annotation   = {One (partial) volume of a multivolume book. This is a
+                  \texttt{book} entry with a \texttt{volume} and a \texttt{part}
+                  field which explicitly refers to the second (physical) part of
+                  the seventh (logical) volume. Also note the \texttt{series}
+                  and \texttt{number} fields},
+}
+
+@Book{companion,
+  author       = {Goossens, Michel and Mittelbach, Frank and Samarin, Alexander},
+  title        = {The LaTeX Companion},
+  date         = 1994,
+  edition      = 1,
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  pagetotal    = 528,
+  hyphenation  = {american},
+  sorttitle    = {LaTeX Companion},
+  indextitle   = {LaTeX Companion, The},
+  shorttitle   = {LaTeX Companion},
+  annotation   = {A book with three authors. Note the formatting of the author
+                  list. By default, only the first name is reversed in the
+                  bibliography},
+}
+
+@Book{cotton,
+  author       = {Cotton, Frank Albert and Wilkinson, Geoffrey and Murillio,
+                  Carlos A. and Bochmann, Manfred},
+  title        = {Advanced inorganic chemistry},
+  date         = 1999,
+  edition      = 6,
+  publisher    = {Wiley},
+  location     = {Chichester},
+  hyphenation  = {british},
+  annotation   = {A \texttt{book} entry with \arabic{author} authors and an
+                  \texttt{edition} field. By default, long \texttt{author} and
+                  \texttt{editor} lists are automatically truncated. This is
+                  configurable},
+}
+
+@Book{gerhardt,
+  author       = {Gerhardt, Michael J.},
+  title        = {The Federal Appointments Process},
+  date         = 2000,
+  publisher    = {Duke University Press},
+  location     = {Durham and London},
+  hyphenation  = {american},
+  sorttitle    = {Federal Appointments Process},
+  indextitle   = {Federal Appointments Process, The},
+  subtitle     = {A Constitutional and Historical Analysis},
+  shorttitle   = {Federal Appointments Process},
+  annotation   = {This is a \texttt{book} entry. Note the format of the
+                  \texttt{location} field as well as the \texttt{sorttitle} and
+                  \texttt{indextitle} fields},
+}
+
+@Book{gonzalez,
+  author       = {Gonzalez, Ray},
+  title        = {The Ghost of John Wayne and Other Stories},
+  date         = 2001,
+  publisher    = {The University of Arizona Press},
+  location     = {Tucson},
+  isbn         = {0-816-52066-6},
+  hyphenation  = {american},
+  sorttitle    = {Ghost of John Wayne and Other Stories},
+  indextitle   = {Ghost of John Wayne and Other Stories, The},
+  shorttitle   = {Ghost of John Wayne},
+  annotation   = {A collection of short stories. This is a \texttt{book} entry.
+                  Note the \texttt{sorttitle} and \texttt{indextitle} fields in
+                  the database file. There's also an \texttt{isbn} field},
+}
+
+@Book{hammond,
+  author       = {Hammond, Christopher},
+  title        = {The basics of crystallography and diffraction},
+  date         = 1997,
+  publisher    = {International Union of Crystallography and Oxford University
+                  Press},
+  location     = {Oxford},
+  hyphenation  = {british},
+  sorttitle    = {Basics of crystallography and diffraction},
+  indextitle   = {Basics of crystallography and diffraction, The},
+  shorttitle   = {Crystallography and diffraction},
+  annotation   = {A \texttt{book} entry. Note the \texttt{sorttitle} and
+                  \texttt{indextitle} fields as well as the format of the
+                  \texttt{publisher} field},
+}
+
+@Book{iliad,
+  author       = {Homer},
+  title        = {Die Ilias},
+  date         = 2004,
+  translator   = {Schadewaldt, Wolfgang},
   introduction = {Latacz, Joachim},
-  indextitle = {Ilias, Die},
-  title = {Die Ilias},
-  shorttitle = {Ilias},
-  edition = {3},
-  publisher = {Artemis \& Winkler},
-  location = {D{\"u}sseldorf and Z{\"u}rich},
-  date = {2004},
-  annotation = {A German translation of the \emph{Iliad}. Note the
-    \texttt{translator} and \texttt{introduction} fields and the format of
-    the \texttt{location} field in the database file. Also note the
-    \texttt{sorttitle} and \texttt{indextitle} fields}
-}
-@book{knuth:ct,
-  hyphenation = {american},
-  sortyear = {1984-0},
-  sorttitle = {Computers & Typesetting},
-  indexsorttitle = {Computers & Typesetting},
-  author = {Knuth, Donald E.},
-  title = {Computers \& Typesetting},
-  volumes = {5},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1984/1986},
-  annotation = {A five-volume book cited as a whole. This is a \texttt{book}
-    entry, note the \texttt{volumes} field}
-}
-@book{knuth:ct:a,
-  hyphenation = {american},
-  sortyear = {1984-1},
-  sorttitle = {Computers & Typesetting A},
-  indexsorttitle = {The TeXbook},
-  author = {Knuth, Donald E.},
-  indextitle = {\protect\TeX book, The},
-  title = {The \TeX book},
-  shorttitle = {\TeX book},
-  maintitle = {Computers \& Typesetting},
-  volume = {A},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1984},
-  annotation = {The first volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields. We want this volume to
-    be listed after the entry referring to the entire five-volume set. Also
-    note the \texttt{indextitle} and \texttt{indexsorttitle} fields. Indexing
-    packages that don't generate robust index entries require some control
-    sequences to be protected from expansion}
-}
-@book{knuth:ct:b,
-  hyphenation = {american},
-  sortyear = {1986-1},
-  sorttitle = {Computers & Typesetting B},
-  indexsorttitle = {TeX: The Program},
-  author = {Knuth, Donald E.},
-  title = {\TeX: The Program},
-  shorttitle = {\TeX},
-  maintitle = {Computers \& Typesetting},
-  volume = {B},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1986},
-  annotation = {The second volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields. Also note the
-    \texttt{indexsorttitle} field}
-}
-@book{knuth:ct:c,
-  hyphenation = {american},
-  sortyear = {1986-2},
-  sorttitle = {Computers & Typesetting C},
-  author = {Knuth, Donald E.},
-  indextitle = {METAFONTbook, The},
-  title = {The METAFONTbook},
-  shorttitle = {METAFONTbook},
-  maintitle = {Computers \& Typesetting},
-  volume = {C},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1986},
-  annotation = {The third volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields as well as the
-    \texttt{indextitle} field}
-}
-@book{knuth:ct:d,
-  hyphenation = {american},
-  sortyear = {1986-3},
-  sorttitle = {Computers & Typesetting D},
-  author = {Knuth, Donald E.},
-  title = {METAFONT: The Program},
-  shorttitle = {METAFONT},
-  maintitle = {Computers \& Typesetting},
-  volume = {D},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1986},
-  annotation = {The fourth volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields}
-}
-@book{knuth:ct:e,
-  hyphenation = {american},
-  sortyear = {1986-4},
-  sorttitle = {Computers & Typesetting E},
-  author = {Knuth, Donald E.},
-  title = {Computer Modern Typefaces},
-  maintitle = {Computers \& Typesetting},
-  volume = {E},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1986},
-  annotation = {The fifth volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields}
-}
-@book{knuth:ct:related,
-  hyphenation = {american},
-  sortyear = {1984-0},
-  sorttitle = {Computers & Typesetting},
-  indexsorttitle = {Computers & Typesetting},
-  author = {Knuth, Donald E.},
-  title = {Computers \& Typesetting},
-  volumes = {5},
-  related = {knuth:ct:a,knuth:ct:b,knuth:ct:c,knuth:ct:d,knuth:ct:e},
-  relatedtype = {multivolume},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1984/1986},
-  annotation = {A five-volume book cited as a whole and related to its
-    individual volumes. Note the \texttt{related} and \texttt{relatedtype}
-    fields}
-}
-@book{kullback,
-  title = {Information Theory and Statistics},
-  author = {Kullback, Solomon},
-  year = {1959},
-  publisher = {John Wiley \& Sons},
-  location = {New York}
-}
-@book{kullback:reprint,
-  title = {Information Theory and Statistics},
-  author = {Kullback, Solomon},
-  year = {1997},
-  origyear = {1959},
-  publisher = {Dover Publications},
-  origpublisher = {John Wiley \& Sons},
-  location = {New York},
-  annotation = {A reprint of the \texttt{kullback} entry. Note the format of
-    \texttt{origyear} and \texttt{origpublisher}. These fields are not used by
-    the standard bibliography styles}
-}
-@book{kullback:related,
-  title = {Information Theory and Statistics},
-  author = {Kullback, Solomon},
-  year = {1997},
-  publisher = {Dover Publications},
-  location = {New York},
-  related = {kullback},
-  relatedtype = {origpubin},
-  annotation = {A reprint of the \texttt{kullback} entry. Note the format of
-    the \texttt{related} and \texttt{relatedtype} fields}
-}
-@book{malinowski,
-  hyphenation = {british},
-  author = {Malinowski, Bronis{\l}aw},
-  title = {Argonauts of the Western Pacific},
-  subtitle = {An account of native enterprise and adventure in the
-     Archipelagoes of Melanesian New Guinea},
-  shorttitle = {Argonauts},
-  edition = {8},
-  publisher = {Routledge and Kegan Paul},
-  location = {London},
-  date = {1972},
-  annotation = {This is a \texttt{book} entry. Note the format of the
-    \texttt{publisher} and \texttt{edition} fields as well as the
-    \texttt{subtitle} field}
-}
-@book{maron,
-  hyphenation = {american},
-  author = {Maron, Monika},
-  translator = {Brigitte Goldstein},
-  title = {Animal Triste},
-  shorttitle = {Animal Triste},
-  publisher = {University of Nebraska Press},
-  location = {Lincoln},
-  date = {2000},
+  edition      = 3,
+  publisher    = {Artemis \& Winkler},
+  location     = {D{\"u}sseldorf and Z{\"u}rich},
+  hyphenation  = {german},
+  sorttitle    = {Ilias},
+  indextitle   = {Ilias, Die},
+  shorttitle   = {Ilias},
+  annotation   = {A German translation of the \emph{Iliad}. Note the
+                  \texttt{translator} and \texttt{introduction} fields and the
+                  format of the \texttt{location} field in the database
+                  file. Also note the \texttt{sorttitle} and \texttt{indextitle}
+                  fields},
+}
+
+@Book{knuth:ct,
+  author       = {Knuth, Donald E.},
+  title        = {Computers \& Typesetting},
+  date         = {1984/1986},
+  volumes      = 5,
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1984-0},
+  sorttitle    = {Computers & Typesetting},
+  indexsorttitle= {Computers & Typesetting},
+  annotation   = {A five-volume book cited as a whole. This is a \texttt{book}
+                  entry, note the \texttt{volumes} field},
+}
+
+@Book{knuth:ct:a,
+  author       = {Knuth, Donald E.},
+  title        = {The \TeX book},
+  date         = 1984,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {A},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1984-1},
+  sorttitle    = {Computers & Typesetting A},
+  indexsorttitle= {The TeXbook},
+  indextitle   = {\protect\TeX book, The},
+  shorttitle   = {\TeX book},
+  annotation   = {The first volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields. We want this
+                  volume to be listed after the entry referring to the entire
+                  five-volume set. Also note the \texttt{indextitle} and
+                  \texttt{indexsorttitle} fields. Indexing packages that don't
+                  generate robust index entries require some control sequences
+                  to be protected from expansion},
+}
+
+@Book{knuth:ct:b,
+  author       = {Knuth, Donald E.},
+  title        = {\TeX: The Program},
+  date         = 1986,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {B},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1986-1},
+  sorttitle    = {Computers & Typesetting B},
+  indexsorttitle= {TeX: The Program},
+  shorttitle   = {\TeX},
+  annotation   = {The second volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields. Also note the
+                  \texttt{indexsorttitle} field},
+}
+
+@Book{knuth:ct:c,
+  author       = {Knuth, Donald E.},
+  title        = {The METAFONTbook},
+  date         = 1986,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {C},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1986-2},
+  sorttitle    = {Computers & Typesetting C},
+  indextitle   = {METAFONTbook, The},
+  shorttitle   = {METAFONTbook},
+  annotation   = {The third volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields as well as the
+                  \texttt{indextitle} field},
+}
+
+@Book{knuth:ct:d,
+  author       = {Knuth, Donald E.},
+  title        = {METAFONT: The Program},
+  date         = 1986,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {D},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1986-3},
+  sorttitle    = {Computers & Typesetting D},
+  shorttitle   = {METAFONT},
+  annotation   = {The fourth volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields},
+}
+
+@Book{knuth:ct:e,
+  author       = {Knuth, Donald E.},
+  title        = {Computer Modern Typefaces},
+  date         = 1986,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {E},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1986-4},
+  sorttitle    = {Computers & Typesetting E},
+  annotation   = {The fifth volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields},
+}
+
+@Book{knuth:ct:related,
+  author       = {Knuth, Donald E.},
+  title        = {Computers \& Typesetting},
+  date         = {1984/1986},
+  volumes      = 5,
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1984-0},
+  sorttitle    = {Computers & Typesetting},
+  indexsorttitle= {Computers & Typesetting},
+  related      = {knuth:ct:a,knuth:ct:b,knuth:ct:c,knuth:ct:d,knuth:ct:e},
+  relatedtype  = {multivolume},
+  annotation   = {A five-volume book cited as a whole and related to its
+                  individual volumes. Note the \texttt{related} and
+                  \texttt{relatedtype} fields},
+}
+
+@Book{kullback,
+  author       = {Kullback, Solomon},
+  title        = {Information Theory and Statistics},
+  year         = 1959,
+  publisher    = {John Wiley \& Sons},
+  location     = {New York},
+  hyphenation  = {american},
+}
+
+@Book{kullback:reprint,
+  author       = {Kullback, Solomon},
+  title        = {Information Theory and Statistics},
+  year         = 1997,
+  publisher    = {Dover Publications},
+  location     = {New York},
+  origyear     = 1959,
+  origpublisher= {John Wiley \& Sons},
+  hyphenation  = {american},
+  annotation   = {A reprint of the \texttt{kullback} entry. Note the format of
+                  \texttt{origyear} and \texttt{origpublisher}. These fields are
+                  not used by the standard bibliography styles},
+}
+
+@Book{kullback:related,
+  author       = {Kullback, Solomon},
+  title        = {Information Theory and Statistics},
+  year         = 1997,
+  publisher    = {Dover Publications},
+  location     = {New York},
+  hyphenation  = {american},
+  related      = {kullback},
+  relatedtype  = {origpubin},
+  annotation   = {A reprint of the \texttt{kullback} entry. Note the format of
+                  the \texttt{related} and \texttt{relatedtype} fields},
+}
+
+@Book{malinowski,
+  author       = {Malinowski, Bronis{\l}aw},
+  title        = {Argonauts of the Western Pacific},
+  date         = 1972,
+  edition      = 8,
+  publisher    = {Routledge and Kegan Paul},
+  location     = {London},
+  hyphenation  = {british},
+  subtitle     = {An account of native enterprise and adventure in the
+                  Archipelagoes of Melanesian New Guinea},
+  shorttitle   = {Argonauts},
+  annotation   = {This is a \texttt{book} entry. Note the format of the
+                  \texttt{publisher} and \texttt{edition} fields as well as the
+                  \texttt{subtitle} field},
+}
+
+@Book{maron,
+  author       = {Maron, Monika},
+  title        = {Animal Triste},
+  date         = 2000,
+  translator   = {Brigitte Goldstein},
   origlanguage = {german},
-  annotation = {An English translation of a German novel with a French title.
-    In other words: a \texttt{book} entry with a \texttt{translator} field.
-    Note the \texttt{origlanguage} field which is concatenated with the
-    \texttt{translator}}
-}
-@book{massa,
-  hyphenation = {british},
-  author = {Werner Massa},
-  title = {Crystal structure determination},
-  edition = {2},
-  publisher = {Spinger},
-  location = {Berlin},
-  date = {2004},
-  annotation = {A \texttt{book} entry with an \texttt{edition} field}
-}
-@book{nietzsche:ksa,
-  hyphenation = {german},
-  sortyear = {1988-00-000},
-  sorttitle = {Werke-00-000},
-  indexsorttitle = {Samtliche Werke},
-  author = {Nietzsche, Friedrich},
-  editor = {Colli, Giorgio and Montinari, Mazzino},
-  title = {S{\"a}mtliche Werke},
-  subtitle = {Kritische Studienausgabe},
-  volumes = {15},
-  edition = {2},
-  publisher = dtv # { and Walter de Gruyter},
-  location = {M{\"u}nchen and Berlin and New York},
-  date = {1988},
-  annotation = {The critical edition of Nietzsche's works. This is a
-    \texttt{book} entry referring to a 15-volume work as a whole. Note the
-    \texttt{volumes} field and the format of the \texttt{publisher} and
-    \texttt{location} fields in the database file. Also note the
-    \texttt{sorttitle} and \texttt{sortyear} fields which are used to
-    fine-tune the sorting order of the bibliography. We want this item listed
-    first in the bibliography}
-}
-@book{nietzsche:ksa1,
-  hyphenation = {german},
-  sortyear = {1988-01-000},
-  sorttitle = {Werke-01-000},
-  indexsorttitle = {Samtliche Werke I},
-  author = {Nietzsche, Friedrich},
-  bookauthor = {Nietzsche, Friedrich},
-  editor = {Colli, Giorgio and Montinari, Mazzino},
-  indextitle = {S{\"a}mtliche Werke I},
-  title = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e Betrachtungen
-    I--IV. Nachgelassene Schriften 1870--1973},
-  shorttitle = {S{\"a}mtliche Werke I},
-  maintitle = {S{\"a}mtliche Werke},
+  publisher    = {University of Nebraska Press},
+  location     = {Lincoln},
+  hyphenation  = {american},
+  shorttitle   = {Animal Triste},
+  annotation   = {An English translation of a German novel with a French title.
+                  In other words: a \texttt{book} entry with a
+                  \texttt{translator} field.  Note the \texttt{origlanguage}
+                  field which is concatenated with the \texttt{translator}},
+}
+
+@Book{massa,
+  author       = {Werner Massa},
+  title        = {Crystal structure determination},
+  date         = 2004,
+  edition      = 2,
+  publisher    = {Spinger},
+  location     = {Berlin},
+  hyphenation  = {british},
+  annotation   = {A \texttt{book} entry with an \texttt{edition} field},
+}
+
+@Article{moore,
+  author       = {Moore, Gordon E.},
+  title        = {Cramming more components onto integrated circuits},
+  journaltitle = {Electronics},
+  year         = 1965,
+  volume       = 38,
+  number       = 8,
+  pages        = {114-117},
+  hyphenation  = {american},
+}
+
+@Article{moore:related,
+  author       = {Moore, Gordon E.},
+  title        = {Cramming more components onto integrated circuits},
+  journaltitle = {Proceedings of the {IEEE}},
+  year         = 1998,
+  volume       = 86,
+  number       = 1,
+  pages        = {82-85},
+  hyphenation  = {american},
+  related      = {moore},
+  relatedtype  = {reprintfrom},
+  annotation   = {A reprint of Moore's law. Note the \texttt{related} and
+                  \texttt{relatedtype} fields},
+}
+
+@Book{nietzsche:ksa,
+  author       = {Nietzsche, Friedrich},
+  title        = {S{\"a}mtliche Werke},
+  date         = 1988,
+  editor       = {Colli, Giorgio and Montinari, Mazzino},
+  edition      = 2,
+  volumes      = 15,
+  publisher    = dtv # { and Walter de Gruyter},
+  location     = {M{\"u}nchen and Berlin and New York},
+  hyphenation  = {german},
+  sortyear     = {1988-0},
+  sorttitle    = {Werke-00-000},
+  indexsorttitle= {Samtliche Werke},
+  subtitle     = {Kritische Studienausgabe},
+  annotation   = {The critical edition of Nietzsche's works. This is a
+                  \texttt{book} entry referring to a 15-volume work as a
+                  whole. Note the \texttt{volumes} field and the format of the
+                  \texttt{publisher} and \texttt{location} fields in the
+                  database file. Also note the \texttt{sorttitle} and
+                  \texttt{sortyear} fields which are used to fine-tune the
+                  sorting order of the bibliography. We want this item listed
+                  first in the bibliography},
+}
+
+@Book{nietzsche:ksa1,
+  author       = {Nietzsche, Friedrich},
+  title        = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e
+                  Betrachtungen I--IV. Nachgelassene Schriften 1870--1973},
+  date         = 1988,
+  editor       = {Colli, Giorgio and Montinari, Mazzino},
+  maintitle    = {S{\"a}mtliche Werke},
   mainsubtitle = {Kritische Studienausgabe},
-  volume = {1},
-  edition = {2},
-  publisher = dtv # { and Walter de Gruyter},
-  location = {M{\"u}nchen and Berlin and New York},
-  date = {1988},
-  annotation = {A single volume from the critical edition of Nietzsche's
-    works. This \texttt{book} entry explicitly refers to the first volume
-    only. Note the \texttt{title} and \texttt{maintitle} fields. Also note the
-    \texttt{sorttitle} and \texttt{sortyear} fields. We want this entry to be
-    listed after the entry referring to the entire edition}
-}
-@book{nussbaum,
-  keywords = {secondary},
-  hyphenation = {american},
-  sorttitle = {Aristotle's De Motu Animalium},
-  indexsorttitle = {Aristotle's De Motu Animalium},
-  author = {Nussbaum, Martha},
-  title = {Aristotle's \mkbibquote{De Motu Animalium}},
-  publisher = pup,
-  location = {Princeton},
-  date = {1978},
-  annotation = {A \texttt{book} entry. Note the \texttt{sorttitle} and
-    \texttt{indexsorttitle} fields and the markup of the quotes in the
-    database file}
-}
-@book{piccato,
-  hyphenation = {american},
-  author = {Piccato, Pablo},
-  title = {City of Suspects},
-  subtitle = {Crime in Mexico City, 1900--1931},
-  shorttitle = {City of Suspects},
-  publisher = {Duke University Press},
-  location = {Durham and London},
-  date = {2001},
-  annotation = {This is a \texttt{book} entry. Note the format of the
-    \texttt{location} field in the database file}
-}
-@book{vangennep,
-  options = {useprefix},
-  hyphenation = {french},
-  sorttitle = {Rites de passage},
-  author = {van Gennep, Arnold},
-  indextitle = {Rites de passage, Les},
-  title = {Les rites de passage},
-  shorttitle = {Rites de passage},
-  publisher = {Nourry},
-  location = {Paris},
-  date = {1909},
-  annotation = {A \texttt{book} entry. Note the format of the printed name and
-    compare the \texttt{useprefix} option in the \texttt{options} field as
-    well as \texttt{brandt} and \texttt{geer}}
-}
-@book{vangennep:trans,
-  options = {useprefix},
-  author = {van Gennep, Arnold},
-  translator = {Vizedom, Monika B. and Caffee, Gabrielle L.},
-  title = {The Rites of Passage},
-  indextitle = {Rites of Passage, The},
-  sorttitle = {Rites of Passage},
-  shorttitle = {Rites of Passage},
-  language = {english},
+  volume       = 1,
+  edition      = 2,
+  publisher    = dtv # { and Walter de Gruyter},
+  location     = {M{\"u}nchen and Berlin and New York},
+  hyphenation  = {german},
+  sortyear     = {1988-1},
+  sorttitle    = {Werke-01-000},
+  indexsorttitle= {Samtliche Werke I},
+  bookauthor   = {Nietzsche, Friedrich},
+  indextitle   = {S{\"a}mtliche Werke I},
+  shorttitle   = {S{\"a}mtliche Werke I},
+  annotation   = {A single volume from the critical edition of Nietzsche's
+                  works. This \texttt{book} entry explicitly refers to the first
+                  volume only. Note the \texttt{title} and \texttt{maintitle}
+                  fields. Also note the \texttt{sorttitle} and \texttt{sortyear}
+                  fields. We want this entry to be listed after the entry
+                  referring to the entire edition},
+}
+
+@Book{nussbaum,
+  author       = {Nussbaum, Martha},
+  title        = {Aristotle's \mkbibquote{De Motu Animalium}},
+  date         = 1978,
+  publisher    = pup,
+  location     = {Princeton},
+  keywords     = {secondary},
+  hyphenation  = {american},
+  sorttitle    = {Aristotle's De Motu Animalium},
+  indexsorttitle= {Aristotle's De Motu Animalium},
+  annotation   = {A \texttt{book} entry. Note the \texttt{sorttitle} and
+                  \texttt{indexsorttitle} fields and the markup of the quotes in
+                  the database file},
+}
+
+@Book{piccato,
+  author       = {Piccato, Pablo},
+  title        = {City of Suspects},
+  date         = 2001,
+  publisher    = {Duke University Press},
+  location     = {Durham and London},
+  hyphenation  = {american},
+  subtitle     = {Crime in Mexico City, 1900--1931},
+  shorttitle   = {City of Suspects},
+  annotation   = {This is a \texttt{book} entry. Note the format of the
+                  \texttt{location} field in the database file},
+}
+
+@Book{vangennep,
+  author       = {van Gennep, Arnold},
+  title        = {Les rites de passage},
+  date         = 1909,
+  publisher    = {Nourry},
+  location     = {Paris},
+  options      = {useprefix},
+  hyphenation  = {french},
+  sorttitle    = {Rites de passage},
+  indextitle   = {Rites de passage, Les},
+  shorttitle   = {Rites de passage},
+  annotation   = {A \texttt{book} entry. Note the format of the printed name and
+                  compare the \texttt{useprefix} option in the \texttt{options}
+                  field as well as \texttt{brandt} and \texttt{geer}},
+}
+
+@Book{vangennep:trans,
+  author       = {van Gennep, Arnold},
+  title        = {The Rites of Passage},
+  year         = 1960,
+  translator   = {Vizedom, Monika B. and Caffee, Gabrielle L.},
+  language     = {english},
   origlanguage = {french},
-  year = {1960},
-  publisher = {University of Chicago Press},
-  annotation = {A translation of the \texttt{vangennep} entry. Note the
-    \texttt{translator} and \texttt{origlanguage} fields. Compare with the
-    \texttt{vangennep:related} entry.}
-}
-@book{vangennep:related,
-  options = {useprefix},
-  hyphenation = {french},
-  author = {van Gennep, Arnold},
-  related = {vizedom:related},
-  relatedtype = {bytranslator},
-  sorttitle = {Rites de passage},
-  indextitle = {Rites de passage, Les},
-  title = {Les rites de passage},
-  shorttitle = {Rites de passage},
-  publisher = {Nourry},
-  location = {Paris},
-  date = {1909},
-  annotation = {A variant of the \texttt{vangennep} entry related to its
-    translation. Note the format of the \texttt{related} and
-    \texttt{relatedtype} fields}
-}
-@book{vizedom:related,
-  options = {usetranslator},
-  translator = {Vizedom, Monika B. and Caffee, Gabrielle L.},
-  related = {vangennep},
-  relatedtype = {translationof},
-  title = {The Rites of Passage},
-  indextitle = {Rites of Passage, The},
-  sorttitle = {Rites of Passage},
-  shorttitle = {Rites of Passage},
-  language = {english},
-  year = {1960},
-  publisher = {University of Chicago Press},
-  annotation = {A translated work from \texttt{vangennep}. Note the format of
-    the \texttt{related} and \texttt{relatedtype} fields}
-}
-@book{vazques-de-parga,
-  hyphenation = {spanish},
-  sorttitle = {Peregrinaciones a Santiago de Compostela},
-  author = {V{\'a}zques{ de }Parga, Luis and Lacarra, Jos{\'e} Mar{\'i}a
-    and Ur{\'i}a R{\'i}u, Juan},
-  indextitle = {Peregrinaciones a Santiago de Compostela, Las},
-  title = {Las Peregrinaciones a Santiago de Compostela},
-  shorttitle = {Peregrinaciones},
-  volumes = {3},
-  publisher = {Iberdrola},
-  location = {Pamplona},
-  date = {1993},
-  note = {Ed. facs. de la realizada en 1948--49},
-  annotation = {A multivolume book cited as a whole. This is a \texttt{book}
-    entry with \texttt{volumes}, \texttt{note}, \texttt{sorttitle}, and
-    \texttt{indextitle} fields}
-}
-@book{wilde,
-  title = {The Importance of Being Earnest: A Trivial Comedy for Serious
-    People},
-  author = {Wilde, Oscar},
-  series = {English and American drama of the Nineteenth Century},
-  year = {1899},
-  eprint ={4HIWAAAAYAAJ},
-  eprinttype = {googlebooks},
-  publisher = {Leonard Smithers and Company},
-  annotation = {A \texttt{book} with \texttt{eprint} and \texttt{eprinttype}
-    fields.}
-}
-@book{worman,
-  hyphenation = {american},
-  sorttitle = {Cast of Character},
-  author = {Worman, Nancy},
-  indextitle = {Cast of Character, The},
-  title = {The Cast of Character},
-  subtitle = {Style in Greek Literature},
-  shorttitle = {Cast of Character},
-  publisher = {University of Texas Press},
-  location = {Austin},
-  date = {2002},
-  annotation = {A \texttt{book} entry. Note the \texttt{sorttitle} and
-    \texttt{indextitle} fields}
-}
-@collection{britannica,
-  options = {useeditor=false},
-  label = {EB},
-  hyphenation = {british},
-  sorttitle = {Encyclop{\ae}dia Britannica},
-  editor = {Preece, Warren E.},
-  indextitle = {Encyclop{\ae}dia Britannica, The New},
-  title = {The New Encyclop{\ae}dia Britannica},
-  shorttitle = {Encyclop{\ae}dia Britannica},
-  volumes = {32},
-  edition = {15},
-  publisher = {Encyclop{\ae}dia Britannica},
-  location = {Chicago, Ill.},
-  date = {2003},
-  annotation = {This is a \texttt{collection} entry for an encyclopedia. Note
-    the \texttt{useeditor} option in the \texttt{options} field as well as the
-    \texttt{sorttitle} field. We want this entry to be cited and alphabetized
-    by title even though there is an editor. In addition to that, we want the
-    title to be alphabetized under \enquote*{E} rather than \enquote*{T}. Also
-    note the \texttt{label} field which is provided for author-year citation
-    styles}
-}
-@collection{gaonkar,
-  hyphenation = {american},
-  editor = {Gaonkar, Dilip Parameshwar},
-  title = {Alternative Modernities},
-  publisher = {Duke University Press},
-  location = {Durham and London},
-  date = {2001},
-  isbn = {0-822-32714-7},
-  annotation = {This is a \texttt{collection} entry. Note the format of the
-    \texttt{location} field in the database file as well as the \texttt{isbn}
-    field}
-}
-@incollection{gaonkar:in,
-  author = {Gaonkar, Dilip Parameshwar},
-  title = {On Alternative Modernities},
-  pages = {1--23},
-  editor = {Gaonkar, Dilip Parameshwar},
-  booktitle = {Alternative Modernities},
-  publisher = {Duke University Press},
-  location = {Durham and London},
-  date = {2001},
-  isbn = {0-822-32714-7}
-}
-@collection{jaffe,
-  editor = {Jaff{\'e}, Philipp},
-  editora = {Loewenfeld, Samuel and Kaltenbrunner, Ferdinand and Ewald, Paul},
-  editoratype = {redactor},
-  indextitle = {Regesta Pontificum Romanorum},
-  title = {Regesta Pontificum Romanorum ab condita ecclesia ad annum post
-    Christum natum \textsc{mcxcviii}},
-  shorttitle = {Regesta Pontificum Romanorum},
-  volumes = {2},
-  edition = {2},
-  location = {Leipzig},
-  date = {1885/1888},
-  annotation = {A \texttt{collection} entry with \texttt{edition} and
-    \texttt{volumes} fields. Note the \texttt{editora} and
-    \texttt{editoratype} fields}
-}
-@collection{westfahl:frontier,
-  hyphenation = {american},
-  editor = {Westfahl, Gary},
-  title = {Space and Beyond},
-  subtitle = {The Frontier Theme in Science Fiction},
-  booktitle = {Space and Beyond},
+  publisher    = {University of Chicago Press},
+  options      = {useprefix},
+  indextitle   = {Rites of Passage, The},
+  sorttitle    = {Rites of Passage},
+  shorttitle   = {Rites of Passage},
+  hyphenation  = {american},
+  annotation   = {A translation of the \texttt{vangennep} entry. Note the
+                  \texttt{translator} and \texttt{origlanguage} fields. Compare
+                  with the \texttt{vangennep:related} entry.},
+}
+
+@Book{vangennep:related,
+  author       = {van Gennep, Arnold},
+  title        = {Les rites de passage},
+  date         = 1909,
+  publisher    = {Nourry},
+  location     = {Paris},
+  options      = {useprefix},
+  hyphenation  = {french},
+  related      = {vizedom:related},
+  relatedtype  = {bytranslator},
+  sorttitle    = {Rites de passage},
+  indextitle   = {Rites de passage, Les},
+  shorttitle   = {Rites de passage},
+  annotation   = {A variant of the \texttt{vangennep} entry related to its
+                  translation. Note the format of the \texttt{related} and
+                  \texttt{relatedtype} fields},
+}
+
+@Book{vizedom:related,
+  title        = {The Rites of Passage},
+  year         = 1960,
+  translator   = {Vizedom, Monika B. and Caffee, Gabrielle L.},
+  language     = {english},
+  publisher    = {University of Chicago Press},
+  hyphenation  = {american},
+  options      = {usetranslator},
+  related      = {vangennep},
+  relatedtype  = {translationof},
+  indextitle   = {Rites of Passage, The},
+  sorttitle    = {Rites of Passage},
+  shorttitle   = {Rites of Passage},
+  annotation   = {A translated work from \texttt{vangennep}. Note the format of
+                  the \texttt{related} and \texttt{relatedtype} fields},
+}
+
+@Book{vazques-de-parga,
+  author       = {V{\'a}zques{ de }Parga, Luis and Lacarra, Jos{\'e} Mar{\'i}a
+                  and Ur{\'i}a R{\'i}u, Juan},
+  title        = {Las Peregrinaciones a Santiago de Compostela},
+  date         = 1993,
+  volumes      = 3,
+  note         = {Ed. facs. de la realizada en 1948--49},
+  publisher    = {Iberdrola},
+  location     = {Pamplona},
+  hyphenation  = {spanish},
+  sorttitle    = {Peregrinaciones a Santiago de Compostela},
+  indextitle   = {Peregrinaciones a Santiago de Compostela, Las},
+  shorttitle   = {Peregrinaciones},
+  annotation   = {A multivolume book cited as a whole. This is a \texttt{book}
+                  entry with \texttt{volumes}, \texttt{note},
+                  \texttt{sorttitle}, and \texttt{indextitle} fields},
+}
+
+@Book{wilde,
+  author       = {Wilde, Oscar},
+  title        = {The Importance of Being Earnest: A Trivial Comedy for Serious
+                  People},
+  year         = 1899,
+  series       = {English and American drama of the Nineteenth Century},
+  publisher    = {Leonard Smithers and Company},
+  eprint       = {4HIWAAAAYAAJ},
+  eprinttype   = {googlebooks},
+  annotation   = {A \texttt{book} with \texttt{eprint} and \texttt{eprinttype}
+                  fields.},
+}
+
+@Book{worman,
+  author       = {Worman, Nancy},
+  title        = {The Cast of Character},
+  date         = 2002,
+  publisher    = {University of Texas Press},
+  location     = {Austin},
+  hyphenation  = {american},
+  sorttitle    = {Cast of Character},
+  indextitle   = {Cast of Character, The},
+  subtitle     = {Style in Greek Literature},
+  shorttitle   = {Cast of Character},
+  annotation   = {A \texttt{book} entry. Note the \texttt{sorttitle} and
+                  \texttt{indextitle} fields},
+}
+
+@Collection{britannica,
+  editor       = {Preece, Warren E.},
+  title        = {The New Encyclop{\ae}dia Britannica},
+  date         = 2003,
+  edition      = 15,
+  volumes      = 32,
+  publisher    = {Encyclop{\ae}dia Britannica},
+  location     = {Chicago, Ill.},
+  options      = {useeditor=false},
+  label        = {EB},
+  hyphenation  = {british},
+  sorttitle    = {Encyclop{\ae}dia Britannica},
+  indextitle   = {Encyclop{\ae}dia Britannica, The New},
+  shorttitle   = {Encyclop{\ae}dia Britannica},
+  annotation   = {This is a \texttt{collection} entry for an encyclopedia. Note
+                  the \texttt{useeditor} option in the \texttt{options} field as
+                  well as the \texttt{sorttitle} field. We want this entry to be
+                  cited and alphabetized by title even though there is an
+                  editor. In addition to that, we want the title to be
+                  alphabetized under \enquote*{E} rather than \enquote*{T}. Also
+                  note the \texttt{label} field which is provided for
+                  author-year citation styles},
+}
+
+@Collection{gaonkar,
+  editor       = {Gaonkar, Dilip Parameshwar},
+  title        = {Alternative Modernities},
+  date         = 2001,
+  publisher    = {Duke University Press},
+  location     = {Durham and London},
+  isbn         = {0-822-32714-7},
+  hyphenation  = {american},
+  annotation   = {This is a \texttt{collection} entry. Note the format of the
+                  \texttt{location} field in the database file as well as the
+                  \texttt{isbn} field},
+}
+
+@InCollection{gaonkar:in,
+  author       = {Gaonkar, Dilip Parameshwar},
+  editor       = {Gaonkar, Dilip Parameshwar},
+  title        = {On Alternative Modernities},
+  date         = 2001,
+  booktitle    = {Alternative Modernities},
+  publisher    = {Duke University Press},
+  location     = {Durham and London},
+  isbn         = {0-822-32714-7},
+  pages        = {1-23},
+}
+
+@Collection{jaffe,
+  editor       = {Jaff{\'e}, Philipp},
+  title        = {Regesta Pontificum Romanorum ab condita ecclesia ad annum post
+                  Christum natum \textsc{mcxcviii}},
+  date         = {1885/1888},
+  editora      = {Loewenfeld, Samuel and Kaltenbrunner, Ferdinand and Ewald,
+                  Paul},
+  edition      = 2,
+  volumes      = 2,
+  location     = {Leipzig},
+  editoratype  = {redactor},
+  indextitle   = {Regesta Pontificum Romanorum},
+  shorttitle   = {Regesta Pontificum Romanorum},
+  annotation   = {A \texttt{collection} entry with \texttt{edition} and
+                  \texttt{volumes} fields. Note the \texttt{editora} and
+                  \texttt{editoratype} fields},
+}
+
+@Collection{westfahl:frontier,
+  editor       = {Westfahl, Gary},
+  title        = {Space and Beyond},
+  date         = 2000,
+  subtitle     = {The Frontier Theme in Science Fiction},
+  publisher    = {Greenwood},
+  location     = {Westport, Conn. and London},
+  hyphenation  = {american},
+  booktitle    = {Space and Beyond},
   booksubtitle = {The Frontier Theme in Science Fiction},
-  publisher = {Greenwood},
-  location = {Westport, Conn. and London},
-  date = {2000},
-  annotation = {This is a \texttt{collection} entry. Note the format of the
-    \texttt{location} field as well as the \texttt{subtitle} and
-    \texttt{booksubtitle} fields}
-}
-@inbook{kant:kpv,
-  shorthand = {KpV},
-  hyphenation = {german},
-  author = {Kant, Immanuel},
-  bookauthor = {Kant, Immanuel},
-  title = {Kritik der praktischen Vernunft},
-  shorttitle = {Kritik der praktischen Vernunft},
-  booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
-  maintitle = {Kants Werke. Akademie Textausgabe},
-  volume = {5},
-  publisher = {Walter de Gruyter},
-  location = {Berlin},
-  date = {1968},
-  pages = {1--163},
-  annotation = {An edition of Kant's \emph{Collected Works}, volume five. This
-    is an \texttt{inbook} entry which explicitly refers to the \emph{Critique
-    of Practical Reason} only, not to the entire fifth volume. Note the
-    \texttt{author} and \texttt{bookauthor} fields in the database file. By
-    default, the \texttt{bookauthor} is omitted if the values of the
-    \texttt{author} and \texttt{bookauthor} fields are identical}
-}
-@inbook{kant:ku,
-  shorthand = {KU},
-  hyphenation = {german},
-  author = {Kant, Immanuel},
-  bookauthor = {Kant, Immanuel},
-  title = {Kritik der Urtheilskraft},
-  booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
-  maintitle = {Kants Werke. Akademie Textausgabe},
-  volume = {5},
-  publisher = {Walter de Gruyter},
-  location = {Berlin},
-  date = {1968},
-  pages = {165--485},
-  annotation = {An edition of Kant's \emph{Collected Works}, volume five. This
-    is an \texttt{inbook} entry which explicitly refers to the \emph{Critique
-    of Judgment} only, not to the entire fifth volume}
-}
-@inbook{nietzsche:historie,
-  hyphenation = {german},
-  sortyear = {1988-01-243},
-  sorttitle = {Werke-01-243},
-  indexsorttitle = {Vom Nutzen und Nachtheil der Historie fur das Leben},
-  author = {Nietzsche, Friedrich},
-  bookauthor = {Nietzsche, Friedrich},
-  editor = {Colli, Giorgio and Montinari, Mazzino},
-  indextitle = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben},
-  title = {Unzeitgem{\"a}sse Betrachtungen. Zweites St{\"u}ck},
-  subtitle = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben},
-  shorttitle = {Vom Nutzen und Nachtheil der Historie},
-  booktitle = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e Betrachtungen
-    I--IV. Nachgelassene Schriften 1870--1973},
-  maintitle = {S{\"a}mtliche Werke},
+  annotation   = {This is a \texttt{collection} entry. Note the format of the
+                  \texttt{location} field as well as the \texttt{subtitle} and
+                  \texttt{booksubtitle} fields},
+}
+
+@InBook{kant:kpv,
+  title        = {Kritik der praktischen Vernunft},
+  date         = 1968,
+  author       = {Kant, Immanuel},
+  booktitle    = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
+  bookauthor   = {Kant, Immanuel},
+  maintitle    = {Kants Werke. Akademie Textausgabe},
+  volume       = 5,
+  publisher    = {Walter de Gruyter},
+  location     = {Berlin},
+  pages        = {1-163},
+  shorthand    = {KpV},
+  hyphenation  = {german},
+  shorttitle   = {Kritik der praktischen Vernunft},
+  annotation   = {An edition of Kant's \emph{Collected Works}, volume five. This
+                  is an \texttt{inbook} entry which explicitly refers to the
+                  \emph{Critique of Practical Reason} only, not to the entire
+                  fifth volume. Note the \texttt{author} and \texttt{bookauthor}
+                  fields in the database file. By default, the
+                  \texttt{bookauthor} is omitted if the values of the
+                  \texttt{author} and \texttt{bookauthor} fields are identical},
+}
+
+@InBook{kant:ku,
+  title        = {Kritik der Urtheilskraft},
+  date         = 1968,
+  author       = {Kant, Immanuel},
+  booktitle    = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
+  bookauthor   = {Kant, Immanuel},
+  maintitle    = {Kants Werke. Akademie Textausgabe},
+  volume       = 5,
+  publisher    = {Walter de Gruyter},
+  location     = {Berlin},
+  pages        = {165-485},
+  shorthand    = {KU},
+  hyphenation  = {german},
+  annotation   = {An edition of Kant's \emph{Collected Works}, volume five. This
+                  is an \texttt{inbook} entry which explicitly refers to the
+                  \emph{Critique of Judgment} only, not to the entire fifth
+                  volume},
+}
+
+@InBook{nietzsche:historie,
+  title        = {Unzeitgem{\"a}sse Betrachtungen. Zweites St{\"u}ck},
+  date         = 1988,
+  author       = {Nietzsche, Friedrich},
+  booktitle    = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e
+                  Betrachtungen I--IV. Nachgelassene Schriften 1870--1973},
+  bookauthor   = {Nietzsche, Friedrich},
+  editor       = {Colli, Giorgio and Montinari, Mazzino},
+  subtitle     = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben},
+  maintitle    = {S{\"a}mtliche Werke},
   mainsubtitle = {Kritische Studienausgabe},
-  volume = {1},
-  publisher = dtv # { and Walter de Gruyter},
-  location = {M{\"u}nchen and Berlin and New York},
-  date = {1988},
-  pages = {243--334},
-  annotation = {A single essay from the critical edition of Nietzsche's works.
-    This \texttt{inbook} entry explicitly refers to an essay found in the
-    first volume. Note the \texttt{title}, \texttt{booktitle}, and
-    \texttt{maintitle} fields. Also note the \texttt{sorttitle} and
-    \texttt{sortyear} fields. We want this entry to be listed after the entry
-    referring to the entire first volume}
-}
-@incollection{brandt,
-  options = {useprefix=false},
-  hyphenation = {german},
-  indexsorttitle = {Nordischen Lander von der Mitte des 11. Jahrhunderts bis
-    1448},
-  author = {von Brandt, Ahasver and Erich Hoffmann},
-  editor = {Ferdinand Seibt},
-  indextitle = {Nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis
-    1448, Die},
-  title = {Die nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis
-    1448},
-  shorttitle = {Die nordischen L{\"a}nder},
-  booktitle = {Europa im Hoch- und Sp{\"a}tmittelalter},
-  series = {Handbuch der europ{\"a}ischen Geschichte},
-  number = {2},
-  publisher = {Klett-Cotta},
-  location = {Stuttgart},
-  date = {1987},
-  pages = {884--917},
-  annotation = {An \texttt{incollection} entry with a \texttt{series} and a
-    \texttt{number}. Note the format of the printed name and compare the
-    \texttt{useprefix} option in the \texttt{options} field as well as
-    \texttt{vangennep}. Also note the \texttt{indextitle, and
-    \texttt{indexsorttitle} fields}}
-}
-@incollection{hyman,
-  keywords = {secondary},
-  hyphenation = {american},
-  author = {Arthur Hyman},
-  editor = {O'Meara, Dominic J.},
-  indextitle = {Aristotle's Theory of the Intellect},
-  title = {Aristotle's Theory of the Intellect and its Interpretation by
-    Averroes},
-  shorttitle = {Aristotle's Theory of the Intellect},
-  booktitle = {Studies in Aristotle},
-  series = {Studies in Philosophy and the History of Philosophy},
-  number = {9},
-  publisher = {The Catholic University of America Press},
-  location = {Washington, D.C.},
-  date = {1981},
-  pages = {161--191},
-  annotation = {An \texttt{incollection} entry with a \texttt{series} and
-    \texttt{number} field}
-}
-@incollection{pines,
-  keywords = {secondary},
-  hyphenation = {american},
-  author = {Pines, Shlomo},
-  editor = {Twersky, Isadore},
-  indextitle = {Limitations of Human Knowledge According to Al-Farabi, ibn
-    Bajja, and Maimonides, The},
-  title = {The Limitations of Human Knowledge According to Al-Farabi, ibn
-    Bajja, and Maimonides},
-  shorttitle = {Limitations of Human Knowledge},
-  booktitle = {Studies in Medieval Jewish History and Literature},
-  publisher = hup,
-  location = {Cambridge, Mass.},
-  date = {1979},
-  pages = {82--109},
-  annotation = {A typical \texttt{incollection} entry. Note the
-    \texttt{indextitle} field}
-}
-@inproceedings{moraux,
-  keywords = {secondary},
-  hyphenation = {french},
-  indexsorttitle = {De Anima dans la tradition grecque},
-  author = {Moraux, Paul},
-  editor = {Lloyd, G. E. R. and Owen, G. E. L.},
-  indextitle = {\emph{De Anima} dans la tradition gr{\`e}cque, Le},
-  title = {Le \emph{De Anima} dans la tradition gr{\`e}cque},
-  subtitle = {Quelques aspects de l'interpretation du trait{\'e}, de
-    Theophraste {\`a} Themistius},
-  shorttitle = {\emph{De Anima} dans la tradition gr{\`e}cque},
-  booktitle = {Aristotle on Mind and the Senses},
-  booktitleaddon = {Proceedings of the Seventh Symposium Aristotelicum},
-  eventdate = {1975},
-  publisher = cup,
-  location = {Cambridge},
-  date = {1979},
-  pages = {281--324},
-  annotation = {This is a typical \texttt{inproceedings} entry. Note the
-    \texttt{booksubtitle}, \texttt{shorttitle}, \texttt{indextitle}, and
-    \texttt{indexsorttitle} fields. Also note the \texttt{eventdate} field.}
-}
-@inproceedings{salam,
-  author = {Salam, Abdus},
-  editor = {Svartholm, Nils},
-  title = {Weak and Electromagnetic Interactions},
-  booktitle = {Elementary particle theory},
+  volume       = 1,
+  publisher    = dtv # { and Walter de Gruyter},
+  location     = {M{\"u}nchen and Berlin and New York},
+  pages        = {243-334},
+  hyphenation  = {german},
+  sortyear     = {1988-2},
+  sorttitle    = {Werke-01-243},
+  indexsorttitle= {Vom Nutzen und Nachtheil der Historie fur das Leben},
+  indextitle   = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben},
+  shorttitle   = {Vom Nutzen und Nachtheil der Historie},
+  annotation   = {A single essay from the critical edition of Nietzsche's works.
+                  This \texttt{inbook} entry explicitly refers to an essay found
+                  in the first volume. Note the \texttt{title},
+                  \texttt{booktitle}, and \texttt{maintitle} fields. Also note
+                  the \texttt{sorttitle} and \texttt{sortyear} fields. We want
+                  this entry to be listed after the entry referring to the
+                  entire first volume},
+}
+
+@InCollection{brandt,
+  author       = {von Brandt, Ahasver and Erich Hoffmann},
+  editor       = {Ferdinand Seibt},
+  title        = {Die nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts
+                  bis 1448},
+  date         = 1987,
+  booktitle    = {Europa im Hoch- und Sp{\"a}tmittelalter},
+  series       = {Handbuch der europ{\"a}ischen Geschichte},
+  number       = 2,
+  publisher    = {Klett-Cotta},
+  location     = {Stuttgart},
+  pages        = {884-917},
+  options      = {useprefix=false},
+  hyphenation  = {german},
+  indexsorttitle= {Nordischen Lander von der Mitte des 11. Jahrhunderts bis
+                  1448},
+  indextitle   = {Nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis
+                  1448, Die},
+  shorttitle   = {Die nordischen L{\"a}nder},
+  annotation   = {An \texttt{incollection} entry with a \texttt{series} and a
+                  \texttt{number}. Note the format of the printed name and
+                  compare the \texttt{useprefix} option in the \texttt{options}
+                  field as well as \texttt{vangennep}. Also note the
+                  \texttt{indextitle, and \texttt{indexsorttitle} fields}},
+}
+
+@InCollection{hyman,
+  author       = {Arthur Hyman},
+  editor       = {O'Meara, Dominic J.},
+  title        = {Aristotle's Theory of the Intellect and its Interpretation by
+                  Averroes},
+  date         = 1981,
+  booktitle    = {Studies in Aristotle},
+  series       = {Studies in Philosophy and the History of Philosophy},
+  number       = 9,
+  publisher    = {The Catholic University of America Press},
+  location     = {Washington, D.C.},
+  pages        = {161-191},
+  keywords     = {secondary},
+  hyphenation  = {american},
+  indextitle   = {Aristotle's Theory of the Intellect},
+  shorttitle   = {Aristotle's Theory of the Intellect},
+  annotation   = {An \texttt{incollection} entry with a \texttt{series} and
+                  \texttt{number} field},
+}
+
+@InCollection{pines,
+  author       = {Pines, Shlomo},
+  editor       = {Twersky, Isadore},
+  title        = {The Limitations of Human Knowledge According to Al-Farabi, ibn
+                  Bajja, and Maimonides},
+  date         = 1979,
+  booktitle    = {Studies in Medieval Jewish History and Literature},
+  publisher    = hup,
+  location     = {Cambridge, Mass.},
+  pages        = {82-109},
+  keywords     = {secondary},
+  hyphenation  = {american},
+  indextitle   = {Limitations of Human Knowledge According to Al-Farabi, ibn
+                  Bajja, and Maimonides, The},
+  shorttitle   = {Limitations of Human Knowledge},
+  annotation   = {A typical \texttt{incollection} entry. Note the
+                  \texttt{indextitle} field},
+}
+
+@InProceedings{moraux,
+  author       = {Moraux, Paul},
+  editor       = {Lloyd, G. E. R. and Owen, G. E. L.},
+  title        = {Le \emph{De Anima} dans la tradition gr{\`e}cque},
+  date         = 1979,
+  booktitle    = {Aristotle on Mind and the Senses},
+  subtitle     = {Quelques aspects de l'interpretation du trait{\'e}, de
+                  Theophraste {\`a} Themistius},
+  booktitleaddon= {Proceedings of the Seventh Symposium Aristotelicum},
+  eventdate    = 1975,
+  publisher    = cup,
+  location     = {Cambridge},
+  pages        = {281-324},
+  keywords     = {secondary},
+  hyphenation  = {french},
+  indexsorttitle= {De Anima dans la tradition grecque},
+  indextitle   = {\emph{De Anima} dans la tradition gr{\`e}cque, Le},
+  shorttitle   = {\emph{De Anima} dans la tradition gr{\`e}cque},
+  annotation   = {This is a typical \texttt{inproceedings} entry. Note the
+                  \texttt{booksubtitle}, \texttt{shorttitle},
+                  \texttt{indextitle}, and \texttt{indexsorttitle} fields. Also
+                  note the \texttt{eventdate} field.},
+}
+
+@InProceedings{salam,
+  author       = {Salam, Abdus},
+  editor       = {Svartholm, Nils},
+  title        = {Weak and Electromagnetic Interactions},
+  date         = 1968,
+  booktitle    = {Elementary particle theory},
   booksubtitle = {Relativistic groups and analyticity},
-  booktitleaddon = {Proceedings of the Eighth Nobel Symposium},
-  eventdate = {1968-05-19/1968-05-25},
-  venue = {Aspen{\"a}sgarden, Lerum},
-  publisher = {Almquist \& Wiksell},
-  location = {Stockholm},
-  date = {1968},
-  pages = {367--377}
-}
-@manual{cms,
-  label = {CMS},
-  hyphenation = {american},
-  sorttitle = {Chicago Manual of Style},
-  indextitle = {Chicago Manual of Style, The},
-  title = {The Chicago Manual of Style},
-  subtitle = {The Essential Guide for Writers, Editors, and Publishers},
-  shorttitle = {Chicago Manual of Style},
-  edition = {15},
-  publisher = {University of Chicago Press},
-  location = {Chicago, Ill.},
-  date = {2003},
-  isbn = {0-226-10403-6},
-  annotation = {This is a \texttt{manual} entry without an \texttt{author} or
-    \texttt{editor}. Note the \texttt{label} field in the database file which
-    is provided for author-year citation styles. Also note the
-    \texttt{sorttitle} and \texttt{indextitle} fields. By default, all entries
-    without an \texttt{author} or \texttt{editor} are alphabetized by
-    \texttt{title} but we want this entry to be alphabetized under
-    \enquote*{C} rather than \enquote*{T}. There's also an \texttt{isbn}
-    field}
-}
-@online{baez/online,
-  hyphenation = {american},
-  author = {Baez, John C. and Lauda, Aaron D.},
-  title = {Higher-Dimensional Algebra V: 2-Groups},
-  version = {3},
-  date = {2004-10-27},
-  eprinttype = {arxiv},
-  eprint = {math/0307200v3},
-  annotation = {An \texttt{online} reference from arXiv. Note the
-    \texttt{eprint} and \texttt{eprinttype} fields. Compare \texttt{baez\slash
-    article} which is the same item given as an \texttt{article} entry with
-    eprint information}
-}
-@online{ctan,
-  label = {CTAN},
-  hyphenation = {american},
-  title = {CTAN},
-  subtitle = {The Comprehensive TeX Archive Network},
-  date = {2006},
-  url = {http://www.ctan.org},
-  urldate = {2006-10-01},
-  annotation = {This is an \texttt{online} entry. The \textsc{url}, which is
-    given in the \texttt{url} field, is transformed into a clickable link if
-    \texttt{hyperref} support has been enabled. Note the format of the
-    \texttt{urldate} field (\texttt{yyyy-mm-dd}) in the database file. Also
-    note the \texttt{label} field which may be used as a fallback by citation
-    styles which need an \texttt{author} and\slash or a \texttt{year}}
-}
-@online{itzhaki,
-  hyphenation = {american},
-  author = {Itzhaki, Nissan},
-  title = {Some remarks on 't Hooft's S-matrix for black holes},
-  version = {1},
-  date = {1996-03-11},
-  eprinttype = {arxiv},
-  eprint = {hep-th/9603067},
-  annotation = {An \texttt{online} reference from arXiv. Note the
-    \texttt{eprint} and \texttt{eprinttype} fields. Also note that the arXiv
-    reference is transformed into a clickable link if \texttt{hyperref}
-    support has been enabled},
-  abstract = {We discuss the limitations of 't Hooft's proposal for the black
-    hole S-matrix. We find that the validity of the S-matrix implies violation
-    of the semi-classical approximation at scales large compared to the Planck
-    scale. We also show that the effect of the centrifugal barrier on the
-    S-matrix is crucial even for large transverse distances.}
-}
-@online{markey,
-  hyphenation = {american},
-  sorttitle = {Tame the Beast},
-  author = {Markey, Nicolas},
-  title = {Tame the BeaST},
-  subtitle = {The B to X of BibTeX},
-  version = {1.3},
-  date = {2005-10-16},
-  url = {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf},
-  urldate = {2006-10-01},
-  annotation = {An \texttt{online} entry for a tutorial. Note the format of
-    the \texttt{date} field (\texttt{yyyy-mm-dd}) in the database file.}
-}
-@online{wassenberg,
-  hyphenation = {american},
-  author = {Wassenberg, Jan and Sanders, Peter},
-  title = {Faster Radix Sort via Virtual Memory and Write-Combining},
-  version = {1},
-  date = {2010-08-17},
-  eprinttype = {arxiv},
-  eprintclass = {cs.DS},
-  eprint = {1008.2849v1},
-  annotation = {A recent \texttt{online} reference from arXiv using the new
-    (April 2007 onward) identifier format. Note the \texttt{eprint},
-    \texttt{eprinttype}, and \texttt{eprintclass} fields. Also note that the
-    arXiv reference is transformed into a clickable link if \texttt{hyperref}
-    support has been enabled},
-  abstract = {Sorting algorithms are the deciding factor for the performance
-    of common operations such as removal of duplicates or database sort-merge
-    joins. This work focuses on 32-bit integer keys, optionally paired with a
-    32-bit value. We present a fast radix sorting algorithm that builds upon a
-    microarchitecture-aware variant of counting sort}
-}
-@patent{almendro,
-  hyphenation = {german},
-  author = {Almendro, Jos{\'e} L. and Mart{\'i}n, Jacinto
-    and S{\'a}nchez, Alberto and Nozal, Fernando},
-  title = {Elektromagnetisches Signalhorn},
-  number = {EU-29702195U},
-  location = {countryfr and countryuk and countryde},
-  date = {1998},
-  annotation = {This is a \texttt{patent} entry with a \texttt{location}
-    field. The number is given in the \texttt{number} field. Note the format
-    of the \texttt{location} field in the database file. Compare
-    \texttt{laufenberg}, \texttt{sorace}, and \texttt{kowalik}}
-}
-@patent{kowalik,
-  hyphenation = {french},
-  author = {Kowalik, F. and Isard, M.},
-  indextitle = {Estimateur d'un d{\'e}faut de fonctionnement},
-  title = {Estimateur d'un d{\'e}faut de fonctionnement d'un modulateur en
-    quadrature et {\'e}tage de modulation l'utilisant},
-  type = {patreqfr},
-  number = {9500261},
-  date = {1995-01-11},
-  annotation = {This is a \texttt{patent} entry for a French patent request
-    with a full date. The number is given in the \texttt{number} field. Note
-    the format of the \texttt{type} and \texttt{date} fields in the database
-    file. Compare \texttt{almendro}, \texttt{laufenberg}, and \texttt{sorace}}
-}
-@patent{laufenberg,
-  hyphenation = {german},
-  author = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut
-    and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann, Miriam
-    and Myrzik, Christian and Schmid, Manfred and Nietfeld, Franz
-    and Thiel, Alexander and Braun, Harald and Ebner, Norbert},
-  holder = {{Robert Bosch GmbH} and {Daimler Chrysler AG}
-    and {Bayerische Motoren Werke AG}},
-  title = {Elektrische Einrichtung und Betriebsverfahren},
-  type = {patenteu},
-  number = {1700367},
-  date = {2006-09-13},
-  annotation = {This is a \texttt{patent} entry with a \texttt{holder} field.
-    Note the format of the \texttt{type} and \texttt{location} fields in the
-    database file. Compare \texttt{almendro}, \texttt{sorace}, and
-    \texttt{kowalik}},
-  abstract = {The invention relates to an electric device comprising a
-    generator, in particular for use in the vehicle electric system of a motor
-    vehicle and a controller for controlling the generator voltage. The device
-    is equipped with a control zone, in which the voltage is controlled and
-    zones, in which the torque is controlled. The invention also relates to
-    methods for operating a device of this type.},
-  file = {http://v3.espacenet.com/textdoc?IDX=EP1700367}
-}
-@patent{sorace,
-  hyphenation = {american},
-  author = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven A.},
-  holder = {{Hughes Aircraft Company}},
-  title = {High-Speed Digital-to-RF Converter},
-  type = {patentus},
-  number = {5668842},
-  date = {1997-09-16},
-  annotation = {This is a \texttt{patent} entry with a \texttt{holder} field.
-    Note the format of the \texttt{type} and \texttt{date} fields in the
-    database file. Compare \texttt{almendro}, \texttt{laufenberg}, and
-    \texttt{kowalik}}
-}
-@periodical{jcg,
-  title = {Computers and Graphics},
-  issuetitle = {Semantic {3D} Media and Content},
-  volume = {35},
-  number = {4},
-  year = {2011},
-  issn = {0097-8493},
-  annotation = {This is a \texttt{periodical} entry with an \texttt{issn}
-    field.}
-}
-@report{chiu,
-  hyphenation = {american},
-  sorttitle = {Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS)
-    Operating System},
-  author = {Chiu, Willy W. and Chow, We Min},
-  indextitle = {Hybrid Hierarchical Model, A},
-  title = {A Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS)
-    Operating System},
-  institution = {IBM},
-  type = {resreport},
-  number = {RC-6947},
-  date = {1978},
-  annotation = {This is a \texttt{report} entry for a research report. Note
-    the format of the \texttt{type} field in the database file which uses a
-    localization key. The number of the report is given in the \texttt{number}
-    field. Also note the \texttt{sorttitle} and \texttt{indextitle} fields}
-}
-@report{padhye,
-  hyphenation = {american},
-  sorttitle = {A Stochastic Model of TCP Reno Congestion Avoidance and
-    Control},
-  author = {Padhye, Jitendra and Firoiu, Victor and Towsley, Don},
-  indextitle = {Stochastic Model of TCP Reno Congestion Avoidance and Control,
-    A},
-  title = {A Stochastic Model of TCP Reno Congestion Avoidance and Control},
-  institution = {University of Massachusetts},
-  type = {techreport},
-  number = {99-02},
-  location = {Amherst, Mass.},
-  date = {1999},
-  annotation = {This is a \texttt{report} entry for a technical report. Note
-    the format of the \texttt{type} field in the database file which uses a
-    localization key. The number of the report is given in the \texttt{number}
-    field. Also note the \texttt{sorttitle} and \texttt{indextitle} fields},
-  abstract = {The steady state performance of a bulk transfer TCP flow (i.e. a
-    flow with a large amount of data to send, such as FTP transfers) may be
-    characterized by three quantities. The first is the send rate, which is
-    the amount of data sent by the sender in unit time. The second is the
-    throughput, which is the amount of data received by the receiver in unit
-    time. Note that the throughput will always be less than or equal to the
-    send rate due to losses. Finally, the number of non-duplicate packets
-    received by the receiver in unit time gives us the goodput of the
-    connection. The goodput is always less than or equal to the throughput,
-    since the receiver may receive two copies of the same packet due to
-    retransmissions by the sender. In a previous paper, we presented a simple
-    model for predicting the steady state send rate of a bulk transfer TCP
-    flow as a function of loss rate and round trip time. In this paper, we
-    extend that work in two ways. First, we analyze the performance of bulk
-    transfer TCP flows using more precise, stochastic analysis. Second, we
-    build upon the previous analysis to provide both an approximate formula as
-    well as a more accurate stochastic model for the steady state throughput
-    of a bulk transfer TCP flow.},
-  file = {ftp://gaia.cs.umass.edu/pub/Padhey99-markov.ps}
-}
-@thesis{geer,
-  options = {useprefix=false},
-  hyphenation = {british},
-  author = {de Geer, Ingrid},
-  title = {Earl, Saint, Bishop, Skald~-- and Music},
-  subtitle = {The Orkney Earldom of the Twelfth Century. A Musicological
-    Study},
-  institution = {Uppsala Universitet},
-  type = {phdthesis},
-  location = {Uppsala},
-  date = {1985},
-  annotation = {This is a typical \texttt{thesis} entry for a PhD thesis. Note
-    the \texttt{type} field in the database file which uses a localization
-    key. Also note the format of the printed name and compare the
-    \texttt{useprefix} option in the \texttt{options} field as well as
-    \texttt{vangennep}}
-}
-@thesis{loh,
-  hyphenation = {american},
-  author = {Loh, Nin C.},
-  title = {High-Resolution Micromachined Interferometric Accelerometer},
-  institution = {Massachusetts Institute of Technology},
-  type = {mathesis},
-  location = {Cambridge, Mass.},
-  date = {1992},
-  annotation = {This is a typical \texttt{thesis} entry for an MA thesis. Note
-    the \texttt{type} field in the database file which uses a localization
-    key}}
+  booktitleaddon= {Proceedings of the Eighth Nobel Symposium},
+  eventdate    = {1968-05-19/1968-05-25},
+  venue        = {Aspen{\"a}sgarden, Lerum},
+  publisher    = {Almquist \& Wiksell},
+  location     = {Stockholm},
+  pages        = {367-377},
+}
+
+@Manual{cms,
+  title        = {The Chicago Manual of Style},
+  date         = 2003,
+  subtitle     = {The Essential Guide for Writers, Editors, and Publishers},
+  edition      = 15,
+  publisher    = {University of Chicago Press},
+  location     = {Chicago, Ill.},
+  isbn         = {0-226-10403-6},
+  label        = {CMS},
+  hyphenation  = {american},
+  sorttitle    = {Chicago Manual of Style},
+  indextitle   = {Chicago Manual of Style, The},
+  shorttitle   = {Chicago Manual of Style},
+  annotation   = {This is a \texttt{manual} entry without an \texttt{author} or
+                  \texttt{editor}. Note the \texttt{label} field in the database
+                  file which is provided for author-year citation styles. Also
+                  note the \texttt{sorttitle} and \texttt{indextitle} fields. By
+                  default, all entries without an \texttt{author} or
+                  \texttt{editor} are alphabetized by \texttt{title} but we want
+                  this entry to be alphabetized under \enquote*{C} rather than
+                  \enquote*{T}. There's also an \texttt{isbn} field},
+}
+
+@Online{baez/online,
+  author       = {Baez, John C. and Lauda, Aaron D.},
+  title        = {Higher-Dimensional Algebra V: 2-Groups},
+  date         = {2004-10-27},
+  version      = 3,
+  hyphenation  = {american},
+  eprinttype   = {arxiv},
+  eprint       = {math/0307200v3},
+  annotation   = {An \texttt{online} reference from arXiv. Note the
+                  \texttt{eprint} and \texttt{eprinttype} fields. Compare
+                  \texttt{baez\slash article} which is the same item given as an
+                  \texttt{article} entry with eprint information},
+}
+
+@Online{ctan,
+  title        = {CTAN},
+  date         = 2006,
+  url          = {http://www.ctan.org},
+  subtitle     = {The Comprehensive TeX Archive Network},
+  urldate      = {2006-10-01},
+  label        = {CTAN},
+  hyphenation  = {american},
+  annotation   = {This is an \texttt{online} entry. The \textsc{url}, which is
+                  given in the \texttt{url} field, is transformed into a
+                  clickable link if \texttt{hyperref} support has been
+                  enabled. Note the format of the \texttt{urldate} field
+                  (\texttt{yyyy-mm-dd}) in the database file. Also note the
+                  \texttt{label} field which may be used as a fallback by
+                  citation styles which need an \texttt{author} and\slash or a
+                  \texttt{year}},
+}
+
+@Online{itzhaki,
+  author       = {Itzhaki, Nissan},
+  title        = {Some remarks on 't Hooft's S-matrix for black holes},
+  date         = {1996-03-11},
+  version      = 1,
+  hyphenation  = {american},
+  eprinttype   = {arxiv},
+  eprint       = {hep-th/9603067},
+  annotation   = {An \texttt{online} reference from arXiv. Note the
+                  \texttt{eprint} and \texttt{eprinttype} fields. Also note that
+                  the arXiv reference is transformed into a clickable link if
+                  \texttt{hyperref} support has been enabled},
+  abstract     = {We discuss the limitations of 't Hooft's proposal for the
+                  black hole S-matrix. We find that the validity of the S-matrix
+                  implies violation of the semi-classical approximation at
+                  scales large compared to the Planck scale. We also show that
+                  the effect of the centrifugal barrier on the S-matrix is
+                  crucial even for large transverse distances.},
+}
+
+@Online{markey,
+  author       = {Markey, Nicolas},
+  title        = {Tame the BeaST},
+  date         = {2005-10-16},
+  url          =
+                  {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf},
+  subtitle     = {The B to X of BibTeX},
+  version      = {1.3},
+  urldate      = {2006-10-01},
+  hyphenation  = {american},
+  sorttitle    = {Tame the Beast},
+  annotation   = {An \texttt{online} entry for a tutorial. Note the format of
+                  the \texttt{date} field (\texttt{yyyy-mm-dd}) in the database
+                  file.},
+}
+
+@Online{wassenberg,
+  author       = {Wassenberg, Jan and Sanders, Peter},
+  title        = {Faster Radix Sort via Virtual Memory and Write-Combining},
+  date         = {2010-08-17},
+  version      = 1,
+  hyphenation  = {american},
+  eprinttype   = {arxiv},
+  eprintclass  = {cs.DS},
+  eprint       = {1008.2849v1},
+  annotation   = {A recent \texttt{online} reference from arXiv using the new
+                  (April 2007 onward) identifier format. Note the
+                  \texttt{eprint}, \texttt{eprinttype}, and \texttt{eprintclass}
+                  fields. Also note that the arXiv reference is transformed into
+                  a clickable link if \texttt{hyperref} support has been
+                  enabled},
+  abstract     = {Sorting algorithms are the deciding factor for the performance
+                  of common operations such as removal of duplicates or database
+                  sort-merge joins. This work focuses on 32-bit integer keys,
+                  optionally paired with a 32-bit value. We present a fast radix
+                  sorting algorithm that builds upon a microarchitecture-aware
+                  variant of counting sort},
+}
+
+@Patent{almendro,
+  author       = {Almendro, Jos{\'e} L. and Mart{\'i}n, Jacinto and S{\'a}nchez,
+                  Alberto and Nozal, Fernando},
+  title        = {Elektromagnetisches Signalhorn},
+  number       = {EU-29702195U},
+  date         = 1998,
+  location     = {countryfr and countryuk and countryde},
+  hyphenation  = {german},
+  annotation   = {This is a \texttt{patent} entry with a \texttt{location}
+                  field. The number is given in the \texttt{number} field. Note
+                  the format of the \texttt{location} field in the database
+                  file. Compare \texttt{laufenberg}, \texttt{sorace}, and
+                  \texttt{kowalik}},
+}
+
+@Patent{kowalik,
+  author       = {Kowalik, F. and Isard, M.},
+  title        = {Estimateur d'un d{\'e}faut de fonctionnement d'un modulateur
+                  en quadrature et {\'e}tage de modulation l'utilisant},
+  number       = 9500261,
+  date         = {1995-01-11},
+  type         = {patreqfr},
+  hyphenation  = {french},
+  indextitle   = {Estimateur d'un d{\'e}faut de fonctionnement},
+  annotation   = {This is a \texttt{patent} entry for a French patent request
+                  with a full date. The number is given in the \texttt{number}
+                  field. Note the format of the \texttt{type} and \texttt{date}
+                  fields in the database file. Compare \texttt{almendro},
+                  \texttt{laufenberg}, and \texttt{sorace}},
+}
+
+@Patent{laufenberg,
+  author       = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut
+                  and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann,
+                  Miriam and Myrzik, Christian and Schmid, Manfred and Nietfeld,
+                  Franz and Thiel, Alexander and Braun, Harald and Ebner,
+                  Norbert},
+  title        = {Elektrische Einrichtung und Betriebsverfahren},
+  number       = 1700367,
+  date         = {2006-09-13},
+  holder       = {{Robert Bosch GmbH} and {Daimler Chrysler AG} and {Bayerische
+                  Motoren Werke AG}},
+  type         = {patenteu},
+  hyphenation  = {german},
+  annotation   = {This is a \texttt{patent} entry with a \texttt{holder} field.
+                  Note the format of the \texttt{type} and \texttt{location}
+                  fields in the database file. Compare \texttt{almendro},
+                  \texttt{sorace}, and \texttt{kowalik}},
+  abstract     = {The invention relates to an electric device comprising a
+                  generator, in particular for use in the vehicle electric
+                  system of a motor vehicle and a controller for controlling the
+                  generator voltage. The device is equipped with a control zone,
+                  in which the voltage is controlled and zones, in which the
+                  torque is controlled. The invention also relates to methods
+                  for operating a device of this type.},
+  file         = {http://v3.espacenet.com/textdoc?IDX=EP1700367},
+}
+
+@Patent{sorace,
+  author       = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven
+                  A.},
+  title        = {High-Speed Digital-to-RF Converter},
+  number       = 5668842,
+  date         = {1997-09-16},
+  holder       = {{Hughes Aircraft Company}},
+  type         = {patentus},
+  hyphenation  = {american},
+  annotation   = {This is a \texttt{patent} entry with a \texttt{holder} field.
+                  Note the format of the \texttt{type} and \texttt{date} fields
+                  in the database file. Compare \texttt{almendro},
+                  \texttt{laufenberg}, and \texttt{kowalik}},
+}
+
+@Periodical{jcg,
+  title        = {Computers and Graphics},
+  year         = 2011,
+  issuetitle   = {Semantic {3D} Media and Content},
+  volume       = 35,
+  number       = 4,
+  issn         = {0097-8493},
+  annotation   = {This is a \texttt{periodical} entry with an \texttt{issn}
+                  field.},
+}
+
+@Report{chiu,
+  author       = {Chiu, Willy W. and Chow, We Min},
+  title        = {A Hybrid Hierarchical Model of a Multiple Virtual Storage
+                  (MVS) Operating System},
+  type         = {resreport},
+  institution  = {IBM},
+  date         = 1978,
+  number       = {RC-6947},
+  hyphenation  = {american},
+  sorttitle    = {Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS)
+                  Operating System},
+  indextitle   = {Hybrid Hierarchical Model, A},
+  annotation   = {This is a \texttt{report} entry for a research report. Note
+                  the format of the \texttt{type} field in the database file
+                  which uses a localization key. The number of the report is
+                  given in the \texttt{number} field. Also note the
+                  \texttt{sorttitle} and \texttt{indextitle} fields},
+}
+
+@Report{padhye,
+  author       = {Padhye, Jitendra and Firoiu, Victor and Towsley, Don},
+  title        = {A Stochastic Model of TCP Reno Congestion Avoidance and
+                  Control},
+  type         = {techreport},
+  institution  = {University of Massachusetts},
+  date         = 1999,
+  number       = {99-02},
+  location     = {Amherst, Mass.},
+  hyphenation  = {american},
+  sorttitle    = {A Stochastic Model of TCP Reno Congestion Avoidance and
+                  Control},
+  indextitle   = {Stochastic Model of TCP Reno Congestion Avoidance and Control,
+                  A},
+  annotation   = {This is a \texttt{report} entry for a technical report. Note
+                  the format of the \texttt{type} field in the database file
+                  which uses a localization key. The number of the report is
+                  given in the \texttt{number} field. Also note the
+                  \texttt{sorttitle} and \texttt{indextitle} fields},
+  abstract     = {The steady state performance of a bulk transfer TCP flow
+                  (i.e. a flow with a large amount of data to send, such as FTP
+                  transfers) may be characterized by three quantities. The first
+                  is the send rate, which is the amount of data sent by the
+                  sender in unit time. The second is the throughput, which is
+                  the amount of data received by the receiver in unit time. Note
+                  that the throughput will always be less than or equal to the
+                  send rate due to losses. Finally, the number of non-duplicate
+                  packets received by the receiver in unit time gives us the
+                  goodput of the connection. The goodput is always less than or
+                  equal to the throughput, since the receiver may receive two
+                  copies of the same packet due to retransmissions by the
+                  sender. In a previous paper, we presented a simple model for
+                  predicting the steady state send rate of a bulk transfer TCP
+                  flow as a function of loss rate and round trip time. In this
+                  paper, we extend that work in two ways. First, we analyze the
+                  performance of bulk transfer TCP flows using more precise,
+                  stochastic analysis. Second, we build upon the previous
+                  analysis to provide both an approximate formula as well as a
+                  more accurate stochastic model for the steady state throughput
+                  of a bulk transfer TCP flow.},
+  file         = {ftp://gaia.cs.umass.edu/pub/Padhey99-markov.ps},
+}
+
+@Thesis{geer,
+  author       = {de Geer, Ingrid},
+  title        = {Earl, Saint, Bishop, Skald~-- and Music},
+  type         = {phdthesis},
+  institution  = {Uppsala Universitet},
+  date         = 1985,
+  subtitle     = {The Orkney Earldom of the Twelfth Century. A Musicological
+                  Study},
+  location     = {Uppsala},
+  options      = {useprefix=false},
+  hyphenation  = {british},
+  annotation   = {This is a typical \texttt{thesis} entry for a PhD thesis. Note
+                  the \texttt{type} field in the database file which uses a
+                  localization key. Also note the format of the printed name and
+                  compare the \texttt{useprefix} option in the \texttt{options}
+                  field as well as \texttt{vangennep}},
+}
+
+@Thesis{loh,
+  author       = {Loh, Nin C.},
+  title        = {High-Resolution Micromachined Interferometric Accelerometer},
+  type         = {mathesis},
+  institution  = {Massachusetts Institute of Technology},
+  date         = 1992,
+  location     = {Cambridge, Mass.},
+  hyphenation  = {american},
+  annotation   = {This is a typical \texttt{thesis} entry for an MA thesis. Note
+                  the \texttt{type} field in the database file which uses a
+                  localization key},
+}
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index 16f95929209..3c34409d175 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -165,7 +165,7 @@ ENTRY {
 INTEGERS { ctrl.debug ctrl.bibtex8 ctrl.maxline ctrl.sorting ctrl.cssort ctrl.sortlos 
            ctrl.maxnames ctrl.minnames ctrl.useauthor ctrl.useeditor ctrl.usetranslator
            ctrl.useprefix ctrl.terseinits ctrl.labelalpha ctrl.singletitle
-           ctrl.labelyear citecount 
+           ctrl.labeldate citecount 
            tempctra tempctrb tempctrc resvctra resvctrb resvctrc
            last.extra.num }
 
@@ -173,14 +173,14 @@ STRINGS  { ctrl.alphaothers templist tempstrga tempstrgb resvstrga
            last.name last.hash last.year last.extra }
 
 FUNCTION {initialize} {
-  "$Revision: 2.5 $"
+  "$Revision: 2.6 $"
   #12 entry.max$ substring$
   #-3 entry.max$ substring$
   "Biblatex version: " swap$ * top$
    #0  'ctrl.terseinits :=
    #0  'ctrl.debug :=
    #0  'ctrl.labelalpha :=
-   #0  'ctrl.labelyear :=
+   #0  'ctrl.labeldate :=
    #0  'ctrl.singletitle :=
    #0  'ctrl.sorting :=
    #0  'ctrl.sortlos :=
@@ -259,8 +259,8 @@ FUNCTION {ctrl:labelalpha} {
   and
 }
 
-FUNCTION {ctrl:labelyear} {
-  ctrl.labelyear
+FUNCTION {ctrl:labeldate} {
+  ctrl.labeldate
   ctrl:skiplab not
   and
 }
@@ -1312,7 +1312,7 @@ FUNCTION {output:specials} {
     }
     'skip$
   if$
-  ctrl:labelyear
+  ctrl:labeldate
   dateyear empty$ not
   and
     { "labelyear"
@@ -1761,7 +1761,7 @@ FUNCTION {input:control:options} {
 % This version corresponds to the .bbl version, *not* the biblatex version!
 FUNCTION {input:control:version} {
   input:control:parse
-  "$Revision: 2.1 $"
+  "$Revision: 2.2 $"
   #12 entry.max$ substring$
   #-3 entry.max$ substring$
   'tempstrga :=
@@ -1788,7 +1788,7 @@ FUNCTION {input:control} {
           input:control:options 'ctrl.useeditor :=
           input:control:options 'ctrl.usetranslator :=
           input:control:options 'ctrl.labelalpha :=
-          input:control:options 'ctrl.labelyear :=
+          input:control:options 'ctrl.labeldate :=
           input:control:options 'ctrl.singletitle :=
           input:control:options 'ctrl.sorting :=
           input:control:options 'ctrl.sortlos :=
@@ -2198,7 +2198,7 @@ FUNCTION {labelsort:label} {
 
 FUNCTION {labelsort:main} {
   ctrl:skiplab not
-  ctrl.singletitle ctrl.labelyear or
+  ctrl.singletitle ctrl.labeldate or
   and
     { label.name purify delimiter.1 *
       sortkey.year * delimiter.1 *
@@ -2396,7 +2396,7 @@ FUNCTION {labelsort:main:singletitle} {
 }
 
 FUNCTION {labelsort:main:year:iterate} {
-  ctrl:labelyear
+  ctrl:labeldate
     { label.name
       dateyear empty$
          'skip$
@@ -2431,7 +2431,7 @@ FUNCTION {labelsort:main:year:iterate} {
 }
 
 FUNCTION {labelsort:main:year:reverse} {
-  ctrl:labelyear
+  ctrl:labeldate
     { last.extra "2" =
         { "1" 'extrayear := }
         'skip$
@@ -2585,7 +2585,7 @@ SORT
 % This version corresponds to the .bbl version, *not* the biblatex version!
 FUNCTION {output:main:begin} {
   "% $ biblatex auxiliary file $"                               write$ newline$
-  "% $ biblatex version " "$Revision: 2.1 $"
+  "% $ biblatex version " "$Revision: 2.2 $"
   #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 e6558181d28..5c55e0ffaf5 100644
--- a/Master/texmf-dist/doc/latex/biblatex/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE
@@ -1,6 +1,21 @@
+RELEASE NOTES FOR VERSION 2.6
+
+* Biber version 1.6 is required for biblatex 2.6
+
+* INCOMPATIBLE CHANGE - \DeclareLabelyear is now \DeclareLabeldate so
+  that the extra fields labelmonth and labelday can be generated by
+  biber. The 'labelyear' package option is now called 'labeldate'. The
+  old names will work but will generate warnings. The default
+  definition for \DeclareLabeldate in biblatex.def results in the same
+  behaviour as with the old \DeclareLabelyear.
+
+* Localised and fixed string fallbacks now possible as values for labelyear field
+
+* Cyclic and cascading RELATED entries now working properly.
+
 RELEASE NOTES FOR VERSION 2.5
 
-*  Biber version 1.5 is required for biblatex 2.5
+* Biber version 1.5 is required for biblatex 2.5
 
 * New  sourcemap step "entrynull" can be used to completely skip an entry.
 
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index 74664694af3..67ed6c091d0 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 0f68a5cd523..e7c01bb5d98 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -1,6 +1,9 @@
 \documentclass{ltxdockit}[2011/03/25]
 \usepackage{btxdockit}
-\usepackage[latin9]{inputenc}
+\usepackage{fontspec}
+\setmainfont[Ligatures=TeX]{TeXGyrePagella}
+\setsansfont[Ligatures=TeX]{TexGyreHeros}
+\setmonofont[Ligatures=NoCommon]{TeXGyreCursor}
 \usepackage[american]{babel}
 \usepackage[strict]{csquotes}
 \usepackage{tabularx}
@@ -8,9 +11,9 @@
 \usepackage{booktabs}
 \usepackage{shortvrb}
 \usepackage{pifont}
-\usepackage{libertine}
-\usepackage[scaled=0.8]{beramono}
 \usepackage{microtype}
+\usepackage{typearea}
+\areaset[current]{370pt}{700pt}
 \lstset{basicstyle=\ttfamily,keepspaces=true}
 \KOMAoptions{numbers=noenddot}
 \addtokomafont{paragraph}{\spotcolor}
@@ -27,14 +30,15 @@
 \patchcmd{\paragraph}{-1em}{1.5ex \@plus .2ex}{}{}
 \makeatother
 
-\MakeAutoQuote{�}{�}
+\MakeAutoQuote{«}{»}
 \MakeAutoQuote*{<}{>}
 \MakeShortVerb{\|}
 
 \newcommand*{\biber}{Biber\xspace}
 \newcommand*{\biblatex}{Biblatex\xspace}
 \newcommand*{\biblatexhome}{http://sourceforge.net/projects/biblatex/}
-\newcommand*{\biblatexctan}{http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex/}
+\newcommand*{\biblatexctan}{%
+  http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex/}
 
 \titlepage{%
   title={The \sty{biblatex} Package},
@@ -42,8 +46,8 @@
   url={\biblatexhome},
   author={Philipp Lehman (with Audrey Boruvka, Philip Kime and Joseph Wright)},
   email={},
-  revision={2.5},
-  date={10/01/2013}}
+  revision={2.6},
+  date={30/04/2013}}
 
 \hypersetup{%
   pdftitle={The \biblatex Package},
@@ -151,22 +155,23 @@ Please use the \sty{biblatex} project page on GitHub to report bugs and submit f
 
 \subsection{Acknowledgments}
 
-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, H�kon Malmedal (Danish\slash Norwegian),
-Per Starb�ck, Carl-Gustav Werner, Filip �sblom (Swedish),
-Augusto Ritter Stoffel (Brazilian),
-Alexander van Loon (Dutch),
-Apostolos Syropoulos (Greek),
-Hannu V�is�nen (Finnish),
-Prokopis (Greek),
-Mateus Ara�jo (Brazilian),
-Andrea Marchitelli (Italian),
-Jos� Carlos Santos (Portuguese),
-Oleg Domanov (Russian),
-Pieter Belmans (Dutch),
-Baldur Kristinsson (Icelandic).
+The language modules of this package are made possible thanks to the following contributors:
+Augusto Ritter Stoffel, Mateus Araújo (Brazilian);
+Sebastià Vila-Marta (Catalan);
+Ivo Pletikosić (Croatian);
+Michal Hoftich (Czech);
+Johannes Wilm (Danish\slash Norwegian);
+Alexander van Loon, Pieter Belmans (Dutch);
+Hannu Väisänen, Janne Kujanpää (Finnish);
+Denis Bitouzé (French);
+Apostolos Syropoulos, Prokopis (Greek);
+Baldur Kristinsson (Icelandic);
+Enrico Gregorio, Andrea Marchitelli (Italian);
+Håkon Malmedal (Norwegian);
+José Carlos Santos (Portuguese);
+Oleg Domanov (Russian);
+Ignacio Fernández Galván (Spanish);
+Per Starbäck, Carl-Gustav Werner, Filip Åsblom (Swedish).
  
 \subsection{Prerequisites}
 \label{int:pre}
@@ -315,6 +320,7 @@ compatibility matrix for the recent versions.
 \toprule
 Biber version & \biblatex\ version\\
 \midrule
+1.6 & 2.6\\
 1.5 & 2.5\\
 1.4 & 2.4\\
 1.3 & 2.3\\
@@ -755,7 +761,7 @@ The Digital Object Identifier of the work.
 
 \fielditem{edition}{integer or literal}
 
-The edition of a printed publication. This must be an integer, not an ordinal. Don't say |edition={First}| or |edition={1st}| but |edition={1}|. The bibliography style converts this to a language dependent ordinal. It is also possible to give the edition as a literal string, for example �Third, revised and expanded edition�.
+The edition of a printed publication. This must be an integer, not an ordinal. Don't say |edition={First}| or |edition={1st}| but |edition={1}|. The bibliography style converts this to a language dependent ordinal. It is also possible to give the edition as a literal string, for example «Third, revised and expanded edition».
 
 \listitem{editor}{name}
 
@@ -815,7 +821,7 @@ The date of a conference, a symposium, or some other event in \bibtype{proceedin
 
 \fielditem{eventtitle}{literal}
 
-The title of a conference, a symposium, or some other event in \bibtype{proceedings} and \bibtype{inproceedings} entries. This field may also be useful for the custom types listed in \secref{bib:typ:ctm}. Note that this field holds the plain title of the event. Things like �Proceedings of the Fifth XYZ Conference� go into the \bibfield{titleaddon} or \bibfield{booktitleaddon} field, respectively. See also \bibfield{eventdate} and \bibfield{venue}.
+The title of a conference, a symposium, or some other event in \bibtype{proceedings} and \bibtype{inproceedings} entries. This field may also be useful for the custom types listed in \secref{bib:typ:ctm}. Note that this field holds the plain title of the event. Things like «Proceedings of the Fifth XYZ Conference» go into the \bibfield{titleaddon} or \bibfield{booktitleaddon} field, respectively. See also \bibfield{eventdate} and \bibfield{venue}.
 
 \fielditem{file}{verbatim}
 
@@ -835,7 +841,7 @@ A publication notice for unusual publications which do not fit into any of the c
 
 \fielditem{indextitle}{literal}
 
-A title to use for indexing instead of the regular \bibfield{title} field. This field may be useful if you have an entry with a title like �An Introduction to \dots� and want that indexed as �Introduction to \dots, An�. Style authors should note that \sty{biblatex} automatically copies the value of the \bibfield{title} field to \bibfield{indextitle} if the latter field is undefined.
+A title to use for indexing instead of the regular \bibfield{title} field. This field may be useful if you have an entry with a title like «An Introduction to \dots» and want that indexed as «Introduction to \dots, An». Style authors should note that \sty{biblatex} automatically copies the value of the \bibfield{title} field to \bibfield{indextitle} if the latter field is undefined.
 
 \listitem{institution}{literal}
 
@@ -927,7 +933,7 @@ An addon to be printed immediately after the author name in the bibliography. No
 
 \fielditem{note}{literal}
 
-Miscellaneous bibliographic data which does not fit into any other field. The \bibfield{note} field may be used to record bibliographic data in a free format. Publication facts such as �Reprint of the edition London 1831� are typical candidates for the \bibfield{note} field. See also \bibfield{addendum}.
+Miscellaneous bibliographic data which does not fit into any other field. The \bibfield{note} field may be used to record bibliographic data in a free format. Publication facts such as «Reprint of the edition London 1831» are typical candidates for the \bibfield{note} field. See also \bibfield{addendum}.
 
 \fielditem{number}{literal}
 
@@ -987,7 +993,7 @@ The publication state of the work, \eg\ <in press>. See \secref{aut:lng:key:pst}
 
 \fielditem{series}{literal}
 
-The name of a publication series, such as �Studies in \dots�, or the number of a journal series. Books in a publication series are usually numbered. The number or volume of a book in a series is given in the \bibfield{number} field. Note that the \bibtype{article} entry type makes use of the \bibfield{series} field as well, but handles it in a special way. See \secref{bib:use:ser} for details.
+The name of a publication series, such as «Studies in \dots», or the number of a journal series. Books in a publication series are usually numbered. The number or volume of a book in a series is given in the \bibfield{number} field. Note that the \bibtype{article} entry type makes use of the \bibfield{series} field as well, but handles it in a special way. See \secref{bib:use:ser} for details.
 
 \listitem{shortauthor}{name}
 
@@ -1003,7 +1009,7 @@ A special designation to be used by the citation style instead of the usual labe
 
 \fielditem{shorthandintro}{literal}
 
-The verbose citation styles which comes with this package use a phrase like �henceforth cited as [shorthand]� to introduce shorthands on the first citation. If the \bibfield{shorthandintro} field is defined, it overrides the standard phrase. Note that the alternative phrase must include the shorthand.
+The verbose citation styles which comes with this package use a phrase like «henceforth cited as [shorthand]» to introduce shorthands on the first citation. If the \bibfield{shorthandintro} field is defined, it overrides the standard phrase. Note that the alternative phrase must include the shorthand.
 
 \fielditem{shortjournal}{literal}
 
@@ -1092,13 +1098,13 @@ The gender of the author or the gender of the editor, if there is no author. The
 
 \begin{table}
 \tablesetup
-\begin{tabularx}{\textwidth}{@{}p{100pt}@{}p{100pt}@{}X@{}}
+\begin{tabularx}{\textwidth}{@{}p{100pt}@{}p{150pt}@{}X@{}}
 \toprule
 \multicolumn{1}{@{}H}{Language} &
 \multicolumn{1}{@{}H}{Region/Dialect} &
 \multicolumn{1}{@{}H}{Babel Identifiers} \\
 \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule{3-3}
-Catalan   & Andorra, Balearic islands, Catalonia, Valencia, Roussillon & \opt{catalan} \\ 
+Catalan   & Spain, France, Andorra, Italy & \opt{catalan} \\ 
 Czech     & Czech Republic & \opt{czech} \\
 Danish    & Denmark        & \opt{danish} \\
 Dutch     & Netherlands    & \opt{dutch} \\
@@ -1157,7 +1163,7 @@ A comma"=separated list of entry options in \keyval notation. This field is used
 
 A special field used to modify the sorting order of the bibliography. This field is the first item the sorting routine considers when sorting the bibliography, hence it may be used to arrange the entries in groups. This may be useful when creating subdivided bibliographies with the bibliography filters. Please refer to \secref{use:srt} for further details. Also see \secref{aut:ctm:srt}. This field is consumed by the backend processing and does not appear in the \path{.bbl}.
 
-\fielditem{related}{comma"=separated values}
+\fielditem{related}{comma"=separated values\BiberOnlyMark}
 
 Citation keys of other entries which have a relationship to this entry. The relationship is specified by the \bibfield{relatedtype} field. Please refer to \secref{use:rel} for further details.
 
@@ -1175,7 +1181,7 @@ formatting directives and bibliography macros for the related entries. Please re
 
 A field used to override the bibliography string specified by \bibfield{relatedtype}. Please refer to \secref{use:rel} for further details.
 
-\fielditem{sortkey}{literal\BiberOnlyMark}
+\fielditem{sortkey}{literal}
 
 A field used to modify the sorting order of the bibliography. Think of this field as the master sort key. If present, \sty{biblatex} uses this field during sorting and ignores everything else, except for the \bibfield{presort} field. Please refer to \secref{use:srt} for further details. This field is consumed by the backend processing and does not appear in the \path{.bbl}.
 
@@ -1189,7 +1195,7 @@ Similar to \bibfield{sortkey} but used in the list of shorthands. If present, \s
 
 \fielditem{sorttitle}{literal}
 
-A field used to modify the sorting order of the bibliography. If present, this field is used instead of the \bibfield{title} field when sorting the bibliography. The \bibfield{sorttitle} field may come in handy if you have an entry with a title like �An Introduction to\dots� and want that alphabetized under <I> rather than <A>. In this case, you could put �Introduction to\dots� in the \bibfield{sorttitle} field. Please refer to \secref{use:srt} for further details. This field is consumed by the backend processing and does not appear in the \path{.bbl}.
+A field used to modify the sorting order of the bibliography. If present, this field is used instead of the \bibfield{title} field when sorting the bibliography. The \bibfield{sorttitle} field may come in handy if you have an entry with a title like «An Introduction to\dots» and want that alphabetized under <I> rather than <A>. In this case, you could put «Introduction to\dots» in the \bibfield{sorttitle} field. Please refer to \secref{use:srt} for further details. This field is consumed by the backend processing and does not appear in the \path{.bbl}.
 
 \fielditem{sortyear}{literal}
 
@@ -1505,7 +1511,7 @@ The \bibtype{article} entry type makes use of the \bibfield{series} field as wel
   ...
 \end{lstlisting}
 %
-This entry will be printed as �\emph{Journal Name}. 3rd ser. 15.7 (1995)�. Some journals use designations such as �old series� and �new series� instead of a number. Such designations may be given in the \bibfield{series} field as well, either as a literal string or as a localization key. Consider the following example which makes use of the localization key \texttt{newseries}:
+This entry will be printed as «\emph{Journal Name}. 3rd ser. 15.7 (1995)». Some journals use designations such as «old series» and «new series» instead of a number. Such designations may be given in the \bibfield{series} field as well, either as a literal string or as a localization key. Consider the following example which makes use of the localization key \texttt{newseries}:
 
 \begin{lstlisting}[style=bibtex]{}
 @Article{...,
@@ -1516,7 +1522,7 @@ This entry will be printed as �\emph{Journal Name}. 3rd ser. 15.7 (1995)�. Some
   ...
 \end{lstlisting}
 %
-This entry will be printed as �\emph{Journal Name}. New ser. 9 (1998)�. See \secref{aut:lng:key} for a list of localization keys defined by default.
+This entry will be printed as «\emph{Journal Name}. New ser. 9 (1998)». See \secref{aut:lng:key} for a list of localization keys defined by default.
 
 \subsubsection{Date Specifications}
 \label{bib:use:dat}
@@ -1701,7 +1707,7 @@ hash\_size     &              & 5000  & 10000  & 19000  & 35000 \\
 Sorry---you've exceeded BibTeX's total number of fields 17250
 \end{lstlisting}
 %
-\Tabref{bib:cav:tab2} gives an overview of the various capacity parameters of \file{bibtex8} and the command"=line switches used to increase their default values. There are two ways to increase the capacity on the command"=line. You may use a high"=level switch like |--huge| to select a different set of defaults or low"=level switches such as |--mfields|�to modify a single parameter. The first thing you should always do is run \file{bibtex8} with the |--wolfgang| switch. Don't even bother trying anything else. With a very large database, however, even that capacity may be too small. In this case, you need to resort to the low"=level switches. Here is an example of a set of switches which should cope with a \file{bib} file containing about 1000 entries:
+\Tabref{bib:cav:tab2} gives an overview of the various capacity parameters of \file{bibtex8} and the command"=line switches used to increase their default values. There are two ways to increase the capacity on the command"=line. You may use a high"=level switch like |--huge| to select a different set of defaults or low"=level switches such as |--mfields| to modify a single parameter. The first thing you should always do is run \file{bibtex8} with the |--wolfgang| switch. Don't even bother trying anything else. With a very large database, however, even that capacity may be too small. In this case, you need to resort to the low"=level switches. Here is an example of a set of switches which should cope with a \file{bib} file containing about 1000 entries:
 
 \begin{lstlisting}[style=plain]{}
 bibtex8 --wolfgang --mcites 30000 --mentints 30000 --mentstrs 40000
@@ -1719,7 +1725,7 @@ When taking a closer look at \tabref{bib:cav:tab2}, you will notice that there a
 
 \paragraph{\bibtex}
 \label{bib:cav:enc:btx}
-Traditional \bibtex can only alphabetize Ascii characters correctly. If the bibliographic data includes non"=Ascii characters, they have to be given in Ascii notation. For example, instead of typing a letter like <�> directly, you need to input it as |\"a|, using an accent command and the Ascii letter. This Ascii notation needs to be wrapped in a pair of curly braces. Traditional \bibtex will then ignore the accent and use the Ascii letter for sorting. Here are a few examples:
+Traditional \bibtex can only alphabetize Ascii characters correctly. If the bibliographic data includes non"=Ascii characters, they have to be given in Ascii notation. For example, instead of typing a letter like <ä> directly, you need to input it as |\"a|, using an accent command and the Ascii letter. This Ascii notation needs to be wrapped in a pair of curly braces. Traditional \bibtex will then ignore the accent and use the Ascii letter for sorting. Here are a few examples:
 
 \begin{lstlisting}[style=bibtex,upquote]{}
 author     = {S<<{\'a}>>nchez, Jos<<{\'e}>>},
@@ -1728,20 +1734,20 @@ translator = {Ferdi<<{\`e}>>re, Fr<<{\c{c}}>>ois},
 title      = {<<{\OE}>>uvres compl<<{\`e}>>tes},
 \end{lstlisting}
 %
-Apart from it being inconvenient, there are two major issues with this convention. One subtle problem is that the extra set of braces suppresses the kerning on both sides of all non"=Ascii letters. But first and foremost, simply ignoring all accents may not be the correct way to handle them. For example, in Danish, the letter <�> is the very last letter of the alphabet, so it should be alphabetized after <z>. \bibtex will sort it like an <a>. The <�> ligature and the letter <�> are also sorted after <z> in this language. There are similar cases in Norwegian. In Swedish, the letter <�> is the very last letter of the alphabet and the letters <�> and <�> are also alphabetized after <z>, rather than like an <a>. What's more, even the sorting of Ascii characters is done in a rather peculiar way by traditional \bibtex because the sorting algorithm uses Ascii codepage order (\texttt{0-9,A-Z,a-z}). This implies that the lowercase letter <a> would end up after the uppercase <Z>, which is not even acceptable in the language \bibtex was originally designed for. The traditional \file{bst} files work around this problem by converting all strings used for sorting to lowercase, \ie sorting is effectively case"=insensitive. See also \secref{bib:cav:enc:enc}.
+Apart from it being inconvenient, there are two major issues with this convention. One subtle problem is that the extra set of braces suppresses the kerning on both sides of all non"=Ascii letters. But first and foremost, simply ignoring all accents may not be the correct way to handle them. For example, in Danish, the letter <å> is the very last letter of the alphabet, so it should be alphabetized after <z>. \bibtex will sort it like an <a>. The <æ> ligature and the letter <ø> are also sorted after <z> in this language. There are similar cases in Norwegian. In Swedish, the letter <ö> is the very last letter of the alphabet and the letters <å> and <ä> are also alphabetized after <z>, rather than like an <a>. What's more, even the sorting of Ascii characters is done in a rather peculiar way by traditional \bibtex because the sorting algorithm uses Ascii codepage order (\texttt{0-9,A-Z,a-z}). This implies that the lowercase letter <a> would end up after the uppercase <Z>, which is not even acceptable in the language \bibtex was originally designed for. The traditional \file{bst} files work around this problem by converting all strings used for sorting to lowercase, \ie sorting is effectively case"=insensitive. See also \secref{bib:cav:enc:enc}.
 
 \paragraph{\file{bibtex8}}
 \label{bib:cav:enc:bt8}
 Switching to \file{bibtex8} will help in such cases. \file{bibtex8} can sort case"=sensitively and it can handle 8-bit characters properly, provided that you supply it with a suitable \file{csf} file and give the |--csfile| switch on the command line. This also implies that it is possible to apply language specific sorting rules to the bibliography. The \sty{biblatex} package comes with \file{csf} files for some common Western European encodings. \bin{bibtex8} also ships with a few \file{csf} files. Note that \file{biblatex.bst} can not detect if it is running under traditional \bibtex or \file{bibtex8}, hence the \opt{bibtex8} package option. By default, sorting is case-insensitive since this is required for traditional \bibtex. If the \opt{bibtex8} package option is enabled, sorting is case-sensitive.
 
-Since \file{bibtex8} is backwards compatible with traditional \bibtex, it is possible to mix 8-bit input and Ascii notation. This is useful if the encoding used in the \file{bib} file does not cover all required characters. There are also a few marginal cases in which the Ascii notation scheme would yield better sorting results. A typical example is the ligature <�>. \file{bibtex8} will handle this ligature like a single character. Depending on the sorting scheme defined in the \file{csf} file, it could be treated like an <o> or alphabetized after the letter <o> but it can not be sorted as <oe>. The Ascii notation (|\oe|) is equivalent to <oe> during sorting:
+Since \file{bibtex8} is backwards compatible with traditional \bibtex, it is possible to mix 8-bit input and Ascii notation. This is useful if the encoding used in the \file{bib} file does not cover all required characters. There are also a few marginal cases in which the Ascii notation scheme would yield better sorting results. A typical example is the ligature <œ>. \file{bibtex8} will handle this ligature like a single character. Depending on the sorting scheme defined in the \file{csf} file, it could be treated like an <o> or alphabetized after the letter <o> but it can not be sorted as <oe>. The Ascii notation (|\oe|) is equivalent to <oe> during sorting:
 
 \begin{lstlisting}[style=bibtex,upquote]{}
-title      = {<<�>>uvres compl<<�>>tes},
-title      = {<<{\OE}>>uvres compl<<�>>tes},
+title      = {<<Œ>>uvres compl<<è>>tes},
+title      = {<<{\OE}>>uvres compl<<è>>tes},
 \end{lstlisting}
 %
-Sometimes even that is not sufficient and further tricks are required. For example, the letter <�> in German is particularly tricky. This letter is essentially alphabetized as <ss> but after <ss>. The name <Ba�mann> would be alphabetized as follows: Basmann\slash Bassmann\slash Ba�mann\slash Bastmann. In this case, the Ascii notation (|\ss|) would yield slightly better sorting results than <�> in conjunction with a \file{csf} file which treats <�> like <s>:
+Sometimes even that is not sufficient and further tricks are required. For example, the letter <ß> in German is particularly tricky. This letter is essentially alphabetized as <ss> but after <ss>. The name <Baßmann> would be alphabetized as follows: Basmann\slash Bassmann\slash Baßmann\slash Bastmann. In this case, the Ascii notation (|\ss|) would yield slightly better sorting results than <ß> in conjunction with a \file{csf} file which treats <ß> like <s>:
 
 \begin{lstlisting}[style=bibtex,upquote]{}
 author     = {Ba<<{\ss}>>mann, Paul},
@@ -1750,7 +1756,7 @@ author     = {Ba<<{\ss}>>mann, Paul},
 To get it absolutely right, however, you need to resort to the \bibfield{sortname} field:
 
 \begin{lstlisting}[style=bibtex,upquote]{}
-author     = {Ba<<�>>mann, Paul},
+author     = {Ba<<ß>>mann, Paul},
 sortname   = {Ba<<sszz>>mann, Paul},
 \end{lstlisting}
 %
@@ -1759,7 +1765,7 @@ Not only \bibtex, \latex needs to know about the encoding as well. See \secref{b
 \paragraph{\biber}
 \biber handles Ascii, 8-bit encodings such as Latin\,1, and \utf. It features true Unicode support and is capable of reencoding the \file{bib} data on the fly in a robust way. For sorting, \biber uses a Perl implementation of the Unicode Collation Algorithm (\acr{UCA}), as outlined in Unicode Technical Standard \#10.\fnurl{http://unicode.org/reports/tr10/} Collation tailoring based on the Unicode Common Locale Data Repository (\acr{CLDR}) is also supported.\fnurl{http://cldr.unicode.org/} The bottom line is that \biber will deliver sorting results far superior to both \bibtex and \file{bibtex8} in many cases. If you are interested in the technical details, section 1.8 of Unicode Technical Standard \#10 will provide you with a very concise summary of why the inadequateness of traditional \bibtex and even \bin{bibtex8} is of a very general nature and not limited to the lack of \utf support.\fnurl{http://unicode.org/reports/tr10/#Common_Misperceptions}
 
-Supporting Unicode implies much more than handling \utf input. Unicode is a complex standard covering more than its most well-known parts, the Unicode character encoding and transport encodings such as \utf. It also standardizes aspects such as string collation, which is required for language-sensitive sorting. For example, by using the Unicode Collation Algorithm, \biber can handle the character <�> mentioned as an example in \secref{bib:cav:enc:bt8} without any manual intervention. All you need to do to get localized sorting is specify the locale:
+Supporting Unicode implies much more than handling \utf input. Unicode is a complex standard covering more than its most well-known parts, the Unicode character encoding and transport encodings such as \utf. It also standardizes aspects such as string collation, which is required for language-sensitive sorting. For example, by using the Unicode Collation Algorithm, \biber can handle the character <ß> mentioned as an example in \secref{bib:cav:enc:bt8} without any manual intervention. All you need to do to get localized sorting is specify the locale:
 
 \begin{lstlisting}[style=latex]{}
 \usepackage[backend=biber,sortlocale=de]{biblatex}
@@ -1880,6 +1886,18 @@ If this option is enabled, \sty{biblatex} will ignore \sty{inputenc}'s \opt{utf8
 
 This solution may be acceptable as a workaround if the data in the \file{bib} file is mostly Ascii anyway, with only a few strings, such as some authors' names, causing problems. However, keep in mind that it will not magically make traditional \tex or \pdftex support Unicode. It may help if the occasional odd character is not supported by \sty{inputenc}, but may still be processed by \tex when using an accent command (\eg |\d{S}| instead of \texttt{\d{S}}). If you need full Unicode support, however, switch to \xetex or \luatex.
 
+Typical errors when \sty{inputenc} cannot handle a certain UTF-8 character are:
+
+\begin{verbatim}
+Package inputenc Error: Unicode char \u8: not set up for use with LaTeX
+\end{verbatim}
+%
+but also less obvious things like:
+
+\begin{verbatim}
+! Argument of \UTFviii@three@octets has an extra }.
+\end{verbatim}
+
 \subsubsection{Editors and Compiler Scripts}
 \label{bib:cav:ide}
 
@@ -1996,7 +2014,7 @@ The sorting order of the list of shorthands. The following choices are available
 
 The sorting order of shorthands with \biber is more flexible and is set with the \opt{sorting} option to the \cmd{printshorthands} command.
 
-\boolitem[true]{related}
+\boolitem[true]{related}[\BiberOnly]
 
 Whether or not to use information from related entries or not. See \secref{use:rel}.
 
@@ -2050,13 +2068,13 @@ This option controls multilingual support. When set to \opt{auto}, \sty{biblatex
 
 \begin{table}
 \tablesetup
-\begin{tabularx}{\textwidth}{@{}p{100pt}@{}p{100pt}@{}>{\ttfamily}X@{}}
+\begin{tabularx}{\textwidth}{@{}p{100pt}@{}p{150pt}@{}>{\ttfamily}X@{}}
 \toprule
 \multicolumn{1}{@{}H}{Language} &
 \multicolumn{1}{@{}H}{Region/Dialect} &
 \multicolumn{1}{@{}H}{Identifier} \\
 \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule{3-3}
-Catalan   & Andorra, Balearic islands, Catalonia, Valencia, Roussillon & catalan \\ 
+Catalan   & Spain, France, Andorra, Italy & catalan \\ 
 Czech     & Czech Republic & czech \\
 Danish    & Denmark        & danish \\
 Dutch     & Netherlands    & dutch \\
@@ -2269,6 +2287,10 @@ January 21--30, 2010\par
 %
 As seen in the above examples, the actual date format is language specific. Note that the month name in all long formats is responsive to the \opt{abbreviate} package option. The leading zeros in all short formats may be controlled separately with the \opt{datezeros} package option.
 
+\optitem[comp]{datelabel}{\opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}}
+
+Similar to the \opt{date} option but controls the format of the date field selected with \cmd{DeclareLabeldate}.
+
 \optitem[comp]{origdate}{\opt{short}, \opt{long}, \opt{terse}, \opt{comp}, \opt{iso8601}}
 
 Similar to the \opt{date} option but controls the format of the \bibfield{origdate}.
@@ -2295,7 +2317,7 @@ This option controls whether \texttt{long} and \texttt{comp} dates are printed w
 
 \boolitem[false]{defernumbers}
 
-In contrast to standard \latex, the numeric labels generated by this package are normally assigned to the full list of references at the beginning of the document body. If this option is enabled, numeric labels (\ie the \bibfield{labelnumber} field discussed in \secref{aut:bbx:fld}) are assigned the first time an entry is printed in any bibliography. See \secref{use:cav:lab} for further explanation.  This option requires two \latex runs after the data has been exported to the \file{bbl} file by the backend. See \secref{aut:int}.
+In contrast to standard \latex, the numeric labels generated by this package are normally assigned to the full list of references at the beginning of the document body. If this option is enabled, numeric labels (\ie the \bibfield{labelnumber} field discussed in \secref{aut:bbx:fld}) are assigned the first time an entry is printed in any bibliography. See \secref{use:cav:lab} for further explanation.  This option requires two \latex runs after the data has been exported to the \file{bbl} file by the backend (in addition to any other runs required by page breaks changing etc.). An important thing to note is that if you change the value of this option in your document (or the value of options which depend on this like some of the options to the \cmd{printbibliography} macro, see \secref{use:bib:bib}), then it is likely that you will need to delete your current \file{aux} file and re-run \latex to obtain the correct numbering. See \secref{aut:int}.
 
 \boolitem[false]{punctfont}
 
@@ -2433,7 +2455,7 @@ This option controls the <ibidem> tracker which is required by the \cmd{ifciteib
 \item[true] Enable the tracker in global mode.
 \item[false] Disable the tracker.
 \item[context] Enable the tracker in context"=sensitive mode. In this mode, citations in footnotes and in the body text are tracked separately.
-\item[strict] Enable the tracker in strict mode. In this mode, potentially ambiguous references are suppressed. A reference is considered ambiguous if either the current citation (the one including the <ibidem>) or the previous citation (the one the <ibidem> refers to) consists of a list of references.\footnote{For example, suppose the initial citation is �Jones, \emph{Title}; Williams, \emph{Title}� and the following one �ibidem�. From a technical point of view, it is fairly clear that the <ibidem> refers to <Williams> because this is the last reference processed by the previous citation command. To a human reader, however, this may not be obvious because the <ibidem> may also refer to both titles. The strict mode avoids such ambiguous references.}
+\item[strict] Enable the tracker in strict mode. In this mode, potentially ambiguous references are suppressed. A reference is considered ambiguous if either the current citation (the one including the <ibidem>) or the previous citation (the one the <ibidem> refers to) consists of a list of references.\footnote{For example, suppose the initial citation is «Jones, \emph{Title}; Williams, \emph{Title}» and the following one «ibidem». From a technical point of view, it is fairly clear that the <ibidem> refers to <Williams> because this is the last reference processed by the previous citation command. To a human reader, however, this may not be obvious because the <ibidem> may also refer to both titles. The strict mode avoids such ambiguous references.}
 \item[constrict] This mode combines the features of \opt{context} and \opt{strict}. It also keeps track of footnote numbers and detects potentially ambiguous references in footnotes in a stricter way than the \opt{strict} option. In addition to the conditions imposed by the \opt{strict} option, a reference in a footnote will only be considered as unambiguous if the current citation and the previous citation are given in the same footnote or in immediately consecutive footnotes.
 \end{valuelist}
 
@@ -2527,9 +2549,9 @@ Whether or not to provide the special field \bibfield{extratitle}, see \secref{a
 
 Whether or not to provide the special field \bibfield{extratitleyear}, see \secref{aut:bbx:fld} for details. Note that the special field \bibfield{labeltitle} is always provided and this option controls rather whether \bibfield{labeltitle} is used to generate \bibfield{extratitleyear} information. This option is also settable on a per-type basis. Table \ref{use:opt:tab2} summarises the various \opt{extra*} disambiguation counters and what they track.
 
-\boolitem[false]{labelyear}
+\boolitem[false]{labeldate}
 
-Whether or not to provide the special fields \bibfield{labelyear} and \bibfield{extrayear}, see \secref{aut:bbx:fld} for details. 
+Whether or not to provide the special fields \bibfield{labelyear}, \bibfield{labelmonth}, \bibfield{labelday} and \bibfield{extrayear}, see \secref{aut:bbx:fld} for details. 
 \BiberOnlyMark With \biber, this option is also settable on a per-type basis. Table \ref{use:opt:tab2} summarises the various \opt{extra*} disambiguation counters and what they track.
 
 \boolitem[false]{singletitle}
@@ -2562,7 +2584,7 @@ Whether or not to update the \cnt{uniquelist} counter, see \secref{aut:aux:tst}
 \begin{valuelist}
 \item[true] Disambiguate the \bibfield{labelname} list.
 \item[false] Disable this feature.
-\item[minyear] Disambiguate the \bibfield{labelname} list only if the truncated list is identical to another one with the same \bibfield{labelyear}. This mode of operation is useful for author-year styles and requires \kvopt{labelyear}{true}.
+\item[minyear] Disambiguate the \bibfield{labelname} list only if the truncated list is identical to another one with the same \bibfield{labelyear}. This mode of operation is useful for author-year styles and requires \kvopt{labeldate}{true}.
 \end{valuelist}
 %
 Note that the \opt{uniquelist} option will also affect the \cmd{ifsingletitle} test and the \bibfield{extrayear} field. See \secref{aut:cav:amb} for further details and practical examples. See \secref{aut:cav:amb} for further details and practical examples.
@@ -2580,7 +2602,7 @@ Note that the \opt{uniquelist} option will also affect the \cmd{ifsingletitle} t
 \multicolumn{1}{@{}H}{Counter tracks} \\
 \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4}
 labelalpha     & labelalpha & extraalpha     &  label\\
-labelyear      & labelyear  & extrayear      &  labelname+labelyear\\
+labeldate      & labelyear  & extrayear      &  labelname+labelyear\\
 labeltitle     & ---        & extratitle     &  labelname+labeltitle\\
 labeltitleyear & ---        & extratitleyear &  labeltitle+labelyear\\
 \bottomrule
@@ -2628,7 +2650,7 @@ With the standard styles, the \bibfield{translator} is printed after the title b
 
 \boolitem[false]{useprefix}
 
-Whether the name prefix (von, van, of, da, de, della, etc.) is considered when printing the last name in citations. This also affects the sorting and formatting of the bibliography as well as the generation of certain types of labels. If this option is enabled, \sty{biblatex} always precedes the last name with the prefix. For example, Ludwig van Beethoven would be cited as �Beethoven� and alphabetized as �Beethoven, Ludwig van� by default. If this option is enabled, he is cited as �van Beethoven� and alphabetized as �Van Beethoven, Ludwig� instead.
+Whether the name prefix (von, van, of, da, de, della, etc.) is considered when printing the last name in citations. This also affects the sorting and formatting of the bibliography as well as the generation of certain types of labels. If this option is enabled, \sty{biblatex} always precedes the last name with the prefix. For example, Ludwig van Beethoven would be cited as «Beethoven» and alphabetized as «Beethoven, Ludwig van» by default. If this option is enabled, he is cited as «van Beethoven» and alphabetized as «Van Beethoven, Ludwig» instead.
 \BiberOnlyMark With \biber, this option is also settable on a per-type basis.
 
 \optitem{indexing}{\opt{true}, \opt{false}, \opt{cite}, \opt{bib}}
@@ -2736,37 +2758,37 @@ The citation styles which come with this package implement several common citati
 \begin{marglist}
 
 \item[numeric]
-This style implements a numeric citation scheme similar to the standard bibliographic facilities of \latex. It should be employed in conjunction with a numeric bibliography style which prints the corresponding labels in the bibliography. It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelnumber}{true}. This style also provides an additional preamble option called \opt{subentry} which affects the handling of entry sets. If this option is disabled, citations referring to a member of a set will point to the entire set. If it is enabled, the style supports citations like �[5c]� which point to a subentry in a set (the third one in this example). See the style example for details.
+This style implements a numeric citation scheme similar to the standard bibliographic facilities of \latex. It should be employed in conjunction with a numeric bibliography style which prints the corresponding labels in the bibliography. It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelnumber}{true}. This style also provides an additional preamble option called \opt{subentry} which affects the handling of entry sets. If this option is disabled, citations referring to a member of a set will point to the entire set. If it is enabled, the style supports citations like «[5c]» which point to a subentry in a set (the third one in this example). See the style example for details.
 
 \item[numeric-comp]
-A compact variant of the \texttt{numeric} style which prints a list of more than two consecutive numbers as a range. This style is similar to the \sty{cite} package and the \opt{sort\&compress} option of the \sty{natbib} package in numerical mode. For example, instead of �[8, 3, 1, 7, 2]� this style would print �[1--3, 7, 8]�. It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{sortcites}{true}, \kvopt{labelnumber}{true}. It also provides the \opt{subentry} option.
+A compact variant of the \texttt{numeric} style which prints a list of more than two consecutive numbers as a range. This style is similar to the \sty{cite} package and the \opt{sort\&compress} option of the \sty{natbib} package in numerical mode. For example, instead of «[8, 3, 1, 7, 2]» this style would print «[1--3, 7, 8]». It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{sortcites}{true}, \kvopt{labelnumber}{true}. It also provides the \opt{subentry} option.
 
 \item[numeric-verb]
-A verbose variant of the \texttt{numeric} style. The difference affects the handling of a list of citations and is only apparent when multiple entry keys are passed to a single citation command. For example, instead of �[2, 5, 6]� this style would print �[2]; [5]; [6]�. It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelnumber}{true}. It also provides the \opt{subentry} option.
+A verbose variant of the \texttt{numeric} style. The difference affects the handling of a list of citations and is only apparent when multiple entry keys are passed to a single citation command. For example, instead of «[2, 5, 6]» this style would print «[2]; [5]; [6]». It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelnumber}{true}. It also provides the \opt{subentry} option.
 
 \item[alphabetic]
-This style implements an alphabetic citation scheme similar to the \path{alpha.bst} style of traditional \bibtex. The alphabetic labels resemble a compact author"=year style to some extent, but the way they are employed is similar to a numeric citation scheme. For example, instead of �Jones 1995� this style would use the label �[Jon95]�. �Jones and Williams 1986� would be rendered as �[JW86]�. This style should be employed in conjunction with an alphabetic bibliography style which prints the corresponding labels in the bibliography. It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelalpha}{true}.
+This style implements an alphabetic citation scheme similar to the \path{alpha.bst} style of traditional \bibtex. The alphabetic labels resemble a compact author"=year style to some extent, but the way they are employed is similar to a numeric citation scheme. For example, instead of «Jones 1995» this style would use the label «[Jon95]». «Jones and Williams 1986» would be rendered as «[JW86]». This style should be employed in conjunction with an alphabetic bibliography style which prints the corresponding labels in the bibliography. It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelalpha}{true}.
 
 \item[alphabetic-verb]
-A verbose variant of the \texttt{alphabetic} style. The difference affects the handling of a list of citations and is only apparent when multiple entry keys are passed to a single citation command. For example, instead of �[Doe92; Doe95; Jon98]� this style would print �[Doe92]; [Doe95]; [Jon98]�. It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelalpha}{true}.
+A verbose variant of the \texttt{alphabetic} style. The difference affects the handling of a list of citations and is only apparent when multiple entry keys are passed to a single citation command. For example, instead of «[Doe92; Doe95; Jon98]» this style would print «[Doe92]; [Doe95]; [Jon98]». It is intended for in-text citations. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelalpha}{true}.
 
 \item[authoryear]
-This style implements an author"=year citation scheme. If the bibliography contains two or more works by the same author which were all published in the same year, a letter is appended to the year. For example, this style would print citations such as �Doe 1995a; Doe 1995b; Jones 1998�. This style should be employed in conjunction with an author"=year bibliography style which prints the corresponding labels in the bibliography. It is primarily intended for in-text citations, but it could also be used with citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelyear}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}.
+This style implements an author"=year citation scheme. If the bibliography contains two or more works by the same author which were all published in the same year, a letter is appended to the year. For example, this style would print citations such as «Doe 1995a; Doe 1995b; Jones 1998». This style should be employed in conjunction with an author"=year bibliography style which prints the corresponding labels in the bibliography. It is primarily intended for in-text citations, but it could also be used with citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labeldate}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}.
 
 \item[authoryear-comp]
-A compact variant of the \texttt{authoryear} style which prints the author only once if subsequent references passed to a single citation command share the same author. If they share the same year as well, the year is also printed only once. For example, instead of �Doe 1995b; Doe 1992; Jones 1998; Doe 1995a� this style would print �Doe 1992, 1995a,b; Jones 1998�. It is primarily intended for in-text citations, but it could also be used with citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{sortcites}{true}, \kvopt{labelyear}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}.
+A compact variant of the \texttt{authoryear} style which prints the author only once if subsequent references passed to a single citation command share the same author. If they share the same year as well, the year is also printed only once. For example, instead of «Doe 1995b; Doe 1992; Jones 1998; Doe 1995a» this style would print «Doe 1992, 1995a,b; Jones 1998». It is primarily intended for in-text citations, but it could also be used with citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{sortcites}{true}, \kvopt{labeldate}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}.
 
 \item[authoryear-ibid]
-A variant of the \texttt{authoryear} style which replaces repeated citations by the abbreviation \emph{ibidem} unless the citation is the first one on the current page or double-page spread, or the \emph{ibidem} would be ambiguous in the sense of the package option \kvopt{ibidtracker}{constrict}. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelyear}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
+A variant of the \texttt{authoryear} style which replaces repeated citations by the abbreviation \emph{ibidem} unless the citation is the first one on the current page or double-page spread, or the \emph{ibidem} would be ambiguous in the sense of the package option \kvopt{ibidtracker}{constrict}. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labeldate}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
 
 \item[authoryear-icomp]
-A style combining \texttt{authoryear-comp} and \texttt{authoryear-ibid}. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labelyear}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}, \kvopt{sortcites}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
+A style combining \texttt{authoryear-comp} and \texttt{authoryear-ibid}. The style will set the following package options at load time: \kvopt{autocite}{inline}, \kvopt{labeldate}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}, \kvopt{sortcites}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
 
 \item[authortitle]
 This style implements a simple author"=title citation scheme. It will make use of the \bibfield{shorttitle} field, if available. It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}.
 
 \item[authortitle-comp]
-A compact variant of the \texttt{authortitle} style which prints the author only once if subsequent references passed to a single citation command share the same author. For example, instead of �Doe, \emph{First title}; Doe, \emph{Second title}� this style would print �Doe, \emph{First title}, \emph{Second title}�. It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{sortcites}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}.
+A compact variant of the \texttt{authortitle} style which prints the author only once if subsequent references passed to a single citation command share the same author. For example, instead of «Doe, \emph{First title}; Doe, \emph{Second title}» this style would print «Doe, \emph{First title}, \emph{Second title}». It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{sortcites}{true}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}.
 
 \item[authortitle-ibid]
 A variant of the \texttt{authortitle} style which replaces repeated citations by the abbreviation \emph{ibidem} unless the citation is the first one on the current page or double-page spread, or the \emph{ibidem} would be ambiguous in the sense of the package option \kvopt{ibidtracker}{constrict}. It is intended for citations given in footnotes. The style will set the following package options at load time: \kvopt{autocite}{footnote}, \kvopt{uniquename}{full}, \kvopt{uniquelist}{true}, \kvopt{ibidtracker}{constrict}, \kvopt{pagetracker}{true}. This style also provides an additional preamble option called \opt{ibidpage}. See the style example for details.
@@ -2835,7 +2857,7 @@ This style prints a numeric label similar to the standard bibliographic faciliti
 This style prints an alphabetic label similar to the \path{alpha.bst} style of traditional \bibtex. It is intended for use in conjunction with an alphabetic citation style. Note that the \bibfield{shorthand} field overrides the default label. The style will set the following package options at load time: \kvopt{labelalpha}{true}, \kvopt{sorting}{anyt}.
 
 \item[authoryear]
-This style differs from the other styles in that the publication date is not printed towards the end of the entry but rather after the author\slash editor. It is intended for use in conjunction with an author"=year citation style. Recurring author and editor names are replaced by a dash unless the entry is the first one on the current page or double-page spread. This style provides an additional preamble option called \opt{dashed} which controls this feature. It also provided a preamble option called \opt{mergedate}. See the style example for details. The style will set the following package options at load time: \kvopt{labelyear}{true}, \kvopt{sorting}{nyt}, \kvopt{pagetracker}{true}, \kvopt{mergedate}{true}.
+This style differs from the other styles in that the publication date is not printed towards the end of the entry but rather after the author\slash editor. It is intended for use in conjunction with an author"=year citation style. Recurring author and editor names are replaced by a dash unless the entry is the first one on the current page or double-page spread. This style provides an additional preamble option called \opt{dashed} which controls this feature. It also provided a preamble option called \opt{mergedate}. See the style example for details. The style will set the following package options at load time: \kvopt{labeldate}{true}, \kvopt{sorting}{nyt}, \kvopt{pagetracker}{true}, \kvopt{mergedate}{true}.
 
 \item[authortitle]
 This style does not print any label at all. It is intended for use in conjunction with an author"=title citation style. Recurring author and editor names are replaced by a dash unless the entry is the first one on the current page or double-page spread. This style also provides an additional preamble option called \opt{dashed} which controls this feature. See the style example for details. The style will set the following package options at load time: \kvopt{pagetracker}{true}.
@@ -2863,7 +2885,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 itself independently) as a clone is taken of the related entry to be used as a data source. 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) as a clone is taken of the related entry to be used as a data source. 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,
@@ -2881,7 +2903,7 @@ Almost all bibliography styles require authors to specify certain types of relat
 Here we specify that entry \texttt{key1} is a reprint of entry \texttt{key2}. In the bibliography driver for \texttt{Book} entries, when \cmd{usebibmacro\{related\}} is called for entry \texttt{key1}:
 
 \begin{itemize}
-\item If the localization string �\texttt{reprintof}� is defined, it is printed, then
+\item If the localization string «\texttt{reprintof}» is defined, it is printed in the \texttt{relatedstring:reprintof} format. If this formatting directive is undefined, the string is printed in the \texttt{relatedstring:default} format.
 \item If the \texttt{related:reprintof} macro is defined, it is used to format the information contained in entry \texttt{key2}, otherwise the \texttt{related:default} macro is used
 \item If the \texttt{related:reprintof} format is defined, it is used to format both the localization string and data. If this format is not defined, then the \texttt{related} format is used instead.
 \end{itemize}
@@ -3543,10 +3565,12 @@ The following commands are provided by the core of \sty{biblatex}. They are inte
 \begin{ltxsyntax}
 
 \cmditem{citeauthor}[prenote][postnote]{key}
+\cmditem*{citeauthor*}[prenote][postnote]{key}
 \cmditem{Citeauthor}[prenote][postnote]{key}
+\cmditem*{Citeauthor*}[prenote][postnote]{key}
 
 These commands print the authors. Strictly speaking, it prints the \bibfield{labelname} list, which may be the
-\bibfield{author}, the \bibfield{editor}, or the \bibfield{translator}. \cmd{Citeauthor} is similar to \cmd{citeauthor} but capitalizes the name prefix of the first name in the citation if the \opt{useprefix} option is enabled, provided that there is a name prefix.
+\bibfield{author}, the \bibfield{editor}, or the \bibfield{translator}. \cmd{Citeauthor} is similar to \cmd{citeauthor} but capitalizes the name prefix of the first name in the citation if the \opt{useprefix} option is enabled, provided that there is a name prefix. The starred variants effectively force maxcitenames to 1 for just this command on so only print the first name in the labelname list (potentially followed by the «et al» string if there are more names). This allows more natural textual flow when refering to a paper in the singular when otherwise \cmd{citeauthor} would generate a (naturally plural) list of names.
 
 \cmditem{citetitle}[prenote][postnote]{key}
 \cmditem*{citetitle*}[prenote][postnote]{key}
@@ -3884,6 +3908,9 @@ The separator inserted between <units> in the sense explained in \secref{aut:pct
 \csitem{finentrypunct}
 The punctuation printed at the very end of every bibliography entry, usually a period. The default definition is a period.
 
+\csitem{entrysetpunct}\BiberOnlyMark
+The punctuation printed between bibliography subentries of an entry set. The default definition is a semicolon and a space.
+
 \csitem{bibnamedelima}\BiberOnlyMark
 This delimiter controls the spacing between the elements which make up a name part. It is inserted automatically after the first name element if the element is less than three characters long and before the last element. The default definition is an interword space penalized by the value of the \cnt{highnamepenalty} counter (\secref{use:fmt:len}). Please refer to \secref{use:cav:nam} for further details.
 
@@ -3951,7 +3978,7 @@ The separator printed after the name used for alphabetizing in the bibliography
 The separator printed between the fields \bibfield{title} and \bibfield{subtitle}, \bibfield{booktitle} and \bibfield{booksubtitle}, as well as \bibfield{maintitle} and \bibfield{mainsubtitle}. With the default styles, this separator replaces \cmd{newunitpunct} at this location. The default definition is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation.
 
 \csitem{intitlepunct}
-The separator between the word �in� and the following title in entry types such as \bibtype{article}, \bibtype{inbook}, \bibtype{incollection}, etc. The default definition is a colon plus an interword space (\eg �Article, in: \emph{Journal}� or �Title, in: \emph{Book}�). Note that this is the separator string, not only the punctuation mark. If you don't want a colon after �in�, \cmd{intitlepunct} should still insert a space.
+The separator between the word «in» and the following title in entry types such as \bibtype{article}, \bibtype{inbook}, \bibtype{incollection}, etc. The default definition is a colon plus an interword space (\eg «Article, in: \emph{Journal}» or «Title, in: \emph{Book}»). Note that this is the separator string, not only the punctuation mark. If you don't want a colon after «in», \cmd{intitlepunct} should still insert a space.
 
 \csitem{bibpagespunct}
 The separator printed before the \bibfield{pages} field. The default is a comma plus an interword space.
@@ -4141,15 +4168,15 @@ The horizontal space between entries and their corresponding labels in the bibli
 
 \lenitem{bibitemsep}
 
-The vertical space between the individual entries in the bibliography. This length is initialized to \cmd{itemsep} at load-time. Note that \len{bibitemsep}, \len{bibnamesep}, and \len{bibinitsep} are cumulative. When they coincide, the largest value will be applied.
+The vertical space between the individual entries in the bibliography. This length is initialized to \cmd{itemsep} at load-time. Note that \len{bibitemsep}, \len{bibnamesep}, and \len{bibinitsep} obey the rules for \cmd{addvspace}, that is, when vertical space introduced by any of these commands immediately follows on from space introduced by another of them, the resulting total space is equal to the largest of them.
 
 \lenitem{bibnamesep}
 
-Vertical space to be inserted between two entries in the bibliography whenever an entry starts with a name which is different from the initial name of the previous entry. The default value is zero. Setting this length to a positive value greater than \len{bibitemsep} will group the bibliography by author\slash editor name. Note that \len{bibitemsep}, \len{bibnamesep}, and \len{bibinitsep} are cumulative. When they coincide, the largest value will be applied.
+Vertical space to be inserted between two entries in the bibliography whenever an entry starts with a name which is different from the initial name of the previous entry. The default value is zero. Setting this length to a positive value greater than \len{bibitemsep} will group the bibliography by author\slash editor name. Note that \len{bibitemsep}, \len{bibnamesep}, and \len{bibinitsep} obey the rules for \cmd{addvspace}, that is, when vertical space introduced by any of these commands immediately follows on from space introduced by another of them, the resulting total space is equal to the largest of them.
 
 \lenitem{bibinitsep}
 
-Vertical space to be inserted between two entries in the bibliography whenever an entry starts with a letter which is different from the initial letter of the previous entry. The default value is zero. Setting this length to a positive value greater than \len{bibitemsep} will group the bibliography alphabetically. Note that \len{bibitemsep}, \len{bibnamesep}, and \len{bibinitsep} are cumulative. When they coincide, the largest value will be applied.
+Vertical space to be inserted between two entries in the bibliography whenever an entry starts with a letter which is different from the initial letter of the previous entry. The default value is zero. Setting this length to a positive value greater than \len{bibitemsep} will group the bibliography alphabetically. Note that \len{bibitemsep}, \len{bibnamesep}, and \len{bibinitsep} obey the rules for \cmd{addvspace}, that is, when vertical space introduced by any of these commands immediately follows on from space introduced by another of them, the resulting total space is equal to the largest of them.
 
 \lenitem{bibparsep}
 
@@ -4157,7 +4184,7 @@ The vertical space between paragraphs within an entry in the bibliography. The d
 
 \cntitem{abbrvpenalty}
 
-This counter, which is used by the localization modules, holds the penalty used in short or abbreviated localization strings. For example, a linebreak in expressions such as �et al.� or �ed. by� is unfortunate, but should still be possible to prevent overfull boxes. This counter is initialized to \cmd{hyphenpenalty} at load-time. The idea is making \tex treat the whole expression as if it were a single, hyphenatable word as far as line"=breaking is concerned. If you dislike such linebreaks, use a higher value. If you do not mind them at all, set this counter to zero. If you want to suppress them unconditionally, set it to <infinite> (10\,000 or higher).\footnote{The default values assigned to \cnt{abbrvpenalty}, \cnt{lownamepenalty}, and \cnt{highnamepenalty} are deliberately very low to prevent overfull boxes. This implies that you will hardly notice any effect on line-breaking if the text is set justified. If you set these counters to 10\,000 to suppress the respective breakpoints, you will notice their effect but you may also be confronted with overfull boxes. Keep in mind that line-breaking in the bibliography is often more difficult than in the body text and that you can not resort to rephrasing a sentence. In some cases it may be preferable to set the entire bibliography \cmd{raggedright} to prevent suboptimal linebreaks. In this case, even the fairly low default penalties will make a visible difference.}
+This counter, which is used by the localization modules, holds the penalty used in short or abbreviated localization strings. For example, a linebreak in expressions such as «et al.» or «ed. by» is unfortunate, but should still be possible to prevent overfull boxes. This counter is initialized to \cmd{hyphenpenalty} at load-time. The idea is making \tex treat the whole expression as if it were a single, hyphenatable word as far as line"=breaking is concerned. If you dislike such linebreaks, use a higher value. If you do not mind them at all, set this counter to zero. If you want to suppress them unconditionally, set it to <infinite> (10\,000 or higher).\footnote{The default values assigned to \cnt{abbrvpenalty}, \cnt{lownamepenalty}, and \cnt{highnamepenalty} are deliberately very low to prevent overfull boxes. This implies that you will hardly notice any effect on line-breaking if the text is set justified. If you set these counters to 10\,000 to suppress the respective breakpoints, you will notice their effect but you may also be confronted with overfull boxes. Keep in mind that line-breaking in the bibliography is often more difficult than in the body text and that you can not resort to rephrasing a sentence. In some cases it may be preferable to set the entire bibliography \cmd{raggedright} to prevent suboptimal linebreaks. In this case, even the fairly low default penalties will make a visible difference.}
 
 \cntitem{highnamepenalty}
 
@@ -4226,13 +4253,13 @@ will yield <Special issue> or <special issue>, as appropriate. If the string to
 \autocap{\'e}dition sp\'eciale
 \end{lstlisting}
 %
-This will yield <�dition sp�ciale> or <�dition sp�ciale>. If the string to be capitalized starts with a command which prints a character, such as \cmd{ae} or \cmd{oe}, simply put the command in the \prm{character} argument:
+This will yield <Édition spéciale> or <édition spéciale>. If the string to be capitalized starts with a command which prints a character, such as \cmd{ae} or \cmd{oe}, simply put the command in the \prm{character} argument:
 
 \begin{lstlisting}[style=latex]{}
 \autocap{\oe}uvres
 \end{lstlisting}
 %
-This will yield <�uvres> or <�uvres>.
+This will yield <Œuvres> or <œuvres>.
 
 \end{ltxsyntax}
 
@@ -4339,7 +4366,7 @@ With traditional \bibtex, the \cmd{bibliography} command serves two purposes. It
 
 Whenever a reference to a work which has not been cited before is added, this procedure must be repeated. This is also the case if the last reference to a work which has been cited before is removed because some citation labels may change in this case. In contrast to traditional \bibtex, there is normally no need to run \bin{latex} twice after running the backend as far as the handling of bibliographic data is concerned.\footnote{That is, unless the \opt{defernumbers} package option is enabled. See \secref{aut:int}}
 
-\BibTeXOnlyMark Note that when using \bibtex as the backend this only applies to the most basic case. Using the \bibfield{xref} field or the \bibfield{entryset} field may require an additional \latex/\bibtex/\latex cycle. Some other facilities provided by \sty{biblatex} may also require an additional \bin{latex} run to get certain references and the page tracking right. In this case, the usual warning messages such as �There were undefined references� and �Label(s) may have changed. Rerun to get cross-references right� will be printed.
+\BibTeXOnlyMark Note that when using \bibtex as the backend this only applies to the most basic case. Using the \bibfield{xref} field or the \bibfield{entryset} field may require an additional \latex/\bibtex/\latex cycle. Some other facilities provided by \sty{biblatex} may also require an additional \bin{latex} run to get certain references and the page tracking right. In this case, the usual warning messages such as «There were undefined references» and «Label(s) may have changed. Rerun to get cross-references right» will be printed.
 
 \subsubsection{Auxiliary Files}
 \label{use:use:aux}
@@ -4420,7 +4447,7 @@ If \cmd{printbibliography} is used inside a \env{refsection} environment, it aut
 \end{document}
 \end{ltxexample}
 %
-Note the definition of the bibliography heading in the above example. This is the definition taking care of the subheadings in the bibliography. The main heading is generated with a plain \cmd{chapter} command in this case. The \sty{biblatex} package automatically sets a label at the beginning of every \env{refsection} environment, using the standard \cmd{label} command. The identifier used is the string \texttt{refsection:} followed by the number of the respective \env{refsection} environment. The number of the current section is accessible via the \cnt{refsection} counter. When using the \opt{section} option of \cmd{printbibliography}, this counter is also set locally. This means that you may use the counter in heading definitions to print subheadings like �References for Chapter 3�, as shown above. You could also use the title of the respective chapter as a subheading by loading the \sty{nameref} package and using \cmd{nameref} instead of \cmd{ref}:
+Note the definition of the bibliography heading in the above example. This is the definition taking care of the subheadings in the bibliography. The main heading is generated with a plain \cmd{chapter} command in this case. The \sty{biblatex} package automatically sets a label at the beginning of every \env{refsection} environment, using the standard \cmd{label} command. The identifier used is the string \texttt{refsection:} followed by the number of the respective \env{refsection} environment. The number of the current section is accessible via the \cnt{refsection} counter. When using the \opt{section} option of \cmd{printbibliography}, this counter is also set locally. This means that you may use the counter in heading definitions to print subheadings like «References for Chapter 3», as shown above. You could also use the title of the respective chapter as a subheading by loading the \sty{nameref} package and using \cmd{nameref} instead of \cmd{ref}:
 
 \begin{lstlisting}[style=latex]
 \usepackage{<<nameref>>}
@@ -4583,7 +4610,7 @@ The handling of the headings is different from \cmd{bibbysection} and \cmd{bibby
 \subsubsection{Entry Sets}
 \label{use:use:set}
 
-An entry set is a group of entries which are cited as a single reference and listed as a single item in the bibliography. The \sty{biblatex} package supports two types of entry sets. Static entry sets are defined in the \file{bib} file like any other entry. Dynamic entry sets are defined with \cmd{defbibentryset} (\secref{use:bib:set}) on a per-document\slash per-refsection basis in the document preamble or the document body. This section deals with the definition of entry sets; style authors should also see \secref{aut:cav:set} for further information.
+An entry set is a group of entries which are cited as a single reference and listed as a single item in the bibliography. The individual entries in the set are separated by \cmd{entrysetpunct} (\secref{aut:fmt:fmt}). The individual entries in the set are separated by \cmd{entrysetpunct} (\secref{aut:fmt:fmt}). The \sty{biblatex} package supports two types of entry sets. Static entry sets are defined in the \file{bib} file like any other entry. Dynamic entry sets are defined with \cmd{defbibentryset} (\secref{use:bib:set}) on a per-document\slash per-refsection basis in the document preamble or the document body. This section deals with the definition of entry sets; style authors should also see \secref{aut:cav:set} for further information.
 
 \paragraph{Static entry sets}
 
@@ -4679,7 +4706,7 @@ See also \secref{bib:typ:blx,bib:fld:spc}.
 \subsubsection{Electronic Publishing Information}
 \label{use:use:epr}
 
-The \sty{biblatex} package provides three fields for electronic publishing information: \bibfield{eprint}, \bibfield{eprinttype}, and \bibfield{eprintclass}. The \bibfield{eprint} field is a verbatim field similar to \bibfield{doi} which holds the identifier of the item. The \bibfield{eprinttype} field holds the resource name, \ie the name of the site or electronic archive. The optional \bibfield{eprintclass} field is intended for additional information specific to the resource indicated by the \bibfield{eprinttype} field. This could be a section, a path, classification information, etc. If the \bibfield{eprinttype} field is available, the standard styles will use it as a literal label. In the following example, they would print �Resource: identifier� rather than the generic �eprint: identifier�:
+The \sty{biblatex} package provides three fields for electronic publishing information: \bibfield{eprint}, \bibfield{eprinttype}, and \bibfield{eprintclass}. The \bibfield{eprint} field is a verbatim field similar to \bibfield{doi} which holds the identifier of the item. The \bibfield{eprinttype} field holds the resource name, \ie the name of the site or electronic archive. The optional \bibfield{eprintclass} field is intended for additional information specific to the resource indicated by the \bibfield{eprinttype} field. This could be a section, a path, classification information, etc. If the \bibfield{eprinttype} field is available, the standard styles will use it as a literal label. In the following example, they would print «Resource: identifier» rather than the generic «eprint: identifier»:
 
 \begin{lstlisting}[style=bibtex]{}
 <<eprint>>     = {<<identifier>>},
@@ -4716,7 +4743,7 @@ When using \acr{JSTOR}'s export feature to export citations in \bibtex format, \
 url = {http://www.jstor.org/stable/<<number>>},
 \end{lstlisting}
 %
-While this will work as expected, full \acr{URL}s tend to clutter the bibliography. With the \bibfield{eprint} fields, the standard styles will use the more readable �\acr{JSTOR}: \prm{number}� format which also supports hyperlinks. The \prm{number} becomes a clickable link if \sty{hyperref} support is enabled.
+While this will work as expected, full \acr{URL}s tend to clutter the bibliography. With the \bibfield{eprint} fields, the standard styles will use the more readable «\acr{JSTOR}: \prm{number}» format which also supports hyperlinks. The \prm{number} becomes a clickable link if \sty{hyperref} support is enabled.
 
 For PubMed references, put the stable PubMed identifier in the \bibfield{eprint} field and the string \texttt{pubmed} in the \bibfield{eprinttype} field. This means that:
 
@@ -4731,7 +4758,7 @@ becomes:
 <<eprinttype>> = {<<pubmed>>},
 \end{lstlisting}
 %
-and the standard styles will print �\acr{PMID}: \prm{pmid}� instead of the lengthy \acr{URL}. If hyperref support is enabled, the \prm{pmid} will be a clickable link to PubMed.
+and the standard styles will print «\acr{PMID}: \prm{pmid}» instead of the lengthy \acr{URL}. If hyperref support is enabled, the \prm{pmid} will be a clickable link to PubMed.
 
 For handles (\acr{HDL}s), put the handle in the \bibfield{eprint} field and the string \texttt{hdl} in the \bibfield{eprinttype} field:
 
@@ -4753,7 +4780,7 @@ would become:
 <<eprinttype>> = {<<googlebooks>>},
 \end{lstlisting}
 %
-and the standard styles would print �Google Books: |XXu4AkRVBBoC|� instead of the full \acr{URL}. If hyperref support is enabled, the identifier will be a clickable link to Google Books.\footnote{Note that the Google Books \acr{id} seems to be a bit of an <internal> value. As of this writing, there does not seem to be any way to search for an \acr{id} on Google Books. You may prefer to use the \bibfield{url} in this case.}
+and the standard styles would print «Google Books: |XXu4AkRVBBoC|» instead of the full \acr{URL}. If hyperref support is enabled, the identifier will be a clickable link to Google Books.\footnote{Note that the Google Books \acr{id} seems to be a bit of an <internal> value. As of this writing, there does not seem to be any way to search for an \acr{id} on Google Books. You may prefer to use the \bibfield{url} in this case.}
 
 Note that \bibfield{eprint} is a verbatim field. Always give the identifier in its unmodified form. For example, there is no need to replace |_| with |\_|. Also see \secref{aut:cav:epr} on how to add dedicated support for other eprint resources.
 
@@ -4915,21 +4942,21 @@ Initials in the \file{bib} file get a special delimiter:
 \item J.\delim{~}{i}Edward\delim{ }{d}Doe
 \end{namesample}
 %
-Let's consider a more complex name: \enquote{Charles-Jean �tienne Gustave Nicolas de La Vall�e Poussin}. This name is composed of the following parts:
+Let's consider a more complex name: \enquote{Charles-Jean Étienne Gustave Nicolas de La Vallée Poussin}. This name is composed of the following parts:
 
 \begin{nameparts}
-First	& Charles-Jean �tienne Gustave Nicolas \\
+First	& Charles-Jean Étienne Gustave Nicolas \\
 Prefix	& de \\
-Last	& La Vall�e Poussin \\
+Last	& La Vallée Poussin \\
 Suffix	& --- \\
 \end{nameparts}
 %
 The delimiters:
 
 \begin{namesample}
-\item Charles-Jean\delim{~}{b}�tienne\delim{~}{b}Gustave\delim{~}{a}Nicolas\delim{ }{d}%
+\item Charles-Jean\delim{~}{b}Étienne\delim{~}{b}Gustave\delim{~}{a}Nicolas\delim{ }{d}%
       de\delim{ }{c}%
-      La\delim{~}{a}Vall�e\delim{~}{a}Poussin
+      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 initials is also handled by the backend and may be customized by redefining the following three macros:
@@ -5285,7 +5312,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 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.
+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}
@@ -5337,6 +5364,11 @@ If the \opt{backref} package option is enabled, this list holds the page numbers
 
 This field holds the initial letter of the string used during sorting. This is useful when subdividing the bibliography alphabetically.
 
+\fielditem{clonesourcekey}{string\BiberOnlyMark}
+
+This field holds the entry key of the entry from which an entry was cloned. Clones are created for 
+entries which are mentioned in \bibfield{related} fields as part of related entry processing, for example.
+
 \end{fieldlist}
 
 \paragraph{Fields for Use in Citation Labels}
@@ -5379,12 +5411,22 @@ It is sometimes useful, for example in author"=title citation schemes, to be abl
 
 \fielditem{labelyear}{literal}
 
-The publication year, as specified in the \bibfield{date} or the \bibfield{year} field, for use in author-year labels. A complete author-year label consists of the fields \bibfield{labelyear} plus \bibfield{extrayear}. Note that the \bibfield{labelyear} and \bibfield{extrayear} fields need to be requested with the package option \opt{labelyear}, see \secref{use:opt:pre:int} for details. See also \bibfield{extrayear}.
-\BiberOnlyMark With \biber, this field may be customized. See \secref{aut:ctm:fld} for details.
+The publication year, as specified in the \bibfield{date} or the \bibfield{year} field, for use in author-year labels. A complete author-year label consists of the fields \bibfield{labelyear} plus \bibfield{extrayear}. Note that the \bibfield{labelyear} and \bibfield{extrayear} fields need to be requested with the package option \opt{labeldate}, see \secref{use:opt:pre:int} for details. See also \bibfield{extrayear}.
+\BiberOnlyMark With \biber, the source date field for this may be customized. See \secref{aut:ctm:fld} for details.
+
+\fielditem{labelmonth}{integer}
+
+The publication month, as specified in the \bibfield{date} or the \bibfield{month} field, for use in author-year labels. Note that the \bibfield{labelmonth} field needs to be requested with the package option \opt{labeldate}, see \secref{use:opt:pre:int} for details.
+\BiberOnlyMark With \biber, this source date field for this may be customized. See \secref{aut:ctm:fld} for details.
+
+\fielditem{labelday}{integer}
+
+The publication day, as specified in the \bibfield{date}, for use in author-year labels. Note that the \bibfield{labelday} field needs to be requested with the package option \opt{labeldate}, see \secref{use:opt:pre:int} for details.
+\BiberOnlyMark With \biber, this source date field for this may be customized. See \secref{aut:ctm:fld} for details.
 
 \fielditem{extrayear}{integer}
 
-The author"=year citation scheme usually requires a letter to be appended to the year if the bibliography contains two or more works by the same author which were all published in the same year. In this case, the \bibfield{extrayear} field holds an integer which may be converted to a letter with \cmd{mknumalph} or formatted in some other way. This field is undefined if there is only one work by the author in the bibliography or if all works by the author have different publication years. A complete author-year label consists of the fields \bibfield{labelyear} plus \bibfield{extrayear}. Note that the \bibfield{labelyear} and \bibfield{extrayear} fields need to be requested with the package option \opt{labelyear}, see \secref{use:opt:pre:int} for details. See also \bibfield{labelyear}. Table \ref{use:opt:tab2} summarises the various \opt{extra*} disambiguation counters and what they track.
+The author"=year citation scheme usually requires a letter to be appended to the year if the bibliography contains two or more works by the same author which were all published in the same year. In this case, the \bibfield{extrayear} field holds an integer which may be converted to a letter with \cmd{mknumalph} or formatted in some other way. This field is undefined if there is only one work by the author in the bibliography or if all works by the author have different publication years. A complete author-year label consists of the fields \bibfield{labelyear} plus \bibfield{extrayear}. Note that the \bibfield{labelyear} and \bibfield{extrayear} fields need to be requested with the package option \opt{labeldate}, see \secref{use:opt:pre:int} for details. See also \bibfield{labelyear}. Table \ref{use:opt:tab2} summarises the various \opt{extra*} disambiguation counters and what they track.
 
 \end{fieldlist}
 
@@ -5700,6 +5742,14 @@ This command prints the date of the entry, as specified in the fields \bibfield{
 
 Similar to \cmd{printdate} but incorporates the \bibfield{extrayear} field in the date specification. This is useful for bibliography styles designed for author-year citations.
 
+\csitem{printdatelabel}|\BiberOnlyMark|
+
+Similar to \cmd{printdate} but prints the date field determined by \cmd{DeclareLabeldate}. The date format is controlled by the package option \opt{datelabel} from \secref{use:opt:pre:gen}. Additional formatting may be applied by adjusting the field format \texttt{urldate} (\secref{aut:fmt:ich}).
+
+\csitem{printdateextralabel}|\BiberOnlyMark|
+
+Similar to \cmd{printdatelabel} but incorporates the \bibfield{extrayear} field in the date specification. This is useful for bibliography styles designed for author-year citations.
+
 \csitem{printurldate}
 
 Similar to \cmd{printdate} but prints the \bibfield{urldate} of the entry. The date format is controlled by the package option \opt{urldate} from \secref{use:opt:pre:gen}. Additional formatting may be applied by adjusting the field format \texttt{urldate} (\secref{aut:fmt:ich}).
@@ -5784,7 +5834,7 @@ Defines the name list format \prm{format}. This formatting directive is arbitrar
 \item[\#4] The first names, given as initials.
 \item[\#5] The name prefixes, for example von, van, of, da, de, del, della, etc. Note that name prefixes are referred to as the <von part> of the name in the \bibtex file format documentation.
 \item[\#6] The name prefixes, given as initials.
-\item[\#7] The name affixes, for example <junior>, <senior>, <der J�ngere>, <der �ltere>, etc.
+\item[\#7] The name affixes, for example <junior>, <senior>, <der Jüngere>, <der Ältere>, etc.
 Note that name affixes are referred to as the <junior part> of the name in the \bibtex file format documentation.
 \item[\#8] The name affixes, given as initials.
 \end{argumentlist}
@@ -5860,7 +5910,7 @@ The related entry feature is enabled by default by the package option \opt{relat
 
 Bibliographic data sources which are automatically generated or which you have no control over can be a problem if you need to edit them in some way. For this reason, \biber has the ability to modify data as it is read so that you can apply modifications to the source data stream without actually changing it. The modification can be defined in \biber's config file (see \biber docs), or via \sty{biblatex} macros in which case you can apply the modification only for specific documents, styles or globally.
 
-Source mappings can be defined at different �levels� which are applied
+Source mappings can be defined at different «levels» which are applied
 in a defined order. See the \biblatex\ manual regarding these macros:\\[2ex]
 
 \noindent \texttt{user}-level maps defined with \cmd{DeclareSourcemap}$\rightarrow$\\
@@ -6413,7 +6463,7 @@ For constraints of \prm{type} <conditional>, specifies a quantified set of \cmd{
 
 \choitem{quantifier}{all, one, none}
 
-Specifies how many of the \cmd{constrainfield}'s inside the \cmd{consequent} have to be present to satisfy the consequent of the conditional constraint.
+Specifies how many of the \cmd{constraintfield}'s inside the \cmd{consequent} have to be present to satisfy the consequent of the conditional constraint.
 
 \end{optionlist*}
 
@@ -6537,6 +6587,14 @@ The number of characters of the \prm{field} to use. For name list fields, if \kv
 
 The side of the string from which to take the \texttt{strwidth} number of characters.
 
+\choitem[right]{padside}{left, right}
+
+Side to pad the label part when using the \texttt{padchar} option. Only for use with fixed-width label strings (\texttt{strwidth}).
+
+\valitem{padchar}{character}
+
+If present, pads the label part on the \texttt{padside} side with the specified character to the length of \texttt{strwidth}. Only for use with fixed-width label strings (\texttt{strwidth}).
+
 \boolitem[false]{uppercase}
 
 Forces the label part derived from the field to uppercase. By default, the case is taken from the field source and not modified.
@@ -6753,6 +6811,41 @@ Agassi, Courier, Laver  [ACouL-002]
 Borg, Connors, Edberg   [BCEd-003]
 Borg, Connors, Emerson  [BCEm-004]
 \end{lstlisting}
+%
+Here is another rather contrived example showing that you don't need to specially quote \latex special characters (apart from <\%>, obviously) when specifying padding characters and literals:
+
+\begin{lstlisting}[style=latex]{}
+\DeclareLabelalphaTemplate{
+  \labelelement{
+    \literal{>}
+  }
+  \labelelement{
+    \literal{\%}
+  }
+  \labelelement{
+    \field[strwidth=4, padchar=_]{<<labelname>>}
+  }
+  \labelelement{
+    \field[strwidth=3, padchar=&, padside=left]{title}
+  }
+  \labelelement{
+    \field[strwidth=2,strside=right]{<<year>>}
+  }
+}
+\end{lstlisting}
+%
+which given:
+\begin{lstlisting}[style=bibtex]{}
+@Book{test,
+  author    = {XXX YY},
+  title     = {T},
+  year      = {2007},
+}
+\end{lstlisting}
+would resulting a label looking like this:
+\begin{verbatim}
+[>%YY__&&T07]
+\end{verbatim}
 
 \subsubsection{Sorting}
 \label{aut:ctm:srt}
@@ -6843,7 +6936,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}{
@@ -6851,7 +6944,7 @@ there is a distinction between the lexical order and the semantic order. Here �o
 }
 \end{lstlisting}
 %
-This sorts the bibliography purely lexically by the order of the keys in the citation commands. In the example above, it sorts �one� before �two�. However, suppose that you consider �one� and �two� to have the same order (semantic order) since they are cited at the same time and want to further sort these by year. Suppose �two� has an earlier \bibfield{year} than �one�:
+This sorts the bibliography purely lexically by the order of the keys in the citation commands. In the example above, it sorts «one» before «two». However, suppose that you consider «one» and «two» to have the same order (semantic order) since they are cited at the same time and want to further sort these by year. Suppose «two» has an earlier \bibfield{year} than «one»:
 
 \begin{lstlisting}[style=latex]{}
 \DeclareSortingScheme{noneyear}{
@@ -6860,7 +6953,7 @@ This sorts the bibliography purely lexically by the order of the keys in the cit
 }
 \end{lstlisting}
 %
-This sorts �two� before �one�, even though lexically, �one� would sort before �two�. This is possible because the semantic order can be disambiguated by the further sorting on year. With the standard \opt{none} sorting scheme, the lexical order and semantic order are identical because there is nothing further to disambiguate them. This means that you can use \cmd{citeorder} just like any other sorting specification element, choosing how to further sort entries cited at the same time (in the same citation command).
+This sorts «two» before «one», even though lexically, «one» would sort before «two». This is possible because the semantic order can be disambiguated by the further sorting on year. With the standard \opt{none} sorting scheme, the lexical order and semantic order are identical because there is nothing further to disambiguate them. This means that you can use \cmd{citeorder} just like any other sorting specification element, choosing how to further sort entries cited at the same time (in the same citation command).
 
 \end{ltxsyntax}
 
@@ -6938,7 +7031,7 @@ Specifies a string to be used to automatically populate the \bibfield{presort} f
 \subsubsection{Controlling Name Initials Generation}
 \label{aut:ctm:noinit}
 
-Generating initials for name parts from a given name involves some difficulties when you have names with prefixes, diacritics, hyphens etc. Often, you want to ignore things like prefixes when generating initials so that the initials for �al-Hasan� is just �H� instead of �a-H�. This is tricky when you also have names like �Ho-Pun� where you want the initials to be �H-P�, for example. 
+Generating initials for name parts from a given name involves some difficulties when you have names with prefixes, diacritics, hyphens etc. Often, you want to ignore things like prefixes when generating initials so that the initials for «al-Hasan» is just «H» instead of «a-H». This is tricky when you also have names like «Ho-Pun» where you want the initials to be «H-P», for example. 
 
 \begin{ltxsyntax}
 
@@ -6993,7 +7086,7 @@ If there is no \cmd{DeclareNosort} specification, \biber will default to:
 }
 \end{lstlisting}
 %
-This \biber default strips diacritics and prefixes from names when sorting. Suppose you wanted to ignore �The� at the beginning of a \bibfield{title} field when sorting:
+This \biber default strips diacritics and prefixes from names when sorting. Suppose you wanted to ignore «The» at the beginning of a \bibfield{title} field when sorting:
 
 \begin{lstlisting}[style=latex]{}
 \DeclareNosort{
@@ -7001,7 +7094,7 @@ This \biber default strips diacritics and prefixes from names when sorting. Supp
 }
 \end{lstlisting}
 %
-Or if you wanted to ignore �The� at the beginning of any title field:
+Or if you wanted to ignore «The» at the beginning of any title field:
 
 \begin{lstlisting}[style=latex]{}
 \DeclareNosort{
@@ -7093,20 +7186,22 @@ For example, the following specification for selecting \bibfield{labelname} firs
 % 
 See \secref{use:opt:bib:ded} for options to override this on a per-entry basis.
 
-\cmditem{DeclareLabelyear}[entrytype, \dots]{specification}|\BiberOnlyMark|
+\cmditem{DeclareLabeldate}[entrytype, \dots]{specification}|\BiberOnlyMark|
 
-Defines the date components to consider when generating the \bibfield{labelyear} field (see \secref{aut:bbx:fld:lab}). The \prm{specification} is an ordered list of \cmd{field} commands. The items are checked in the order listed and the first item which is available will be used as \bibfield{labelyear}. Note that the items are date components, not date fields. This is the default definition:
+Defines the date components to consider when generating \bibfield{labelyear}, \bibfield{labelmonth} and \bibfield{labelday} fields (see \secref{aut:bbx:fld:lab}). The \prm{specification} is an ordered list of \cmd{field} or \cmd{literal} commands. The items are checked in the order listed and the first item which is available will be used to popluate the \bibfield{labelyear}, \bibfield{labelmonth} and \bibfield{labelday} fields. Note that the \cmd{field} items do not have to be datetype <date> in the data model so that you can create pseudo-year labels by, for example, using a \bibfield{pubstate} field contents, if available, as the year label by defining \cmd{DeclareLabeldate} suitably. Note also that a \cmd{literal} command will always be used when found and so this should always be the last thing in the list. If the value of a \cmd{literal} command is a valid localisation string, then this will be resolved in the current language, otherwise the value is used as a literal string as-is. This is the default definition:
 
 \begin{lstlisting}[style=latex]{}
-\DeclareLabelyear{%
-  \field{year}
-  \field{eventyear}
-  \field{origyear}
-  \field{urlyear}
+\DeclareLabeldate{%
+  \field{date}
+  \field{eventdate}
+  \field{origdate}
+  \field{urldate}
+  \literal{nodate}
 }
 \end{lstlisting}
 %
-The \bibfield{labelyear} field may be customized globally or on a per-type basis. If the optional \prm{entrytype} argument is given, the specification applies to the respective entry type. If not, it is applied globally. The \prm{entrytype} argument may be a comma"=separated list of values. This command may only be used in the preamble. See also \secref{aut:bbx:fld:dat}.
+Note that the \bibfield{date} field is split by the backend into \bibfield{year}, \bibfield{month} which are also valid fields in the default data model. In order to support legacy data which directly sets \bibfield{year} and/or \bibfield{month}, the specification <\bibfield{date}> in \cmd{DeclareLabeldate} will also match \bibfield{year} and \bibfield{month} fields, if present.
+The \bibfield{labelyear}, \bibfield{labelmonth} and \bibfield{labelday} fields may be customized globally or on a per-type basis. If the optional \prm{entrytype} argument is given, the specification applies to the respective entry type. If not, it is applied globally. The \prm{entrytype} argument may be a comma"=separated list of values. This command may only be used in the preamble. See also \secref{aut:bbx:fld:dat}.
 
 \cmditem{DeclareLabeltitle}[entrytype, \dots]{specification}|\BiberOnlyMark|
 
@@ -7447,7 +7542,7 @@ Expands to \prm{true} if the \prm{list} is defined and has been truncated in the
 
 \cmditem{ifmorenames}{true}{false}
 
-Expands to \prm{true} if the current name list has been or will be truncated, and to \prm{false} otherwise. This command is intended for use in formatting directives for name lists. It will always expand to \prm{false} when used elsewhere. This command performs the equivalent of an \cmd{ifandothers} test for the current list. If this test is negative, it also checks if the \cnt{listtotal} counter is larger than \cnt{liststop}. This command may be used in a formatting directive to decide if a note such as �and others� or �et al.� is to be printed at the end of the list. Note that you still need to check whether you are in the middle or at the end of the list, \ie whether \cnt{listcount} is smaller than or equal to \cnt{liststop}, see \secref{aut:bib:dat} for details.
+Expands to \prm{true} if the current name list has been or will be truncated, and to \prm{false} otherwise. This command is intended for use in formatting directives for name lists. It will always expand to \prm{false} when used elsewhere. This command performs the equivalent of an \cmd{ifandothers} test for the current list. If this test is negative, it also checks if the \cnt{listtotal} counter is larger than \cnt{liststop}. This command may be used in a formatting directive to decide if a note such as «and others» or «et al.» is to be printed at the end of the list. Note that you still need to check whether you are in the middle or at the end of the list, \ie whether \cnt{listcount} is smaller than or equal to \cnt{liststop}, see \secref{aut:bib:dat} for details.
 
 \cmditem{ifmoreitems}{true}{false}
 
@@ -7535,7 +7630,7 @@ Executes \prm{true} if the \prm{string} is an Arabic or Roman numeral, and \prm{
 
 \cmditem{ifnumerals}{string}{true}{false}
 
-Executes \prm{true} if the \prm{string} is a range or a list of Arabic or Roman numerals, and \prm{false} otherwise. This command is robust. In contrast to \cmd{ifnumeral}, it will also execute \prm{true} with arguments like �52--58�, �14/15�, �1,~3,~5�, and so on. See also \cmd{DeclareNumChars}, \cmd{DeclareRangeChars}, \cmd{DeclareRangeCommands}, and \cmd{NumCheckSetup} in \secref{aut:aux:msc}.
+Executes \prm{true} if the \prm{string} is a range or a list of Arabic or Roman numerals, and \prm{false} otherwise. This command is robust. In contrast to \cmd{ifnumeral}, it will also execute \prm{true} with arguments like «52--58», «14/15», «1,~3,~5», and so on. See also \cmd{DeclareNumChars}, \cmd{DeclareRangeChars}, \cmd{DeclareRangeCommands}, and \cmd{NumCheckSetup} in \secref{aut:aux:msc}.
 
 \cmditem{ifpages}{string}{true}{false}
 
@@ -7794,7 +7889,7 @@ The optional argument \bibfield{pagination} in the first example is omissible.
 
 \cmditem{mkpagetotal}[pagination][postpro]{text}
 
-This command is similar to \cmd{mkpageprefix} except that it is intended for the \bibfield{pagetotal} field of bibliography entries, \ie it will print �123 pages� rather than �page 123�. The optional \prm{pagination} argument defaults to \bibfield{bookpagination}. The spacing inserted between the pagination suffix and the \prm{text} may be modified by redefining the macro \cmd{ppspace}. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. If only one optional argument is given, it is taken as \prm{pagination}. Here is a typical example:
+This command is similar to \cmd{mkpageprefix} except that it is intended for the \bibfield{pagetotal} field of bibliography entries, \ie it will print «123 pages» rather than «page 123». The optional \prm{pagination} argument defaults to \bibfield{bookpagination}. The spacing inserted between the pagination suffix and the \prm{text} may be modified by redefining the macro \cmd{ppspace}. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. If only one optional argument is given, it is taken as \prm{pagination}. Here is a typical example:
 
 \begin{lstlisting}[style=latex]{}
 \DeclareFieldFormat{pagetotal}{<<\mkpagetotal[bookpagination]{#1}>>}
@@ -7841,7 +7936,7 @@ The optional argument \bibfield{bookpagination} is omissible in this case.
 \cmditem{mkcomprange}[postpro]{text}
 \cmditem*{mkcomprange*}[postpro]{text}
 
-This command, which is intended for use in field formatting directives, will parse its \prm{text} argument for page ranges and compress them. For example, �125--129� may be formatted as �125--9�. You may configure the behavior of \cmd{mkcomprange} by adjusting the \latex counters \cnt{mincomprange}, \cnt{maxcomprange}, and \cnt{mincompwidth}, as illustrated in \tabref{aut:aux:tab1}. The default settings are \texttt{10}, \texttt{100000}, and \texttt{1}, respectively. This means that the command tries to compress as much as possible by default. Use \cmd{setcounter} to adjust the parameters. The scanner recognizes \cmd{bibrangedash} and hyphens as range dashes. It will normalize the dash by replacing any number of consecutive hyphens with \cmd{bibrangedash}. Lists of ranges delimited with \cmd{bibrangessep} (\biber\footnote{\biber will always convert commas/semicolon multi-range separators into \cmd{bibrangessep} so that it can be controlled in the style.}) or commas/semicolons (BibTeX) are also supported. If you want to hide a character from the list/range scanner for some reason, wrap the character or the entire string in curly braces. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. This is important if you want to combine \cmd{mkcomprange} with other formatting macros which also need to parse their \prm{text} argument, such as \cmd{mkpageprefix}. Simply nesting these commands will not work as expected. Use the \prm{postpro} argument to set up the processing chain as follows:
+This command, which is intended for use in field formatting directives, will parse its \prm{text} argument for page ranges and compress them. For example, «125--129» may be formatted as «125--9». You may configure the behavior of \cmd{mkcomprange} by adjusting the \latex counters \cnt{mincomprange}, \cnt{maxcomprange}, and \cnt{mincompwidth}, as illustrated in \tabref{aut:aux:tab1}. The default settings are \texttt{10}, \texttt{100000}, and \texttt{1}, respectively. This means that the command tries to compress as much as possible by default. Use \cmd{setcounter} to adjust the parameters. The scanner recognizes \cmd{bibrangedash} and hyphens as range dashes. It will normalize the dash by replacing any number of consecutive hyphens with \cmd{bibrangedash}. Lists of ranges delimited with \cmd{bibrangessep} (\biber\footnote{\biber will always convert commas/semicolon multi-range separators into \cmd{bibrangessep} so that it can be controlled in the style.}) or commas/semicolons (BibTeX) are also supported. If you want to hide a character from the list/range scanner for some reason, wrap the character or the entire string in curly braces. The optional \prm{postpro} argument specifies a macro to be used for post-processing the \prm{text}. This is important if you want to combine \cmd{mkcomprange} with other formatting macros which also need to parse their \prm{text} argument, such as \cmd{mkpageprefix}. Simply nesting these commands will not work as expected. Use the \prm{postpro} argument to set up the processing chain as follows:
 
 \begin{lstlisting}[style=latex]{}
 \DeclareFieldFormat{postnote}{\mkcomprange[<<{>>\mkpageprefix[pagination]<<}>>]{#1}}
@@ -7878,6 +7973,22 @@ pp. 5, 123, 423
 p. 5, p. 123, p. 423
 \end{lstlisting}
 
+\cmditem{rangelen}{text}
+
+This command will parse its argument as a range and return the length of the range. It will return 0 for open-ended ranges.
+
+\begin{lstlisting}[style=latex]{}
+\rangelen{5-10} returns '5'
+\rangelen{-10} returns '0'
+\rangelen{5-} returns '0'
+\rangelen{5} returns '1'
+\end{lstlisting}
+%
+This can be used as part of tests in styles which require, for example, <f> as a suffix for ranges of only two pages, for example, when a page range <36-37> should be printed as <36f>. This could be done using \cmd{ifnumcomp}:
+
+\begin{lstlisting}[style=latex]{}
+\ifnumcomp{\rangelen{\thefield{pages}}}{=}{1}{add 'f'}{do nothing}
+\end{lstlisting}
 
 \cmditem{DeclareNumChars}{characters}
 \cmditem*{DeclareNumChars*}{characters}
@@ -7989,6 +8100,11 @@ Inserts \cmd{finentrypunct}. This command should be used at the very end of ever
 
 The \cmd{setunit} command is similar to \cmd{newunit} except that it uses \prm{punctuation} instead of \cmd{newunitpunct}. The starred variant differs from the regular version in that it checks if the last \cmd{printtext}, \cmd{printfield}, \cmd{printlist}, \cmd{printnames}, or \cmd{bibstring} command did actually print anything. If not, it does nothing.
 
+\cmditem{printunit}{punctuation}
+\cmditem*{printunit*}{punctuation}
+
+The \cmd{printunit} command is similar to \cmd{setunit} except that \prm{punctuation} persists in the buffer until the next \cmd{printtext}, \cmd{printfield}, \cmd{printlist}, \cmd{printnames}, or \cmd{bibstring} command.
+
 \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 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.
@@ -8199,7 +8315,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 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:
+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}
 
@@ -8286,6 +8402,10 @@ Similar to \cmd{bibxstring} but always uses the long string, ignoring the \opt{a
 
 Similar to \cmd{bibxstring} but always uses the short string, ignoring the \opt{abbreviate} option.
 
+\cmditem{mainlang}
+
+Switches from the current language to the main document language. This can be used the \prm{wrapper} argument in the localization string commands above.
+
 \end{ltxsyntax}
 
 \subsection{Localization Modules}
@@ -8557,7 +8677,7 @@ The following keys refer to roles which are expressed as an action (<edited by>,
 \item[byreviser] The expression <revised by \prm{name}>.
 \item[byreviewer] The expression <reviewed by \prm{name}>.
 \item[bycollaborator] An expression like <in collaboration with \prm{name}> or <in cooperation with \prm{name}>.
-\item[bytranslator] The expression <translated by \prm{name}> or <translated from \prm{language}�by \prm{name}>.
+\item[bytranslator] The expression <translated by \prm{name}> or <translated from \prm{language} by \prm{name}>.
 \item[bycommentator] The expression <commented by \prm{name}>.
 \item[byannotator] The expression <annotated by \prm{name}>.
 \end{keymarglist}
@@ -8755,6 +8875,7 @@ The following keys are typically used in the \bibfield{type} field of \bibtype{t
 \label{aut:lng:key:msc}
 
 \begin{keymarglist}
+\item[nodate] The term to use in place of a date when there is no date for an entry \eg\ <n.d.>
 \item[and] The term <and>, as used in a list of authors or editors, for example.
 \item[andothers] The expression <and others> or <et alii>, used to mark the truncation of a name list.
 \item[andmore] Like \texttt{andothers} but used to mark the truncation of a literal list.
@@ -8767,6 +8888,7 @@ The following strings are intended for use as labels, \eg\ <Address: \prm{url}>
 
 \begin{keymarglist}
 \item[url] The term <address> in the sense of an internet address.
+\item[urlfrom] An expression like <available from \prm{url}> or <available at \prm{url}>.
 \item[urlseen] An expression like <accessed on \prm{date}>, <retrieved on \prm{date}>, <visited on \prm{date}>, referring to the access date of an online resource.
 \item[file] The term <file>.
 \item[library] The term <library>.
@@ -8989,7 +9111,7 @@ The separator to be printed after the name used for alphabetizing in the bibliog
 The separator to be printed between the fields \bibfield{title} and \bibfield{subtitle}, \bibfield{booktitle} and \bibfield{booksubtitle}, as well as \bibfield{maintitle} and \bibfield{mainsubtitle}. Use this separator instead of \cmd{newunitpunct} at this location. The default is \cmd{newunitpunct}, \ie it is not handled differently from regular unit punctuation but permits convenient reconfiguration.
 
 \csitem{intitlepunct}
-The separator to be printed between the word �in� and the following title in entry types such as \bibtype{article}, \bibtype{inbook}, \bibtype{incollection}, etc. Use this separator instead of \cmd{newunitpunct} at this location. The default definition is a colon plus an interword space.
+The separator to be printed between the word «in» and the following title in entry types such as \bibtype{article}, \bibtype{inbook}, \bibtype{incollection}, etc. Use this separator instead of \cmd{newunitpunct} at this location. The default definition is a colon plus an interword space.
 
 \csitem{bibpagespunct}
 The separator to be printed before the \bibfield{pages} field. Use this separator instead of \cmd{newunitpunct} at this location. The default is a comma plus an interword space.
@@ -9287,6 +9409,10 @@ A special formatting directive which controls the format of the volume portion i
 
 A special formatting directive which controls the format of \cmd{printdate} (\secref{aut:bib:dat}). Note that the date format (long/short etc.) is controlled by the package option \opt{date} from \secref{use:opt:pre:gen}. This formatting directive only controls additional formatting such as fonts etc.
 
+\optitem{datelabel}
+
+Similar to \texttt{date} but controls the format of \cmd{printdatelabel}.
+
 \optitem{urldate}
 
 Similar to \texttt{date} but controls the format of \cmd{printurldate}.
@@ -9375,7 +9501,7 @@ This counter is similar to \cnt{citecount} but only available in multicite comma
 
 \cntitem{listtotal}
 
-This counter holds the total number of items in the current list. It is intended for use in list formatting directives and does not hold a meaningful value when used anywhere else. As an exception, it may also be used in the second optional argument to \cmd{printnames} and \cmd{printlist}, see \secref{aut:bib:dat} for details. For every list, there is also a counter by the same name which holds the total number of items in the corresponding list. For example, the \cnt{author} counter holds the total number of items in the \bibfield{author} list. This applies to both name lists and literal lists. These counters are similar to \cnt{listtotal} except that they may also be used independently of list formatting directives. For example, a bibliography style might check the \cnt{editor} counter to decide Whether or not to print the term �editor� or rather its plural form �editors� after the list of editors.
+This counter holds the total number of items in the current list. It is intended for use in list formatting directives and does not hold a meaningful value when used anywhere else. As an exception, it may also be used in the second optional argument to \cmd{printnames} and \cmd{printlist}, see \secref{aut:bib:dat} for details. For every list, there is also a counter by the same name which holds the total number of items in the corresponding list. For example, the \cnt{author} counter holds the total number of items in the \bibfield{author} list. This applies to both name lists and literal lists. These counters are similar to \cnt{listtotal} except that they may also be used independently of list formatting directives. For example, a bibliography style might check the \cnt{editor} counter to decide Whether or not to print the term «editor» or rather its plural form «editors» after the list of editors.
 
 \cntitem{listcount}
 
@@ -9424,6 +9550,10 @@ Appends the \prm{code} to an internal hook executed at the beginning of every it
 
 Appends the \prm{code} to an internal hook executed at the beginning of every item in the list of shorthands. The \prm{code} is executed immediately after the \prm{item code} of \cmd{defbibenvironment}. The bibliographic data of the respective entry is available at this point. This command may only be used in the preamble.
 
+\cmditem{AtNextBibliography}{code}
+
+Similar to \cmd{AtBeginBibliography} but only affecting the next \cmd{printbibliography}. The internal hook is cleared after being executed once. This command may be used in the document body.
+
 \cmditem{AtEveryCite}{code}
 
 Appends the \prm{code} to an internal hook executed at the beginning of every citation command. The \prm{code} is executed immediately before the \prm{precode} of the command (see \secref{aut:cbx:cbx}). No bibliographic data is available at this point. This command may only be used in the preamble.
@@ -10355,7 +10485,7 @@ The \opt{ris} driver reflects the fact that \opt{ris} itself is a very simple an
 
 \subsection{\opt{zoterordfxml}}
 
-The \opt{zoterordfxml} driver reads the Zotero\footnote{\url{www.zotero.org}} XML representation of its RDF format. From the \biblatex point of view, it suffers from a lack of the notion of a citation key and so is of limited use. The format may include a citation key in the future at which point the \biber driver and these default mappings will be updated. As with \opt{endnotexml}, the format is somewhat messy with, in particular, a very limited way of dealing with related entries which makes the driver setup rather ugly. As can be seen below, it is possible to map into a field prefixed with �BIBERCUSTOM� which is not a real field in the data model but can be detected in the \biber driver itself and used to process a source field which does not map naturally to any \biblatex data model field as it needs special treatment. This is messy but is due largely due to messy source data models.
+The \opt{zoterordfxml} driver reads the Zotero\footnote{\url{www.zotero.org}} XML representation of its RDF format. From the \biblatex point of view, it suffers from a lack of the notion of a citation key and so is of limited use. The format may include a citation key in the future at which point the \biber driver and these default mappings will be updated. As with \opt{endnotexml}, the format is somewhat messy with, in particular, a very limited way of dealing with related entries which makes the driver setup rather ugly. As can be seen below, it is possible to map into a field prefixed with «BIBERCUSTOM» which is not a real field in the data model but can be detected in the \biber driver itself and used to process a source field which does not map naturally to any \biblatex data model field as it needs special treatment. This is messy but is due largely due to messy source data models.
 
 \begin{lstlisting}[style=latex]{}
 \DeclareDriverSourcemap[datatype=zoterordfxml]{
@@ -10742,7 +10872,7 @@ labeltitlefield &\_&\_&\_&\+\\
 labeltitleform  &\_&\_&\_&\+\\
 labeltitlelang  &\_&\_&\_&\+\\
 labeltitleyear	&\+&\+&\+&\_\\
-labelyear	&\+&\+&\+&\_\\
+labeldate	&\+&\+&\+&\_\\
 language	&\+&\+&\_&\_\\
 loadfiles	&\+&\+&\_&\_\\
 loccittracker	&\+&\+&\_&\_\\
@@ -10802,6 +10932,20 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.6}{2013-04-30}
+\item Added \cmd{printunit}see{aut:pct:new}
+\item Added field \bibfield{clonesourcekey}see{aut:bbx:fld:gen}
+\item New options for \cmd{DeclareLabelalphaTemplate}\see{aut:ctm:lab} 
+\item Added \cmd{DeclareLabeldate} and retired \cmd{DeclareLabelyear}\see{aut:ctm:fld}
+\item Added \texttt{nodate} localisation string\see{aut:lng:key:msc}
+\item Added \cmd{rangelen}\see{aut:aux:msc}
+\item Added starred variants of \cmd{citeauthor} and \cmd{Citeauthor}\see{use:cit:txt}
+\item Restored original \texttt{url} format. Added \texttt{urlfrom} localization key\see{aut:lng:key:lab}
+\item Added \cmd{AtNextBibliography}\see{aut:fmt:hok}
+\item Fixed related entry processing to allow nested and cyclic related entries
+\item Misc bug fixes
+\end{release}
+
 \begin{release}{2.5}{2013-01-10}
 \item Made \texttt{url} work as a localisation string, defaulting to previously hard-coded value <\textsc{URL}>.
 \item Changed some \biber\ option names to cohere with \biber\ 1.5.
@@ -11095,7 +11239,7 @@ This revision history is a list of changes relevant to users of this package. Ch
 \item Added option \opt{check} to \cmd{printbibliography}\see{use:bib:bib}
 \item Added option \opt{check} to \cmd{printshorthands}\see{use:bib:los}
 \item Added \cmd{defbibcheck}\see{use:bib:flt}
-\item Updated support for Portuguese (Jos� Carlos Santos)
+\item Updated support for Portuguese (José Carlos Santos)
 \item Fixed conflict with \sty{titletoc}
 \item Fixed some bugs
 \end{release}
@@ -11144,7 +11288,7 @@ This revision history is a list of changes relevant to users of this package. Ch
 %\item Added field alias \bibfield{primaryclass}\see{bib:fld:als}
 %\item Updated documentation\see{use:use:epr}
 %\item Tweaked package option \kvopt{babel}{other*}\see{use:opt:pre:gen}
-%\item Updated support for Brazilian (Mateus Ara�jo)
+%\item Updated support for Brazilian (Mateus Araújo)
 %\item Fixed some bugs
 %\end{release}
 %
@@ -11240,7 +11384,7 @@ This revision history is a list of changes relevant to users of this package. Ch
 %\item Added localization key \texttt{backrefpages}\see{aut:lng:key}
 %\item Slightly expanded documentation\see{bib:use:dat}
 %\item Slightly expanded documentation\see{aut:bbx:fld:dat}
-%\item Added support for Finnish (translations by Hannu V�is�nen)
+%\item Added support for Finnish (translations by Hannu Väisänen)
 %\item Updated support for Greek (translations by Prokopis)
 %
 %\end{release}
@@ -11422,7 +11566,7 @@ This revision history is a list of changes relevant to users of this package. Ch
 %\item Updated and clarified documentation\see{aut:lng:key}
 %\item Added support for Brazilian Portuguese (by Augusto Ritter Stoffel)
 %\item Added preliminary support for Portuguese/Portugal\see{use:opt:pre:gen}
-%\item Added revised Swedish translations (by Per Starb�ck)\see{use:opt:pre:gen}
+%\item Added revised Swedish translations (by Per Starbäck)\see{use:opt:pre:gen}
 %\item Expanded documentation\see{aut:cav:nam}
 %\item Improved concatenation of editorial and other roles
 %\item Fixed some bugs
@@ -11595,7 +11739,7 @@ This revision history is a list of changes relevant to users of this package. Ch
 %\item Added \cmd{DeclareNumChars}\see{aut:aux:msc}
 %\item Added \cmd{DeclareRangeChars}\see{aut:aux:msc}
 %\item Added \cmd{DeclareRangeCommands}\see{aut:aux:msc}
-%\item Added support for Swedish (translations by Per Starb�ck and others)
+%\item Added support for Swedish (translations by Per Starbäck and others)
 %\item Updated various localization files
 %\item Various minor improvements throughout
 %\item Fixed some bugs
@@ -12048,7 +12192,7 @@ This revision history is a list of changes relevant to users of this package. Ch
 %\item Updated documentation\see{aut:fmt:fmt}
 %\item Updated and completed documentation\see{use:fmt:lng}
 %\item Updated and completed documentation\see{aut:fmt:lng}
-%\item Added support for Spanish (translations by Ignacio Fern�ndez Galv�n)
+%\item Added support for Spanish (translations by Ignacio Fernández Galván)
 %\item Various memory-related optimizations in \path{biblatex.bst}
 %
 %\end{release}
@@ -12231,7 +12375,7 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \end{document}
 %%% Local Variables:
-%%% TeX-command-default: "PDFLaTeX"
+%%% coding: utf-8
 %%% eval: (auto-fill-mode -1)
 %%% eval: (visual-line-mode)
 %%% End:
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex
new file mode 100644
index 00000000000..2e031d9b3c4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/03-localization-keys.tex
@@ -0,0 +1,625 @@
+%
+% This file presents default localization keys for the module specified by
+% the main document language passed to 'babel'.
+%
+\documentclass{article}
+
+% localization modules
+% - ascii
+\usepackage[T1]{fontenc}
+%\usepackage[brazilian]{babel}
+%\usepackage[catalan]{babel}
+%\usepackage[croatian]{babel}
+%\usepackage[czech]{babel}
+%\usepackage[danish]{babel}
+%\usepackage[dutch]{babel}
+\usepackage[english]{babel}
+%\usepackage[finnish]{babel}
+%\usepackage[french]{babel}
+%\usepackage[german]{babel}
+%\usepackage[icelandic]{babel}
+%\usepackage[italian]{babel}
+%\usepackage[norsk]{babel}
+%\usepackage[nynorsk]{babel}
+%\usepackage[polish]{babel}
+%\usepackage[portuguese]{babel}
+%\usepackage[spanish]{babel}
+%\usepackage[swedish]{babel}
+% - UTF-8
+% -- Russian
+%\usepackage[T1,T2A]{fontenc}
+%\usepackage[utf8]{inputenc}
+%\usepackage[russian]{babel}
+% -- Greek
+%\usepackage[LGRx,T1]{fontenc}
+%\usepackage[utf8]{inputenx}
+%\usepackage[english,greek]{babel}
+
+\usepackage[autostyle]{csquotes}
+\DeclareQuoteAlias{spanish}{catalan}
+\DeclareQuoteAlias{croatian}{polish}
+\usepackage[backend=biber]{biblatex}
+\usepackage[colorlinks]{hyperref}
+
+% list format
+\newcommand*{\ie}{i.\,e.}
+\newcommand*{\eg}{e.\,g.}
+\newcommand{\cmd}[1]{\vrb{\textbackslash #1}}
+\newcommand{\vrb}[1]{\mbox{\ttfamily #1}}
+\newcommand{\acr}[1]{\textsc{#1}}
+\newrobustcmd*{\bibfield}[1]{\mbox{\ttfamily #1}}
+\newrobustcmd*{\bibtype}[1]{\mbox{\ttfamily @#1}}
+\newcommand{\prm}[1]{%
+  \mbox{%
+    \ensuremath\langle
+    \normalfont\textit{#1}%
+    \ensuremath\rangle}}
+\newenvironment*{keylist}
+  {\list{}{%
+     \setlength{\labelwidth}{1.25in}%
+     \setlength{\labelsep}{10pt}%
+     \setlength{\leftmargin}{0pt}%
+     \setlength{\itemsep}{0pt}%
+     \raggedright%
+     \renewcommand*{\makelabel}[1]{\hss\bfseries##1}}}
+  {\endlist}
+\makeatletter
+\def\keyitem#1{%
+  \item[#1]
+  \begingroup
+    \keyitemhook%
+    \blx@bibinit%
+    \midsentence\biblstring{#1}%
+    \expandafter\lbx@initnamehook\lsmartoftext%
+    \par\nobreak
+    \midsentence\bibsstring{#1}%
+    \expandafter\lbx@initnamehook\ssmartoftext%
+  \endgroup
+  \par\nobreak}
+\makeatother
+\ifdefstring{\languagename}{greek}{%
+  \AtBeginDocument{%
+    \appto{\keyitemhook}{\greektext}%
+    \latintext}
+  \preto{\UrlFont}{\latintext}
+  \pretocmd{\printbibliography}{\greektext}{}{}}{}
+\AtBeginBibliography{\raggedright}
+\MakeAutoQuote*{<}{>}
+
+% user-configurable commands
+\newcommand{\keyitemhook}{}
+\newcommand{\lsmartoftext}{A}
+\newcommand{\ssmartoftext}{B}
+
+\addbibresource{biblatex-examples.bib}
+\nocite{*}
+
+\begin{document}
+\section*{Localization Strings for \vrb{\languagename}}
+
+The localization keys listed in this document are defined by default. Each key is printed with its description from the \vrb{biblatex} manual and strings specified by \vrb{\languagename.lbx} in following format.
+\begin{verbatim}
+<key name>  <long string>
+            <short string>
+\end{verbatim}
+Long and short strings ending with \cmd{smartof}-type commands are respectively given the arguments \cmd{lsmarttext} and \cmd{ssmarttext}, which can be redefined in this document's preamble. Any unspecified keys will appear in boldface and generate warnings in the \vrb{log} file. String definitions or corrections are welcome at:
+\begin{center}
+\url{http://github.com/plk/biblatex/issues}
+\end{center}
+
+\subsection*{Headings}
+
+The following strings are special because they are intended for use in headings and made available globally via macros. For this reason, they should be capitalized for use in headings and they must not include any local commands which are part of \vrb{biblatex}'s author interface.
+
+\begin{keylist}
+\keyitem{bibliography} The term <bibliography>, also available as \cmd{bibname}.
+\keyitem{references} The term <references>, also available as \cmd{refname}.
+\keyitem{shorthands} The term <list of shorthands> or <list of abbreviations>, also available as \cmd{losname}.
+\end{keylist}
+
+\subsection*{Roles, Expressed as Functions}
+
+The following keys refer to roles which are expressed as a function (<editor>, <translator>) rather than as an action (<edited by>, <translated by>).
+
+\begin{keylist}
+\keyitem{editor} The term <editor>, referring to the main editor. This is the most generic editorial role.
+\keyitem{editors} The plural form of \vrb{editor}.
+\keyitem{compiler} The term <compiler>, referring to an editor whose task is to compile a work.
+\keyitem{compilers} The plural form of \vrb{compiler}.
+\keyitem{founder} The term <founder>, referring to a founding editor.
+\keyitem{founders} The plural form of \vrb{founder}.
+\keyitem{continuator} An expression like <continuator>, <continuation>, or <continued>, referring to a past editor who continued the work of the founding editor but was subsequently replaced by the current editor.
+\keyitem{continuators} The plural form of \vrb{continuator}.
+\keyitem{redactor} The term <redactor>, referring to a secondary editor.
+\keyitem{redactors} The plural form of \vrb{redactor}.
+\keyitem{reviser} The term <reviser>, referring to a secondary editor.
+\keyitem{revisers} The plural form of \vrb{reviser}.
+\keyitem{collaborator} A term like <collaborator>, <collaboration>, <cooperator>, or <cooperation>, referring to a secondary editor.
+\keyitem{collaborators} The plural form of \vrb{collaborator}.
+\keyitem{translator} The term <translator>.
+\keyitem{translators} The plural form of \vrb{translator}.
+\keyitem{commentator} The term <commentator>, referring to the author of a commentary to a work.
+\keyitem{commentators} The plural form of \vrb{commentators}.
+\keyitem{annotator} The term <annotator>, referring to the author of annotations to a work.
+\keyitem{annotators} The plural form of \vrb{annotators}.
+\end{keylist}
+
+\subsection*{Concatenated Editor Roles, Expressed as Functions}
+
+The following keys are similar in function to \vrb{editor}, \vrb{translator}, etc. They are used to indicate additional roles of the editor, e.g. <editor and translator>, <editor and foreword>.
+
+\begin{keylist}
+\keyitem{editortr} Used if \vrb{editor}\slash \vrb{translator} are identical.
+\keyitem{editorstr} The plural form of \vrb{editortr}.
+\keyitem{editorco} Used if \vrb{editor}\slash \vrb{commentator} are identical.
+\keyitem{editorsco} The plural form of \vrb{editorco}.
+\keyitem{editoran} Used if \vrb{editor}\slash \vrb{annotator} are identical.
+\keyitem{editorsan} The plural form of \vrb{editoran}.
+\keyitem{editorin} Used if \vrb{editor}\slash \vrb{introduction} are identical.
+\keyitem{editorsin} The plural form of \vrb{editorin}.
+\keyitem{editorfo} Used if \vrb{editor}\slash \vrb{foreword} are identical.
+\keyitem{editorsfo} The plural form of \vrb{editorfo}.
+\keyitem{editoraf} Used if \vrb{editor}\slash \vrb{afterword} are identical.
+\keyitem{editorsaf} The plural form of \vrb{editoraf}.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{translator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{editortrco} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator} are identical.
+\keyitem{editorstrco} The plural form of \vrb{editortrco}.
+\keyitem{editortran} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator} are identical.
+\keyitem{editorstran} The plural form of \vrb{editortran}.
+\keyitem{editortrin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{introduction} are identical.
+\keyitem{editorstrin} The plural form of \vrb{editortrin}.
+\keyitem{editortrfo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{foreword} are identical.
+\keyitem{editorstrfo} The plural form of \vrb{editortrfo}.
+\keyitem{editortraf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{afterword} are identical.
+\keyitem{editorstraf} The plural form of \vrb{editortraf}.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{commentator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{editorcoin} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{editorscoin} The plural form of \vrb{editorcoin}.
+\keyitem{editorcofo} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{editorscofo} The plural form of \vrb{editorcofo}.
+\keyitem{editorcoaf} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\keyitem{editorscoaf} The plural form of \vrb{editorcoaf}.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{annotator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{editoranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{introduction} are identical.
+\keyitem{editorsanin} The plural form of \vrb{editoranin}.
+\keyitem{editoranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{foreword} are identical.
+\keyitem{editorsanfo} The plural form of \vrb{editoranfo}.
+\keyitem{editoranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{afterword} are identical.
+\keyitem{editorsanaf} The plural form of \vrb{editoranaf}.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{editortrcoin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{editorstrcoin} The plural form of \vrb{editortrcoin}.
+\keyitem{editortrcofo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{editorstrcofo} The plural form of \vrb{editortrcofo}.
+\keyitem{editortrcoaf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\keyitem{editorstrcoaf} The plural form of \vrb{editortrcoaf}.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{editortranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{editorstranin} The plural form of \vrb{editortranin}.
+\keyitem{editortranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{editorstranfo} The plural form of \vrb{editortranfo}.
+\keyitem{editortranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\keyitem{editorstranaf} The plural form of \vrb{editortranaf}.
+\end{keylist}
+
+\subsection*{Concatenated Translator Roles, Expressed as Functions}
+
+The following keys are similar in function to \vrb{translator}. They are used to indicate additional roles of the translator, e.g. <translator and commentator>, <translator and introduction>.
+
+\begin{keylist}
+\keyitem{translatorco} Used if \vrb{translator}\slash \vrb{commentator} are identical.
+\keyitem{translatorsco} The plural form of \vrb{translatorco}.
+\keyitem{translatoran} Used if \vrb{translator}\slash \vrb{annotator} are identical.
+\keyitem{translatorsan} The plural form of \vrb{translatoran}.
+\keyitem{translatorin} Used if \vrb{translator}\slash \vrb{introduction} are identical.
+\keyitem{translatorsin} The plural form of \vrb{translatorin}.
+\keyitem{translatorfo} Used if \vrb{translator}\slash \vrb{foreword} are identical.
+\keyitem{translatorsfo} The plural form of \vrb{translatorfo}.
+\keyitem{translatoraf} Used if \vrb{translator}\slash \vrb{afterword} are identical.
+\keyitem{translatorsaf} The plural form of \vrb{translatoraf}.
+\end{keylist}
+%
+Keys for \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{translatorcoin} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{translatorscoin} The plural form of \vrb{translatorcoin}.
+\keyitem{translatorcofo} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{translatorscofo} The plural form of \vrb{translatorcofo}.
+\keyitem{translatorcoaf} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\keyitem{translatorscoaf} The plural form of \vrb{translatorcoaf}.
+\end{keylist}
+%
+Keys for \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{translatoranin} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{introduction} are identical.
+\keyitem{translatorsanin} The plural form of \vrb{translatoranin}.
+\keyitem{translatoranfo} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{foreword} are identical.
+\keyitem{translatorsanfo} The plural form of \vrb{translatoranfo}.
+\keyitem{translatoranaf} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{afterword} are identical.
+\keyitem{translatorsanaf} The plural form of \vrb{translatoranaf}.
+\end{keylist}
+
+\subsection*{Roles, Expressed as Actions}
+
+The following keys refer to roles which are expressed as an action (<edited by>, <translated by>) rather than as a function (<editor>, <translator>).
+
+\begin{keylist}
+\keyitem{byauthor} The expression <[created] by \prm{name}>.
+\keyitem{byeditor} The expression <edited by \prm{name}>.
+\keyitem{bycompiler} The expression <compiled by \prm{name}>.
+\keyitem{byfounder} The expression <founded by \prm{name}>.
+\keyitem{bycontinuator} The expression <continued by \prm{name}>.
+\keyitem{byredactor} The expression <redacted by \prm{name}>.
+\keyitem{byreviser} The expression <revised by \prm{name}>.
+\keyitem{byreviewer} The expression <reviewed by \prm{name}>.
+\keyitem{bycollaborator} An expression like <in collaboration with \prm{name}> or <in cooperation with \prm{name}>.
+\keyitem{bytranslator} The expression <translated by \prm{name}> or <translated from \prm{language} \prm{name}>.
+\keyitem{bycommentator} The expression <commented by \prm{name}>.
+\keyitem{byannotator} The expression <annotated by \prm{name}>.
+\end{keylist}
+
+\subsection*{Concatenated Editor Roles, Expressed as Actions}
+
+The following keys are similar in function to \vrb{byeditor}, \vrb{bytranslator}, etc. They are used to indicate additional roles of the editor, e.g. <edited and translated by>, <edited and furnished with an introduction by>, <edited, with a foreword, by>.
+
+\begin{keylist}
+\keyitem{byeditortr} Used if \vrb{editor}\slash \vrb{translator} are identical.
+\keyitem{byeditorco} Used if \vrb{editor}\slash \vrb{commentator} are identical.
+\keyitem{byeditoran} Used if \vrb{editor}\slash \vrb{annotator} are identical.
+\keyitem{byeditorin} Used if \vrb{editor}\slash \vrb{introduction} are identical.
+\keyitem{byeditorfo} Used if \vrb{editor}\slash \vrb{foreword} are identical.
+\keyitem{byeditoraf} Used if \vrb{editor}\slash \vrb{afterword} are identical.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{translator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{byeditortrco} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator} are identical.
+\keyitem{byeditortran} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator} are identical.
+\keyitem{byeditortrin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{introduction} are identical.
+\keyitem{byeditortrfo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{foreword} are identical.
+\keyitem{byeditortraf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{afterword} are identical.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{commentator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{byeditorcoin} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{byeditorcofo} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{byeditorcoaf} Used if \vrb{editor}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{annotator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{byeditoranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{introduction} are identical.
+\keyitem{byeditoranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{foreword} are identical.
+\keyitem{byeditoranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{afterword} are identical.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{byeditortrcoin} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{byeditortrcofo} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{byeditortrcoaf} Used if \vrb{editor}\slash \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\end{keylist}
+%
+Keys for \vrb{editor}\slash \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{byeditortranin} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{byeditortranfo} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{byeditortranaf} Used if \vrb{editor}\slash \vrb{annotator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\end{keylist}
+
+\subsection*{Concatenated Translator Roles, Expressed as Actions}
+
+The following keys are similar in function to \vrb{bytranslator}. They are used to indicate additional roles of the translator, e.g. <translated and commented by>, <translated and furnished with an introduction by>, <translated, with a foreword, by>.
+
+\begin{keylist}
+\keyitem{bytranslatorco} Used if \vrb{translator}\slash \vrb{commentator} are identical.
+\keyitem{bytranslatoran} Used if \vrb{translator}\slash \vrb{annotator} are identical.
+\keyitem{bytranslatorin} Used if \vrb{translator}\slash \vrb{introduction} are identical.
+\keyitem{bytranslatorfo} Used if \vrb{translator}\slash \vrb{foreword} are identical.
+\keyitem{bytranslatoraf} Used if \vrb{translator}\slash \vrb{afterword} are identical.
+\end{keylist}
+%
+Keys for \vrb{translator}\slash \vrb{commentator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{bytranslatorcoin} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{introduction} are identical.
+\keyitem{bytranslatorcofo} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{foreword} are identical.
+\keyitem{bytranslatorcoaf} Used if \vrb{translator}\slash \vrb{commentator}\slash \vrb{afterword} are identical.
+\end{keylist}
+%
+Keys for \vrb{translator}\slash \vrb{annotator}\slash \prm{role} combinations:
+
+\begin{keylist}
+\keyitem{bytranslatoranin} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{introduction} are identical.
+\keyitem{bytranslatoranfo} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{foreword} are identical.
+\keyitem{bytranslatoranaf} Used if \vrb{translator}\slash \vrb{annotator}\slash \vrb{afterword} are identical.
+\end{keylist}
+
+\subsection*{Roles, Expressed as Objects}
+
+Roles which are related to supplementary material may also be expressed as objects (<with a commentary by>) rather than as functions (<commentator>) or as actions (<commented by>).
+
+\begin{keylist}
+\keyitem{withcommentator} The expression <with a commentary by \prm{name}>.
+\keyitem{withannotator} The expression <with annotations by \prm{name}>.
+\keyitem{withintroduction} The expression <with an introduction by \prm{name}>.
+\keyitem{withforeword} The expression <with a foreword by \prm{name}>.
+\keyitem{withafterword} The expression <with an afterword by \prm{name}>.
+\end{keylist}
+
+\subsection*{Supplementary Material}
+
+\begin{keylist}
+\keyitem{commentary} The term <commentary>.
+\keyitem{annotations} The term <annotations>.
+\keyitem{introduction} The term <introduction>.
+\keyitem{foreword} The term <foreword>.
+\keyitem{afterword} The term <afterword>.
+\end{keylist}
+
+\subsection*{Publication Details}
+
+\begin{keylist}
+\keyitem{volume} The term <volume>, referring to a book.
+\keyitem{volumes} The plural form of \vrb{volume}.
+\keyitem{involumes} The term <in>, as used in expressions like <in \prm{number of volumes} volumes>.
+\keyitem{jourvol} The term <volume>, referring to a journal.
+\keyitem{jourser} The term <series>, referring to a journal.
+\keyitem{book} The term <book>, referring to a document division.
+\keyitem{part} The term <part>, referring to a part of a book or a periodical.
+\keyitem{issue} The term <issue>, referring to a periodical.
+\keyitem{newseries} The expression <new series>, referring to a journal.
+\keyitem{oldseries} The expression <old series>, referring to a journal.
+\keyitem{edition} The term <edition>.
+\keyitem{in} The term <in>, referring to the title of a work published as part of another one, e.g. <\prm{title of article} in \prm{title of journal}>.
+\keyitem{inseries} The term <in>, as used in expressions like <volume \prm{number} in \prm{name of series}>.
+\keyitem{ofseries} The term <of>, as used in expressions like <volume \prm{number} of \prm{name of series}>.
+\keyitem{number} The term <number>, referring to an issue of a journal.
+\keyitem{chapter} The term <chapter>, referring to a chapter in a book.
+\keyitem{version} The term <version>, referring to a revision number.
+\keyitem{reprint} The term <reprint>.
+\keyitem{reprintof} The expression <reprint of \prm{title}>.
+\keyitem{reprintas} The expression <reprinted as \prm{title}>.
+\keyitem{reprintfrom} The expression <reprinted from \prm{title}>.
+\keyitem{translationof} The expression <translation of \prm{title}>.
+\keyitem{translationas} The expression <translated as \prm{title}>.
+\keyitem{translationfrom} The expression <translated from [the] \prm{language}>.
+\keyitem{reviewof} The expression <review of \prm{title}>.
+\keyitem{origpubas} The expression <originally published as \prm{title}>.
+\keyitem{origpubin} The expression <originally published in \prm{year}>.
+\keyitem{astitle} The term <as>, as used in expressions like <published by \prm{publisher} as \prm{title}>.
+\keyitem{bypublisher} The term <by>, as used in expressions like <published by \prm{publisher}>.
+\end{keylist}
+
+\subsection*{Publication State}
+
+\begin{keylist}
+\keyitem{inpreparation} The expression <in preparation> (the manuscript is being prepared for publication).
+\keyitem{submitted} The expression <submitted> (the manuscript has been submitted to a journal or conference).
+\keyitem{forthcoming} The expression <forthcoming> (the manuscript has been accepted by a press or journal).
+\keyitem{inpress} The expression <in press> (the manuscript is fully copyedited and out of the author's hands; it is in the final stages of the production process).
+\keyitem{prepublished} The expression <pre-published> (the manuscript is published in a preliminary form or location, such as online version in advance of print publication).
+\end{keylist}
+
+\subsection*{Pagination}
+
+\begin{keylist}
+\keyitem{page} The term <page>.
+\keyitem{pages} The plural form of \vrb{page}.
+\keyitem{column} The term <column>, referring to a column on a page.
+\keyitem{columns} The plural form of \vrb{column}.
+\keyitem{section} The term <section>, referring to a document division (usually abbreviated as \S).
+\keyitem{sections} The plural form of \vrb{section} (usually abbreviated as \S\S).
+\keyitem{paragraph} The term <paragraph> (\ie a block of text, not to be confused with \vrb{section}).
+\keyitem{paragraphs} The plural form of \vrb{paragraph}.
+\keyitem{verse} The term <verse> as used when referring to a work which is cited by verse numbers.
+\keyitem{verses} The plural form of \vrb{verse}.
+\keyitem{line} The term <line> as used when referring to a work which is cited by line numbers.
+\keyitem{lines} The plural form of \vrb{line}.
+\end{keylist}
+
+\subsection*{Types}
+
+The following keys are typically used in the \bibfield{type} field of \bibtype{thesis}, \bibtype{report}, \bibtype{misc}, and other entries:
+
+\begin{keylist}
+\keyitem{mathesis} An expression equivalent to the term <Master's thesis>.
+\keyitem{phdthesis} The term <PhD thesis>, <PhD dissertation>, <doctoral thesis>, etc.
+\keyitem{candthesis} An expression equivalent to the term <Candidate thesis>. Used for <Candidate> degrees that have no clear equivalent to the Master's or doctoral level.
+\keyitem{techreport} The term <technical report>.
+\keyitem{resreport} The term <research report>.
+\keyitem{software} The term <computer software>.
+\keyitem{datacd} The term <data \textsc{cd}> or <\textsc{cd-rom}>.
+\keyitem{audiocd} The term <audio \textsc{cd}>.
+\end{keylist}
+
+\subsection*{Miscellaneous}
+
+\begin{keylist}
+\keyitem{nodate} The term to use in place of a date when there is no date for an entry \eg\ <n.d.>
+\keyitem{and} The term <and>, as used in a list of authors or editors, for example.
+\keyitem{andothers} The expression <and others> or <et alii>, used to mark the truncation of a name list.
+\keyitem{andmore} Like \vrb{andothers} but used to mark the truncation of a literal list.
+\end{keylist}
+
+\subsection*{Labels}
+
+The following strings are intended for use as labels, \eg\ <Address: \prm{url}> or <Abstract: \prm{abstract}>.
+
+\begin{keylist}
+\keyitem{url} The term <address> in the sense of an internet address.
+\keyitem{urlfrom} An expression like <available from \prm{url}> or <available at \prm{url}>.
+\keyitem{urlseen} An expression like <accessed on \prm{date}>, <retrieved on \prm{date}>, <visited on \prm{date}>, referring to the access date of an online resource.
+\keyitem{file} The term <file>.
+\keyitem{library} The term <library>.
+\keyitem{abstract} The term <abstract>.
+\keyitem{annotation} The term <annotations>.
+\end{keylist}
+
+\subsection*{Citations}
+
+Traditional scholarly expressions used in citations:
+
+\begin{keylist}
+\keyitem{idem} The term equivalent to the Latin <idem> (<the same [person]>).
+\keyitem{idemsf} The feminine singular form of \vrb{idem}.
+\keyitem{idemsm} The masculine singular form of \vrb{idem}.
+\keyitem{idemsn} The neuter singular form of \vrb{idem}.
+\keyitem{idempf} The feminine plural form of \vrb{idem}.
+\keyitem{idempm} The masculine plural form of \vrb{idem}.
+\keyitem{idempn} The neuter plural form of \vrb{idem}.
+\keyitem{idempp} The plural form of \vrb{idem} suitable for a mixed gender list of names.
+\keyitem{ibidem} The term equivalent to the Latin <ibidem> (<in the same place>).
+\keyitem{opcit} The term equivalent to the Latin term <opere citato> (<[in] the work [already] cited>).
+\keyitem{loccit} The term equivalent to the Latin term <loco citato> (<[at] the place [already] cited>).
+\keyitem{confer} The term equivalent to the Latin <confer> (<compare>).
+\keyitem{sequens} The term equivalent to the Latin <sequens> (<[and] the following [page]>), as used to indicate a range of two pages when only the starting page is provided (\eg\ <25\,sq.> or <25\,f.> instead of <25--26>).
+\keyitem{sequentes} The term equivalent to the Latin <sequentes> (<[and] the following [pages]>), as used to indicate an open"=ended range of pages when only the starting page is provided (\eg\ <25\,sqq.> or <25\,ff.>).
+\keyitem{passim} The term equivalent to the Latin <passim> (<throughout>, <here and there>, <scatteredly>).
+\end{keylist}
+%
+Other expressions frequently used in citations:
+
+\begin{keylist}
+\keyitem{see} The term <see>.
+\keyitem{seealso} The expression <see also>.
+\keyitem{seenote} An expression like <see note \prm{footnote}> or <as in \prm{footnote}>, used to refer to a previous footnote in a citation.
+\keyitem{backrefpage} An expression like <see page \prm{page}> or <cited on page \prm{page}>, used to introduce back references in the bibliography.
+\keyitem{backrefpages} The plural form of \vrb{backrefpage}, \eg\ <see pages \prm{pages}> or <cited on pages \prm{pages}>.
+\keyitem{quotedin} An expression like <quoted in \prm{citation}>, used when quoting a passage which was already a quotation in the cited work.
+\keyitem{citedas} An expression like <henceforth cited as \prm{shorthand}>, used to introduce a shorthand in a citation.
+\keyitem{thiscite} The expression used in some verbose citation styles to differentiate between the page range of the cited item (typically an article in a journal, collection, or conference proceedings) and the page number the citation refers to. For example: \enquote{Author, Title, in: Book, pp. 45--61, \vrb{thiscite} p. 52.}
+\end{keylist}
+
+\subsection*{Month Names}
+
+\begin{keylist}
+\keyitem{january} The name <January>.
+\keyitem{february} The name <February>.
+\keyitem{march} The name <March>.
+\keyitem{april} The name <April>.
+\keyitem{may} The name <May>.
+\keyitem{june} The name <June>.
+\keyitem{july} The name <July>.
+\keyitem{august} The name <August>.
+\keyitem{september} The name <September>.
+\keyitem{october} The name <October>.
+\keyitem{november} The name <November>.
+\keyitem{december} The name <December>.
+\end{keylist}
+
+\subsection*{Language Names}
+
+\begin{keylist}
+\keyitem{langamerican} The language <American> or <American English>.
+\keyitem{langbrazilian} The language <Brazilian> or <Brazilian Portuguese>.
+\keyitem{langcatalan} The language <Catalan>.
+\keyitem{langcroatian} The language <Croatian>.
+\keyitem{langczech} The language <Czech>.
+\keyitem{langdanish} The language <Danish>.
+\keyitem{langdutch} The language <Dutch>.
+\keyitem{langenglish} The language <English>.
+\keyitem{langfinnish} The language <Finnish>.
+\keyitem{langfrench} The language <French>.
+\keyitem{langgerman} The language <German>.
+\keyitem{langgreek} The language <Greek>.
+\keyitem{langitalian} The language <Italian>.
+\keyitem{langlatin} The language <Latin>.
+\keyitem{langnorwegian} The language <Norwegian>.
+\keyitem{langportuguese} The language <Portuguese>.
+\keyitem{langrussian} The language <Russian>.
+\keyitem{langspanish} The language <Spanish>.
+\keyitem{langswedish} The language <Swedish>.
+\end{keylist}
+%
+The following strings are intended for use in phrases like <translated from [the] English by \prm{translator}>:
+
+\begin{keylist}
+\keyitem{fromamerican} The expression <from [the] American> or <from [the] American English>.
+\keyitem{frombrazilian} The expression <from [the] Brazilian> or <from [the] Brazilian Portuguese>.
+\keyitem{fromcatalan} The expression <from [the] Catalan>.
+\keyitem{fromczech} The expression <from [the] Czech>.
+\keyitem{fromcroatian} The expression <from [the] Croatian>.
+\keyitem{fromdanish} The expression <from [the] Danish>.
+\keyitem{fromdutch} The expression <from [the] Dutch>.
+\keyitem{fromenglish} The expression <from [the] English>.
+\keyitem{fromfinnish} The expression <from [the] Finnish>.
+\keyitem{fromfrench} The expression <from [the] French>.
+\keyitem{fromgerman} The expression <from [the] German>.
+\keyitem{fromgreek} The expression <from [the] Greek>.
+\keyitem{fromitalian} The expression <from [the] Italian>.
+\keyitem{fromlatin} The expression <from [the] Latin>.
+\keyitem{fromnorwegian} The expression <from [the] Norwegian>.
+\keyitem{fromportuguese} The expression <from [the] Portuguese>.
+\keyitem{fromrussian} The expression <from [the] Russian>.
+\keyitem{fromspanish} The expression <from [the] Spanish>.
+\keyitem{fromswedish} The expression <from [the] Swedish>.
+\end{keylist}
+
+\subsection*{Country Names}
+
+Country names are localized by using the string \vrb{country} plus the \acr{ISO}-3166 country code as the key. The short version of the translation should be the \acr{ISO}-3166 country code. Note that only a small number of country names is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{location} list of \bibtype{patent} entries but they may be useful for other purposes as well.
+
+\begin{keylist}
+\keyitem{countryde} The name <Germany>, abbreviated as \vrb{DE}.
+\keyitem{countryeu} The name <European Union>, abbreviated as \vrb{EU}.
+\keyitem{countryep} Similar to \vrb{countryeu} but abbreviated as \vrb{EP}. This is intended for \bibfield{patent} entries.
+\keyitem{countryfr} The name <France>, abbreviated as \vrb{FR}.
+\keyitem{countryuk} The name <United Kingdom>, abbreviated (according to \acr{ISO}-3166) as \vrb{GB}.
+\keyitem{countryus} The name <United States of America>, abbreviated as \vrb{US}.
+\end{keylist}
+
+\subsection*{Patents and Patent Requests}
+
+Strings related to patents are localized by using the term \vrb{patent} plus the \acr{ISO}-3166 country code as the key. Note that only a small number of patent keys is defined by default, mainly to illustrate this scheme. These keys are used in the \bibfield{type} field of \bibtype{patent} entries.
+
+\begin{keylist}
+\keyitem{patent} The generic term <patent>.
+\keyitem{patentde} The expression <German patent>.
+\keyitem{patenteu} The expression <European patent>.
+\keyitem{patentfr} The expression <French patent>.
+\keyitem{patentuk} The expression <British patent>.
+\keyitem{patentus} The expression <U.S. patent>.
+\end{keylist}
+%
+Patent requests are handled in a similar way, using the string \vrb{patreq} as the base name of the key:
+
+\begin{keylist}
+\keyitem{patreq} The generic term <patent request>.
+\keyitem{patreqde} The expression <German patent request>.
+\keyitem{patreqeu} The expression <European patent request>.
+\keyitem{patreqfr} The expression <French patent request>.
+\keyitem{patrequk} The expression <British patent request>.
+\keyitem{patrequs} The expression <U.S. patent request>.
+\end{keylist}
+
+\printbibliography
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.tex b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.tex
index df15724ba2f..3d376be8bb7 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.tex
@@ -9,7 +9,7 @@
 \usepackage{hyperref}
 \addbibresource{biblatex-examples.bib}
 \begin{document}
-\nocite{knuth:ct:related,kullback:related}
+\nocite{knuth:ct:related,kullback:related,moore:related}
 \nocite{doody,vangennep:trans,vangennep:related,vizedom:related}
 \printbibliography
 \end{document}
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 994b91995db..e2fb9051305 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
@@ -1,1436 +1,1609 @@
-@string{anch-ie = {Angew.~Chem. Int.~Ed.} }
-@string{cup = {Cambridge University Press} }
-@string{dtv = {Deutscher Taschenbuch-Verlag} }
-@string{hup = {Harvard University Press} }
-@string{jams = {J.~Amer. Math. Soc.} }
-@string{jchph = {J.~Chem. Phys.} }
-@string{jomch = {J.~Organomet. Chem.} }
-@string{pup = {Princeton University Press} }
-
-@incollection{westfahl:space,
-  crossref = {westfahl:frontier},
-  hyphenation = {american},
-  author = {Westfahl, Gary},
-  indextitle = {True Frontier, The},
-  title = {The True Frontier},
-  subtitle = {Confronting and Avoiding the Realities of Space in American
-    Science Fiction Films},
-  pages = {55--65},
-  annotation = {A cross-referenced article from a \texttt{collection}. This is
-    an \texttt{incollection} entry with a \texttt{crossref} field. Note the
-    \texttt{subtitle} and \texttt{indextitle} fields}
+@string{ anch-ie = {Angew.~Chem. Int.~Ed.} }
+@string{ cup     = {Cambridge University Press} }
+@string{ dtv     = {Deutscher Taschenbuch-Verlag} }
+@string{ hup     = {Harvard University Press} }
+@string{ jams    = {J.~Amer. Math. Soc.} }
+@string{ jchph   = {J.~Chem. Phys.} }
+@string{ jomch   = {J.~Organomet. Chem.} }
+@string{ pup     = {Princeton University Press} }
+
+@InCollection{westfahl:space,
+  author       = {Westfahl, Gary},
+  title        = {The True Frontier},
+  subtitle     = {Confronting and Avoiding the Realities of Space in American
+                  Science Fiction Films},
+  pages        = {55-65},
+  crossref     = {westfahl:frontier},
+  hyphenation  = {american},
+  indextitle   = {True Frontier, The},
+  annotation   = {A cross-referenced article from a \texttt{collection}. This is
+                  an \texttt{incollection} entry with a \texttt{crossref}
+                  field. Note the \texttt{subtitle} and \texttt{indextitle}
+                  fields},
 }
+
 @set{set,
-  entryset = {herrmann,aksin,yoon},
-  annotation = {A \texttt{set} with three members}
+  entryset     = {herrmann,aksin,yoon},
+  annotation   = {A \texttt{set} with three members},
 }
+
 @set{stdmodel,
-  entryset = {glashow,weinberg,salam},
-  annotation = {A \texttt{set} with three members discussing the standard
-    model of particle physics}
-}
-@article{aksin,
-  author = {Aks{\i}n, {\"O}zge and T{\"u}rkmen, Hayati and Artok, Levent
-    and {\k{C}}etinkaya, Bekir and Ni, Chaoying
-    and B{\"u}y{\"u}kg{\"u}ng{\"o}r, Orhan and {\"O}zkal, Erhan},
-  indextitle = {Effect of immobilization on catalytic characteristics},
-  title = {Effect of immobilization on catalytic characteristics of saturated
-    Pd-N-heterocyclic carbenes in Mizoroki-Heck reactions},
+  entryset     = {glashow,weinberg,salam},
+  annotation   = {A \texttt{set} with three members discussing the standard
+                  model of particle physics},
+}
+
+@Article{aksin,
+  author       = {Aks{\i}n, {\"O}zge and T{\"u}rkmen, Hayati and Artok, Levent
+                  and {\k{C}}etinkaya, Bekir and Ni, Chaoying and
+                  B{\"u}y{\"u}kg{\"u}ng{\"o}r, Orhan and {\"O}zkal, Erhan},
+  title        = {Effect of immobilization on catalytic characteristics of
+                  saturated Pd-N-heterocyclic carbenes in Mizoroki-Heck
+                  reactions},
   journaltitle = jomch,
-  volume = {691},
-  number = {13},
-  date = {2006},
-  pages = {3027--3036}
-}
-@article{angenendt,
-  hyphenation = {german},
-  author = {Angenendt, Arnold},
-  indextitle = {In Honore Salvatoris},
-  title = {In Honore Salvatoris~-- Vom Sinn und Unsinn der Patrozinienkunde},
-  shorttitle = {In Honore Salvatoris},
+  date         = 2006,
+  volume       = 691,
+  number       = 13,
+  pages        = {3027-3036},
+  indextitle   = {Effect of immobilization on catalytic characteristics},
+}
+
+@Article{angenendt,
+  author       = {Angenendt, Arnold},
+  title        = {In Honore Salvatoris~-- Vom Sinn und Unsinn der
+                  Patrozinienkunde},
   journaltitle = {Revue d'Histoire Eccl{\'e}siastique},
-  volume = {97},
-  date = {2002},
-  pages = {431--456, 791--823},
-  annotation = {A German article in a French journal. Apart from that, a
-    typical \texttt{article} entry. Note the \texttt{indextitle} field}
-}
-@article{baez/article,
-  hyphenation = {american},
-  author = {Baez, John C. and Lauda, Aaron D.},
-  title = {Higher-Dimensional Algebra V: 2-Groups},
+  date         = 2002,
+  volume       = 97,
+  pages        = {431--456, 791--823},
+  hyphenation  = {german},
+  indextitle   = {In Honore Salvatoris},
+  shorttitle   = {In Honore Salvatoris},
+  annotation   = {A German article in a French journal. Apart from that, a
+                  typical \texttt{article} entry. Note the \texttt{indextitle}
+                  field},
+}
+
+@Article{baez/article,
+  author       = {Baez, John C. and Lauda, Aaron D.},
+  title        = {Higher-Dimensional Algebra V: 2-Groups},
   journaltitle = {Theory and Applications of Categories},
-  volume = {12},
-  version = {3},
-  date = {2004},
-  pages = {423--491},
-  eprinttype = {arxiv},
-  eprint = {math/0307200v3},
-  annotation = {An \texttt{article} with \texttt{eprint} and
-    \texttt{eprinttype} fields. Note that the arXiv reference is transformed
-    into a clickable link if \texttt{hyperref} support has been enabled.
-    Compare \texttt{baez\slash online}, which is the same item given as an
-    \texttt{online} entry}
-}
-@article{bertram,
-  hyphenation = {american},
-  author = {Bertram, Aaron and Wentworth, Richard},
-  title = {Gromov invariants for holomorphic maps on Riemann surfaces},
-  shorttitle = {Gromov invariants},
+  date         = 2004,
+  volume       = 12,
+  pages        = {423-491},
+  version      = 3,
+  eprint       = {math/0307200v3},
+  eprinttype   = {arxiv},
+  hyphenation  = {american},
+  annotation   = {An \texttt{article} with \texttt{eprint} and
+                  \texttt{eprinttype} fields. Note that the arXiv reference is
+                  transformed into a clickable link if \texttt{hyperref} support
+                  has been enabled.  Compare \texttt{baez\slash online}, which
+                  is the same item given as an \texttt{online} entry},
+}
+
+@Article{bertram,
+  author       = {Bertram, Aaron and Wentworth, Richard},
+  title        = {Gromov invariants for holomorphic maps on Riemann surfaces},
   journaltitle = jams,
-  volume = {9},
-  number = {2},
-  date = {1996},
-  pages = {529--571},
-  annotation = {An \texttt{article} entry with a \texttt{volume} and a
-    \texttt{number} field}
-}
-@article{doody,
-  title = {Hemingway's Style and Jake's Narration},
-  author = {Doody, Terrence},
-  related = {matuz:doody},
-  relatedstring = {\autocap{e}xcerpt in},
-  journal = {The Journal of Narrative Technique},
-  volume = {4},
-  number = {3},
-  pages = {212--225},
-  year = {1974},
-  annotation = {An \texttt{article} entry cited as an excerpt from a
-    \texttt{collection} entry. Note the format of the \texttt{related}
-    and \texttt{relatedstring} fields}
-}
-@collection{matuz:doody,
-  title = {Contemporary Literary Criticism},
-  editor = {Matuz, Roger},
-  volume = {61},
-  location = {Detroit},
-  publisher = {Gale},
-  pages = {204--208},
-  year = {1990},
-  annotation = {A \texttt{collection} entry providing the excerpt information
-    for the \texttt{doody} entry. Note the format of the \texttt{pages} field}
-}
-@article{gillies,
-  hyphenation = {british},
-  author = {Gillies, Alexander},
-  title = {Herder and the Preparation of Goethe's Idea of World Literature},
+  date         = 1996,
+  volume       = 9,
+  number       = 2,
+  pages        = {529-571},
+  hyphenation  = {american},
+  shorttitle   = {Gromov invariants},
+  annotation   = {An \texttt{article} entry with a \texttt{volume} and a
+                  \texttt{number} field},
+}
+
+@Article{doody,
+  author       = {Doody, Terrence},
+  title        = {Hemingway's Style and Jake's Narration},
+  year         = 1974,
+  volume       = 4,
+  number       = 3,
+  pages        = {212-225},
+  hyphenation  = {american},
+  related      = {matuz:doody},
+  relatedstring= {\autocap{e}xcerpt in},
+  journal      = {The Journal of Narrative Technique},
+  annotation   = {An \texttt{article} entry cited as an excerpt from a
+                  \texttt{collection} entry. Note the format of the
+                  \texttt{related} and \texttt{relatedstring} fields},
+}
+
+@Collection{matuz:doody,
+  editor       = {Matuz, Roger},
+  title        = {Contemporary Literary Criticism},
+  year         = 1990,
+  volume       = 61,
+  publisher    = {Gale},
+  location     = {Detroit},
+  pages        = {204-208},
+  hyphenation  = {american},
+  annotation   = {A \texttt{collection} entry providing the excerpt information
+                  for the \texttt{doody} entry. Note the format of the
+                  \texttt{pages} field},
+}
+
+@Article{gillies,
+  author       = {Gillies, Alexander},
+  title        = {Herder and the Preparation of Goethe's Idea of World
+                  Literature},
   journaltitle = {Publications of the English Goethe Society},
-  volume = {9},
-  series = {newseries},
-  date = {1933},
-  pages = {46--67},
-  annotation = {An \texttt{article} entry with a \texttt{series} and a
-    \texttt{volume} field. Note that format of the \texttt{series} field in
-    the database file}
-}
-@article{glashow,
-  author = {Glashow, Sheldon},
-  title = {Partial Symmetries of Weak Interactions},
+  date         = 1933,
+  series       = {newseries},
+  volume       = 9,
+  pages        = {46-67},
+  hyphenation  = {british},
+  annotation   = {An \texttt{article} entry with a \texttt{series} and a
+                  \texttt{volume} field. Note that format of the \texttt{series}
+                  field in the database file},
+}
+
+@Article{glashow,
+  author       = {Glashow, Sheldon},
+  title        = {Partial Symmetries of Weak Interactions},
   journaltitle = {Nucl.~Phys.},
-  volume = {22},
-  date = {1961},
-  pages = {579--588}
-}
-@article{herrmann,
-  author = {Herrmann, Wolfgang A. and {\"O}fele, Karl and Schneider, Sabine K.
-    and Herdtweck, Eberhardt and Hoffmann, Stephan D.},
-  indextitle = {Carbocyclic carbene as an efficient catalyst, A},
-  title = {A carbocyclic carbene as an efficient catalyst ligand for C--C
-    coupling reactions},
+  date         = 1961,
+  volume       = 22,
+  pages        = {579-588},
+}
+
+@Article{herrmann,
+  author       = {Herrmann, Wolfgang A. and {\"O}fele, Karl and Schneider,
+                  Sabine K.  and Herdtweck, Eberhardt and Hoffmann, Stephan D.},
+  title        = {A carbocyclic carbene as an efficient catalyst ligand for C--C
+                  coupling reactions},
   journaltitle = anch-ie,
-  volume = {45},
-  number = {23},
-  date = {2006},
-  pages = {3859--3862}
-}
-@article{kastenholz,
-  hyphenation = {american},
-  author = {Kastenholz, M. A. and H{\"u}nenberger, Philippe H.},
-  indextitle = {Computation of ionic solvation free energies},
-  title = {Computation of methodology\hyphen independent ionic solvation free
-    energies from molecular simulations},
-  subtitle = {I. The electrostatic potential in molecular liquids},
+  date         = 2006,
+  volume       = 45,
+  number       = 23,
+  pages        = {3859-3862},
+  indextitle   = {Carbocyclic carbene as an efficient catalyst, A},
+}
+
+@Article{kastenholz,
+  author       = {Kastenholz, M. A. and H{\"u}nenberger, Philippe H.},
+  title        = {Computation of methodology\hyphen independent ionic solvation
+                  free energies from molecular simulations},
   journaltitle = jchph,
-  volume = {124},
-  eid = {124106},
-  date = {2006},
-  doi = {10.1063/1.2172593},
-  annotation = {An \texttt{article} entry with an \texttt{eid} and a
-    \texttt{doi} field. Note that the \textsc{doi} is transformed into a
-    clickable link if \texttt{hyperref} support has been enabled},
-  abstract = {The computation of ionic solvation free energies from atomistic
-    simulations is a surprisingly difficult problem that has found no
-    satisfactory solution for more than 15 years. The reason is that the
-    charging free energies evaluated from such simulations are affected by
-    very large errors. One of these is related to the choice of a specific
-    convention for summing up the contributions of solvent charges to the
-    electrostatic potential in the ionic cavity, namely, on the basis of point
-    charges within entire solvent molecules (M scheme) or on the basis of
-    individual point charges (P scheme). The use of an inappropriate
-    convention may lead to a charge-independent offset in the calculated
-    potential, which depends on the details of the summation scheme, on the
-    quadrupole-moment trace of the solvent molecule, and on the approximate
-    form used to represent electrostatic interactions in the system. However,
-    whether the M or P scheme (if any) represents the appropriate convention
-    is still a matter of on-going debate. The goal of the present article is
-    to settle this long-standing controversy by carefully analyzing (both
-    analytically and numerically) the properties of the electrostatic
-    potential in molecular liquids (and inside cavities within them).}
-}
-@article{murray,
-  hyphenation = {american},
-  author = {Hostetler, Michael J. and Wingate, Julia E. and Zhong, Chuan-Jian
-    and Harris, Jay E. and Vachet, Richard W. and Clark, Michael R.
-    and Londono, J. David and Green, Stephen J. and Stokes, Jennifer J.
-    and Wignall, George D. and Glish, Gary L. and Porter, Marc D.
-    and Evans, Neal D. and Murray, Royce W.},
-  indextitle = {Alkanethiolate gold cluster molecules},
-  title = {Alkanethiolate gold cluster molecules with core diameters from 1.5
-    to 5.2~nm},
-  subtitle = {Core and monolayer properties as a function of core size},
-  shorttitle = {Alkanethiolate gold cluster molecules},
+  date         = 2006,
+  subtitle     = {I. The electrostatic potential in molecular liquids},
+  volume       = 124,
+  eid          = 124106,
+  doi          = {10.1063/1.2172593},
+  hyphenation  = {american},
+  indextitle   = {Computation of ionic solvation free energies},
+  annotation   = {An \texttt{article} entry with an \texttt{eid} and a
+                  \texttt{doi} field. Note that the \textsc{doi} is transformed
+                  into a clickable link if \texttt{hyperref} support has been
+                  enabled},
+  abstract     = {The computation of ionic solvation free energies from
+                  atomistic simulations is a surprisingly difficult problem that
+                  has found no satisfactory solution for more than 15 years. The
+                  reason is that the charging free energies evaluated from such
+                  simulations are affected by very large errors. One of these is
+                  related to the choice of a specific convention for summing up
+                  the contributions of solvent charges to the electrostatic
+                  potential in the ionic cavity, namely, on the basis of point
+                  charges within entire solvent molecules (M scheme) or on the
+                  basis of individual point charges (P scheme). The use of an
+                  inappropriate convention may lead to a charge-independent
+                  offset in the calculated potential, which depends on the
+                  details of the summation scheme, on the quadrupole-moment
+                  trace of the solvent molecule, and on the approximate form
+                  used to represent electrostatic interactions in the
+                  system. However, whether the M or P scheme (if any) represents
+                  the appropriate convention is still a matter of on-going
+                  debate. The goal of the present article is to settle this
+                  long-standing controversy by carefully analyzing (both
+                  analytically and numerically) the properties of the
+                  electrostatic potential in molecular liquids (and inside
+                  cavities within them).},
+}
+
+@Article{murray,
+  author       = {Hostetler, Michael J. and Wingate, Julia E. and Zhong,
+                  Chuan-Jian and Harris, Jay E. and Vachet, Richard W. and
+                  Clark, Michael R.  and Londono, J. David and Green, Stephen
+                  J. and Stokes, Jennifer J.  and Wignall, George D. and Glish,
+                  Gary L. and Porter, Marc D.  and Evans, Neal D. and Murray,
+                  Royce W.},
+  title        = {Alkanethiolate gold cluster molecules with core diameters from
+                  1.5 to 5.2~nm},
   journaltitle = {Langmuir},
-  volume = {14},
-  number = {1},
-  date = {1998},
-  pages = {17--30},
-  annotation = {An \texttt{article} entry with \arabic{author} authors. By
-    default, long author and editor lists are automatically truncated. This is
-    configurable}
-}
-@article{reese,
-  hyphenation = {american},
-  author = {Reese, Trevor R.},
-  title = {Georgia in Anglo-Spanish Diplomacy, 1736-1739},
+  date         = 1998,
+  subtitle     = {Core and monolayer properties as a function of core size},
+  volume       = 14,
+  number       = 1,
+  pages        = {17-30},
+  hyphenation  = {american},
+  indextitle   = {Alkanethiolate gold cluster molecules},
+  shorttitle   = {Alkanethiolate gold cluster molecules},
+  annotation   = {An \texttt{article} entry with \arabic{author} authors. By
+                  default, long author and editor lists are automatically
+                  truncated. This is configurable},
+}
+
+@Article{reese,
+  author       = {Reese, Trevor R.},
+  title        = {Georgia in Anglo-Spanish Diplomacy, 1736-1739},
   journaltitle = {William and Mary Quarterly},
-  volume = {15},
-  series = {3},
-  date = {1958},
-  pages = {168--190},
-  annotation = {An \texttt{article} entry with a \texttt{series} and a
-    \texttt{volume} field. Note the format of the series. If the value of the
-    \texttt{series} field is an integer, this number is printed as an ordinal
-    and the string \enquote*{series} is appended automatically}
-}
-@article{sarfraz,
-  author = {M. Sarfraz and M. F. A. Razzak},
-  title = {Technical section: {An} algorithm for automatic capturing of the
-    font outlines},
-  journal = {Computers and Graphics},
-  volume = {26},
-  number = {5},
-  pages = {795--804},
-  year = {2002},
-  issn = {0097-8493},
-  annotation = {An \texttt{article} entry with an \texttt{issn} field}
-}
-@article{shore,
-  author = {Shore, Bradd},
-  title = {Twice-Born, Once Conceived},
-  subtitle = {Meaning Construction and Cultural Cognition},
+  date         = 1958,
+  series       = 3,
+  volume       = 15,
+  pages        = {168-190},
+  hyphenation  = {american},
+  annotation   = {An \texttt{article} entry with a \texttt{series} and a
+                  \texttt{volume} field. Note the format of the series. If the
+                  value of the \texttt{series} field is an integer, this number
+                  is printed as an ordinal and the string \enquote*{series} is
+                  appended automatically},
+}
+
+@Article{sarfraz,
+  author       = {M. Sarfraz and M. F. A. Razzak},
+  title        = {Technical section: {An} algorithm for automatic capturing of
+                  the font outlines},
+  year         = 2002,
+  volume       = 26,
+  number       = 5,
+  pages        = {795-804},
+  issn         = {0097-8493},
+  journal      = {Computers and Graphics},
+  annotation   = {An \texttt{article} entry with an \texttt{issn} field},
+}
+
+@Article{shore,
+  author       = {Shore, Bradd},
+  title        = {Twice-Born, Once Conceived},
   journaltitle = {American Anthropologist},
-  volume = {93},
-  series = {newseries},
-  number = {1},
-  date = {1991-03},
-  pages = {9--27},
-  annotation = {An \texttt{article} entry with \texttt{series},
-    \texttt{volume}, and \texttt{number} fields. Note the format of the
-    \texttt{series} which is a localization key}
-}
-@article{sigfridsson,
-  hyphenation = {american},
-  author = {Sigfridsson, Emma and Ryde, Ulf},
-  indextitle = {Methods for deriving atomic charges},
-  title = {Comparison of methods for deriving atomic charges from the
-    electrostatic potential and moments},
+  date         = {1991-03},
+  subtitle     = {Meaning Construction and Cultural Cognition},
+  series       = {newseries},
+  volume       = 93,
+  number       = 1,
+  pages        = {9-27},
+  annotation   = {An \texttt{article} entry with \texttt{series},
+                  \texttt{volume}, and \texttt{number} fields. Note the format
+                  of the \texttt{series} which is a localization key},
+}
+
+@Article{sigfridsson,
+  author       = {Sigfridsson, Emma and Ryde, Ulf},
+  title        = {Comparison of methods for deriving atomic charges from the
+                  electrostatic potential and moments},
   journaltitle = {Journal of Computational Chemistry},
-  volume = {19},
-  number = {4},
-  date = {1998},
-  doi = {10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P},
-  pages = {377--395},
-  annotation = {An \texttt{article} entry with \texttt{volume}, 
-    \texttt{number}, and \texttt{doi} fields. Note that the \textsc{doi} is
-    transformed into a clickable link if \texttt{hyperref} support has been
-    enabled},
-  abstract = {Four methods for deriving partial atomic charges from the
-    quantum chemical electrostatic potential (CHELP, CHELPG, Merz-Kollman, and
-    RESP) have been compared and critically evaluated. It is shown that
-    charges strongly depend on how and where the potential points are
-    selected. Two alternative methods are suggested to avoid the
-    arbitrariness in the point-selection schemes and van der Waals exclusion
-    radii: CHELP-BOW, which also estimates the charges from the electrostatic
-    potential, but with potential points that are Boltzmann-weighted after
-    their occurrence in actual simulations using the energy function of the
-    program in which the charges will be used, and CHELMO, which estimates
-    the charges directly from the electrostatic multipole moments. Different
-    criteria for the quality of the charges are discussed.}
-}
-@article{spiegelberg,
-  hyphenation = {german},
-  sorttitle = {Intention und Intentionalitat in der Scholastik, bei Brentano
-    und Husserl},
-  indexsorttitle = {Intention und Intentionalitat in der Scholastik, bei
-    Brentano und Husserl},
-  author = {Spiegelberg, Herbert},
-  title = {\mkbibquote{Intention} und \mkbibquote{Intentionalit{\"a}t} in der
-    Scholastik, bei Brentano und Husserl},
-  shorttitle = {Intention und Intentionalit{\"a}t},
+  date         = 1998,
+  volume       = 19,
+  number       = 4,
+  pages        = {377-395},
+  doi          = {10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P},
+  hyphenation  = {american},
+  indextitle   = {Methods for deriving atomic charges},
+  annotation   = {An \texttt{article} entry with \texttt{volume},
+                  \texttt{number}, and \texttt{doi} fields. Note that the
+                  \textsc{doi} is transformed into a clickable link if
+                  \texttt{hyperref} support has been enabled},
+  abstract     = {Four methods for deriving partial atomic charges from the
+                  quantum chemical electrostatic potential (CHELP, CHELPG,
+                  Merz-Kollman, and RESP) have been compared and critically
+                  evaluated. It is shown that charges strongly depend on how and
+                  where the potential points are selected. Two alternative
+                  methods are suggested to avoid the arbitrariness in the
+                  point-selection schemes and van der Waals exclusion radii:
+                  CHELP-BOW, which also estimates the charges from the
+                  electrostatic potential, but with potential points that are
+                  Boltzmann-weighted after their occurrence in actual
+                  simulations using the energy function of the program in which
+                  the charges will be used, and CHELMO, which estimates the
+                  charges directly from the electrostatic multipole
+                  moments. Different criteria for the quality of the charges are
+                  discussed.},
+}
+
+@Article{spiegelberg,
+  author       = {Spiegelberg, Herbert},
+  title        = {\mkbibquote{Intention} und \mkbibquote{Intentionalit{\"a}t} in
+                  der Scholastik, bei Brentano und Husserl},
   journaltitle = {Studia Philosophica},
-  volume = {29},
-  date = {1969},
-  pages = {189--216},
-  annotation = {An \texttt{article} entry. Note the \texttt{sorttitle} and
-    \texttt{indexsorttitle} fields and the markup of the quotes in the
-    database file}
-}
-@article{springer,
-  hyphenation = {british},
-  author = {Springer, Otto},
-  title = {Mediaeval Pilgrim Routes from Scandinavia to Rome},
-  shorttitle = {Mediaeval Pilgrim Routes},
+  date         = 1969,
+  volume       = 29,
+  pages        = {189-216},
+  hyphenation  = {german},
+  sorttitle    = {Intention und Intentionalitat in der Scholastik, bei Brentano
+                  und Husserl},
+  indexsorttitle= {Intention und Intentionalitat in der Scholastik, bei Brentano
+                  und Husserl},
+  shorttitle   = {Intention und Intentionalit{\"a}t},
+  annotation   = {An \texttt{article} entry. Note the \texttt{sorttitle} and
+                  \texttt{indexsorttitle} fields and the markup of the quotes in
+                  the database file},
+}
+
+@Article{springer,
+  author       = {Springer, Otto},
+  title        = {Mediaeval Pilgrim Routes from Scandinavia to Rome},
   journaltitle = {Mediaeval Studies},
-  volume = {12},
-  date = {1950},
-  pages = {92--122},
-  annotation = {A plain \texttt{article} entry}
-}
-@article{weinberg,
-  author = {Weinberg, Steven},
-  title = {A Model of Leptons},
+  date         = 1950,
+  volume       = 12,
+  pages        = {92-122},
+  hyphenation  = {british},
+  shorttitle   = {Mediaeval Pilgrim Routes},
+  annotation   = {A plain \texttt{article} entry},
+}
+
+@Article{weinberg,
+  author       = {Weinberg, Steven},
+  title        = {A Model of Leptons},
   journaltitle = {Phys.~Rev.~Lett.},
-  volume = {19},
-  date = {1967},
-  pages = {1264--1266}
-}
-@article{yoon,
-  author = {Yoon, Myeong S. and Ryu, Dowook and Kim, Jeongryul
-    and Ahn, Kyo Han},
-  indextitle = {Palladium pincer complexes},
-  title = {Palladium pincer complexes with reduced bond angle strain:
-    efficient catalysts for the Heck reaction},
+  date         = 1967,
+  volume       = 19,
+  pages        = {1264-1266},
+}
+
+@Article{yoon,
+  author       = {Yoon, Myeong S. and Ryu, Dowook and Kim, Jeongryul and Ahn,
+                  Kyo Han},
+  title        = {Palladium pincer complexes with reduced bond angle strain:
+                  efficient catalysts for the Heck reaction},
   journaltitle = {Organometallics},
-  volume = {25},
-  number = {10},
-  date = {2006},
-  pages = {2409--2411}
-}
-@book{aristotle:anima,
-  keywords = {primary},
-  hyphenation = {british},
-  author = {Aristotle},
-  editor = {Hicks, Robert Drew},
-  title = {De Anima},
-  publisher = cup,
-  location = {Cambridge},
-  date = {1907},
-  annotation = {A \texttt{book} entry with an \texttt{author} and an
-    \texttt{editor}}
-}
-@book{aristotle:physics,
-  keywords = {primary},
-  hyphenation = {american},
-  author = {Aristotle},
-  translator = {Wicksteed, P. H. and Cornford, F. M.},
-  title = {Physics},
-  shorttitle = {Physics},
-  publisher = {G. P. Putnam},
-  location = {New York},
-  date = {1929},
-  annotation = {A \texttt{book} entry with a \texttt{translator} field}
-}
-@book{aristotle:poetics,
-  keywords = {primary},
-  hyphenation = {british},
-  author = {Aristotle},
-  editor = {Lucas, D. W.},
-  title = {Poetics},
-  shorttitle = {Poetics},
-  series = {Clarendon Aristotle},
-  publisher = {Clarendon Press},
-  location = {Oxford},
-  date = {1968},
-  annotation = {A \texttt{book} entry with an \texttt{author} and an
-    \texttt{editor} as well as a \texttt{series} field}
-}
-@book{aristotle:rhetoric,
-  keywords = {primary},
-  hyphenation = {british},
-  sorttitle = {Rhetoric of Aristotle},
-  author = {Aristotle},
-  editor = {Cope, Edward Meredith},
-  commentator = {Cope, Edward Meredith},
-  indextitle = {Rhetoric of Aristotle, The},
-  title = {The Rhetoric of Aristotle with a commentary by the late Edward
-    Meredith Cope},
-  shorttitle = {Rhetoric},
-  volumes = {3},
-  publisher = cup,
-  date = {1877},
-  annotation = {A commented edition. Note the concatenation of the
-    \texttt{editor} and \texttt{commentator} fields as well as the
-    \texttt{volumes}, \texttt{sorttitle}, and \texttt{indextitle} fields}
-}
-@book{augustine,
-  hyphenation = {american},
-  author = {Augustine, Robert L.},
-  title = {Heterogeneous catalysis for the synthetic chemist},
-  shorttitle = {Heterogeneous catalysis},
-  publisher = {Marcel Dekker},
-  location = {New York},
-  date = {1995},
-  annotation = {A plain \texttt{book} entry}
-}
-@book{averroes/bland,
-  keywords = {primary},
-  hyphenation = {american},
-  author = {Averroes},
-  editor = {Bland, Kalman P.},
-  translator = {Bland, Kalman P.},
-  indextitle = {Epistle on the Possibility of Conjunction, The},
-  title = {The Epistle on the Possibility of Conjunction with the Active
-    Intellect by Ibn Rushd with the Commentary of Moses Narboni},
-  shorttitle = {Possibility of Conjunction},
-  series = {Moreshet: Studies in Jewish History, Literature and Thought},
-  number = {7},
-  publisher = {Jewish Theological Seminary of America},
-  location = {New York},
-  date = {1982},
-  annotation = {A \texttt{book} entry with a \texttt{series} and a
-    \texttt{number}. Note the concatenation of the \texttt{editor} and
-    \texttt{translator} fields as well as the \texttt{indextitle} field}
-}
-@book{averroes/hannes,
-  keywords = {primary},
-  hyphenation = {german},
-  sorttitle = {Uber die Moglichkeit der Conjunktion},
-  indexsorttitle = {Uber die Moglichkeit der Conjunktion},
-  author = {Averroes},
-  editor = {Hannes, Ludwig},
-  translator = {Hannes, Ludwig},
-  annotator = {Hannes, Ludwig},
-  indextitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion},
-  title = {Des Averro{\"e}s Abhandlung: \mkbibquote{{\"U}ber die
-    M{\"o}glichkeit der Conjunktion} oder \mkbibquote{{\"U}ber den
-    materiellen Intellekt}},
-  shorttitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion},
-  publisher = {C.~A. Kaemmerer},
-  location = {Halle an der Saale},
-  date = {1892},
-  annotation = {An annotated edition. Note the concatenation of the
-    \texttt{editor}, \texttt{translator}, and \texttt{annotator} fields. Also
-    note the \texttt{shorttitle}, \texttt{indextitle}, \texttt{sorttitle},
-    and \texttt{indexsorttitle} fields}
-}
-@book{averroes/hercz,
-  keywords = {primary},
-  hyphenation = {german},
-  indexsorttitle = {Drei Abhandlungen uber die Conjunction},
-  author = {Averroes},
-  editor = {Hercz, J.},
-  translator = {Hercz, J.},
-  indextitle = {Drei Abhandlungen {\"u}ber die Conjunction},
-  title = {Drei Abhandlungen {\"u}ber die Conjunction des separaten Intellects
-    mit dem Menschen},
-  subtitle = {Von Averroes (Vater und Sohn), aus dem Arabischen {\"u}bersetzt
-    von Samuel Ibn Tibbon},
-  shorttitle = {Drei Abhandlungen},
-  publisher = {S.~Hermann},
-  location = {Berlin},
-  date = {1869},
-  annotation = {A \texttt{book} entry. Note the concatenation of the
-    \texttt{editor} and \texttt{translator} fields as well as the
-    \texttt{indextitle} and \texttt{indexsorttitle} fields}
-}
-@book{cicero,
-  hyphenation = {german},
-  author = {Cicero, Marcus Tullius},
-  editor = {Blank-Sangmeister, Ursula},
-  translator = {Blank-Sangmeister, Ursula},
-  afterword = {Thraede, Klaus},
-  indextitle = {De natura deorum},
-  title = {De natura deorum. {\"U}ber das Wesen der G{\"o}tter},
-  shorttitle = {De natura deorum},
-  language = {langlatin and langgerman},
-  publisher = {Reclam},
-  location = {Stuttgart},
-  date = {1995},
-  annotation = {A bilingual edition of Cicero's \emph{De natura deorum}, with
-    a German translation. Note the format of the \texttt{language} field in
-    the database file, the concatenation of the \texttt{editor} and
-    \texttt{translator} fields, and the \texttt{afterword} field}
-}
-@book{coleridge,
-  hyphenation = {british},
-  author = {Coleridge, Samuel Taylor},
-  editor = {Coburn, Kathleen and Engell, James and Bate, W. Jackson},
-  indextitle = {Biographia literaria},
-  title = {Biographia literaria, or Biographical sketches of my literary life
-    and opinions},
-  shorttitle = {Biographia literaria},
-  maintitle = {The collected works of Samuel Taylor Coleridge},
-  part = {2},
-  volume = {7},
-  series = {Bollingen Series},
-  number = {75},
-  publisher = {Routledge and Kegan Paul},
-  location = {London},
-  date = {1983},
-  annotation = {One (partial) volume of a multivolume book. This is a
-    \texttt{book} entry with a \texttt{volume} and a \texttt{part} field
-    which explicitly refers to the second (physical) part of the seventh
-    (logical) volume. Also note the \texttt{series} and \texttt{number}
-    fields}
-}
-@book{companion,
-  hyphenation = {american},
-  sorttitle = {LaTeX Companion},
-  author = {Goossens, Michel and Mittelbach, Frank and Samarin, Alexander},
-  indextitle = {LaTeX Companion, The},
-  title = {The LaTeX Companion},
-  shorttitle = {LaTeX Companion},
-  edition = {1},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1994},
-  pagetotal = {528},
-  annotation = {A book with three authors. Note the formatting of the author
-    list. By default, only the first name is reversed in the bibliography}
-}
-@book{cotton,
-  hyphenation = {british},
-  author = {Cotton, Frank Albert and Wilkinson, Geoffrey
-    and Murillio, Carlos A. and Bochmann, Manfred},
-  title = {Advanced inorganic chemistry},
-  edition = {6},
-  publisher = {Wiley},
-  location = {Chichester},
-  date = {1999},
-  annotation = {A \texttt{book} entry with \arabic{author} authors and an
-    \texttt{edition} field. By default, long \texttt{author} and
-    \texttt{editor} lists are automatically truncated. This is configurable}
-}
-@book{gerhardt,
-  hyphenation = {american},
-  sorttitle = {Federal Appointments Process},
-  author = {Gerhardt, Michael J.},
-  indextitle = {Federal Appointments Process, The},
-  title = {The Federal Appointments Process},
-  subtitle = {A Constitutional and Historical Analysis},
-  shorttitle = {Federal Appointments Process},
-  publisher = {Duke University Press},
-  location = {Durham and London},
-  date = {2000},
-  annotation = {This is a \texttt{book} entry. Note the format of the
-    \texttt{location} field as well as the \texttt{sorttitle} and
-    \texttt{indextitle} fields}
-}
-@book{gonzalez,
-  hyphenation = {american},
-  sorttitle = {Ghost of John Wayne and Other Stories},
-  author = {Gonzalez, Ray},
-  indextitle = {Ghost of John Wayne and Other Stories, The},
-  title = {The Ghost of John Wayne and Other Stories},
-  shorttitle = {Ghost of John Wayne},
-  publisher = {The University of Arizona Press},
-  location = {Tucson},
-  date = {2001},
-  isbn = {0-816-52066-6},
-  annotation = {A collection of short stories. This is a \texttt{book} entry.
-    Note the \texttt{sorttitle} and \texttt{indextitle} fields in the
-    database file. There's also an \texttt{isbn} field}
-}
-@book{hammond,
-  hyphenation = {british},
-  sorttitle = {Basics of crystallography and diffraction},
-  author = {Hammond, Christopher},
-  indextitle = {Basics of crystallography and diffraction, The},
-  title = {The basics of crystallography and diffraction},
-  shorttitle = {Crystallography and diffraction},
-  publisher = {International Union of Crystallography and Oxford University
-    Press},
-  location = {Oxford},
-  date = {1997},
-  annotation = {A \texttt{book} entry. Note the \texttt{sorttitle} and
-    \texttt{indextitle} fields as well as the format of the
-    \texttt{publisher} field}
-}
-@book{iliad,
-  hyphenation = {german},
-  sorttitle = {Ilias},
-  author = {Homer},
-  translator = {Schadewaldt, Wolfgang},
+  date         = 2006,
+  volume       = 25,
+  number       = 10,
+  pages        = {2409-2411},
+  indextitle   = {Palladium pincer complexes},
+}
+
+@Book{aristotle:anima,
+  author       = {Aristotle},
+  title        = {De Anima},
+  date         = 1907,
+  editor       = {Hicks, Robert Drew},
+  publisher    = cup,
+  location     = {Cambridge},
+  keywords     = {primary},
+  hyphenation  = {british},
+  annotation   = {A \texttt{book} entry with an \texttt{author} and an
+                  \texttt{editor}},
+}
+
+@Book{aristotle:physics,
+  author       = {Aristotle},
+  title        = {Physics},
+  date         = 1929,
+  translator   = {Wicksteed, P. H. and Cornford, F. M.},
+  publisher    = {G. P. Putnam},
+  location     = {New York},
+  keywords     = {primary},
+  hyphenation  = {american},
+  shorttitle   = {Physics},
+  annotation   = {A \texttt{book} entry with a \texttt{translator} field},
+}
+
+@Book{aristotle:poetics,
+  author       = {Aristotle},
+  title        = {Poetics},
+  date         = 1968,
+  editor       = {Lucas, D. W.},
+  series       = {Clarendon Aristotle},
+  publisher    = {Clarendon Press},
+  location     = {Oxford},
+  keywords     = {primary},
+  hyphenation  = {british},
+  shorttitle   = {Poetics},
+  annotation   = {A \texttt{book} entry with an \texttt{author} and an
+                  \texttt{editor} as well as a \texttt{series} field},
+}
+
+@Book{aristotle:rhetoric,
+  author       = {Aristotle},
+  title        = {The Rhetoric of Aristotle with a commentary by the late Edward
+                  Meredith Cope},
+  date         = 1877,
+  editor       = {Cope, Edward Meredith},
+  commentator  = {Cope, Edward Meredith},
+  volumes      = 3,
+  publisher    = cup,
+  keywords     = {primary},
+  hyphenation  = {british},
+  sorttitle    = {Rhetoric of Aristotle},
+  indextitle   = {Rhetoric of Aristotle, The},
+  shorttitle   = {Rhetoric},
+  annotation   = {A commented edition. Note the concatenation of the
+                  \texttt{editor} and \texttt{commentator} fields as well as the
+                  \texttt{volumes}, \texttt{sorttitle}, and \texttt{indextitle}
+                  fields},
+}
+
+@Book{augustine,
+  author       = {Augustine, Robert L.},
+  title        = {Heterogeneous catalysis for the synthetic chemist},
+  date         = 1995,
+  publisher    = {Marcel Dekker},
+  location     = {New York},
+  hyphenation  = {american},
+  shorttitle   = {Heterogeneous catalysis},
+  annotation   = {A plain \texttt{book} entry},
+}
+
+@Book{averroes/bland,
+  author       = {Averroes},
+  title        = {The Epistle on the Possibility of Conjunction with the Active
+                  Intellect by Ibn Rushd with the Commentary of Moses Narboni},
+  date         = 1982,
+  editor       = {Bland, Kalman P.},
+  translator   = {Bland, Kalman P.},
+  series       = {Moreshet: Studies in Jewish History, Literature and Thought},
+  number       = 7,
+  publisher    = {Jewish Theological Seminary of America},
+  location     = {New York},
+  keywords     = {primary},
+  hyphenation  = {american},
+  indextitle   = {Epistle on the Possibility of Conjunction, The},
+  shorttitle   = {Possibility of Conjunction},
+  annotation   = {A \texttt{book} entry with a \texttt{series} and a
+                  \texttt{number}. Note the concatenation of the \texttt{editor}
+                  and \texttt{translator} fields as well as the
+                  \texttt{indextitle} field},
+}
+
+@Book{averroes/hannes,
+  author       = {Averroes},
+  title        = {Des Averro{\"e}s Abhandlung: \mkbibquote{{\"U}ber die
+                  M{\"o}glichkeit der Conjunktion} oder \mkbibquote{{\"U}ber den
+                  materiellen Intellekt}},
+  date         = 1892,
+  editor       = {Hannes, Ludwig},
+  translator   = {Hannes, Ludwig},
+  annotator    = {Hannes, Ludwig},
+  publisher    = {C.~A. Kaemmerer},
+  location     = {Halle an der Saale},
+  keywords     = {primary},
+  hyphenation  = {german},
+  sorttitle    = {Uber die Moglichkeit der Conjunktion},
+  indexsorttitle= {Uber die Moglichkeit der Conjunktion},
+  indextitle   = {{\"U}ber die M{\"o}glichkeit der Conjunktion},
+  shorttitle   = {{\"U}ber die M{\"o}glichkeit der Conjunktion},
+  annotation   = {An annotated edition. Note the concatenation of the
+                  \texttt{editor}, \texttt{translator}, and \texttt{annotator}
+                  fields. Also note the \texttt{shorttitle},
+                  \texttt{indextitle}, \texttt{sorttitle}, and
+                  \texttt{indexsorttitle} fields},
+}
+
+@Book{averroes/hercz,
+  author       = {Averroes},
+  title        = {Drei Abhandlungen {\"u}ber die Conjunction des separaten
+                  Intellects mit dem Menschen},
+  date         = 1869,
+  editor       = {Hercz, J.},
+  translator   = {Hercz, J.},
+  publisher    = {S.~Hermann},
+  location     = {Berlin},
+  keywords     = {primary},
+  hyphenation  = {german},
+  indexsorttitle= {Drei Abhandlungen uber die Conjunction},
+  indextitle   = {Drei Abhandlungen {\"u}ber die Conjunction},
+  subtitle     = {Von Averroes (Vater und Sohn), aus dem Arabischen
+                  {\"u}bersetzt von Samuel Ibn Tibbon},
+  shorttitle   = {Drei Abhandlungen},
+  annotation   = {A \texttt{book} entry. Note the concatenation of the
+                  \texttt{editor} and \texttt{translator} fields as well as the
+                  \texttt{indextitle} and \texttt{indexsorttitle} fields},
+}
+
+@Book{cicero,
+  author       = {Cicero, Marcus Tullius},
+  title        = {De natura deorum. {\"U}ber das Wesen der G{\"o}tter},
+  date         = 1995,
+  editor       = {Blank-Sangmeister, Ursula},
+  translator   = {Blank-Sangmeister, Ursula},
+  afterword    = {Thraede, Klaus},
+  language     = {langlatin and langgerman},
+  publisher    = {Reclam},
+  location     = {Stuttgart},
+  hyphenation  = {german},
+  indextitle   = {De natura deorum},
+  shorttitle   = {De natura deorum},
+  annotation   = {A bilingual edition of Cicero's \emph{De natura deorum}, with
+                  a German translation. Note the format of the \texttt{language}
+                  field in the database file, the concatenation of the
+                  \texttt{editor} and \texttt{translator} fields, and the
+                  \texttt{afterword} field},
+}
+
+@Book{coleridge,
+  author       = {Coleridge, Samuel Taylor},
+  title        = {Biographia literaria, or Biographical sketches of my literary
+                  life and opinions},
+  date         = 1983,
+  editor       = {Coburn, Kathleen and Engell, James and Bate, W. Jackson},
+  maintitle    = {The collected works of Samuel Taylor Coleridge},
+  volume       = 7,
+  part         = 2,
+  series       = {Bollingen Series},
+  number       = 75,
+  publisher    = {Routledge and Kegan Paul},
+  location     = {London},
+  hyphenation  = {british},
+  indextitle   = {Biographia literaria},
+  shorttitle   = {Biographia literaria},
+  annotation   = {One (partial) volume of a multivolume book. This is a
+                  \texttt{book} entry with a \texttt{volume} and a \texttt{part}
+                  field which explicitly refers to the second (physical) part of
+                  the seventh (logical) volume. Also note the \texttt{series}
+                  and \texttt{number} fields},
+}
+
+@Book{companion,
+  author       = {Goossens, Michel and Mittelbach, Frank and Samarin, Alexander},
+  title        = {The LaTeX Companion},
+  date         = 1994,
+  edition      = 1,
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  pagetotal    = 528,
+  hyphenation  = {american},
+  sorttitle    = {LaTeX Companion},
+  indextitle   = {LaTeX Companion, The},
+  shorttitle   = {LaTeX Companion},
+  annotation   = {A book with three authors. Note the formatting of the author
+                  list. By default, only the first name is reversed in the
+                  bibliography},
+}
+
+@Book{cotton,
+  author       = {Cotton, Frank Albert and Wilkinson, Geoffrey and Murillio,
+                  Carlos A. and Bochmann, Manfred},
+  title        = {Advanced inorganic chemistry},
+  date         = 1999,
+  edition      = 6,
+  publisher    = {Wiley},
+  location     = {Chichester},
+  hyphenation  = {british},
+  annotation   = {A \texttt{book} entry with \arabic{author} authors and an
+                  \texttt{edition} field. By default, long \texttt{author} and
+                  \texttt{editor} lists are automatically truncated. This is
+                  configurable},
+}
+
+@Book{gerhardt,
+  author       = {Gerhardt, Michael J.},
+  title        = {The Federal Appointments Process},
+  date         = 2000,
+  publisher    = {Duke University Press},
+  location     = {Durham and London},
+  hyphenation  = {american},
+  sorttitle    = {Federal Appointments Process},
+  indextitle   = {Federal Appointments Process, The},
+  subtitle     = {A Constitutional and Historical Analysis},
+  shorttitle   = {Federal Appointments Process},
+  annotation   = {This is a \texttt{book} entry. Note the format of the
+                  \texttt{location} field as well as the \texttt{sorttitle} and
+                  \texttt{indextitle} fields},
+}
+
+@Book{gonzalez,
+  author       = {Gonzalez, Ray},
+  title        = {The Ghost of John Wayne and Other Stories},
+  date         = 2001,
+  publisher    = {The University of Arizona Press},
+  location     = {Tucson},
+  isbn         = {0-816-52066-6},
+  hyphenation  = {american},
+  sorttitle    = {Ghost of John Wayne and Other Stories},
+  indextitle   = {Ghost of John Wayne and Other Stories, The},
+  shorttitle   = {Ghost of John Wayne},
+  annotation   = {A collection of short stories. This is a \texttt{book} entry.
+                  Note the \texttt{sorttitle} and \texttt{indextitle} fields in
+                  the database file. There's also an \texttt{isbn} field},
+}
+
+@Book{hammond,
+  author       = {Hammond, Christopher},
+  title        = {The basics of crystallography and diffraction},
+  date         = 1997,
+  publisher    = {International Union of Crystallography and Oxford University
+                  Press},
+  location     = {Oxford},
+  hyphenation  = {british},
+  sorttitle    = {Basics of crystallography and diffraction},
+  indextitle   = {Basics of crystallography and diffraction, The},
+  shorttitle   = {Crystallography and diffraction},
+  annotation   = {A \texttt{book} entry. Note the \texttt{sorttitle} and
+                  \texttt{indextitle} fields as well as the format of the
+                  \texttt{publisher} field},
+}
+
+@Book{iliad,
+  author       = {Homer},
+  title        = {Die Ilias},
+  date         = 2004,
+  translator   = {Schadewaldt, Wolfgang},
   introduction = {Latacz, Joachim},
-  indextitle = {Ilias, Die},
-  title = {Die Ilias},
-  shorttitle = {Ilias},
-  edition = {3},
-  publisher = {Artemis \& Winkler},
-  location = {D{\"u}sseldorf and Z{\"u}rich},
-  date = {2004},
-  annotation = {A German translation of the \emph{Iliad}. Note the
-    \texttt{translator} and \texttt{introduction} fields and the format of
-    the \texttt{location} field in the database file. Also note the
-    \texttt{sorttitle} and \texttt{indextitle} fields}
-}
-@book{knuth:ct,
-  hyphenation = {american},
-  sortyear = {1984-0},
-  sorttitle = {Computers & Typesetting},
-  indexsorttitle = {Computers & Typesetting},
-  author = {Knuth, Donald E.},
-  title = {Computers \& Typesetting},
-  volumes = {5},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1984/1986},
-  annotation = {A five-volume book cited as a whole. This is a \texttt{book}
-    entry, note the \texttt{volumes} field}
-}
-@book{knuth:ct:a,
-  hyphenation = {american},
-  sortyear = {1984-1},
-  sorttitle = {Computers & Typesetting A},
-  indexsorttitle = {The TeXbook},
-  author = {Knuth, Donald E.},
-  indextitle = {\protect\TeX book, The},
-  title = {The \TeX book},
-  shorttitle = {\TeX book},
-  maintitle = {Computers \& Typesetting},
-  volume = {A},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1984},
-  annotation = {The first volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields. We want this volume to
-    be listed after the entry referring to the entire five-volume set. Also
-    note the \texttt{indextitle} and \texttt{indexsorttitle} fields. Indexing
-    packages that don't generate robust index entries require some control
-    sequences to be protected from expansion}
-}
-@book{knuth:ct:b,
-  hyphenation = {american},
-  sortyear = {1986-1},
-  sorttitle = {Computers & Typesetting B},
-  indexsorttitle = {TeX: The Program},
-  author = {Knuth, Donald E.},
-  title = {\TeX: The Program},
-  shorttitle = {\TeX},
-  maintitle = {Computers \& Typesetting},
-  volume = {B},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1986},
-  annotation = {The second volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields. Also note the
-    \texttt{indexsorttitle} field}
-}
-@book{knuth:ct:c,
-  hyphenation = {american},
-  sortyear = {1986-2},
-  sorttitle = {Computers & Typesetting C},
-  author = {Knuth, Donald E.},
-  indextitle = {METAFONTbook, The},
-  title = {The METAFONTbook},
-  shorttitle = {METAFONTbook},
-  maintitle = {Computers \& Typesetting},
-  volume = {C},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1986},
-  annotation = {The third volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields as well as the
-    \texttt{indextitle} field}
-}
-@book{knuth:ct:d,
-  hyphenation = {american},
-  sortyear = {1986-3},
-  sorttitle = {Computers & Typesetting D},
-  author = {Knuth, Donald E.},
-  title = {METAFONT: The Program},
-  shorttitle = {METAFONT},
-  maintitle = {Computers \& Typesetting},
-  volume = {D},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1986},
-  annotation = {The fourth volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields}
-}
-@book{knuth:ct:e,
-  hyphenation = {american},
-  sortyear = {1986-4},
-  sorttitle = {Computers & Typesetting E},
-  author = {Knuth, Donald E.},
-  title = {Computer Modern Typefaces},
-  maintitle = {Computers \& Typesetting},
-  volume = {E},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1986},
-  annotation = {The fifth volume of a five-volume book. Note the
-    \texttt{sorttitle} and \texttt{sortyear} fields}
-}
-@book{knuth:ct:related,
-  hyphenation = {american},
-  sortyear = {1984-0},
-  sorttitle = {Computers & Typesetting},
-  indexsorttitle = {Computers & Typesetting},
-  author = {Knuth, Donald E.},
-  title = {Computers \& Typesetting},
-  volumes = {5},
-  related = {knuth:ct:a,knuth:ct:b,knuth:ct:c,knuth:ct:d,knuth:ct:e},
-  relatedtype = {multivolume},
-  publisher = {Addison-Wesley},
-  location = {Reading, Mass.},
-  date = {1984/1986},
-  annotation = {A five-volume book cited as a whole and related to its
-    individual volumes. Note the \texttt{related} and \texttt{relatedtype}
-    fields}
-}
-@book{kullback,
-  title = {Information Theory and Statistics},
-  author = {Kullback, Solomon},
-  year = {1959},
-  publisher = {John Wiley \& Sons},
-  location = {New York}
-}
-@book{kullback:reprint,
-  title = {Information Theory and Statistics},
-  author = {Kullback, Solomon},
-  year = {1997},
-  origyear = {1959},
-  publisher = {Dover Publications},
-  origpublisher = {John Wiley \& Sons},
-  location = {New York},
-  annotation = {A reprint of the \texttt{kullback} entry. Note the format of
-    \texttt{origyear} and \texttt{origpublisher}. These fields are not used by
-    the standard bibliography styles}
-}
-@book{kullback:related,
-  title = {Information Theory and Statistics},
-  author = {Kullback, Solomon},
-  year = {1997},
-  publisher = {Dover Publications},
-  location = {New York},
-  related = {kullback},
-  relatedtype = {origpubin},
-  annotation = {A reprint of the \texttt{kullback} entry. Note the format of
-    the \texttt{related} and \texttt{relatedtype} fields}
-}
-@book{malinowski,
-  hyphenation = {british},
-  author = {Malinowski, Bronis{\l}aw},
-  title = {Argonauts of the Western Pacific},
-  subtitle = {An account of native enterprise and adventure in the
-     Archipelagoes of Melanesian New Guinea},
-  shorttitle = {Argonauts},
-  edition = {8},
-  publisher = {Routledge and Kegan Paul},
-  location = {London},
-  date = {1972},
-  annotation = {This is a \texttt{book} entry. Note the format of the
-    \texttt{publisher} and \texttt{edition} fields as well as the
-    \texttt{subtitle} field}
-}
-@book{maron,
-  hyphenation = {american},
-  author = {Maron, Monika},
-  translator = {Brigitte Goldstein},
-  title = {Animal Triste},
-  shorttitle = {Animal Triste},
-  publisher = {University of Nebraska Press},
-  location = {Lincoln},
-  date = {2000},
+  edition      = 3,
+  publisher    = {Artemis \& Winkler},
+  location     = {D{\"u}sseldorf and Z{\"u}rich},
+  hyphenation  = {german},
+  sorttitle    = {Ilias},
+  indextitle   = {Ilias, Die},
+  shorttitle   = {Ilias},
+  annotation   = {A German translation of the \emph{Iliad}. Note the
+                  \texttt{translator} and \texttt{introduction} fields and the
+                  format of the \texttt{location} field in the database
+                  file. Also note the \texttt{sorttitle} and \texttt{indextitle}
+                  fields},
+}
+
+@Book{knuth:ct,
+  author       = {Knuth, Donald E.},
+  title        = {Computers \& Typesetting},
+  date         = {1984/1986},
+  volumes      = 5,
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1984-0},
+  sorttitle    = {Computers & Typesetting},
+  indexsorttitle= {Computers & Typesetting},
+  annotation   = {A five-volume book cited as a whole. This is a \texttt{book}
+                  entry, note the \texttt{volumes} field},
+}
+
+@Book{knuth:ct:a,
+  author       = {Knuth, Donald E.},
+  title        = {The \TeX book},
+  date         = 1984,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {A},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1984-1},
+  sorttitle    = {Computers & Typesetting A},
+  indexsorttitle= {The TeXbook},
+  indextitle   = {\protect\TeX book, The},
+  shorttitle   = {\TeX book},
+  annotation   = {The first volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields. We want this
+                  volume to be listed after the entry referring to the entire
+                  five-volume set. Also note the \texttt{indextitle} and
+                  \texttt{indexsorttitle} fields. Indexing packages that don't
+                  generate robust index entries require some control sequences
+                  to be protected from expansion},
+}
+
+@Book{knuth:ct:b,
+  author       = {Knuth, Donald E.},
+  title        = {\TeX: The Program},
+  date         = 1986,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {B},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1986-1},
+  sorttitle    = {Computers & Typesetting B},
+  indexsorttitle= {TeX: The Program},
+  shorttitle   = {\TeX},
+  annotation   = {The second volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields. Also note the
+                  \texttt{indexsorttitle} field},
+}
+
+@Book{knuth:ct:c,
+  author       = {Knuth, Donald E.},
+  title        = {The METAFONTbook},
+  date         = 1986,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {C},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1986-2},
+  sorttitle    = {Computers & Typesetting C},
+  indextitle   = {METAFONTbook, The},
+  shorttitle   = {METAFONTbook},
+  annotation   = {The third volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields as well as the
+                  \texttt{indextitle} field},
+}
+
+@Book{knuth:ct:d,
+  author       = {Knuth, Donald E.},
+  title        = {METAFONT: The Program},
+  date         = 1986,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {D},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1986-3},
+  sorttitle    = {Computers & Typesetting D},
+  shorttitle   = {METAFONT},
+  annotation   = {The fourth volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields},
+}
+
+@Book{knuth:ct:e,
+  author       = {Knuth, Donald E.},
+  title        = {Computer Modern Typefaces},
+  date         = 1986,
+  maintitle    = {Computers \& Typesetting},
+  volume       = {E},
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1986-4},
+  sorttitle    = {Computers & Typesetting E},
+  annotation   = {The fifth volume of a five-volume book. Note the
+                  \texttt{sorttitle} and \texttt{sortyear} fields},
+}
+
+@Book{knuth:ct:related,
+  author       = {Knuth, Donald E.},
+  title        = {Computers \& Typesetting},
+  date         = {1984/1986},
+  volumes      = 5,
+  publisher    = {Addison-Wesley},
+  location     = {Reading, Mass.},
+  hyphenation  = {american},
+  sortyear     = {1984-0},
+  sorttitle    = {Computers & Typesetting},
+  indexsorttitle= {Computers & Typesetting},
+  related      = {knuth:ct:a,knuth:ct:b,knuth:ct:c,knuth:ct:d,knuth:ct:e},
+  relatedtype  = {multivolume},
+  annotation   = {A five-volume book cited as a whole and related to its
+                  individual volumes. Note the \texttt{related} and
+                  \texttt{relatedtype} fields},
+}
+
+@Book{kullback,
+  author       = {Kullback, Solomon},
+  title        = {Information Theory and Statistics},
+  year         = 1959,
+  publisher    = {John Wiley \& Sons},
+  location     = {New York},
+  hyphenation  = {american},
+}
+
+@Book{kullback:reprint,
+  author       = {Kullback, Solomon},
+  title        = {Information Theory and Statistics},
+  year         = 1997,
+  publisher    = {Dover Publications},
+  location     = {New York},
+  origyear     = 1959,
+  origpublisher= {John Wiley \& Sons},
+  hyphenation  = {american},
+  annotation   = {A reprint of the \texttt{kullback} entry. Note the format of
+                  \texttt{origyear} and \texttt{origpublisher}. These fields are
+                  not used by the standard bibliography styles},
+}
+
+@Book{kullback:related,
+  author       = {Kullback, Solomon},
+  title        = {Information Theory and Statistics},
+  year         = 1997,
+  publisher    = {Dover Publications},
+  location     = {New York},
+  hyphenation  = {american},
+  related      = {kullback},
+  relatedtype  = {origpubin},
+  annotation   = {A reprint of the \texttt{kullback} entry. Note the format of
+                  the \texttt{related} and \texttt{relatedtype} fields},
+}
+
+@Book{malinowski,
+  author       = {Malinowski, Bronis{\l}aw},
+  title        = {Argonauts of the Western Pacific},
+  date         = 1972,
+  edition      = 8,
+  publisher    = {Routledge and Kegan Paul},
+  location     = {London},
+  hyphenation  = {british},
+  subtitle     = {An account of native enterprise and adventure in the
+                  Archipelagoes of Melanesian New Guinea},
+  shorttitle   = {Argonauts},
+  annotation   = {This is a \texttt{book} entry. Note the format of the
+                  \texttt{publisher} and \texttt{edition} fields as well as the
+                  \texttt{subtitle} field},
+}
+
+@Book{maron,
+  author       = {Maron, Monika},
+  title        = {Animal Triste},
+  date         = 2000,
+  translator   = {Brigitte Goldstein},
   origlanguage = {german},
-  annotation = {An English translation of a German novel with a French title.
-    In other words: a \texttt{book} entry with a \texttt{translator} field.
-    Note the \texttt{origlanguage} field which is concatenated with the
-    \texttt{translator}}
-}
-@book{massa,
-  hyphenation = {british},
-  author = {Werner Massa},
-  title = {Crystal structure determination},
-  edition = {2},
-  publisher = {Spinger},
-  location = {Berlin},
-  date = {2004},
-  annotation = {A \texttt{book} entry with an \texttt{edition} field}
-}
-@book{nietzsche:ksa,
-  hyphenation = {german},
-  sortyear = {1988-00-000},
-  sorttitle = {Werke-00-000},
-  indexsorttitle = {Samtliche Werke},
-  author = {Nietzsche, Friedrich},
-  editor = {Colli, Giorgio and Montinari, Mazzino},
-  title = {S{\"a}mtliche Werke},
-  subtitle = {Kritische Studienausgabe},
-  volumes = {15},
-  edition = {2},
-  publisher = dtv # { and Walter de Gruyter},
-  location = {M{\"u}nchen and Berlin and New York},
-  date = {1988},
-  annotation = {The critical edition of Nietzsche's works. This is a
-    \texttt{book} entry referring to a 15-volume work as a whole. Note the
-    \texttt{volumes} field and the format of the \texttt{publisher} and
-    \texttt{location} fields in the database file. Also note the
-    \texttt{sorttitle} and \texttt{sortyear} fields which are used to
-    fine-tune the sorting order of the bibliography. We want this item listed
-    first in the bibliography}
-}
-@book{nietzsche:ksa1,
-  hyphenation = {german},
-  sortyear = {1988-01-000},
-  sorttitle = {Werke-01-000},
-  indexsorttitle = {Samtliche Werke I},
-  author = {Nietzsche, Friedrich},
-  bookauthor = {Nietzsche, Friedrich},
-  editor = {Colli, Giorgio and Montinari, Mazzino},
-  indextitle = {S{\"a}mtliche Werke I},
-  title = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e Betrachtungen
-    I--IV. Nachgelassene Schriften 1870--1973},
-  shorttitle = {S{\"a}mtliche Werke I},
-  maintitle = {S{\"a}mtliche Werke},
+  publisher    = {University of Nebraska Press},
+  location     = {Lincoln},
+  hyphenation  = {american},
+  shorttitle   = {Animal Triste},
+  annotation   = {An English translation of a German novel with a French title.
+                  In other words: a \texttt{book} entry with a
+                  \texttt{translator} field.  Note the \texttt{origlanguage}
+                  field which is concatenated with the \texttt{translator}},
+}
+
+@Book{massa,
+  author       = {Werner Massa},
+  title        = {Crystal structure determination},
+  date         = 2004,
+  edition      = 2,
+  publisher    = {Spinger},
+  location     = {Berlin},
+  hyphenation  = {british},
+  annotation   = {A \texttt{book} entry with an \texttt{edition} field},
+}
+
+@Article{moore,
+  author       = {Moore, Gordon E.},
+  title        = {Cramming more components onto integrated circuits},
+  journaltitle = {Electronics},
+  year         = 1965,
+  volume       = 38,
+  number       = 8,
+  pages        = {114-117},
+  hyphenation  = {american},
+}
+
+@Article{moore:related,
+  author       = {Moore, Gordon E.},
+  title        = {Cramming more components onto integrated circuits},
+  journaltitle = {Proceedings of the {IEEE}},
+  year         = 1998,
+  volume       = 86,
+  number       = 1,
+  pages        = {82-85},
+  hyphenation  = {american},
+  related      = {moore},
+  relatedtype  = {reprintfrom},
+  annotation   = {A reprint of Moore's law. Note the \texttt{related} and
+                  \texttt{relatedtype} fields},
+}
+
+@Book{nietzsche:ksa,
+  author       = {Nietzsche, Friedrich},
+  title        = {S{\"a}mtliche Werke},
+  date         = 1988,
+  editor       = {Colli, Giorgio and Montinari, Mazzino},
+  edition      = 2,
+  volumes      = 15,
+  publisher    = dtv # { and Walter de Gruyter},
+  location     = {M{\"u}nchen and Berlin and New York},
+  hyphenation  = {german},
+  sortyear     = {1988-0},
+  sorttitle    = {Werke-00-000},
+  indexsorttitle= {Samtliche Werke},
+  subtitle     = {Kritische Studienausgabe},
+  annotation   = {The critical edition of Nietzsche's works. This is a
+                  \texttt{book} entry referring to a 15-volume work as a
+                  whole. Note the \texttt{volumes} field and the format of the
+                  \texttt{publisher} and \texttt{location} fields in the
+                  database file. Also note the \texttt{sorttitle} and
+                  \texttt{sortyear} fields which are used to fine-tune the
+                  sorting order of the bibliography. We want this item listed
+                  first in the bibliography},
+}
+
+@Book{nietzsche:ksa1,
+  author       = {Nietzsche, Friedrich},
+  title        = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e
+                  Betrachtungen I--IV. Nachgelassene Schriften 1870--1973},
+  date         = 1988,
+  editor       = {Colli, Giorgio and Montinari, Mazzino},
+  maintitle    = {S{\"a}mtliche Werke},
   mainsubtitle = {Kritische Studienausgabe},
-  volume = {1},
-  edition = {2},
-  publisher = dtv # { and Walter de Gruyter},
-  location = {M{\"u}nchen and Berlin and New York},
-  date = {1988},
-  annotation = {A single volume from the critical edition of Nietzsche's
-    works. This \texttt{book} entry explicitly refers to the first volume
-    only. Note the \texttt{title} and \texttt{maintitle} fields. Also note the
-    \texttt{sorttitle} and \texttt{sortyear} fields. We want this entry to be
-    listed after the entry referring to the entire edition}
-}
-@book{nussbaum,
-  keywords = {secondary},
-  hyphenation = {american},
-  sorttitle = {Aristotle's De Motu Animalium},
-  indexsorttitle = {Aristotle's De Motu Animalium},
-  author = {Nussbaum, Martha},
-  title = {Aristotle's \mkbibquote{De Motu Animalium}},
-  publisher = pup,
-  location = {Princeton},
-  date = {1978},
-  annotation = {A \texttt{book} entry. Note the \texttt{sorttitle} and
-    \texttt{indexsorttitle} fields and the markup of the quotes in the
-    database file}
-}
-@book{piccato,
-  hyphenation = {american},
-  author = {Piccato, Pablo},
-  title = {City of Suspects},
-  subtitle = {Crime in Mexico City, 1900--1931},
-  shorttitle = {City of Suspects},
-  publisher = {Duke University Press},
-  location = {Durham and London},
-  date = {2001},
-  annotation = {This is a \texttt{book} entry. Note the format of the
-    \texttt{location} field in the database file}
-}
-@book{vangennep,
-  options = {useprefix},
-  hyphenation = {french},
-  sorttitle = {Rites de passage},
-  author = {van Gennep, Arnold},
-  indextitle = {Rites de passage, Les},
-  title = {Les rites de passage},
-  shorttitle = {Rites de passage},
-  publisher = {Nourry},
-  location = {Paris},
-  date = {1909},
-  annotation = {A \texttt{book} entry. Note the format of the printed name and
-    compare the \texttt{useprefix} option in the \texttt{options} field as
-    well as \texttt{brandt} and \texttt{geer}}
-}
-@book{vangennep:trans,
-  options = {useprefix},
-  author = {van Gennep, Arnold},
-  translator = {Vizedom, Monika B. and Caffee, Gabrielle L.},
-  title = {The Rites of Passage},
-  indextitle = {Rites of Passage, The},
-  sorttitle = {Rites of Passage},
-  shorttitle = {Rites of Passage},
-  language = {english},
+  volume       = 1,
+  edition      = 2,
+  publisher    = dtv # { and Walter de Gruyter},
+  location     = {M{\"u}nchen and Berlin and New York},
+  hyphenation  = {german},
+  sortyear     = {1988-1},
+  sorttitle    = {Werke-01-000},
+  indexsorttitle= {Samtliche Werke I},
+  bookauthor   = {Nietzsche, Friedrich},
+  indextitle   = {S{\"a}mtliche Werke I},
+  shorttitle   = {S{\"a}mtliche Werke I},
+  annotation   = {A single volume from the critical edition of Nietzsche's
+                  works. This \texttt{book} entry explicitly refers to the first
+                  volume only. Note the \texttt{title} and \texttt{maintitle}
+                  fields. Also note the \texttt{sorttitle} and \texttt{sortyear}
+                  fields. We want this entry to be listed after the entry
+                  referring to the entire edition},
+}
+
+@Book{nussbaum,
+  author       = {Nussbaum, Martha},
+  title        = {Aristotle's \mkbibquote{De Motu Animalium}},
+  date         = 1978,
+  publisher    = pup,
+  location     = {Princeton},
+  keywords     = {secondary},
+  hyphenation  = {american},
+  sorttitle    = {Aristotle's De Motu Animalium},
+  indexsorttitle= {Aristotle's De Motu Animalium},
+  annotation   = {A \texttt{book} entry. Note the \texttt{sorttitle} and
+                  \texttt{indexsorttitle} fields and the markup of the quotes in
+                  the database file},
+}
+
+@Book{piccato,
+  author       = {Piccato, Pablo},
+  title        = {City of Suspects},
+  date         = 2001,
+  publisher    = {Duke University Press},
+  location     = {Durham and London},
+  hyphenation  = {american},
+  subtitle     = {Crime in Mexico City, 1900--1931},
+  shorttitle   = {City of Suspects},
+  annotation   = {This is a \texttt{book} entry. Note the format of the
+                  \texttt{location} field in the database file},
+}
+
+@Book{vangennep,
+  author       = {van Gennep, Arnold},
+  title        = {Les rites de passage},
+  date         = 1909,
+  publisher    = {Nourry},
+  location     = {Paris},
+  options      = {useprefix},
+  hyphenation  = {french},
+  sorttitle    = {Rites de passage},
+  indextitle   = {Rites de passage, Les},
+  shorttitle   = {Rites de passage},
+  annotation   = {A \texttt{book} entry. Note the format of the printed name and
+                  compare the \texttt{useprefix} option in the \texttt{options}
+                  field as well as \texttt{brandt} and \texttt{geer}},
+}
+
+@Book{vangennep:trans,
+  author       = {van Gennep, Arnold},
+  title        = {The Rites of Passage},
+  year         = 1960,
+  translator   = {Vizedom, Monika B. and Caffee, Gabrielle L.},
+  language     = {english},
   origlanguage = {french},
-  year = {1960},
-  publisher = {University of Chicago Press},
-  annotation = {A translation of the \texttt{vangennep} entry. Note the
-    \texttt{translator} and \texttt{origlanguage} fields. Compare with the
-    \texttt{vangennep:related} entry.}
-}
-@book{vangennep:related,
-  options = {useprefix},
-  hyphenation = {french},
-  author = {van Gennep, Arnold},
-  related = {vizedom:related},
-  relatedtype = {bytranslator},
-  sorttitle = {Rites de passage},
-  indextitle = {Rites de passage, Les},
-  title = {Les rites de passage},
-  shorttitle = {Rites de passage},
-  publisher = {Nourry},
-  location = {Paris},
-  date = {1909},
-  annotation = {A variant of the \texttt{vangennep} entry related to its
-    translation. Note the format of the \texttt{related} and
-    \texttt{relatedtype} fields}
-}
-@book{vizedom:related,
-  options = {usetranslator},
-  translator = {Vizedom, Monika B. and Caffee, Gabrielle L.},
-  related = {vangennep},
-  relatedtype = {translationof},
-  title = {The Rites of Passage},
-  indextitle = {Rites of Passage, The},
-  sorttitle = {Rites of Passage},
-  shorttitle = {Rites of Passage},
-  language = {english},
-  year = {1960},
-  publisher = {University of Chicago Press},
-  annotation = {A translated work from \texttt{vangennep}. Note the format of
-    the \texttt{related} and \texttt{relatedtype} fields}
-}
-@book{vazques-de-parga,
-  hyphenation = {spanish},
-  sorttitle = {Peregrinaciones a Santiago de Compostela},
-  author = {V{\'a}zques{ de }Parga, Luis and Lacarra, Jos{\'e} Mar{\'i}a
-    and Ur{\'i}a R{\'i}u, Juan},
-  indextitle = {Peregrinaciones a Santiago de Compostela, Las},
-  title = {Las Peregrinaciones a Santiago de Compostela},
-  shorttitle = {Peregrinaciones},
-  volumes = {3},
-  publisher = {Iberdrola},
-  location = {Pamplona},
-  date = {1993},
-  note = {Ed. facs. de la realizada en 1948--49},
-  annotation = {A multivolume book cited as a whole. This is a \texttt{book}
-    entry with \texttt{volumes}, \texttt{note}, \texttt{sorttitle}, and
-    \texttt{indextitle} fields}
-}
-@book{wilde,
-  title = {The Importance of Being Earnest: A Trivial Comedy for Serious
-    People},
-  author = {Wilde, Oscar},
-  series = {English and American drama of the Nineteenth Century},
-  year = {1899},
-  eprint ={4HIWAAAAYAAJ},
-  eprinttype = {googlebooks},
-  publisher = {Leonard Smithers and Company},
-  annotation = {A \texttt{book} with \texttt{eprint} and \texttt{eprinttype}
-    fields.}
-}
-@book{worman,
-  hyphenation = {american},
-  sorttitle = {Cast of Character},
-  author = {Worman, Nancy},
-  indextitle = {Cast of Character, The},
-  title = {The Cast of Character},
-  subtitle = {Style in Greek Literature},
-  shorttitle = {Cast of Character},
-  publisher = {University of Texas Press},
-  location = {Austin},
-  date = {2002},
-  annotation = {A \texttt{book} entry. Note the \texttt{sorttitle} and
-    \texttt{indextitle} fields}
-}
-@collection{britannica,
-  options = {useeditor=false},
-  label = {EB},
-  hyphenation = {british},
-  sorttitle = {Encyclop{\ae}dia Britannica},
-  editor = {Preece, Warren E.},
-  indextitle = {Encyclop{\ae}dia Britannica, The New},
-  title = {The New Encyclop{\ae}dia Britannica},
-  shorttitle = {Encyclop{\ae}dia Britannica},
-  volumes = {32},
-  edition = {15},
-  publisher = {Encyclop{\ae}dia Britannica},
-  location = {Chicago, Ill.},
-  date = {2003},
-  annotation = {This is a \texttt{collection} entry for an encyclopedia. Note
-    the \texttt{useeditor} option in the \texttt{options} field as well as the
-    \texttt{sorttitle} field. We want this entry to be cited and alphabetized
-    by title even though there is an editor. In addition to that, we want the
-    title to be alphabetized under \enquote*{E} rather than \enquote*{T}. Also
-    note the \texttt{label} field which is provided for author-year citation
-    styles}
-}
-@collection{gaonkar,
-  hyphenation = {american},
-  editor = {Gaonkar, Dilip Parameshwar},
-  title = {Alternative Modernities},
-  publisher = {Duke University Press},
-  location = {Durham and London},
-  date = {2001},
-  isbn = {0-822-32714-7},
-  annotation = {This is a \texttt{collection} entry. Note the format of the
-    \texttt{location} field in the database file as well as the \texttt{isbn}
-    field}
-}
-@incollection{gaonkar:in,
-  author = {Gaonkar, Dilip Parameshwar},
-  title = {On Alternative Modernities},
-  pages = {1--23},
-  editor = {Gaonkar, Dilip Parameshwar},
-  booktitle = {Alternative Modernities},
-  publisher = {Duke University Press},
-  location = {Durham and London},
-  date = {2001},
-  isbn = {0-822-32714-7}
-}
-@collection{jaffe,
-  editor = {Jaff{\'e}, Philipp},
-  editora = {Loewenfeld, Samuel and Kaltenbrunner, Ferdinand and Ewald, Paul},
-  editoratype = {redactor},
-  indextitle = {Regesta Pontificum Romanorum},
-  title = {Regesta Pontificum Romanorum ab condita ecclesia ad annum post
-    Christum natum \textsc{mcxcviii}},
-  shorttitle = {Regesta Pontificum Romanorum},
-  volumes = {2},
-  edition = {2},
-  location = {Leipzig},
-  date = {1885/1888},
-  annotation = {A \texttt{collection} entry with \texttt{edition} and
-    \texttt{volumes} fields. Note the \texttt{editora} and
-    \texttt{editoratype} fields}
-}
-@collection{westfahl:frontier,
-  hyphenation = {american},
-  editor = {Westfahl, Gary},
-  title = {Space and Beyond},
-  subtitle = {The Frontier Theme in Science Fiction},
-  booktitle = {Space and Beyond},
+  publisher    = {University of Chicago Press},
+  options      = {useprefix},
+  indextitle   = {Rites of Passage, The},
+  sorttitle    = {Rites of Passage},
+  shorttitle   = {Rites of Passage},
+  hyphenation  = {american},
+  annotation   = {A translation of the \texttt{vangennep} entry. Note the
+                  \texttt{translator} and \texttt{origlanguage} fields. Compare
+                  with the \texttt{vangennep:related} entry.},
+}
+
+@Book{vangennep:related,
+  author       = {van Gennep, Arnold},
+  title        = {Les rites de passage},
+  date         = 1909,
+  publisher    = {Nourry},
+  location     = {Paris},
+  options      = {useprefix},
+  hyphenation  = {french},
+  related      = {vizedom:related},
+  relatedtype  = {bytranslator},
+  sorttitle    = {Rites de passage},
+  indextitle   = {Rites de passage, Les},
+  shorttitle   = {Rites de passage},
+  annotation   = {A variant of the \texttt{vangennep} entry related to its
+                  translation. Note the format of the \texttt{related} and
+                  \texttt{relatedtype} fields},
+}
+
+@Book{vizedom:related,
+  title        = {The Rites of Passage},
+  year         = 1960,
+  translator   = {Vizedom, Monika B. and Caffee, Gabrielle L.},
+  language     = {english},
+  publisher    = {University of Chicago Press},
+  hyphenation  = {american},
+  options      = {usetranslator},
+  related      = {vangennep},
+  relatedtype  = {translationof},
+  indextitle   = {Rites of Passage, The},
+  sorttitle    = {Rites of Passage},
+  shorttitle   = {Rites of Passage},
+  annotation   = {A translated work from \texttt{vangennep}. Note the format of
+                  the \texttt{related} and \texttt{relatedtype} fields},
+}
+
+@Book{vazques-de-parga,
+  author       = {V{\'a}zques{ de }Parga, Luis and Lacarra, Jos{\'e} Mar{\'i}a
+                  and Ur{\'i}a R{\'i}u, Juan},
+  title        = {Las Peregrinaciones a Santiago de Compostela},
+  date         = 1993,
+  volumes      = 3,
+  note         = {Ed. facs. de la realizada en 1948--49},
+  publisher    = {Iberdrola},
+  location     = {Pamplona},
+  hyphenation  = {spanish},
+  sorttitle    = {Peregrinaciones a Santiago de Compostela},
+  indextitle   = {Peregrinaciones a Santiago de Compostela, Las},
+  shorttitle   = {Peregrinaciones},
+  annotation   = {A multivolume book cited as a whole. This is a \texttt{book}
+                  entry with \texttt{volumes}, \texttt{note},
+                  \texttt{sorttitle}, and \texttt{indextitle} fields},
+}
+
+@Book{wilde,
+  author       = {Wilde, Oscar},
+  title        = {The Importance of Being Earnest: A Trivial Comedy for Serious
+                  People},
+  year         = 1899,
+  series       = {English and American drama of the Nineteenth Century},
+  publisher    = {Leonard Smithers and Company},
+  eprint       = {4HIWAAAAYAAJ},
+  eprinttype   = {googlebooks},
+  annotation   = {A \texttt{book} with \texttt{eprint} and \texttt{eprinttype}
+                  fields.},
+}
+
+@Book{worman,
+  author       = {Worman, Nancy},
+  title        = {The Cast of Character},
+  date         = 2002,
+  publisher    = {University of Texas Press},
+  location     = {Austin},
+  hyphenation  = {american},
+  sorttitle    = {Cast of Character},
+  indextitle   = {Cast of Character, The},
+  subtitle     = {Style in Greek Literature},
+  shorttitle   = {Cast of Character},
+  annotation   = {A \texttt{book} entry. Note the \texttt{sorttitle} and
+                  \texttt{indextitle} fields},
+}
+
+@Collection{britannica,
+  editor       = {Preece, Warren E.},
+  title        = {The New Encyclop{\ae}dia Britannica},
+  date         = 2003,
+  edition      = 15,
+  volumes      = 32,
+  publisher    = {Encyclop{\ae}dia Britannica},
+  location     = {Chicago, Ill.},
+  options      = {useeditor=false},
+  label        = {EB},
+  hyphenation  = {british},
+  sorttitle    = {Encyclop{\ae}dia Britannica},
+  indextitle   = {Encyclop{\ae}dia Britannica, The New},
+  shorttitle   = {Encyclop{\ae}dia Britannica},
+  annotation   = {This is a \texttt{collection} entry for an encyclopedia. Note
+                  the \texttt{useeditor} option in the \texttt{options} field as
+                  well as the \texttt{sorttitle} field. We want this entry to be
+                  cited and alphabetized by title even though there is an
+                  editor. In addition to that, we want the title to be
+                  alphabetized under \enquote*{E} rather than \enquote*{T}. Also
+                  note the \texttt{label} field which is provided for
+                  author-year citation styles},
+}
+
+@Collection{gaonkar,
+  editor       = {Gaonkar, Dilip Parameshwar},
+  title        = {Alternative Modernities},
+  date         = 2001,
+  publisher    = {Duke University Press},
+  location     = {Durham and London},
+  isbn         = {0-822-32714-7},
+  hyphenation  = {american},
+  annotation   = {This is a \texttt{collection} entry. Note the format of the
+                  \texttt{location} field in the database file as well as the
+                  \texttt{isbn} field},
+}
+
+@InCollection{gaonkar:in,
+  author       = {Gaonkar, Dilip Parameshwar},
+  editor       = {Gaonkar, Dilip Parameshwar},
+  title        = {On Alternative Modernities},
+  date         = 2001,
+  booktitle    = {Alternative Modernities},
+  publisher    = {Duke University Press},
+  location     = {Durham and London},
+  isbn         = {0-822-32714-7},
+  pages        = {1-23},
+}
+
+@Collection{jaffe,
+  editor       = {Jaff{\'e}, Philipp},
+  title        = {Regesta Pontificum Romanorum ab condita ecclesia ad annum post
+                  Christum natum \textsc{mcxcviii}},
+  date         = {1885/1888},
+  editora      = {Loewenfeld, Samuel and Kaltenbrunner, Ferdinand and Ewald,
+                  Paul},
+  edition      = 2,
+  volumes      = 2,
+  location     = {Leipzig},
+  editoratype  = {redactor},
+  indextitle   = {Regesta Pontificum Romanorum},
+  shorttitle   = {Regesta Pontificum Romanorum},
+  annotation   = {A \texttt{collection} entry with \texttt{edition} and
+                  \texttt{volumes} fields. Note the \texttt{editora} and
+                  \texttt{editoratype} fields},
+}
+
+@Collection{westfahl:frontier,
+  editor       = {Westfahl, Gary},
+  title        = {Space and Beyond},
+  date         = 2000,
+  subtitle     = {The Frontier Theme in Science Fiction},
+  publisher    = {Greenwood},
+  location     = {Westport, Conn. and London},
+  hyphenation  = {american},
+  booktitle    = {Space and Beyond},
   booksubtitle = {The Frontier Theme in Science Fiction},
-  publisher = {Greenwood},
-  location = {Westport, Conn. and London},
-  date = {2000},
-  annotation = {This is a \texttt{collection} entry. Note the format of the
-    \texttt{location} field as well as the \texttt{subtitle} and
-    \texttt{booksubtitle} fields}
-}
-@inbook{kant:kpv,
-  shorthand = {KpV},
-  hyphenation = {german},
-  author = {Kant, Immanuel},
-  bookauthor = {Kant, Immanuel},
-  title = {Kritik der praktischen Vernunft},
-  shorttitle = {Kritik der praktischen Vernunft},
-  booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
-  maintitle = {Kants Werke. Akademie Textausgabe},
-  volume = {5},
-  publisher = {Walter de Gruyter},
-  location = {Berlin},
-  date = {1968},
-  pages = {1--163},
-  annotation = {An edition of Kant's \emph{Collected Works}, volume five. This
-    is an \texttt{inbook} entry which explicitly refers to the \emph{Critique
-    of Practical Reason} only, not to the entire fifth volume. Note the
-    \texttt{author} and \texttt{bookauthor} fields in the database file. By
-    default, the \texttt{bookauthor} is omitted if the values of the
-    \texttt{author} and \texttt{bookauthor} fields are identical}
-}
-@inbook{kant:ku,
-  shorthand = {KU},
-  hyphenation = {german},
-  author = {Kant, Immanuel},
-  bookauthor = {Kant, Immanuel},
-  title = {Kritik der Urtheilskraft},
-  booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
-  maintitle = {Kants Werke. Akademie Textausgabe},
-  volume = {5},
-  publisher = {Walter de Gruyter},
-  location = {Berlin},
-  date = {1968},
-  pages = {165--485},
-  annotation = {An edition of Kant's \emph{Collected Works}, volume five. This
-    is an \texttt{inbook} entry which explicitly refers to the \emph{Critique
-    of Judgment} only, not to the entire fifth volume}
-}
-@inbook{nietzsche:historie,
-  hyphenation = {german},
-  sortyear = {1988-01-243},
-  sorttitle = {Werke-01-243},
-  indexsorttitle = {Vom Nutzen und Nachtheil der Historie fur das Leben},
-  author = {Nietzsche, Friedrich},
-  bookauthor = {Nietzsche, Friedrich},
-  editor = {Colli, Giorgio and Montinari, Mazzino},
-  indextitle = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben},
-  title = {Unzeitgem{\"a}sse Betrachtungen. Zweites St{\"u}ck},
-  subtitle = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben},
-  shorttitle = {Vom Nutzen und Nachtheil der Historie},
-  booktitle = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e Betrachtungen
-    I--IV. Nachgelassene Schriften 1870--1973},
-  maintitle = {S{\"a}mtliche Werke},
+  annotation   = {This is a \texttt{collection} entry. Note the format of the
+                  \texttt{location} field as well as the \texttt{subtitle} and
+                  \texttt{booksubtitle} fields},
+}
+
+@InBook{kant:kpv,
+  title        = {Kritik der praktischen Vernunft},
+  date         = 1968,
+  author       = {Kant, Immanuel},
+  booktitle    = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
+  bookauthor   = {Kant, Immanuel},
+  maintitle    = {Kants Werke. Akademie Textausgabe},
+  volume       = 5,
+  publisher    = {Walter de Gruyter},
+  location     = {Berlin},
+  pages        = {1-163},
+  shorthand    = {KpV},
+  hyphenation  = {german},
+  shorttitle   = {Kritik der praktischen Vernunft},
+  annotation   = {An edition of Kant's \emph{Collected Works}, volume five. This
+                  is an \texttt{inbook} entry which explicitly refers to the
+                  \emph{Critique of Practical Reason} only, not to the entire
+                  fifth volume. Note the \texttt{author} and \texttt{bookauthor}
+                  fields in the database file. By default, the
+                  \texttt{bookauthor} is omitted if the values of the
+                  \texttt{author} and \texttt{bookauthor} fields are identical},
+}
+
+@InBook{kant:ku,
+  title        = {Kritik der Urtheilskraft},
+  date         = 1968,
+  author       = {Kant, Immanuel},
+  booktitle    = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft},
+  bookauthor   = {Kant, Immanuel},
+  maintitle    = {Kants Werke. Akademie Textausgabe},
+  volume       = 5,
+  publisher    = {Walter de Gruyter},
+  location     = {Berlin},
+  pages        = {165-485},
+  shorthand    = {KU},
+  hyphenation  = {german},
+  annotation   = {An edition of Kant's \emph{Collected Works}, volume five. This
+                  is an \texttt{inbook} entry which explicitly refers to the
+                  \emph{Critique of Judgment} only, not to the entire fifth
+                  volume},
+}
+
+@InBook{nietzsche:historie,
+  title        = {Unzeitgem{\"a}sse Betrachtungen. Zweites St{\"u}ck},
+  date         = 1988,
+  author       = {Nietzsche, Friedrich},
+  booktitle    = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e
+                  Betrachtungen I--IV. Nachgelassene Schriften 1870--1973},
+  bookauthor   = {Nietzsche, Friedrich},
+  editor       = {Colli, Giorgio and Montinari, Mazzino},
+  subtitle     = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben},
+  maintitle    = {S{\"a}mtliche Werke},
   mainsubtitle = {Kritische Studienausgabe},
-  volume = {1},
-  publisher = dtv # { and Walter de Gruyter},
-  location = {M{\"u}nchen and Berlin and New York},
-  date = {1988},
-  pages = {243--334},
-  annotation = {A single essay from the critical edition of Nietzsche's works.
-    This \texttt{inbook} entry explicitly refers to an essay found in the
-    first volume. Note the \texttt{title}, \texttt{booktitle}, and
-    \texttt{maintitle} fields. Also note the \texttt{sorttitle} and
-    \texttt{sortyear} fields. We want this entry to be listed after the entry
-    referring to the entire first volume}
-}
-@incollection{brandt,
-  options = {useprefix=false},
-  hyphenation = {german},
-  indexsorttitle = {Nordischen Lander von der Mitte des 11. Jahrhunderts bis
-    1448},
-  author = {von Brandt, Ahasver and Erich Hoffmann},
-  editor = {Ferdinand Seibt},
-  indextitle = {Nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis
-    1448, Die},
-  title = {Die nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis
-    1448},
-  shorttitle = {Die nordischen L{\"a}nder},
-  booktitle = {Europa im Hoch- und Sp{\"a}tmittelalter},
-  series = {Handbuch der europ{\"a}ischen Geschichte},
-  number = {2},
-  publisher = {Klett-Cotta},
-  location = {Stuttgart},
-  date = {1987},
-  pages = {884--917},
-  annotation = {An \texttt{incollection} entry with a \texttt{series} and a
-    \texttt{number}. Note the format of the printed name and compare the
-    \texttt{useprefix} option in the \texttt{options} field as well as
-    \texttt{vangennep}. Also note the \texttt{indextitle, and
-    \texttt{indexsorttitle} fields}}
-}
-@incollection{hyman,
-  keywords = {secondary},
-  hyphenation = {american},
-  author = {Arthur Hyman},
-  editor = {O'Meara, Dominic J.},
-  indextitle = {Aristotle's Theory of the Intellect},
-  title = {Aristotle's Theory of the Intellect and its Interpretation by
-    Averroes},
-  shorttitle = {Aristotle's Theory of the Intellect},
-  booktitle = {Studies in Aristotle},
-  series = {Studies in Philosophy and the History of Philosophy},
-  number = {9},
-  publisher = {The Catholic University of America Press},
-  location = {Washington, D.C.},
-  date = {1981},
-  pages = {161--191},
-  annotation = {An \texttt{incollection} entry with a \texttt{series} and
-    \texttt{number} field}
-}
-@incollection{pines,
-  keywords = {secondary},
-  hyphenation = {american},
-  author = {Pines, Shlomo},
-  editor = {Twersky, Isadore},
-  indextitle = {Limitations of Human Knowledge According to Al-Farabi, ibn
-    Bajja, and Maimonides, The},
-  title = {The Limitations of Human Knowledge According to Al-Farabi, ibn
-    Bajja, and Maimonides},
-  shorttitle = {Limitations of Human Knowledge},
-  booktitle = {Studies in Medieval Jewish History and Literature},
-  publisher = hup,
-  location = {Cambridge, Mass.},
-  date = {1979},
-  pages = {82--109},
-  annotation = {A typical \texttt{incollection} entry. Note the
-    \texttt{indextitle} field}
-}
-@inproceedings{moraux,
-  keywords = {secondary},
-  hyphenation = {french},
-  indexsorttitle = {De Anima dans la tradition grecque},
-  author = {Moraux, Paul},
-  editor = {Lloyd, G. E. R. and Owen, G. E. L.},
-  indextitle = {\emph{De Anima} dans la tradition gr{\`e}cque, Le},
-  title = {Le \emph{De Anima} dans la tradition gr{\`e}cque},
-  subtitle = {Quelques aspects de l'interpretation du trait{\'e}, de
-    Theophraste {\`a} Themistius},
-  shorttitle = {\emph{De Anima} dans la tradition gr{\`e}cque},
-  booktitle = {Aristotle on Mind and the Senses},
-  booktitleaddon = {Proceedings of the Seventh Symposium Aristotelicum},
-  eventdate = {1975},
-  publisher = cup,
-  location = {Cambridge},
-  date = {1979},
-  pages = {281--324},
-  annotation = {This is a typical \texttt{inproceedings} entry. Note the
-    \texttt{booksubtitle}, \texttt{shorttitle}, \texttt{indextitle}, and
-    \texttt{indexsorttitle} fields. Also note the \texttt{eventdate} field.}
-}
-@inproceedings{salam,
-  author = {Salam, Abdus},
-  editor = {Svartholm, Nils},
-  title = {Weak and Electromagnetic Interactions},
-  booktitle = {Elementary particle theory},
+  volume       = 1,
+  publisher    = dtv # { and Walter de Gruyter},
+  location     = {M{\"u}nchen and Berlin and New York},
+  pages        = {243-334},
+  hyphenation  = {german},
+  sortyear     = {1988-2},
+  sorttitle    = {Werke-01-243},
+  indexsorttitle= {Vom Nutzen und Nachtheil der Historie fur das Leben},
+  indextitle   = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben},
+  shorttitle   = {Vom Nutzen und Nachtheil der Historie},
+  annotation   = {A single essay from the critical edition of Nietzsche's works.
+                  This \texttt{inbook} entry explicitly refers to an essay found
+                  in the first volume. Note the \texttt{title},
+                  \texttt{booktitle}, and \texttt{maintitle} fields. Also note
+                  the \texttt{sorttitle} and \texttt{sortyear} fields. We want
+                  this entry to be listed after the entry referring to the
+                  entire first volume},
+}
+
+@InCollection{brandt,
+  author       = {von Brandt, Ahasver and Erich Hoffmann},
+  editor       = {Ferdinand Seibt},
+  title        = {Die nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts
+                  bis 1448},
+  date         = 1987,
+  booktitle    = {Europa im Hoch- und Sp{\"a}tmittelalter},
+  series       = {Handbuch der europ{\"a}ischen Geschichte},
+  number       = 2,
+  publisher    = {Klett-Cotta},
+  location     = {Stuttgart},
+  pages        = {884-917},
+  options      = {useprefix=false},
+  hyphenation  = {german},
+  indexsorttitle= {Nordischen Lander von der Mitte des 11. Jahrhunderts bis
+                  1448},
+  indextitle   = {Nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis
+                  1448, Die},
+  shorttitle   = {Die nordischen L{\"a}nder},
+  annotation   = {An \texttt{incollection} entry with a \texttt{series} and a
+                  \texttt{number}. Note the format of the printed name and
+                  compare the \texttt{useprefix} option in the \texttt{options}
+                  field as well as \texttt{vangennep}. Also note the
+                  \texttt{indextitle, and \texttt{indexsorttitle} fields}},
+}
+
+@InCollection{hyman,
+  author       = {Arthur Hyman},
+  editor       = {O'Meara, Dominic J.},
+  title        = {Aristotle's Theory of the Intellect and its Interpretation by
+                  Averroes},
+  date         = 1981,
+  booktitle    = {Studies in Aristotle},
+  series       = {Studies in Philosophy and the History of Philosophy},
+  number       = 9,
+  publisher    = {The Catholic University of America Press},
+  location     = {Washington, D.C.},
+  pages        = {161-191},
+  keywords     = {secondary},
+  hyphenation  = {american},
+  indextitle   = {Aristotle's Theory of the Intellect},
+  shorttitle   = {Aristotle's Theory of the Intellect},
+  annotation   = {An \texttt{incollection} entry with a \texttt{series} and
+                  \texttt{number} field},
+}
+
+@InCollection{pines,
+  author       = {Pines, Shlomo},
+  editor       = {Twersky, Isadore},
+  title        = {The Limitations of Human Knowledge According to Al-Farabi, ibn
+                  Bajja, and Maimonides},
+  date         = 1979,
+  booktitle    = {Studies in Medieval Jewish History and Literature},
+  publisher    = hup,
+  location     = {Cambridge, Mass.},
+  pages        = {82-109},
+  keywords     = {secondary},
+  hyphenation  = {american},
+  indextitle   = {Limitations of Human Knowledge According to Al-Farabi, ibn
+                  Bajja, and Maimonides, The},
+  shorttitle   = {Limitations of Human Knowledge},
+  annotation   = {A typical \texttt{incollection} entry. Note the
+                  \texttt{indextitle} field},
+}
+
+@InProceedings{moraux,
+  author       = {Moraux, Paul},
+  editor       = {Lloyd, G. E. R. and Owen, G. E. L.},
+  title        = {Le \emph{De Anima} dans la tradition gr{\`e}cque},
+  date         = 1979,
+  booktitle    = {Aristotle on Mind and the Senses},
+  subtitle     = {Quelques aspects de l'interpretation du trait{\'e}, de
+                  Theophraste {\`a} Themistius},
+  booktitleaddon= {Proceedings of the Seventh Symposium Aristotelicum},
+  eventdate    = 1975,
+  publisher    = cup,
+  location     = {Cambridge},
+  pages        = {281-324},
+  keywords     = {secondary},
+  hyphenation  = {french},
+  indexsorttitle= {De Anima dans la tradition grecque},
+  indextitle   = {\emph{De Anima} dans la tradition gr{\`e}cque, Le},
+  shorttitle   = {\emph{De Anima} dans la tradition gr{\`e}cque},
+  annotation   = {This is a typical \texttt{inproceedings} entry. Note the
+                  \texttt{booksubtitle}, \texttt{shorttitle},
+                  \texttt{indextitle}, and \texttt{indexsorttitle} fields. Also
+                  note the \texttt{eventdate} field.},
+}
+
+@InProceedings{salam,
+  author       = {Salam, Abdus},
+  editor       = {Svartholm, Nils},
+  title        = {Weak and Electromagnetic Interactions},
+  date         = 1968,
+  booktitle    = {Elementary particle theory},
   booksubtitle = {Relativistic groups and analyticity},
-  booktitleaddon = {Proceedings of the Eighth Nobel Symposium},
-  eventdate = {1968-05-19/1968-05-25},
-  venue = {Aspen{\"a}sgarden, Lerum},
-  publisher = {Almquist \& Wiksell},
-  location = {Stockholm},
-  date = {1968},
-  pages = {367--377}
-}
-@manual{cms,
-  label = {CMS},
-  hyphenation = {american},
-  sorttitle = {Chicago Manual of Style},
-  indextitle = {Chicago Manual of Style, The},
-  title = {The Chicago Manual of Style},
-  subtitle = {The Essential Guide for Writers, Editors, and Publishers},
-  shorttitle = {Chicago Manual of Style},
-  edition = {15},
-  publisher = {University of Chicago Press},
-  location = {Chicago, Ill.},
-  date = {2003},
-  isbn = {0-226-10403-6},
-  annotation = {This is a \texttt{manual} entry without an \texttt{author} or
-    \texttt{editor}. Note the \texttt{label} field in the database file which
-    is provided for author-year citation styles. Also note the
-    \texttt{sorttitle} and \texttt{indextitle} fields. By default, all entries
-    without an \texttt{author} or \texttt{editor} are alphabetized by
-    \texttt{title} but we want this entry to be alphabetized under
-    \enquote*{C} rather than \enquote*{T}. There's also an \texttt{isbn}
-    field}
-}
-@online{baez/online,
-  hyphenation = {american},
-  author = {Baez, John C. and Lauda, Aaron D.},
-  title = {Higher-Dimensional Algebra V: 2-Groups},
-  version = {3},
-  date = {2004-10-27},
-  eprinttype = {arxiv},
-  eprint = {math/0307200v3},
-  annotation = {An \texttt{online} reference from arXiv. Note the
-    \texttt{eprint} and \texttt{eprinttype} fields. Compare \texttt{baez\slash
-    article} which is the same item given as an \texttt{article} entry with
-    eprint information}
-}
-@online{ctan,
-  label = {CTAN},
-  hyphenation = {american},
-  title = {CTAN},
-  subtitle = {The Comprehensive TeX Archive Network},
-  date = {2006},
-  url = {http://www.ctan.org},
-  urldate = {2006-10-01},
-  annotation = {This is an \texttt{online} entry. The \textsc{url}, which is
-    given in the \texttt{url} field, is transformed into a clickable link if
-    \texttt{hyperref} support has been enabled. Note the format of the
-    \texttt{urldate} field (\texttt{yyyy-mm-dd}) in the database file. Also
-    note the \texttt{label} field which may be used as a fallback by citation
-    styles which need an \texttt{author} and\slash or a \texttt{year}}
-}
-@online{itzhaki,
-  hyphenation = {american},
-  author = {Itzhaki, Nissan},
-  title = {Some remarks on 't Hooft's S-matrix for black holes},
-  version = {1},
-  date = {1996-03-11},
-  eprinttype = {arxiv},
-  eprint = {hep-th/9603067},
-  annotation = {An \texttt{online} reference from arXiv. Note the
-    \texttt{eprint} and \texttt{eprinttype} fields. Also note that the arXiv
-    reference is transformed into a clickable link if \texttt{hyperref}
-    support has been enabled},
-  abstract = {We discuss the limitations of 't Hooft's proposal for the black
-    hole S-matrix. We find that the validity of the S-matrix implies violation
-    of the semi-classical approximation at scales large compared to the Planck
-    scale. We also show that the effect of the centrifugal barrier on the
-    S-matrix is crucial even for large transverse distances.}
-}
-@online{markey,
-  hyphenation = {american},
-  sorttitle = {Tame the Beast},
-  author = {Markey, Nicolas},
-  title = {Tame the BeaST},
-  subtitle = {The B to X of BibTeX},
-  version = {1.3},
-  date = {2005-10-16},
-  url = {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf},
-  urldate = {2006-10-01},
-  annotation = {An \texttt{online} entry for a tutorial. Note the format of
-    the \texttt{date} field (\texttt{yyyy-mm-dd}) in the database file.}
-}
-@online{wassenberg,
-  hyphenation = {american},
-  author = {Wassenberg, Jan and Sanders, Peter},
-  title = {Faster Radix Sort via Virtual Memory and Write-Combining},
-  version = {1},
-  date = {2010-08-17},
-  eprinttype = {arxiv},
-  eprintclass = {cs.DS},
-  eprint = {1008.2849v1},
-  annotation = {A recent \texttt{online} reference from arXiv using the new
-    (April 2007 onward) identifier format. Note the \texttt{eprint},
-    \texttt{eprinttype}, and \texttt{eprintclass} fields. Also note that the
-    arXiv reference is transformed into a clickable link if \texttt{hyperref}
-    support has been enabled},
-  abstract = {Sorting algorithms are the deciding factor for the performance
-    of common operations such as removal of duplicates or database sort-merge
-    joins. This work focuses on 32-bit integer keys, optionally paired with a
-    32-bit value. We present a fast radix sorting algorithm that builds upon a
-    microarchitecture-aware variant of counting sort}
-}
-@patent{almendro,
-  hyphenation = {german},
-  author = {Almendro, Jos{\'e} L. and Mart{\'i}n, Jacinto
-    and S{\'a}nchez, Alberto and Nozal, Fernando},
-  title = {Elektromagnetisches Signalhorn},
-  number = {EU-29702195U},
-  location = {countryfr and countryuk and countryde},
-  date = {1998},
-  annotation = {This is a \texttt{patent} entry with a \texttt{location}
-    field. The number is given in the \texttt{number} field. Note the format
-    of the \texttt{location} field in the database file. Compare
-    \texttt{laufenberg}, \texttt{sorace}, and \texttt{kowalik}}
-}
-@patent{kowalik,
-  hyphenation = {french},
-  author = {Kowalik, F. and Isard, M.},
-  indextitle = {Estimateur d'un d{\'e}faut de fonctionnement},
-  title = {Estimateur d'un d{\'e}faut de fonctionnement d'un modulateur en
-    quadrature et {\'e}tage de modulation l'utilisant},
-  type = {patreqfr},
-  number = {9500261},
-  date = {1995-01-11},
-  annotation = {This is a \texttt{patent} entry for a French patent request
-    with a full date. The number is given in the \texttt{number} field. Note
-    the format of the \texttt{type} and \texttt{date} fields in the database
-    file. Compare \texttt{almendro}, \texttt{laufenberg}, and \texttt{sorace}}
-}
-@patent{laufenberg,
-  hyphenation = {german},
-  author = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut
-    and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann, Miriam
-    and Myrzik, Christian and Schmid, Manfred and Nietfeld, Franz
-    and Thiel, Alexander and Braun, Harald and Ebner, Norbert},
-  holder = {{Robert Bosch GmbH} and {Daimler Chrysler AG}
-    and {Bayerische Motoren Werke AG}},
-  title = {Elektrische Einrichtung und Betriebsverfahren},
-  type = {patenteu},
-  number = {1700367},
-  date = {2006-09-13},
-  annotation = {This is a \texttt{patent} entry with a \texttt{holder} field.
-    Note the format of the \texttt{type} and \texttt{location} fields in the
-    database file. Compare \texttt{almendro}, \texttt{sorace}, and
-    \texttt{kowalik}},
-  abstract = {The invention relates to an electric device comprising a
-    generator, in particular for use in the vehicle electric system of a motor
-    vehicle and a controller for controlling the generator voltage. The device
-    is equipped with a control zone, in which the voltage is controlled and
-    zones, in which the torque is controlled. The invention also relates to
-    methods for operating a device of this type.},
-  file = {http://v3.espacenet.com/textdoc?IDX=EP1700367}
-}
-@patent{sorace,
-  hyphenation = {american},
-  author = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven A.},
-  holder = {{Hughes Aircraft Company}},
-  title = {High-Speed Digital-to-RF Converter},
-  type = {patentus},
-  number = {5668842},
-  date = {1997-09-16},
-  annotation = {This is a \texttt{patent} entry with a \texttt{holder} field.
-    Note the format of the \texttt{type} and \texttt{date} fields in the
-    database file. Compare \texttt{almendro}, \texttt{laufenberg}, and
-    \texttt{kowalik}}
-}
-@periodical{jcg,
-  title = {Computers and Graphics},
-  issuetitle = {Semantic {3D} Media and Content},
-  volume = {35},
-  number = {4},
-  year = {2011},
-  issn = {0097-8493},
-  annotation = {This is a \texttt{periodical} entry with an \texttt{issn}
-    field.}
-}
-@report{chiu,
-  hyphenation = {american},
-  sorttitle = {Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS)
-    Operating System},
-  author = {Chiu, Willy W. and Chow, We Min},
-  indextitle = {Hybrid Hierarchical Model, A},
-  title = {A Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS)
-    Operating System},
-  institution = {IBM},
-  type = {resreport},
-  number = {RC-6947},
-  date = {1978},
-  annotation = {This is a \texttt{report} entry for a research report. Note
-    the format of the \texttt{type} field in the database file which uses a
-    localization key. The number of the report is given in the \texttt{number}
-    field. Also note the \texttt{sorttitle} and \texttt{indextitle} fields}
-}
-@report{padhye,
-  hyphenation = {american},
-  sorttitle = {A Stochastic Model of TCP Reno Congestion Avoidance and
-    Control},
-  author = {Padhye, Jitendra and Firoiu, Victor and Towsley, Don},
-  indextitle = {Stochastic Model of TCP Reno Congestion Avoidance and Control,
-    A},
-  title = {A Stochastic Model of TCP Reno Congestion Avoidance and Control},
-  institution = {University of Massachusetts},
-  type = {techreport},
-  number = {99-02},
-  location = {Amherst, Mass.},
-  date = {1999},
-  annotation = {This is a \texttt{report} entry for a technical report. Note
-    the format of the \texttt{type} field in the database file which uses a
-    localization key. The number of the report is given in the \texttt{number}
-    field. Also note the \texttt{sorttitle} and \texttt{indextitle} fields},
-  abstract = {The steady state performance of a bulk transfer TCP flow (i.e. a
-    flow with a large amount of data to send, such as FTP transfers) may be
-    characterized by three quantities. The first is the send rate, which is
-    the amount of data sent by the sender in unit time. The second is the
-    throughput, which is the amount of data received by the receiver in unit
-    time. Note that the throughput will always be less than or equal to the
-    send rate due to losses. Finally, the number of non-duplicate packets
-    received by the receiver in unit time gives us the goodput of the
-    connection. The goodput is always less than or equal to the throughput,
-    since the receiver may receive two copies of the same packet due to
-    retransmissions by the sender. In a previous paper, we presented a simple
-    model for predicting the steady state send rate of a bulk transfer TCP
-    flow as a function of loss rate and round trip time. In this paper, we
-    extend that work in two ways. First, we analyze the performance of bulk
-    transfer TCP flows using more precise, stochastic analysis. Second, we
-    build upon the previous analysis to provide both an approximate formula as
-    well as a more accurate stochastic model for the steady state throughput
-    of a bulk transfer TCP flow.},
-  file = {ftp://gaia.cs.umass.edu/pub/Padhey99-markov.ps}
-}
-@thesis{geer,
-  options = {useprefix=false},
-  hyphenation = {british},
-  author = {de Geer, Ingrid},
-  title = {Earl, Saint, Bishop, Skald~-- and Music},
-  subtitle = {The Orkney Earldom of the Twelfth Century. A Musicological
-    Study},
-  institution = {Uppsala Universitet},
-  type = {phdthesis},
-  location = {Uppsala},
-  date = {1985},
-  annotation = {This is a typical \texttt{thesis} entry for a PhD thesis. Note
-    the \texttt{type} field in the database file which uses a localization
-    key. Also note the format of the printed name and compare the
-    \texttt{useprefix} option in the \texttt{options} field as well as
-    \texttt{vangennep}}
-}
-@thesis{loh,
-  hyphenation = {american},
-  author = {Loh, Nin C.},
-  title = {High-Resolution Micromachined Interferometric Accelerometer},
-  institution = {Massachusetts Institute of Technology},
-  type = {mathesis},
-  location = {Cambridge, Mass.},
-  date = {1992},
-  annotation = {This is a typical \texttt{thesis} entry for an MA thesis. Note
-    the \texttt{type} field in the database file which uses a localization
-    key}}
+  booktitleaddon= {Proceedings of the Eighth Nobel Symposium},
+  eventdate    = {1968-05-19/1968-05-25},
+  venue        = {Aspen{\"a}sgarden, Lerum},
+  publisher    = {Almquist \& Wiksell},
+  location     = {Stockholm},
+  pages        = {367-377},
+}
+
+@Manual{cms,
+  title        = {The Chicago Manual of Style},
+  date         = 2003,
+  subtitle     = {The Essential Guide for Writers, Editors, and Publishers},
+  edition      = 15,
+  publisher    = {University of Chicago Press},
+  location     = {Chicago, Ill.},
+  isbn         = {0-226-10403-6},
+  label        = {CMS},
+  hyphenation  = {american},
+  sorttitle    = {Chicago Manual of Style},
+  indextitle   = {Chicago Manual of Style, The},
+  shorttitle   = {Chicago Manual of Style},
+  annotation   = {This is a \texttt{manual} entry without an \texttt{author} or
+                  \texttt{editor}. Note the \texttt{label} field in the database
+                  file which is provided for author-year citation styles. Also
+                  note the \texttt{sorttitle} and \texttt{indextitle} fields. By
+                  default, all entries without an \texttt{author} or
+                  \texttt{editor} are alphabetized by \texttt{title} but we want
+                  this entry to be alphabetized under \enquote*{C} rather than
+                  \enquote*{T}. There's also an \texttt{isbn} field},
+}
+
+@Online{baez/online,
+  author       = {Baez, John C. and Lauda, Aaron D.},
+  title        = {Higher-Dimensional Algebra V: 2-Groups},
+  date         = {2004-10-27},
+  version      = 3,
+  hyphenation  = {american},
+  eprinttype   = {arxiv},
+  eprint       = {math/0307200v3},
+  annotation   = {An \texttt{online} reference from arXiv. Note the
+                  \texttt{eprint} and \texttt{eprinttype} fields. Compare
+                  \texttt{baez\slash article} which is the same item given as an
+                  \texttt{article} entry with eprint information},
+}
+
+@Online{ctan,
+  title        = {CTAN},
+  date         = 2006,
+  url          = {http://www.ctan.org},
+  subtitle     = {The Comprehensive TeX Archive Network},
+  urldate      = {2006-10-01},
+  label        = {CTAN},
+  hyphenation  = {american},
+  annotation   = {This is an \texttt{online} entry. The \textsc{url}, which is
+                  given in the \texttt{url} field, is transformed into a
+                  clickable link if \texttt{hyperref} support has been
+                  enabled. Note the format of the \texttt{urldate} field
+                  (\texttt{yyyy-mm-dd}) in the database file. Also note the
+                  \texttt{label} field which may be used as a fallback by
+                  citation styles which need an \texttt{author} and\slash or a
+                  \texttt{year}},
+}
+
+@Online{itzhaki,
+  author       = {Itzhaki, Nissan},
+  title        = {Some remarks on 't Hooft's S-matrix for black holes},
+  date         = {1996-03-11},
+  version      = 1,
+  hyphenation  = {american},
+  eprinttype   = {arxiv},
+  eprint       = {hep-th/9603067},
+  annotation   = {An \texttt{online} reference from arXiv. Note the
+                  \texttt{eprint} and \texttt{eprinttype} fields. Also note that
+                  the arXiv reference is transformed into a clickable link if
+                  \texttt{hyperref} support has been enabled},
+  abstract     = {We discuss the limitations of 't Hooft's proposal for the
+                  black hole S-matrix. We find that the validity of the S-matrix
+                  implies violation of the semi-classical approximation at
+                  scales large compared to the Planck scale. We also show that
+                  the effect of the centrifugal barrier on the S-matrix is
+                  crucial even for large transverse distances.},
+}
+
+@Online{markey,
+  author       = {Markey, Nicolas},
+  title        = {Tame the BeaST},
+  date         = {2005-10-16},
+  url          =
+                  {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf},
+  subtitle     = {The B to X of BibTeX},
+  version      = {1.3},
+  urldate      = {2006-10-01},
+  hyphenation  = {american},
+  sorttitle    = {Tame the Beast},
+  annotation   = {An \texttt{online} entry for a tutorial. Note the format of
+                  the \texttt{date} field (\texttt{yyyy-mm-dd}) in the database
+                  file.},
+}
+
+@Online{wassenberg,
+  author       = {Wassenberg, Jan and Sanders, Peter},
+  title        = {Faster Radix Sort via Virtual Memory and Write-Combining},
+  date         = {2010-08-17},
+  version      = 1,
+  hyphenation  = {american},
+  eprinttype   = {arxiv},
+  eprintclass  = {cs.DS},
+  eprint       = {1008.2849v1},
+  annotation   = {A recent \texttt{online} reference from arXiv using the new
+                  (April 2007 onward) identifier format. Note the
+                  \texttt{eprint}, \texttt{eprinttype}, and \texttt{eprintclass}
+                  fields. Also note that the arXiv reference is transformed into
+                  a clickable link if \texttt{hyperref} support has been
+                  enabled},
+  abstract     = {Sorting algorithms are the deciding factor for the performance
+                  of common operations such as removal of duplicates or database
+                  sort-merge joins. This work focuses on 32-bit integer keys,
+                  optionally paired with a 32-bit value. We present a fast radix
+                  sorting algorithm that builds upon a microarchitecture-aware
+                  variant of counting sort},
+}
+
+@Patent{almendro,
+  author       = {Almendro, Jos{\'e} L. and Mart{\'i}n, Jacinto and S{\'a}nchez,
+                  Alberto and Nozal, Fernando},
+  title        = {Elektromagnetisches Signalhorn},
+  number       = {EU-29702195U},
+  date         = 1998,
+  location     = {countryfr and countryuk and countryde},
+  hyphenation  = {german},
+  annotation   = {This is a \texttt{patent} entry with a \texttt{location}
+                  field. The number is given in the \texttt{number} field. Note
+                  the format of the \texttt{location} field in the database
+                  file. Compare \texttt{laufenberg}, \texttt{sorace}, and
+                  \texttt{kowalik}},
+}
+
+@Patent{kowalik,
+  author       = {Kowalik, F. and Isard, M.},
+  title        = {Estimateur d'un d{\'e}faut de fonctionnement d'un modulateur
+                  en quadrature et {\'e}tage de modulation l'utilisant},
+  number       = 9500261,
+  date         = {1995-01-11},
+  type         = {patreqfr},
+  hyphenation  = {french},
+  indextitle   = {Estimateur d'un d{\'e}faut de fonctionnement},
+  annotation   = {This is a \texttt{patent} entry for a French patent request
+                  with a full date. The number is given in the \texttt{number}
+                  field. Note the format of the \texttt{type} and \texttt{date}
+                  fields in the database file. Compare \texttt{almendro},
+                  \texttt{laufenberg}, and \texttt{sorace}},
+}
+
+@Patent{laufenberg,
+  author       = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut
+                  and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann,
+                  Miriam and Myrzik, Christian and Schmid, Manfred and Nietfeld,
+                  Franz and Thiel, Alexander and Braun, Harald and Ebner,
+                  Norbert},
+  title        = {Elektrische Einrichtung und Betriebsverfahren},
+  number       = 1700367,
+  date         = {2006-09-13},
+  holder       = {{Robert Bosch GmbH} and {Daimler Chrysler AG} and {Bayerische
+                  Motoren Werke AG}},
+  type         = {patenteu},
+  hyphenation  = {german},
+  annotation   = {This is a \texttt{patent} entry with a \texttt{holder} field.
+                  Note the format of the \texttt{type} and \texttt{location}
+                  fields in the database file. Compare \texttt{almendro},
+                  \texttt{sorace}, and \texttt{kowalik}},
+  abstract     = {The invention relates to an electric device comprising a
+                  generator, in particular for use in the vehicle electric
+                  system of a motor vehicle and a controller for controlling the
+                  generator voltage. The device is equipped with a control zone,
+                  in which the voltage is controlled and zones, in which the
+                  torque is controlled. The invention also relates to methods
+                  for operating a device of this type.},
+  file         = {http://v3.espacenet.com/textdoc?IDX=EP1700367},
+}
+
+@Patent{sorace,
+  author       = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven
+                  A.},
+  title        = {High-Speed Digital-to-RF Converter},
+  number       = 5668842,
+  date         = {1997-09-16},
+  holder       = {{Hughes Aircraft Company}},
+  type         = {patentus},
+  hyphenation  = {american},
+  annotation   = {This is a \texttt{patent} entry with a \texttt{holder} field.
+                  Note the format of the \texttt{type} and \texttt{date} fields
+                  in the database file. Compare \texttt{almendro},
+                  \texttt{laufenberg}, and \texttt{kowalik}},
+}
+
+@Periodical{jcg,
+  title        = {Computers and Graphics},
+  year         = 2011,
+  issuetitle   = {Semantic {3D} Media and Content},
+  volume       = 35,
+  number       = 4,
+  issn         = {0097-8493},
+  annotation   = {This is a \texttt{periodical} entry with an \texttt{issn}
+                  field.},
+}
+
+@Report{chiu,
+  author       = {Chiu, Willy W. and Chow, We Min},
+  title        = {A Hybrid Hierarchical Model of a Multiple Virtual Storage
+                  (MVS) Operating System},
+  type         = {resreport},
+  institution  = {IBM},
+  date         = 1978,
+  number       = {RC-6947},
+  hyphenation  = {american},
+  sorttitle    = {Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS)
+                  Operating System},
+  indextitle   = {Hybrid Hierarchical Model, A},
+  annotation   = {This is a \texttt{report} entry for a research report. Note
+                  the format of the \texttt{type} field in the database file
+                  which uses a localization key. The number of the report is
+                  given in the \texttt{number} field. Also note the
+                  \texttt{sorttitle} and \texttt{indextitle} fields},
+}
+
+@Report{padhye,
+  author       = {Padhye, Jitendra and Firoiu, Victor and Towsley, Don},
+  title        = {A Stochastic Model of TCP Reno Congestion Avoidance and
+                  Control},
+  type         = {techreport},
+  institution  = {University of Massachusetts},
+  date         = 1999,
+  number       = {99-02},
+  location     = {Amherst, Mass.},
+  hyphenation  = {american},
+  sorttitle    = {A Stochastic Model of TCP Reno Congestion Avoidance and
+                  Control},
+  indextitle   = {Stochastic Model of TCP Reno Congestion Avoidance and Control,
+                  A},
+  annotation   = {This is a \texttt{report} entry for a technical report. Note
+                  the format of the \texttt{type} field in the database file
+                  which uses a localization key. The number of the report is
+                  given in the \texttt{number} field. Also note the
+                  \texttt{sorttitle} and \texttt{indextitle} fields},
+  abstract     = {The steady state performance of a bulk transfer TCP flow
+                  (i.e. a flow with a large amount of data to send, such as FTP
+                  transfers) may be characterized by three quantities. The first
+                  is the send rate, which is the amount of data sent by the
+                  sender in unit time. The second is the throughput, which is
+                  the amount of data received by the receiver in unit time. Note
+                  that the throughput will always be less than or equal to the
+                  send rate due to losses. Finally, the number of non-duplicate
+                  packets received by the receiver in unit time gives us the
+                  goodput of the connection. The goodput is always less than or
+                  equal to the throughput, since the receiver may receive two
+                  copies of the same packet due to retransmissions by the
+                  sender. In a previous paper, we presented a simple model for
+                  predicting the steady state send rate of a bulk transfer TCP
+                  flow as a function of loss rate and round trip time. In this
+                  paper, we extend that work in two ways. First, we analyze the
+                  performance of bulk transfer TCP flows using more precise,
+                  stochastic analysis. Second, we build upon the previous
+                  analysis to provide both an approximate formula as well as a
+                  more accurate stochastic model for the steady state throughput
+                  of a bulk transfer TCP flow.},
+  file         = {ftp://gaia.cs.umass.edu/pub/Padhey99-markov.ps},
+}
+
+@Thesis{geer,
+  author       = {de Geer, Ingrid},
+  title        = {Earl, Saint, Bishop, Skald~-- and Music},
+  type         = {phdthesis},
+  institution  = {Uppsala Universitet},
+  date         = 1985,
+  subtitle     = {The Orkney Earldom of the Twelfth Century. A Musicological
+                  Study},
+  location     = {Uppsala},
+  options      = {useprefix=false},
+  hyphenation  = {british},
+  annotation   = {This is a typical \texttt{thesis} entry for a PhD thesis. Note
+                  the \texttt{type} field in the database file which uses a
+                  localization key. Also note the format of the printed name and
+                  compare the \texttt{useprefix} option in the \texttt{options}
+                  field as well as \texttt{vangennep}},
+}
+
+@Thesis{loh,
+  author       = {Loh, Nin C.},
+  title        = {High-Resolution Micromachined Interferometric Accelerometer},
+  type         = {mathesis},
+  institution  = {Massachusetts Institute of Technology},
+  date         = 1992,
+  location     = {Cambridge, Mass.},
+  hyphenation  = {american},
+  annotation   = {This is a typical \texttt{thesis} entry for an MA thesis. Note
+                  the \texttt{type} field in the database file which uses a
+                  localization key},
+}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index feff034590c..11184cb886e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,6 +1,16 @@
 \ProvidesFile{authoryear.bbx}
 [\abx@bbxid]
 
+% authoryear styles are special in the following way:
+
+% The citation labels are "labelname (labelyear)" and since citation
+% labels are the keys into the references section, the fact that the
+% citation uses labelyear means that the references must also. This
+% means we use a special \printdate[extra]label macro to generate the
+% references section main date for an entry. Otherwise, if labeldate selects
+% anything other than DATE (or equivalently, YEAR/MONTH), then the
+% citation won't match the reference.
+
 \RequireBibliographyStyle{standard}
 
 \DeclareBibliographyOption{dashed}[true]{%
@@ -23,21 +33,21 @@
 
 \def\bbx@opt@mergedate@maximum{%
   \renewbibmacro*{date+extrayear}{%
-    \iffieldundef{year}
+    \iffieldundef{labelyear}
       {}
       {\printtext[parens]{%
          \printfield{issue}%
 	 \setunit*{\addspace}%
-	 \printdateextra}}}%
+	 \printdateextralabel}}}%
   \renewbibmacro*{date}{}%
   \renewbibmacro*{issue+date}{}%
 }
 
 \def\bbx@opt@mergedate@compact{%
   \renewbibmacro*{date+extrayear}{%
-    \iffieldundef{year}
+    \iffieldundef{labelyear}
       {}
-      {\printtext[parens]{\printdateextra}}}%
+      {\printtext[parens]{\printdateextralabel}}}%
   \renewbibmacro*{date}{}%
   \renewbibmacro*{issue+date}{%
     \iffieldundef{issue}
@@ -118,7 +128,7 @@
     \newunit}%
 }
 
-\ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker,mergedate}
+\ExecuteBibliographyOptions{labeldate,sorting=nyt,pagetracker,mergedate}
 
 \DeclareFieldFormat{shorthandwidth}{#1}
 \setlength{\bibitemsep}{0pt}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index 5ae940ff95b..d70de1fd075 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
@@ -49,7 +49,7 @@
   \entryset
     {\ifbool{bbx:subentry}
        {\printfield[bibentrysetcount]{entrysetcount}%
-	\setunit*{\addnbspace}}
+	\printunit*{\addnbspace}}
        {}}
     {}%
   \newunit\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index 06d73b16a75..7af574d54c9 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -55,7 +55,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{book}{%
@@ -100,7 +103,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{booklet}{%
@@ -134,7 +140,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{collection}{%
@@ -177,7 +186,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{inbook}{%
@@ -225,7 +237,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{incollection}{%
@@ -271,7 +286,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{inproceedings}{%
@@ -319,7 +337,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{manual}{%
@@ -363,7 +384,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{misc}{%
@@ -395,7 +419,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{online}{%
@@ -429,7 +456,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{patent}{%
@@ -464,7 +494,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{periodical}{%
@@ -490,7 +523,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{proceedings}{%
@@ -535,7 +571,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{report}{%
@@ -573,7 +612,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{thesis}{%
@@ -607,7 +649,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{unpublished}{%
@@ -635,7 +680,10 @@
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \usebibmacro{related}%
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{shorthands}{%
@@ -833,42 +881,69 @@
 \newcounter{bbx:relatedcount}
 \newcounter{bbx:relatedtotal}
 
+\newbibmacro*{related:init}{%
+  \csundef{bbx:relatedloop}}
+
+\newbibmacro*{begrelated}{}
+\newbibmacro*{endrelated}{}
+
+\def\ifrelatedloop{%
+  \ifboolexpr{ test {\xifinlistcs{\strfield{entrykey}}{bbx:relatedloop}}
+    or test {\xifinlistcs{\strfield{clonesourcekey}}{bbx:relatedloop}} }}
+
 \newbibmacro*{related}{%
-  \ifboolexpr{
-    not test {\iftoggle{bbx:related}}
-    or
-    test {\iffieldundef{related}}
-  }
+  \ifboolexpr{ test {\iffieldundef{related}} or test {\ifrelatedloop} }
     {}
-    {\setcounter{bbx:relatedcount}{0}%
+    {\def\bbx@tempa{}%
      \setcounter{bbx:relatedtotal}{0}%
-     \def\do##1{\stepcounter{bbx:relatedtotal}}%
+     \def\do##1{%
+       \entrydata{##1}{%
+         \ifrelatedloop
+           {}
+           {\stepcounter{bbx:relatedtotal}%
+            \gappto{\bbx@tempa}{##1,}}}}%
      \docsvfield{related}%
-     \def\do{%
-       \stepcounter{bbx:relatedcount}%
-       \ifnumgreater{\value{bbx:relatedcount}}{1}
-         {\printtext{\relateddelim}}
-         {}}%
-     \ifbibmacroundef{related:\strfield{relatedtype}}
-       {\appto{\do}{\usebibmacro{related:default}}}
-       {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}%
-     \iffieldformatundef{related:\strfield{relatedtype}}
-       {\def\bbx@tempa{related}}
-       {\def\bbx@tempa{related:\strfield{relatedtype}}}%
-     \printtext[\bbx@tempa]{%
-       \iffieldundef{relatedstring}
-         {\ifboolexpr{
-            test {\ifnumgreater{\value{bbx:relatedtotal}}{1}}
-            and
-            test {\ifbibxstring{\thefield{relatedtype}s}}
-          }
-            {\printtext{\bibstring{\thefield{relatedtype}s}\relatedpunct}}
-            {\iffieldbibstring{relatedtype}
-               {\printtext{\bibstring{\thefield{relatedtype}}\relatedpunct}}
-               {}}}
-         {\iffieldbibstring{relatedstring}
-            {\printtext{\bibstring{\thefield{relatedstring}}\relatedpunct}}
-            {\printtext{\printfield{relatedstring}\relatedpunct}}}%
-       \docsvfield{related}}}}
+     \restorefield{related}{\bbx@tempa}%
+     \ifnumgreater{\value{bbx:relatedtotal}}{0}
+       {\listcsxadd{bbx:relatedloop}{\strfield{entrykey}}%
+        \iffieldundef{clonesourcekey}
+          {}
+          {\listcsxadd{bbx:relatedloop}{\strfield{clonesourcekey}}}%
+        \setcounter{bbx:relatedcount}{0}%
+        \def\do{%
+          \stepcounter{bbx:relatedcount}%
+          \ifnumgreater{\value{bbx:relatedcount}}{1}
+            {\printtext{\relateddelim}}
+            {}}%
+        \ifbibmacroundef{related:\strfield{relatedtype}}
+          {\appto{\do}{\usebibmacro{related:default}}}
+          {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}%
+        \iffieldformatundef{related:\strfield{relatedtype}}
+          {\def\bbx@tempa{related}}
+          {\def\bbx@tempa{related:\strfield{relatedtype}}}%
+        \iffieldformatundef{relatedstring:\strfield{relatedtype}}
+          {\def\bbx@tempb{relatedstring:default}}
+          {\def\bbx@tempb{relatedstring:\strfield{relatedtype}}}%
+        \printtext[\bbx@tempa]{%
+          \usebibmacro{begrelated}%
+          \iffieldundef{relatedstring}
+            {\ifboolexpr{
+               test {\ifnumgreater{\value{bbx:relatedtotal}}{1}}
+               and
+               test {\ifbibxstring{\thefield{relatedtype}s}}
+             }
+               {\printtext[\bbx@tempb]{%
+                  \bibstring[\mkrelatedstring]{\thefield{relatedtype}s}}}
+               {\iffieldbibstring{relatedtype}
+                  {\printtext[\bbx@tempb]{%
+                     \bibstring[\mkrelatedstring]{\thefield{relatedtype}}}}
+                  {}}}
+            {\iffieldbibstring{relatedstring}
+               {\printtext[\bbx@tempb]{%
+                  \bibstring[\mkrelatedstring]{\thefield{relatedstring}}}}
+               {\printfield[\bbx@tempb]{relatedstring}}}%
+          \docsvfield{related}%
+          \usebibmacro{endrelated}}}%
+       {}}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 979902aa8ba..49a025842ee 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -60,8 +60,9 @@
        \ifdimless{\leftmargin}{1.25em}
          {\textendash}
 	 {\textemdash}}}}
-\newcommand*{\relatedpunct}{\space}
+\newcommand*{\relatedpunct}{\addspace}
 \newcommand*{\relateddelim}{\adddot\par\nobreak}
+\newcommand{\mkrelatedstring}{\mainlang}
 
 % Used for indexing
 
@@ -281,7 +282,9 @@
 \DeclareFieldFormat
   [suppbook,suppcollection,suppperiodical]
   {citetitle}{#1}
-\DeclareFieldFormat{labelyear}{\stripzeros{#1}}% = the '1995' part in 'Jones 1995a'
+% labelyear can be a localisation string to allow for "no date" etc.
+\DeclareFieldFormat{labelyear}{% = the '1995' part in 'Jones 1995a'
+  \ifbibstring{#1}{\bibstring{#1}}{\stripzeros{#1}}}
 \DeclareFieldFormat{extrayear}{% = the 'a' in 'Jones 1995a'
   \iffieldnums{labelyear}
     {\mknumalph{#1}}
@@ -306,8 +309,6 @@
 
 % Used in the bibliography and the list of shorthands
 
-\DeclareFieldFormat{booktitle}{\mkbibemph{#1}}
-\DeclareFieldFormat{chapter}{\bibstring{chapter}~#1}
 \DeclareFieldFormat{doi}{%
   \mkbibacro{DOI}\addcolon\space
   \ifhyperref
@@ -372,6 +373,8 @@
 \DeclareFieldFormat{journaltitle}{\mkbibemph{#1}}
 \DeclareFieldFormat{issuetitle}{\mkbibemph{#1}}
 \DeclareFieldFormat{maintitle}{\mkbibemph{#1}}
+\DeclareFieldFormat{booktitle}{\mkbibemph{#1}}
+\DeclareFieldFormat{chapter}{\bibstring{chapter}~#1}
 \DeclareFieldFormat{month}{\mkbibmonth{#1}}
 \DeclareFieldFormat{note}{#1\isdot}
 \DeclareFieldFormat{number}{#1}% number in a series
@@ -393,7 +396,7 @@
   [suppbook,suppcollection,suppperiodical]
   {title}{#1}
 \DeclareFieldFormat{type}{\ifbibstring{#1}{\bibstring{#1}}{#1}}
-\DeclareFieldFormat{url}{\mkbibacro{\bibstring{url}}\addcolon\space\url{#1}}
+\DeclareFieldFormat{url}{\mkbibacro{URL}\addcolon\space\url{#1}}
 \DeclareFieldFormat{urldate}{\mkbibparens{\bibstring{urlseen}\space#1}}
 \DeclareFieldFormat{version}{\bibstring{version}~#1}
 \DeclareFieldFormat{volume}{\bibstring{volume}~#1}% volume of a book
@@ -403,6 +406,7 @@
 \DeclareFieldFormat{related:multivolume}{\par\nobreak#1}
 \DeclareFieldFormat{related:origpubin}{\mkbibparens{#1}}
 \DeclareFieldFormat{related:origpubas}{\mkbibparens{#1}}
+\DeclareFieldFormat{relatedstring:default}{#1\relatedpunct}
 
 % Generic formats for \printtext and \printfield
 
@@ -728,7 +732,7 @@
         \ifpunctmark{'}{}{\bibnamedelimc}}}
     {\usebibmacro{name:delim}{#1}%
      \usebibmacro{name:hook}{#1}}%
-  \mkbibnamelast{#1}}%
+  \mkbibnamelast{#1}\isdot}%
 
 \newbibmacro*{name:first-last}[4]{%
   \usebibmacro{name:delim}{#2#3#1}%
@@ -1278,11 +1282,12 @@
   \field{translator}
 }
 
-\DeclareLabelyear{%
-  \field{year}
-  \field{eventyear}
-  \field{origyear}
-  \field{urlyear}
+\DeclareLabeldate{%
+  \field{date}
+  \field{eventdate}
+  \field{origdate}
+  \field{urldate}
+  \literal{nodate}
 }
 
 \DeclareLabeltitle{%
@@ -1639,6 +1644,7 @@
 % ------------------------------------------------------------------
 
 \newcommand*{\lbx@initnamehook}[1]{}
+\newcommand*{\lbx@inittitlehook}[1]{}
 \newcommand*{\lbx@finalnamedelim}[1]{\finalnamedelim}
 \newcommand*{\lbx@finallistdelim}[1]{\finallistdelim}
 
@@ -1670,7 +1676,7 @@
   \DeclareQuotePunctuation{}%
   \DeclarePunctuationPairs{comma}{*!?}}
 
-% french
+% catalan and french
 
 \newtoggle{smartof}
 \newrobustcmd*{\smartof}{\global\toggletrue{smartof}}
@@ -1681,11 +1687,11 @@
   \@ifpackageloaded{babel}
     {\ifdef\AutoSpaceBeforeFDP
        {\newrobustcmd*{\EnsureAutoSpaceBeforeFDP}{%
-	  \iflanguage{french}
-	    {\AutoSpaceBeforeFDP}
-	    {}}%
-	\appto\bibsetup{\EnsureAutoSpaceBeforeFDP}%
-	\appto\citesetup{\EnsureAutoSpaceBeforeFDP}}
+          \iflanguage{french}
+            {\AutoSpaceBeforeFDP}
+            {}}%
+        \appto\bibsetup{\EnsureAutoSpaceBeforeFDP}%
+        \appto\citesetup{\EnsureAutoSpaceBeforeFDP}}
        {}}
     {}}
 
@@ -1979,6 +1985,17 @@
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
+\DeclareCiteCommand*{\citeauthor}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\ifciteindex
+     {\indexnames{labelname}}
+     {}%
+   \printnames[][1-1]{labelname}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
 \DeclareCiteCommand{\citetitle}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -2076,7 +2093,7 @@
 \newrobustcmd*{\Footcitetext}{\footcitetext}
 \newrobustcmd*{\Smartcite}{\bibsentence\smartcite}
 \newrobustcmd*{\Textcite}{\bibsentence\textcite}
-\newrobustcmd*{\Citeauthor}{\bibsentence\citeauthor}
+\newrobustcmd*{\Citeauthor}{\@ifstar{\bibsentence\citeauthor*}{\bibsentence\citeauthor}}
 \newrobustcmd*{\Citetitle}{\bibsentence\citetitle}
 
 \newrobustcmd*{\Volcite}{\volcitecmd\Cite}
@@ -2711,43 +2728,37 @@
     {\printfield{abstract}}}
 
 \newbibmacro*{related:default}[1]{%
-  \entrydata{#1}{%
-    \usebibmacro{title}%
-    \newunit
-    \ifentrytype{article}
-      {\usebibmacro{in:}%
-       \usebibmacro{journal+issuetitle}%
-       \newunit\newblock}
-      {}%
-    \ifboolexpr{
-      test {\ifentrytype{inbook}}
-      or
-      test {\ifentrytype{incollection}}
-      or
-      test {\ifentrytype{inproceedings}}
-    }
-      {\usebibmacro{in:}%
-       \usebibmacro{maintitle+booktitle}%
-       \newunit\newblock
-       \usebibmacro{event+venue+date}%
-       \newunit\newblock}
-      {}%
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printlist{location}%
-  \iflistundef{publisher}
-    {\setunit*{\addcomma\space}}
-    {\setunit*{\addcolon\space}}%
-  \printlist{publisher}%
-  \setunit*{\addcomma\space}%
-  \printdate%
-  \setunit{\bibpagespunct}%
-  \printfield{pages}}}
+  \entrydata*{#1}{%
+    \usedriver
+      {\ifnameundef{savedauthor}
+         {\ifnameundef{savededitor}
+            {}
+            {\ifnamesequal{editor}{savededitor}
+               {\clearname{editor}}
+               {}}}
+         {\ifnamesequal{author}{savedauthor}
+            {\clearname{author}}
+            {}}%
+       \renewbibmacro*{related:init}{}%
+       \DeclareNameAlias{sortname}{default}%
+       \ifbibmacroundef{date+extrayear}
+         {}
+         {\renewbibmacro*{date+extrayear}{}%
+          \renewbibmacro*{date}{\printdate}}%
+       \renewbibmacro*{pageref}{}}
+      {\thefield{entrytype}}}}
 
 \newbibmacro*{related:bytranslator}[1]{%
   \entrydata{#1}{%
+    \renewbibmacro*{name:hook}[1]{%
+      \ifnumequal{\value{listcount}}{1}
+        {\begingroup
+         \mkrelatedstring%
+         \lbx@initnamehook{#1}%
+         \endgroup}
+        {}}%
     \printnames[bytranslator]{translator}%
-    \setunit*{\addspace\bibstring{astitle}\space}%
+    \setunit*{\addspace\bibstring[\mkrelatedstring]{astitle}\space}%
     \usebibmacro{title}%
     \setunit{\addspace}%
     \printtext[parens]{%
@@ -2794,7 +2805,7 @@
       test {\iflistundef{publisher}}
     }
       {}
-      {\setunit{\addspace\bibstring{bypublisher}\space}%
+      {\setunit{\addspace\bibstring[\mkrelatedstring]{bypublisher}\space}%
        \printlist{publisher}%
        \setunit{\addcomma\space}%
        \iflistsequal{location}{savedlocation}
@@ -2810,11 +2821,47 @@
       test {\iflistundef{publisher}}
     }
       {}
-      {\setunit{\addspace\bibstring{bypublisher}\space}%
+      {\setunit{\addspace\bibstring[\mkrelatedstring]{bypublisher}\space}%
        \printlist{publisher}%
        \setunit{\addcomma\space}%
        \iflistsequal{location}{savedlocation}
          {}
          {\printlist{location}}}}}
 
+\DeclareFieldFormat{title:hook}{%
+  \begingroup
+  \mkrelatedstring%
+  \lbx@inittitlehook{#1}%
+  \endgroup
+  \mkbibemph{#1}}
+
+\newbibmacro*{related:reprintfrom}[1]{%
+  \entrydata*{#1}{%
+    \iffieldundef{journaltitle}
+      {\iffieldundef{maintitle}
+         {\printfield[title:hook]{booktitle}}
+         {\printfield[title:hook]{maintitle}}%
+       \newunit\newblock
+       \usebibmacro{byeditor+others}%
+       \newunit\newblock
+       \printfield{edition}%
+       \newunit
+       \iffieldundef{volume}
+         {}
+         {\printfield{volume}%
+          \printfield{part}}
+       \newunit\newblock
+       \usebibmacro{series+number}%
+       \newunit\newblock
+       \printfield{note}%
+       \newunit\newblock
+       \usebibmacro{publisher+location+date}%
+       \newunit\newblock
+       \usebibmacro{chapter+pages}}
+      {\printfield[title:hook]{journaltitle}%
+       \newunit\newblock
+       \usebibmacro{byeditor+others}%
+       \newunit\newblock
+       \usebibmacro{note+pages}}}}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index dfb6d967ab4..a08ff30bc76 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -3,8 +3,8 @@
 %%
 
 % Set up the version strings here, so they are the same for both branches
-\def\abx@date{2013/01/10}
-\def\abx@version{2.5}
+\def\abx@date{2013/05/01}
+\def\abx@version{2.6}
 \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)}
@@ -12,11 +12,11 @@
 % 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.3}
+\def\blx@bcfversion{2.4}
 % 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}
+\def\blx@bblversion{2.2}
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{biblatex}
@@ -80,6 +80,8 @@
     \protected\long\def\DeclareDriverSourcemap[#1]#2{}%
     \protected\long\def\DeclareLabelalphaTemplate#1{}%
     \protected\long\def\DeclareLabeltitle#1{}%
+    \protected\long\def\DeclareLabelname#1{}%
+    \protected\long\def\DeclareLabeldate#1{}%
     \protected\long\def\abx@dointernalfields{}%
     \RequirePackage{biblatex1}%
   }
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
index 4073f8a8f4f..8cdc5134eff 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
@@ -412,6 +412,7 @@
 \newtoggle{blx@skipentry}
 \newtoggle{blx@insert}
 \newtoggle{blx@lastins}
+\newtoggle{blx@keepunit}
 \newtoggle{blx@debug}
 \newtoggle{blx@sortcase}
 \newtoggle{blx@sortupper}
@@ -422,7 +423,7 @@
 \newtoggle{blx@footnote}
 \newtoggle{blx@labelalpha}
 \newtoggle{blx@labelnumber}
-\newtoggle{blx@labelyear}
+\newtoggle{blx@labeldate}
 \newtoggle{blx@natbib}
 \newtoggle{blx@mcite}
 \newtoggle{blx@loadfiles}
@@ -789,31 +790,36 @@
   \PackageError{biblatex}{#1}{#2.}%
   \endgroup}
 
-\protected\def\blx@warning#1{%
-  \begingroup
-  \blx@safe@actives
-  \PackageWarning{biblatex}{#1\blx@noline}%
-  \endgroup}
 \protected\def\blx@warning@noline#1{%
   \begingroup
   \blx@safe@actives
   \PackageWarningNoLine{biblatex}{#1}%
   \endgroup}
+\let\blx@warning\blx@warning@noline
+\AtEndOfPackage{
+  \protected\def\blx@warning#1{%
+    \begingroup
+    \blx@safe@actives
+    \PackageWarning{biblatex}{#1}%
+    \endgroup}}
+
 \protected\def\blx@warning@entry#1{%
   \ifdef\abx@field@entrykey
     {\blx@warning{#1\MessageBreak at entry '\abx@field@entrykey'}}
     {\blx@warning{#1}}}
 
-\protected\def\blx@info#1{%
-  \begingroup
-  \blx@safe@actives
-  \PackageInfo{biblatex}{#1\blx@noline}%
-  \endgroup}
-\def\blx@info@noline#1{%
+\protected\def\blx@info@noline#1{%
   \begingroup
   \blx@safe@actives
   \PackageInfo{biblatex}{#1\@gobble}%
   \endgroup}
+\let\blx@info\blx@info@noline
+\AtEndOfPackage{
+  \protected\def\blx@info#1{%
+    \begingroup
+    \blx@safe@actives
+    \PackageInfo{biblatex}{#1}%
+    \endgroup}}
 
 \let\blx@noline\@gobble
 \AtEndOfPackage{\let\blx@noline\@empty}
@@ -2835,6 +2841,50 @@
 \setcounter{mincompwidth}{1}
 \def\abx@rangeproclimit{100000}
 
+% {<string>}
+% This mustn't be robust as it's likely to be used mainly tests and so
+% needs to be expandable
+\newcommand*{\rangelen}[1]{%
+  \blx@rangelen@range#1\bibrangedash\bibrangedash&}
+
+\def\blx@rangelen@range#1\bibrangedash#2\bibrangedash#3&{%
+  \ifblank{#3}
+    {\blx@rangelen@hyphen#1--&}
+    {\ifblank{#2}
+       {0}% n\bibrangedash
+       {\ifblank{#1}
+          {0}% \bibrangedash n
+          {\blx@rangelen@check{#1}{#2}}}}}
+
+\def\blx@rangelen@hyphen#1-#2-#3&{%
+  \ifblank{#3}
+    {1}% n
+    {\ifblank{#2}
+       {\ifblank{#1}
+          {\let\blx@tempb\@empty}
+          {\def\blx@tempb{#1}}%
+        \blx@rangelen@hyphen@i#3&}
+       {\ifblank{#1}
+          {0}% -n
+          {\blx@rangelen@check{#1}{#2}}}}}
+
+\def\blx@rangelen@hyphen@i#1-#2&{%
+  \ifblank{#1#2}
+    {0}% n-
+    {\notblank{#1}
+       {\ifdefempty\blx@tempb
+          {0}
+          {\expandafter\blx@rangelen@check
+           \expandafter{\blx@tempb}{#1}}}
+       {\blx@rangelen@hyphen@i#2&}}}
+
+\def\blx@rangelen@check#1#2{%
+  \blx@imc@ifinteger{#1}
+    {\blx@imc@ifinteger{#2}
+       {\the\numexpr#2-#1\relax}% n-m
+       {0}}
+    {0}}
+
 % <*>[<postpro>]{<string>}
 
 \newrobustcmd*{\mkcomprange}{%
@@ -3075,6 +3125,7 @@
   \global\togglefalse{blx@unit}%
   \global\togglefalse{blx@insert}%
   \global\togglefalse{blx@lastins}%
+  \global\togglefalse{blx@keepunit}%
   \global\let\blx@unitpunct\newunitpunct
   \blx@imc@resetpunctfont}
 
@@ -3125,21 +3176,38 @@
   \global\toggletrue{blx@block}}%
 
 \protected\def\blx@imc@newunit{%
-  \global\let\blx@unitpunct\newunitpunct
-  \global\toggletrue{blx@unit}}%
+  \iftoggle{blx@keepunit}
+    {}
+    {\global\let\blx@unitpunct\newunitpunct
+     \global\toggletrue{blx@unit}}}
 
 \protected\def\blx@imc@setunit{%
   \@ifstar\blx@setunit@i\blx@setunit}
 
 \long\def\blx@setunit#1{%
-  \long\gdef\blx@unitpunct{#1}%
-  \global\toggletrue{blx@unit}}%
+  \iftoggle{blx@keepunit}
+    {}
+    {\long\gdef\blx@unitpunct{#1}%
+     \global\toggletrue{blx@unit}}}
 
 \def\blx@setunit@i{%
   \iftoggle{blx@lastins}
     {\blx@setunit}
     {\@gobble}}
 
+\protected\def\blx@imc@printunit{%
+  \@ifstar\blx@printunit@i\blx@printunit}
+
+\def\blx@printunit#1{%
+  \long\gdef\blx@unitpunct{#1\global\togglefalse{blx@keepunit}}%
+  \global\toggletrue{blx@keepunit}%
+  \global\toggletrue{blx@unit}}
+
+\def\blx@printunit@i{%
+  \iftoggle{blx@lastins}
+    {\blx@printunit}
+    {\@gobble}}
+
 \protected\def\blx@imc@finentry{%
   \unspace\finentrypunct
   \blx@postpunct
@@ -3167,7 +3235,7 @@
   \ifinteger \ifnumeral \ifnumerals \ifpages
   \iffieldint \iffieldnum \iffieldnums \iffieldpages
   \mkpageprefix \mkpagetotal \mkpagefirst
-  \newblock \newunit \setunit \finentry}
+  \newblock \newunit \setunit \printunit \finentry}
 
 \appto\blx@blxinit{%
   \def\ifnatbibmode{\iftoggle{blx@natbib}}%
@@ -3925,10 +3993,24 @@
   \let\do\blx@entryset@i}
 
 \def\blx@entryset@i#1{%
-  \blx@imc@entrydata{#1}{%
-    \blx@entryset@precode
-    \blx@driver{\blx@imc@thefield{entrytype}}
-    \blx@entryset@postcode}}
+  \blx@ifdata{#1}
+    {\begingroup
+     \blx@resetdata
+     \blx@getdata{#1}%
+     \blx@entrysetcount
+     \blx@setoptions@type\abx@field@entrytype
+     \blx@setoptions@entry
+     \addtocounter{instcount}\@ne
+     \blx@execute
+     \blx@beglang
+     \blx@begunit
+     \blx@entryset@precode
+     \blx@driver{\blx@imc@thefield{entrytype}}
+     \blx@entryset@postcode
+     \blx@endunit
+     \blx@endlang
+     \endgroup}
+    {\blx@nounit}}
 
 \blx@regimcs{%
   \printtext \printfield \printlist \printnames \printfile
@@ -4324,6 +4406,7 @@
   \do{columns}%
   \do{line}%
   \do{lines}%
+  \do{nodate}%
   \do{verse}%
   \do{verses}%
   \do{section}%
@@ -4346,8 +4429,8 @@
   \do{datacd}%
   \do{audiocd}%
   \do{version}%
-  \do{doi}%
   \do{url}%
+  \do{urlfrom}%
   \do{urlseen}%
   \do{file}%
   \do{inpreparation}%
@@ -4397,6 +4480,7 @@
   \do{langbrazilian}%
   \do{langcatalan}%
   \do{langcroatian}%
+  \do{langczech}%
   \do{langdanish}%
   \do{langdutch}%
   \do{langenglish}%
@@ -4415,6 +4499,7 @@
   \do{frombrazilian}%
   \do{fromcatalan}%
   \do{fromcroatian}%
+  \do{fromczech}%
   \do{fromdanish}%
   \do{fromdutch}%
   \do{fromenglish}%
@@ -4429,7 +4514,6 @@
   \do{fromrussian}%
   \do{fromspanish}%
   \do{fromswedish}%
-  \do{countryct}%
   \do{countryde}%
   \do{countryep}%
   \do{countryeu}%
@@ -4828,8 +4912,8 @@
   {\egroup#1}}
 
 \blx@regimcs{%
-  \printdate \printdateextra \printurldate \printeventdate
-  \printorigdate \stripzeros \mkdatezeros}
+  \printdate \printdateextra \printdatelabel \printdateextralabel
+  \printurldate \printeventdate \printorigdate \stripzeros \mkdatezeros}
 
 % {<language>}{<strings>}
 
@@ -4848,6 +4932,7 @@
 \def\blx@endlang{\endgroup}
 \let\blx@hook@endlang\@empty
 \let\blx@hook@initlang\@empty
+\let\blx@imc@mainlang\@empty
 \def\blx@hyphenreset{%
   \ifcsundef{l@\blx@languagename}
     {}
@@ -4878,8 +4963,9 @@
                   \csname end\blx@thelangenv\endcsname
                   \endgroup}%
                 \csname\blx@thelangenv\expandafter\endcsname
-                \expandafter{\abx@field@hyphenation}}}}}
+                \expandafter{\abx@field@hyphenation}}}}}%
        {}%
+     \def\blx@imc@mainlang{\select@language{\bbl@main@language}}%
      \blx@langsetup\bbl@main@language}
     {\blx@err@patch{'babel' package}%
      \blx@mknobabel}}
@@ -4890,6 +4976,8 @@
     {}
     {\blx@err@nolang{\blx@languagename}}}
 
+\blx@regimcs{\mainlang}
+
 \newrobustcmd*{\DeclareRedundantLanguages}[2]{%
   \begingroup
   \ifblank{#2}
@@ -4907,8 +4995,8 @@
     {\iflistundef{language}
        {}
        {\ifnumgreater{\value{language}}{1}
-	  {}
-	  {\expandafter\blx@clearlang@i\abx@list@language}}}
+          {}
+          {\expandafter\blx@clearlang@i\abx@list@language}}}
     {}}
 
 \def\blx@clearlang@i#1{%
@@ -5070,7 +5158,7 @@
   \do{extraalpha}%
   \do{labelnumber}%
   \do{labeltitle}%
-  \do{labelyear}%
+  \do{labeldate}%
   \do{extrayear}%
   \do{library}%
   \do{localnumber}%
@@ -5629,8 +5717,8 @@
      \iftoggle{blx@labelalpha}
        {\blx@bbl@labelalpha}
        {}%
-     \iftoggle{blx@labelyear}
-       {\blx@bbl@labelyear}
+     \iftoggle{blx@labeldate}
+       {\blx@bbl@labeldate}
        {}%
      \blx@bbl@prefixnumber}
     {}%
@@ -5724,7 +5812,7 @@
        {\blx@setlabwidth{\labelalphawidth}{%
           \csuse{abx@ffd@*@labelalphawidth}{\abx@field@shorthand}}}}}
 
-\def\blx@bbl@labelyear{%
+\def\blx@bbl@labeldate{%
   \ifundef\abx@field@extrayear
     {}
     {\ifnum\abx@field@extrayear>\c@maxextrayear
@@ -6564,6 +6652,7 @@
   \fi
   \csuse{blx@env@\blx@theenv}%
   \csuse{blx@hook@bibinit}%
+  \csuse{blx@hook@bibinit@next}%
   \let\blx@do\blx@bibitem
   \let\blx@done\blx@endbibliography
   \blx@listloop}
@@ -6666,6 +6755,12 @@
 \@onlypreamble\AtBeginBibliography
 \@onlypreamble\AtEveryBibitem
 
+\newrobustcmd*{\AtNextBibliography}{%
+  \ifundef\blx@hook@bibinit@next
+    {\gdef\blx@hook@bibinit@next{\global\undef\blx@hook@bibinit@next}}
+    {}%
+  \gappto\blx@hook@bibinit@next}
+
 % page tracker
 
 \def\blx@pagetracker@context{%
@@ -8975,8 +9070,8 @@
     \blx@xml@svalue{alphaothers}{\labelalphaothers}%
     \blx@xml@toggle{labelalpha}%
     \blx@xml@mvalue{labelnamespec}{\blx@bcf@labelnamespec}%
-    \blx@xml@toggle{labelyear}%
-    \blx@xml@mvalue{labelyearspec}{\blx@bcf@labelyearspec}%
+    \blx@xml@toggle{labeldate}%
+    \blx@xml@mvalue{labeldatespec}{\blx@bcf@labeldatespec}%
     \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}%
     \blx@xml@svalue{maxbibnames}{\blx@maxbibnames}%
     \blx@xml@svalue{maxcitenames}{\blx@maxcitenames}%
@@ -9005,11 +9100,11 @@
       \ifcsdef{blx@bcf@labelnamespec@#1}
 	{\csuse{blx@bcf@labelnamespec@#1}}
 	{\blx@bcf@labelnamespec}}%
-    \blx@xml@toggle{labelyear}%
-    \blx@xml@mvalue{labelyearspec}{%
-      \ifcsdef{blx@bcf@labelyearspec@#1}
-        {\csuse{blx@bcf@labelyearspec@#1}}
-	{\blx@bcf@labelyearspec}}%
+    \blx@xml@toggle{labeldate}%
+    \blx@xml@mvalue{labeldatespec}{%
+      \ifcsdef{blx@bcf@labeldatespec@#1}
+        {\csuse{blx@bcf@labeldatespec@#1}}
+	{\blx@bcf@labeldatespec}}%
     \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}%
     \blx@xml@svalue{maxbibnames}{\blx@maxbibnames@type}%
     \blx@xml@svalue{maxcitenames}{\blx@maxcitenames@type}%
@@ -9049,7 +9144,7 @@
     \noexpand\iftoggle{blx@useeditor}{1}{0}:%
     \noexpand\iftoggle{blx@usetranslator}{1}{0}:%
     \noexpand\iftoggle{blx@labelalpha}{1}{0}:%
-    \noexpand\iftoggle{blx@labelyear}{1}{0}:%
+    \noexpand\iftoggle{blx@labeldate}{1}{0}:%
     \noexpand\iftoggle{blx@singletitle}{1}{0}:%
     \noexpand\csuse{blx@bibtex@sorting@\noexpand\blx@sorting}:%
     \noexpand\blx@sortlos:%
@@ -9357,72 +9452,6 @@
 \def\blx@sortexlude@i#1{%
   \appto\blx@tempa{\blx@xml@exclude{#1}}}
 
-% [<type,type,...>]{<field,field,...>}
-
-\newrobustcmd*{\DeclareLabelname}[2][]{%
-  \begingroup
-  \let\blx@tempa\@empty
-  \def\blx@tempb{labelnamespec}%
-  \let\field\blx@ordered@field
-  \ifblank{#1}
-    {\global\cslet{blx@bcf@labelnamespec}\@empty}
-    {\def\blx@tempa{#1}%
-     \do{\global\cslet{blx@bcf@labelnamespec@##1}\@empty}%
-     \docsvlist{#1}}%
-  #2%
-  \endgroup}
-\@onlypreamble\DeclareLabelname
-
-\newrobustcmd*{\DeclareLabelyear}[2][]{%
-  \begingroup
-  \let\blx@tempa\@empty
-  \def\blx@tempb{labelyearspec}%
-  \let\field\blx@ordered@field
-  \ifblank{#1}
-    {\global\cslet{blx@bcf@labelyearspec}\@empty}
-    {\def\blx@tempa{#1}%
-     \do{\global\cslet{blx@bcf@labelyearspec@##1}\@empty}%
-     \docsvlist{#1}}%
-  #2%
-  \endgroup}
-\@onlypreamble\DeclareLabelyear
-
-\newcommand*{\blx@ordered@field}[2][]{%
-  \let\blx@tempc\@empty
-  \ifblank{#1}
-    {}
-    {\setkeys{blx@ordered@field}{#1}}%
-  \advance\blx@tempcnta\@ne
-  \ifdefempty{\blx@tempa}
-    {\csxappto{blx@bcf@\blx@tempb}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}
-    {\def\do{\blx@addtypeopt{##1}%
-             \csxappto{blx@bcf@\blx@tempb @##1}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}%
-     \docsvlist{\blx@tempa}}}
-
-\define@key{blx@ordered@field}{form}{%
-  \appto\blx@tempc{ form="#1"}}
-\define@key{blx@ordered@field}{lang}{%
-  \appto\blx@tempc{ lang="#1"}}
-
-% experimental
-
-\newrobustcmd*{\DeclareDisplaymode}[2][global]{%
-  \begingroup
-  \blx@tempcnta\z@
-  \def\blx@tempa{\blx@xml@dtarget{*}}%
-  \forcsvlist\blx@defdisplaymode{#2}%
-  \csxdef{blx@biber@displaymodes@#1}{%
-    \blx@xml@displaymode{\blx@tempa}}%
-  \endgroup}
-
-\def\blx@defdisplaymode#1{%
-  \advance\blx@tempcnta\@ne
-  \edef\blx@tempa{%
-    \blx@tempa
-    \blx@xml@dmode{\the\blx@tempcnta}{#1}}}
-
-\DeclareDisplaymode{original,romanised,uniform,translated}
-
 %% Package options
 
 % [<entrytype,entrytype,...>]{<options>}
@@ -10084,7 +10113,9 @@
 \DeclareBibliographyOption{date}{%
   \ifcsdef{mkbibrange#1}
     {\protected\def\blx@imc@printdate{\csuse{mkbibrange#1}{}}%
-     \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}}
+     \protected\def\blx@imc@printdatelabel{\csuse{mkbibrange#1}{}}%
+     \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}%
+     \protected\def\blx@imc@printdateextralabel{\csuse{mkbibrange#1extra}{}}}
     {\blx@err@invopt{date=#1}{}}}
 
 \DeclareBibliographyOption{urldate}{%
@@ -10150,10 +10181,19 @@
 \DeclareTypeOption{labelalpha}[true]{%
   \settoggle{blx@labelalpha}{#1}}
 
+\DeclareBibliographyOption{labeldate}[true]{%
+  \settoggle{blx@labeldate}{#1}}
+\DeclareTypeOption{labeldate}[true]{%
+  \settoggle{blx@labeldate}{#1}}
+
 \DeclareBibliographyOption{labelyear}[true]{%
-  \settoggle{blx@labelyear}{#1}}
+  \blx@warning@noline{%
+    'labelyear' option is deprecated, use 'labeldate' instead}%
+  \settoggle{blx@labeldate}{#1}}
 \DeclareTypeOption{labelyear}[true]{%
-  \settoggle{blx@labelyear}{#1}}
+  \blx@warning@noline{%
+    'labelyear' option is deprecated, use 'labeldate' instead}%
+  \settoggle{blx@labeldate}{#1}}
 
 \DeclareBibliographyOption{uniquelist}[true]{%
   \ifcsdef{blx@opt@uniquelist@#1}
@@ -10433,10 +10473,10 @@
 	\setkeys{blx@opt@pre}{uniquename=mininit}}
        {}}
     {}%
-  \nottoggle{blx@labelyear}
+  \nottoggle{blx@labeldate}
     {\ifnumequal\blx@uniquelist\blx@opt@uniquelist@minyear
        {\blx@warn@conflopt{%
-          'uniquelist=minyear' requires 'labelyear'.\MessageBreak
+          'uniquelist=minyear' requires 'labeldate'.\MessageBreak
           Setting 'uniquelist=true'}%
         \setkeys{blx@opt@pre}{uniquelist}}
        {}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
index 621b68f047c..1a9542da6c6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
@@ -415,6 +415,7 @@
 \newtoggle{blx@skipentry}
 \newtoggle{blx@insert}
 \newtoggle{blx@lastins}
+\newtoggle{blx@keepunit}
 \newtoggle{blx@debug}
 \newtoggle{blx@sortcase}
 \newtoggle{blx@sortupper}
@@ -427,7 +428,7 @@
 \newtoggle{blx@labelnumber}
 \newtoggle{blx@labeltitle}
 \newtoggle{blx@labeltitleyear}
-\newtoggle{blx@labelyear}
+\newtoggle{blx@labeldate}
 \newtoggle{blx@natbib}
 \newtoggle{blx@mcite}
 \newtoggle{blx@loadfiles}
@@ -738,31 +739,36 @@
   \PackageError{biblatex}{#1}{#2.}%
   \endgroup}
 
-\protected\def\blx@warning#1{%
-  \begingroup
-  \blx@safe@actives
-  \PackageWarning{biblatex}{#1\blx@noline}%
-  \endgroup}
 \protected\def\blx@warning@noline#1{%
   \begingroup
   \blx@safe@actives
   \PackageWarningNoLine{biblatex}{#1}%
   \endgroup}
+\let\blx@warning\blx@warning@noline
+\AtEndOfPackage{
+  \protected\def\blx@warning#1{%
+    \begingroup
+    \blx@safe@actives
+    \PackageWarning{biblatex}{#1}%
+    \endgroup}}
+
 \protected\def\blx@warning@entry#1{%
   \ifdef\abx@field@entrykey
     {\blx@warning{#1\MessageBreak at entry '\abx@field@entrykey'}}
     {\blx@warning{#1}}}
 
-\protected\def\blx@info#1{%
-  \begingroup
-  \blx@safe@actives
-  \PackageInfo{biblatex}{#1\blx@noline}%
-  \endgroup}
-\def\blx@info@noline#1{%
+\protected\def\blx@info@noline#1{%
   \begingroup
   \blx@safe@actives
   \PackageInfo{biblatex}{#1\@gobble}%
   \endgroup}
+\let\blx@info\blx@info@noline
+\AtEndOfPackage{
+  \protected\def\blx@info#1{%
+    \begingroup
+    \blx@safe@actives
+    \PackageInfo{biblatex}{#1}%
+    \endgroup}}
 
 \let\blx@noline\@gobble
 \AtEndOfPackage{\let\blx@noline\@empty}
@@ -2666,6 +2672,50 @@
 \setcounter{mincompwidth}{1}
 \def\abx@rangeproclimit{100000}
 
+% {<string>}
+% This mustn't be robust as it's likely to be used mainly tests and so
+% needs to be expandable
+\newcommand*{\rangelen}[1]{%
+  \blx@rangelen@range#1\bibrangedash\bibrangedash&}
+
+\def\blx@rangelen@range#1\bibrangedash#2\bibrangedash#3&{%
+  \ifblank{#3}
+    {\blx@rangelen@hyphen#1--&}
+    {\ifblank{#2}
+       {0}% n\bibrangedash
+       {\ifblank{#1}
+          {0}% \bibrangedash n
+          {\blx@rangelen@check{#1}{#2}}}}}
+
+\def\blx@rangelen@hyphen#1-#2-#3&{%
+  \ifblank{#3}
+    {1}% n
+    {\ifblank{#2}
+       {\ifblank{#1}
+          {\let\blx@tempb\@empty}
+          {\def\blx@tempb{#1}}%
+        \blx@rangelen@hyphen@i#3&}
+       {\ifblank{#1}
+          {0}% -n
+          {\blx@rangelen@check{#1}{#2}}}}}
+
+\def\blx@rangelen@hyphen@i#1-#2&{%
+  \ifblank{#1#2}
+    {0}% n-
+    {\notblank{#1}
+       {\ifdefempty\blx@tempb
+          {0}
+          {\expandafter\blx@rangelen@check
+           \expandafter{\blx@tempb}{#1}}}
+       {\blx@rangelen@hyphen@i#2&}}}
+
+\def\blx@rangelen@check#1#2{%
+  \blx@imc@ifinteger{#1}
+    {\blx@imc@ifinteger{#2}
+       {\the\numexpr#2-#1\relax}% n-m
+       {0}}
+    {0}}
+
 % <*>[<postpro>]{<string>}
 
 \newrobustcmd*{\mkcomprange}{%
@@ -2897,6 +2947,7 @@
   \global\togglefalse{blx@unit}%
   \global\togglefalse{blx@insert}%
   \global\togglefalse{blx@lastins}%
+  \global\togglefalse{blx@keepunit}%
   \global\let\blx@unitpunct\newunitpunct
   \blx@imc@resetpunctfont}
 
@@ -2947,21 +2998,38 @@
   \global\toggletrue{blx@block}}%
 
 \protected\def\blx@imc@newunit{%
-  \global\let\blx@unitpunct\newunitpunct
-  \global\toggletrue{blx@unit}}%
+  \iftoggle{blx@keepunit}
+    {}
+    {\global\let\blx@unitpunct\newunitpunct
+     \global\toggletrue{blx@unit}}}
 
 \protected\def\blx@imc@setunit{%
   \@ifstar\blx@setunit@i\blx@setunit}
 
 \long\def\blx@setunit#1{%
-  \long\gdef\blx@unitpunct{#1}%
-  \global\toggletrue{blx@unit}}%
+  \iftoggle{blx@keepunit}
+    {}
+    {\long\gdef\blx@unitpunct{#1}%
+     \global\toggletrue{blx@unit}}}
 
 \def\blx@setunit@i{%
   \iftoggle{blx@lastins}
     {\blx@setunit}
     {\@gobble}}
 
+\protected\def\blx@imc@printunit{%
+  \@ifstar\blx@printunit@i\blx@printunit}
+
+\def\blx@printunit#1{%
+  \long\gdef\blx@unitpunct{#1\global\togglefalse{blx@keepunit}}%
+  \global\toggletrue{blx@keepunit}%
+  \global\toggletrue{blx@unit}}
+
+\def\blx@printunit@i{%
+  \iftoggle{blx@lastins}
+    {\blx@printunit}
+    {\@gobble}}
+
 \protected\def\blx@imc@finentry{%
   \unspace\finentrypunct
   \blx@postpunct
@@ -2988,8 +3056,8 @@
   \savelistcs \savename \savenamecs \usedriver
   \ifinteger \ifnumeral \ifnumerals \ifpages
   \iffieldint \iffieldnum \iffieldnums \iffieldpages
-  \mkpageprefix \mkpagetotal \mkpagefirst
-  \newblock \newunit \setunit \finentry}
+  \mkpageprefix \mkpagetotal
+  \newblock \newunit \setunit \printunit \finentry}
 
 \appto\blx@blxinit{%
   \def\ifnatbibmode{\iftoggle{blx@natbib}}%
@@ -3744,10 +3812,24 @@
   \let\do\blx@entryset@i}
 
 \def\blx@entryset@i#1{%
-  \blx@imc@entrydata{#1}{%
-    \blx@entryset@precode
-    \blx@driver{\blx@imc@thefield{entrytype}}
-    \blx@entryset@postcode}}
+  \blx@ifdata{#1}
+    {\begingroup
+     \blx@resetdata
+     \blx@getdata{#1}%
+     \blx@entrysetcount
+     \blx@setoptions@type\abx@field@entrytype
+     \blx@setoptions@entry
+     \addtocounter{instcount}\@ne
+     \blx@execute
+     \blx@beglang
+     \blx@begunit
+     \blx@entryset@precode
+     \blx@driver{\blx@imc@thefield{entrytype}}
+     \blx@entryset@postcode
+     \blx@endunit
+     \blx@endlang
+     \endgroup}
+    {\blx@nounit}}
 
 \blx@regimcs{%
   \printtext \printfield \printlist \printnames \printfile
@@ -4143,6 +4225,7 @@
   \do{columns}%
   \do{line}%
   \do{lines}%
+  \do{nodate}%
   \do{verse}%
   \do{verses}%
   \do{section}%
@@ -4165,8 +4248,8 @@
   \do{datacd}%
   \do{audiocd}%
   \do{version}%
-  \do{doi}%
   \do{url}%
+  \do{urlfrom}%
   \do{urlseen}%
   \do{file}%
   \do{inpreparation}%
@@ -4216,6 +4299,7 @@
   \do{langbrazilian}%
   \do{langcatalan}%
   \do{langcroatian}%
+  \do{langczech}%
   \do{langdanish}%
   \do{langdutch}%
   \do{langenglish}%
@@ -4234,6 +4318,7 @@
   \do{frombrazilian}%
   \do{fromcatalan}%
   \do{fromcroatian}%
+  \do{fromczech}%
   \do{fromdanish}%
   \do{fromdutch}%
   \do{fromenglish}%
@@ -4248,7 +4333,6 @@
   \do{fromrussian}%
   \do{fromspanish}%
   \do{fromswedish}%
-  \do{countryct}%
   \do{countryde}%
   \do{countryep}%
   \do{countryeu}%
@@ -4626,6 +4710,8 @@
 
 \protected\def\blx@imc@printdate{}
 \protected\def\blx@imc@printdateextra{}
+\protected\def\blx@imc@printdatelabel{}
+\protected\def\blx@imc@printdateextralabel{}
 \protected\def\blx@imc@printurldate{}
 \protected\def\blx@imc@printeventdate{}
 \protected\def\blx@imc@printorigdate{}
@@ -4648,8 +4734,8 @@
   {\egroup#1}}
 
 \blx@regimcs{%
-  \printdate \printdateextra \printurldate \printeventdate
-  \printorigdate \stripzeros \mkdatezeros}
+  \printdate \printdateextra \printdatelabel \printdateextralabel
+  \printurldate \printeventdate \printorigdate \stripzeros \mkdatezeros}
 
 % {<language>}{<strings>}
 
@@ -4668,6 +4754,7 @@
 \def\blx@endlang{\endgroup}
 \let\blx@hook@endlang\@empty
 \let\blx@hook@initlang\@empty
+\let\blx@imc@mainlang\@empty
 \def\blx@hyphenreset{%
   \ifcsundef{l@\blx@languagename}
     {}
@@ -4700,6 +4787,7 @@
                 \csname\blx@thelangenv\expandafter\endcsname
                 \expandafter{\abx@field@hyphenation}}}}}
        {}%
+     \def\blx@imc@mainlang{\select@language{\bbl@main@language}}%
      \blx@langsetup\bbl@main@language}
     {\blx@err@patch{'babel' package}%
      \blx@mknobabel}}
@@ -4710,6 +4798,8 @@
     {}
     {\blx@err@nolang{\blx@languagename}}}
 
+\blx@regimcs{\mainlang}
+
 \newrobustcmd*{\DeclareRedundantLanguages}[2]{%
   \begingroup
   \ifblank{#2}
@@ -4764,7 +4854,7 @@
 \def\regexp#1{\expandafter\zap@space\detokenize{#1} \@empty}
 
 % Have to do this otherwise the '~'s in the .bcf strings are not expanded
-% This is done for the .bcf later in the style but since we have to do all the
+% This is done for the .bcf later but since we have to do all the
 % data model things much earlier, have to set this here and reset on finishing
 \let\blx@tsave~
 \let~\space
@@ -4816,6 +4906,7 @@
 % which need to be dealt with along with data model fields in places
 \def\abx@dointernalfields{%
   \do{childentrykey}%
+  \do{clonesourcekey}%
   \do{entrykey}%
   \do{entryset}%
   \do{entrysetcount}%
@@ -4829,7 +4920,7 @@
   \do{labelnumber}%
   \do{labeltitle}%
   \do{labeltitleyear}%
-  \do{labelyear}%
+  \do{labeldate}%
   \do{localnumber}%
   \do{namehash}%
   \do{prefixnumber}%
@@ -5308,8 +5399,8 @@
     \iftoggle{blx@labeltitleyear}
       {\blx@bbl@labeltitleyear}
       {}%
-    \iftoggle{blx@labelyear}
-      {\blx@bbl@labelyear}
+    \iftoggle{blx@labeldate}
+      {\blx@bbl@labeldate}
       {}%
     \blx@bbl@prefixnumber}
     {}%
@@ -5348,7 +5439,7 @@
        \csuse{abx@ffd@*@shorthandwidth}{\abx@field@shorthand}}}}
 
 \def\blx@bbl@labelnumber{%
-  % Used at endentry
+  % Used at endentry, when reading .bbl
   % only do this for the global sorting list otherwise we increment
   % the labelnumbers for each sortlist
   \ifdefstrequal{\blx@slist@name}{\blx@sorting}
@@ -5417,7 +5508,7 @@
        \global\c@maxextratitleyear\abx@field@extratitleyear\relax
      \fi}}
 
-\def\blx@bbl@labelyear{%
+\def\blx@bbl@labeldate{%
   \ifundef\abx@field@extrayear
     {}
     {\ifnum\abx@field@extrayear>\c@maxextrayear
@@ -5506,11 +5597,17 @@
     {}
     {\csgdef{blx@labelnumber@#3}{#4}}}
 
+% Here we mustn't change the checksum if we used localnumbers from the
+% .aux file as this means that deferred numbering is
+% complete. Otherwise we get in an endless rerun loop because the
+% checksum due to number changes is always different.
 \AtEndDocument{%
   \def\abx@aux@number#1#2#3#4{%
     \ifblank{#4}
       {}
-      {\blx@addchecksum{#1}{#4}}}}
+      {\nottoggle{blx@localnumber}
+         {\blx@addchecksum{#1}{#4}}
+         {}}}}
 
 \AtEndDocument{%
   % Here we run some tests to decide if we need to issue re-run
@@ -5567,6 +5664,7 @@
     {}%
   \endgroup}
 
+% Called as part of bib output for an entry
 % Only used when defernumbers=true
 \def\blx@addlabelnumber{%
   \begingroup
@@ -5585,7 +5683,13 @@
                  \blx@bbl@addentryfield{\abx@field@entrykey}{\the\c@refsection}%
                    {localnumber}{\abx@field@localnumber}}%
                  \listxadd\blx@localnumaux{\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}{\the\c@refsection}{\abx@field@localnumber}}}
-             {}}
+             % If localnumbers were already in the .aux, add them
+             % again from the .aux. This prevents some cycling
+             % problems where pagebreaks change after localnumber
+             % settles down and then we need another run which then
+             % regenerates localnumber requiring another run but then
+             % the pagebreaks change back again ... etc.
+             {\listxadd\blx@localnumaux{\string\abx@aux@number{\the\c@instcount}{\abx@field@entrykey}{\the\c@refsection}{\abx@field@localnumber}}}}
           {}}%
        {}}
     {}%
@@ -6174,6 +6278,10 @@
       {}
       {\letcs\blx@tempa{blx@sbib@\blx@tempe}}}%
   \blx@safe@actives
+  %  Must reset omitnumbers as it's a global macro and if we don't, any
+  % \printbibliography following one with this set will inherit any
+  % previous "true" value
+  \togglefalse{blx@omitnumbers}%
   \setkeys{blx@bib2}{#1}% ... now we have correct \blx@tempa, set rest of options
   \blx@rest@actives
   \csxappto{blx@xml@slistsbib}{\blx@xml@slist{entry}{\blx@tempe}{\blx@tempc}{\blx@tempd}}%
@@ -6324,6 +6432,7 @@
   \fi
   \csuse{blx@env@\blx@theenv}%
   \csuse{blx@hook@bibinit}%
+  \csuse{blx@hook@bibinit@next}%
   \let\blx@do\blx@bibitem
   \let\blx@done\blx@endbibliography
   \blx@listloop}
@@ -6427,6 +6536,12 @@
 \@onlypreamble\AtBeginBibliography
 \@onlypreamble\AtEveryBibitem
 
+\newrobustcmd*{\AtNextBibliography}{%
+  \ifundef\blx@hook@bibinit@next
+    {\gdef\blx@hook@bibinit@next{\global\undef\blx@hook@bibinit@next}}
+    {}%
+  \gappto\blx@hook@bibinit@next}
+
 % page tracker
 
 \def\blx@pagetracker@context{%
@@ -7692,7 +7807,9 @@
         {\blx@xsanitizeafter{\forcsvlist\blx@nocite@do}{#1}}}}%
   \@esphack}
 
-\def\blx@nocite@do#1{\blx@citation{#1}\blx@msg@cundef}
+\def\blx@nocite@do#1{%
+  \global\advance\csname blx@sectionciteorder@\the\c@refsection\endcsname\@ne
+  \blx@citation{#1}\blx@msg@cundef}
 
 % {<macro>}[<arg1>][<arg2>]{<arg3>}
 % => <macro>{<arg1>}{<arg2>}{<arg3>}
@@ -8749,8 +8866,8 @@
     \blx@xml@toggle{labeltitle}%
     \blx@xml@mvalue{labeltitlespec}{\blx@bcf@labeltitlespec}%
     \blx@xml@toggle{labeltitleyear}%
-    \blx@xml@toggle{labelyear}%
-    \blx@xml@mvalue{labelyearspec}{\blx@bcf@labelyearspec}%
+    \blx@xml@toggle{labeldate}%
+    \blx@xml@mvalue{labeldatespec}{\blx@bcf@labeldatespec}%
     \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}%
     \blx@xml@svalue{maxbibnames}{\blx@maxbibnames}%
     \blx@xml@svalue{maxcitenames}{\blx@maxcitenames}%
@@ -8785,11 +8902,11 @@
         {\csuse{blx@bcf@labeltitlespec@#1}}
         {\blx@bcf@labeltitlespec}}%
     \blx@xml@toggle{labeltitleyear}%
-    \blx@xml@toggle{labelyear}%
-    \blx@xml@mvalue{labelyearspec}{%
-      \ifcsdef{blx@bcf@labelyearspec@#1}
-        {\csuse{blx@bcf@labelyearspec@#1}}
-        {\blx@bcf@labelyearspec}}%
+    \blx@xml@toggle{labeldate}%
+    \blx@xml@mvalue{labeldatespec}{%
+      \ifcsdef{blx@bcf@labeldatespec@#1}
+        {\csuse{blx@bcf@labeldatespec@#1}}
+        {\blx@bcf@labeldatespec}}%
     \blx@xml@svalue{maxalphanames}{\blx@maxalphanames}%
     \blx@xml@svalue{maxbibnames}{\blx@maxbibnames@type}%
     \blx@xml@svalue{maxcitenames}{\blx@maxcitenames@type}%
@@ -9163,8 +9280,9 @@
     \blx@xml@labelalpha@element{\the\blx@tempcnta}{\blx@tempb}}}
 
 \newcommand*{\blx@latem@literal}[1]{%
+  \blx@xmlsanitizeafter{\def\blx@temps}{#1}%
   \eappto\blx@tempb{%
-    \blx@xml@labelalpha@part{}{#1}}}
+    \blx@xml@labelalpha@part{}{\expandafter\regexp\expandafter{\blx@temps}}}}
 
 \newcommand*{\blx@latem@field}[2][]{%
   \let\blx@tempc\@empty
@@ -9221,6 +9339,13 @@
     \eappto\blx@tempc{ ifnamecount="#1"}}
 \define@key{blx@latem@field}{names}{%
     \eappto\blx@tempc{ namecount="#1"}}
+\define@key{blx@latem@field}{padchar}{%
+  \blx@xmlsanitizeafter{\def\blx@temps}{#1}%
+  \eappto\blx@tempc{ pad\string_char="\expandafter\regexp\expandafter{\blx@temps}"}}
+\define@key{blx@latem@field}{padside}{% left|right
+  \ifstrequal{#1}{left}
+    {\eappto\blx@tempc{ pad\string_side="left"}}
+    {\eappto\blx@tempc{ pad\string_side="right"}}}
 
 % [<exceptions>]{<options>}
 
@@ -9456,18 +9581,23 @@
 \@onlypreamble\DeclareLabeltitle
 
 \newrobustcmd*{\DeclareLabelyear}[2][]{%
+  \blx@warning@noline{%
+    'DeclareLabelyear' is deprecated, please use 'DeclareLabeldate'}}
+
+\newrobustcmd*{\DeclareLabeldate}[2][]{%
   \begingroup
   \let\blx@tempa\@empty
-  \def\blx@tempb{labelyearspec}%
-  \let\field\blx@ordered@field
+  \def\blx@tempb{labeldatespec}%
+  \let\field\blx@orderedld@field
+  \let\literal\blx@orderedld@literal
   \ifblank{#1}
-    {\global\cslet{blx@bcf@labelyearspec}\@empty}
+    {\global\cslet{blx@bcf@labeldatespec}\@empty}
     {\def\blx@tempa{#1}%
-     \def\do##1{\global\cslet{blx@bcf@labelyearspec@##1}\@empty}%
+     \def\do##1{\global\cslet{blx@bcf@labeldatespec@##1}\@empty}%
      \expandafter\docsvlist\expandafter{#1}}%
   #2%
   \endgroup}
-\@onlypreamble\DeclareLabelyear
+\@onlypreamble\DeclareLabeldate
 
 \newcommand*{\blx@ordered@field}[2][]{%
   \let\blx@tempc\@empty
@@ -9481,6 +9611,26 @@
                 \csxappto{blx@bcf@\blx@tempb @##1}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}%
      \expandafter\docsvlist\expandafter{\blx@tempa}}}
 
+\newcommand*{\blx@orderedld@field}[2][]{%
+  \let\blx@tempc\@empty
+  \ifblank{#1}
+    {}
+    {\setkeys{blx@ordered@field}{#1}}%
+  \advance\blx@tempcnta\@ne
+  \ifdefempty{\blx@tempa}
+    {\csxappto{blx@bcf@\blx@tempb}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="field"\blx@tempc}{#2}}}
+    {\def\do##1{\blx@addtypeopt{##1}%
+                \csxappto{blx@bcf@\blx@tempb @##1}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}%
+     \expandafter\docsvlist\expandafter{\blx@tempa}}}
+
+\newcommand*{\blx@orderedld@literal}[1]{%
+  \advance\blx@tempcnta\@ne
+  \ifdefempty{\blx@tempa}
+    {\csxappto{blx@bcf@\blx@tempb}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="string"}{#1}}}
+    {\def\do##1{\blx@addtypeopt{##1}%
+                \csxappto{blx@bcf@\blx@tempb @##1}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{ type="string"}{#1}}}%
+     \expandafter\docsvlist\expandafter{\blx@tempa}}}
+
 \define@key{blx@ordered@field}{form}{%
   \appto\blx@tempc{ form="#1"}}
 \define@key{blx@ordered@field}{lang}{%
@@ -10124,6 +10274,12 @@
      \protected\def\blx@imc@printdateextra{\csuse{mkbibrange#1extra}{}}}
     {\blx@err@invopt{date=#1}{}}}
 
+\DeclareBibliographyOption{datelabel}{%
+  \ifcsdef{mkbibrange#1}
+    {\protected\def\blx@imc@printdatelabel{\csuse{mkbibrange#1}{label}}%
+     \protected\def\blx@imc@printdateextralabel{\csuse{mkbibrange#1extra}{label}}}
+    {\blx@err@invopt{datelabel=#1}{}}}
+
 \DeclareBibliographyOption{urldate}{%
   \ifcsdef{mkbibrange#1}
     {\protected\def\blx@imc@printurldate{\csuse{mkbibrange#1}{url}}}
@@ -10140,7 +10296,7 @@
     {\blx@err@invopt{origdate=#1}{}}}
 
 \DeclareBibliographyOption{alldates}{%
-  \ExecuteBibliographyOptions{date=#1,urldate=#1,eventdate=#1,origdate=#1}}
+  \ExecuteBibliographyOptions{date=#1,datelabel=#1,urldate=#1,eventdate=#1,origdate=#1}}
 
 \DeclareBibliographyOption{datezeros}[true]{%
   \ifstrequal{#1}{true}
@@ -10197,10 +10353,19 @@
 \DeclareTypeOption{labeltitleyear}[true]{%
   \settoggle{blx@labeltitleyear}{#1}}
 
+\DeclareBibliographyOption{labeldate}[true]{%
+  \settoggle{blx@labeldate}{#1}}
+\DeclareTypeOption{labeldate}[true]{%
+  \settoggle{blx@labeldate}{#1}}
+
 \DeclareBibliographyOption{labelyear}[true]{%
-  \settoggle{blx@labelyear}{#1}}
+  \blx@warning@noline{%
+    'labelyear' option is deprecated, use 'labeldate' instead}%
+  \settoggle{blx@labeldate}{#1}}
 \DeclareTypeOption{labelyear}[true]{%
-  \settoggle{blx@labelyear}{#1}}
+  \blx@warning@noline{%
+    'labelyear' option is deprecated, use 'labeldate' instead}%
+  \settoggle{blx@labeldate}{#1}}
 
 \DeclareBibliographyOption{uniquelist}[true]{%
   \ifcsdef{blx@opt@uniquelist@#1}
@@ -10415,7 +10580,7 @@
   backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false,
   idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false,
   citecounter=false,block=none,language=auto,clearlang=true,babel=none,
-  date=comp,origdate=comp,eventdate=comp,urldate=short,autopunct=true,
+  date=comp,datelabel=comp,origdate=comp,eventdate=comp,urldate=short,autopunct=true,
   punctfont=false,defernumbers=false,refsection=none,refsegment=none,
   citereset=none,hyperref=auto,parentracker,maxparens=3,
   bibencoding=auto,bibwarn}
@@ -10480,10 +10645,10 @@
         \setkeys{blx@opt@pre}{uniquename=mininit}}
        {}}
     {}%
-  \nottoggle{blx@labelyear}
+  \nottoggle{blx@labeldate}
     {\ifnumequal\blx@uniquelist\blx@opt@uniquelist@minyear
        {\blx@warn@conflopt{%
-          'uniquelist=minyear' requires 'labelyear'.\MessageBreak
+          'uniquelist=minyear' requires 'labeldate'.\MessageBreak
           Setting 'uniquelist=true'}%
         \setkeys{blx@opt@pre}{uniquelist}}
        {}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
index 6456e06b0b8..fb217873dc0 100644
--- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
+++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def
@@ -295,6 +295,7 @@
   movie,
   music,
   mvcollection,
+  mvreference,
   mvbook,
   online,
   patent,
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
index 185499b12ba..d831050b97a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authortitle-comp.cbx
@@ -42,8 +42,8 @@
        {}
        {\printnames{labelname}%
         \setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \addspace\bibopenparen}}%
+          \global\booltrue{cbx:parens}%
+          \addspace\bibopenparen}}%
      \savefield{namehash}{\cbx@lasthash}}%
   \ifnumequal{\value{citecount}}{1}
     {\usebibmacro{prenote}}
@@ -74,12 +74,12 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}%
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}%
        \multicitedelim}}}
 
 \DeclareCiteCommand{\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
index b579d1c9efd..5936fe16d88 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-comp.cbx
@@ -1,7 +1,7 @@
 \ProvidesFile{authoryear-comp.cbx}
 [\abx@cbxid]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,sortcites,autocite=inline}
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,sortcites,autocite=inline}
 \newbool{cbx:parens}
 
 \newbibmacro*{cite:init}{%
@@ -12,7 +12,7 @@
     {\iffieldundef{prenote}
        {}
        {\global\undef\cbx@lasthash
-	\global\undef\cbx@lastyear}}}
+        \global\undef\cbx@lastyear}}}
 
 \newbibmacro*{cite:reinit}{%
   \global\undef\cbx@lasthash
@@ -22,8 +22,8 @@
   \iffieldundef{shorthand}
     {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
        {\usebibmacro{cite:label}%
-	\setunit{\addspace}%
-	\usebibmacro{cite:labelyear+extrayear}%
+        \setunit{\addspace}%
+        \usebibmacro{cite:labelyear+extrayear}%
         \usebibmacro{cite:reinit}}
        {\iffieldequals{namehash}{\cbx@lasthash}
           {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
@@ -34,7 +34,7 @@
               \usebibmacro{cite:labelyear+extrayear}%
               \savefield{labelyear}{\cbx@lastyear}}}
           {\printnames{labelname}%
-  	   \setunit{\nameyeardelim}%
+           \setunit{\nameyeardelim}%
            \usebibmacro{cite:labelyear+extrayear}%
            \savefield{namehash}{\cbx@lasthash}%
            \savefield{labelyear}{\cbx@lastyear}}}}
@@ -78,29 +78,29 @@
     {\ifnameundef{labelname}
        {\iffieldundef{shorthand}
           {\usebibmacro{cite:label}%
-	   \setunit{%
-	     \global\booltrue{cbx:parens}%
-	     \addspace\bibopenparen}%
-	   \ifnumequal{\value{citecount}}{1}
-	     {\usebibmacro{prenote}}
-	     {}%
-	   \usebibmacro{cite:labelyear+extrayear}}
+           \setunit{%
+             \global\booltrue{cbx:parens}%
+             \addspace\bibopenparen}%
+           \ifnumequal{\value{citecount}}{1}
+             {\usebibmacro{prenote}}
+             {}%
+           \usebibmacro{cite:labelyear+extrayear}}
           {\usebibmacro{cite:shorthand}}}
        {\printnames{labelname}%
-	\setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \addspace\bibopenparen}%
-	\ifnumequal{\value{citecount}}{1}
-	  {\usebibmacro{prenote}}
-	  {}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \addspace\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
         \iffieldundef{shorthand}
           {\iffieldundef{labelyear}
              {\usebibmacro{cite:label}}
              {\usebibmacro{cite:labelyear+extrayear}}%
            \savefield{labelyear}{\cbx@lastyear}}
           {\usebibmacro{cite:shorthand}%
-           \global\undef\cbx@lastyear}%
-        \savefield{namehash}{\cbx@lasthash}}}%
+           \global\undef\cbx@lastyear}}%
+       \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
       {\bibcloseparen\global\boolfalse{cbx:parens}}
@@ -133,12 +133,12 @@
     {\setunit{}%
      \printtext{%
        \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}}}
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}}}
     {\setunit{%
        \ifbool{cbx:parens}
-	 {\bibcloseparen\global\boolfalse{cbx:parens}}
-	 {}%
+         {\bibcloseparen\global\boolfalse{cbx:parens}}
+         {}%
        \multicitedelim}}}
 
 \DeclareCiteCommand{\cite}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
index 56dc3f27d86..77c4b1e0033 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-ibid.cbx
@@ -1,7 +1,7 @@
 \ProvidesFile{authoryear-ibid.cbx}
 [\abx@cbxid]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,pagetracker,
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,pagetracker,
                             ibidtracker=constrict,autocite=inline}
 \providecommand*{\mkibid}[1]{#1}
 \newbool{cbx:parens}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
index afa46ee3677..0fdb7f60eda 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear-icomp.cbx
@@ -1,7 +1,7 @@
 \ProvidesFile{authoryear-icomp.cbx}
 [\abx@cbxid]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,ibidtracker=constrict,
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,ibidtracker=constrict,
                             pagetracker,sortcites,autocite=inline}
 \providecommand*{\mkibid}[1]{#1}
 \newbool{cbx:parens}
@@ -32,20 +32,20 @@
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
        {\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
-	  {\usebibmacro{cite:label}%
-	   \setunit{\addspace}%
-	   \usebibmacro{cite:labelyear+extrayear}%
+          {\usebibmacro{cite:label}%
+           \setunit{\addspace}%
+           \usebibmacro{cite:labelyear+extrayear}%
            \usebibmacro{cite:reinit}}
-	  {\iffieldequals{namehash}{\cbx@lasthash}
+          {\iffieldequals{namehash}{\cbx@lasthash}
              {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                	  \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
-        	{\setunit{\addcomma}%
-        	 \usebibmacro{cite:extrayear}}
-        	{\setunit{\compcitedelim}%
-        	 \usebibmacro{cite:labelyear+extrayear}%
-        	 \savefield{labelyear}{\cbx@lastyear}}}
+                          \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+                {\setunit{\addcomma}%
+                 \usebibmacro{cite:extrayear}}
+                {\setunit{\compcitedelim}%
+                 \usebibmacro{cite:labelyear+extrayear}%
+                 \savefield{labelyear}{\cbx@lastyear}}}
              {\printnames{labelname}%
-  	      \setunit{\nameyeardelim}%
+              \setunit{\nameyeardelim}%
               \usebibmacro{cite:labelyear+extrayear}%
               \savefield{namehash}{\cbx@lasthash}%
               \savefield{labelyear}{\cbx@lastyear}}}}}
@@ -58,16 +58,16 @@
     {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
        {\usebibmacro{cite:ibid}}
        {\iffieldundef{labelyear}
-	  {\usebibmacro{cite:label}%
+          {\usebibmacro{cite:label}%
            \usebibmacro{cite:reinit}}
-	  {\iffieldequals{namehash}{\cbx@lasthash}
+          {\iffieldequals{namehash}{\cbx@lasthash}
              {\ifthenelse{\iffieldequals{labelyear}{\cbx@lastyear}\AND
-                	  \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
-        	{\setunit{\addcomma}%
-        	 \usebibmacro{cite:extrayear}}
-        	{\setunit{\compcitedelim}%
-        	 \usebibmacro{cite:labelyear+extrayear}%
-        	 \savefield{labelyear}{\cbx@lastyear}}}
+                          \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+                {\setunit{\addcomma}%
+                 \usebibmacro{cite:extrayear}}
+                {\setunit{\compcitedelim}%
+                 \usebibmacro{cite:labelyear+extrayear}%
+                 \savefield{labelyear}{\cbx@lastyear}}}
              {\usebibmacro{cite:labelyear+extrayear}%
               \savefield{namehash}{\cbx@lasthash}%
               \savefield{labelyear}{\cbx@lastyear}}}}}
@@ -91,33 +91,33 @@
     {\ifnameundef{labelname}
        {\iffieldundef{shorthand}
           {\usebibmacro{cite:label}%
-	   \setunit{%
-	     \global\booltrue{cbx:parens}%
-	     \addspace\bibopenparen}%
-	   \ifnumequal{\value{citecount}}{1}
-	     {\usebibmacro{prenote}}
-	     {}%
-	   \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
-	     {\usebibmacro{cite:ibid}}
-	     {\usebibmacro{cite:labelyear+extrayear}}}
+           \setunit{%
+             \global\booltrue{cbx:parens}%
+             \addspace\bibopenparen}%
+           \ifnumequal{\value{citecount}}{1}
+             {\usebibmacro{prenote}}
+             {}%
+           \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+             {\usebibmacro{cite:ibid}}
+             {\usebibmacro{cite:labelyear+extrayear}}}
           {\usebibmacro{cite:shorthand}}}
        {\printnames{labelname}%
-	\setunit{%
-	  \global\booltrue{cbx:parens}%
-	  \addspace\bibopenparen}%
-	\ifnumequal{\value{citecount}}{1}
-	  {\usebibmacro{prenote}}
-	  {}%
+        \setunit{%
+          \global\booltrue{cbx:parens}%
+          \addspace\bibopenparen}%
+        \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
         \iffieldundef{shorthand}
           {\iffieldundef{labelyear}
              {\usebibmacro{cite:label}}
              {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
-		{\usebibmacro{cite:ibid}}
-		{\usebibmacro{cite:labelyear+extrayear}}}%
+                {\usebibmacro{cite:ibid}}
+                {\usebibmacro{cite:labelyear+extrayear}}}%
            \savefield{labelyear}{\cbx@lastyear}}
           {\usebibmacro{cite:shorthand}%
-           \global\undef\cbx@lastyear}%
-        \savefield{namehash}{\cbx@lasthash}}}%
+           \global\undef\cbx@lastyear}}%
+       \savefield{namehash}{\cbx@lasthash}}%
   \setunit{%
     \ifbool{cbx:parens}
       {\bibcloseparen\global\boolfalse{cbx:parens}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
index c8fb2f891ad..97a4aa9bf21 100644
--- a/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex/cbx/authoryear.cbx
@@ -1,7 +1,7 @@
 \ProvidesFile{authoryear.cbx}
 [\abx@cbxid]
 
-\ExecuteBibliographyOptions{labelyear,uniquename,uniquelist,autocite=inline}
+\ExecuteBibliographyOptions{labeldate,uniquename,uniquelist,autocite=inline}
 \newbool{cbx:parens}
 
 \newbibmacro*{cite}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
index 44dc3408647..551afa2c5df 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/australian.lbx
@@ -12,7 +12,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
 }
 
 \InheritBibliographyStrings{english}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
index 186be09f3df..fdfce137a95 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/brazilian.lbx
@@ -23,7 +23,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\nobreakspace de\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -33,7 +33,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibfemord}%
@@ -327,6 +327,7 @@
   columns          = {{colunas}{cols\adddot}},
   line             = {{linha}{l\adddot}},
   lines            = {{linhas}{ll\adddot}},
+  nodate           = {{sem\space data}{{s\adddot d\adddot}},
   verse            = {{verso}{v\adddot}},
   verses           = {{versos}{vv\adddot}},
   section          = {{se\c{c}\~ao}{\S}},
@@ -340,7 +341,7 @@
   chapter          = {{cap\'\i tulo}{cap\adddot}},
   mathesis         = {{disserta\c{c}\~ao de mestrado}{diss\adddot\ de mestrado}},
   phdthesis        = {{tese de doutorado}{tese de doutorado}},
-% candthesis       = {{}{}}, % FIXME: missing
+% candthesis       = {{}{}},% FIXME: missing
   resreport        = {{relat\'orio de pesquisa}{rel\adddotspace de pesquisa}},
   techreport       = {{relat\'orio t\'ecnico}{rel\adddotspace t\'ec\adddot}},
   software         = {{software}{software}},
@@ -348,12 +349,13 @@
   audiocd          = {{CD de \'audio}{CD de \'audio}},
   version          = {{vers\~ao}{vers\~ao}},
   url              = {{endere\c{c}o eletr\^onico}{endere\c{c}o}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{acesso em}{acesso em}},
   inpreparation    = {{em prepara\c{c}\~ao}{em prep\adddot}},
   submitted        = {{submetido}{subm\adddot}},
   forthcoming      = {{aceito para publica\c{c}\~ao}{aceito para publ\adddot}},
   inpress          = {{no prelo}{no prelo}},
-  prepublished     = {{pr\'e-publicado}{pr\'e-publ\adddot}}, % FIXME: missing
+% prepublished     = {{pr\'e-publicado}{pr\'e-publ\adddot}},% FIXME: missing
   citedas          = {{doravante citado como}{doravante citado como}},
   seenote          = {{ver nota}{ver nota}},
   quotedin         = {{apud}{apud}},
@@ -390,7 +392,9 @@
   december         = {{dezembro}{dez\adddot}},
   langamerican     = {{ingl\^es}{ingl\^es}},
   langbrazilian    = {{portugu{\^e}s}{portugu{\^e}s}},
+% langcatalan      = {{}{}},% FIXME: missing
   langcroatian     = {{croata}{croata}},
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{dinamarqu\^es}{dinamarqu\^es}},
   langdutch        = {{holand{\^e}s}{holand{\^e}s}},
   langenglish      = {{ingl\^es}{ingl\^es}},
@@ -407,7 +411,9 @@
   langswedish      = {{sueco}{sueco}},
   fromamerican     = {{do ingl\^es}{do ingl\^es}},
   frombrazilian    = {{do portugu{\^e}s}{do portugu{\^e}s}},
+% fromcatalan      = {{}{}},% FIXME: missing
   fromcroatian     = {{do croata}{do croata}},
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{do dinamarqu\^es}{do dinamarqu\^es}},
   fromdutch        = {{do holand{\^e}s}{do holand{\^e}s}},
   fromenglish      = {{do ingl\^es}{do ingl\^es}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
index f2ce1a735d0..5d54ac91fad 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/british.lbx
@@ -27,7 +27,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -37,7 +37,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
 }
 
 \InheritBibliographyStrings{english}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
index 576c6e49232..adae37126cd 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx
@@ -1,73 +1,72 @@
-% -*- latex -*-
 \ProvidesFile{catalan.lbx}
-
-% Changes:
-% 2012-4-23   Translation (Sebastià Vila-Marta)
-% 2012-10-23  Added to biblatex project (Sebastià Vila-Marta)
-% 2012-11-4   All strings translated (Sebastià Vila-Marta)
-% 1013-1-8    Some syntactic typos corrected. New strings (Sebastià Vila-Marta)
-
+[\abx@lbxid]
 
 \DeclareRedundantLanguages{catalan}{catalan}
 
 \DeclareBibliographyExtras{%
-  \protected\def\bibrangedash{\bibendash{}}% 
-  \protected\def\bibdatedash{\bibrangedash}% 
-  \let\finalandcomma=\empty%
-  \protected\def\deap#1{\@ifnextchar{ yes }{ no }}%
-  \protected\def\mkbibordinalm#1{%
+  \protected\def\bibrangedash{\addnbthinspace -\addnbthinspace}%
+  \protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}%
+  \let\finalandcomma=\empty
+  \def\mkbibordinal{\mkbibmascord}%
+  \protected\def\mkbibmascord#1{%
     \begingroup
     \@tempcnta0#1\relax\number\@tempcnta
-    \ifcase\@tempcnta x\or er\or n\or er\or rt\else \`e\fi
+    \ifcase\@tempcnta\or r\or n\or r\or t\else\`e\fi		
     \endgroup}%
-  \protected\def\mkbibordinalf#1{#1a}%
-  \protected\def\mkbibmascord#1{\mkbibordinalm{#1}}%
-  \protected\def\mkbibfemord#1{\mkbibordinalf{#1}}%
-  \protected\def\mkbibdatelong#1#2#3{%
-    \iffieldundef{#3}{}{%
-      \stripzeros{\thefield{#3}}%
-      \iffieldundef{#2}{}{%
-        \nobreakspace%
-        \ifthenelse{\thefield{#2}=4}{d'}{%
-          \ifthenelse{\thefield{#2}=8}{d'}{%
-            \ifthenelse{\thefield{#2}=10}{d'}{%
-              de\space}}}%
-      }%
-    }%
-    \iffieldundef{#2}{}{%
-      \mkbibmonth{\thefield{#2}}%
-      \iffieldundef{#1}{}{%
-        \space de\nobreakspace%
-      }%
-    }%
-    \iffieldundef{#1}{}{\thefield{#1}}%
-  }%
-  \protected\def\mkbibdateshort#1#2#3{%
+  \protected\def\mkbibfemord#1{\stripzeros{#1}a}%
+  \protected\def\mkbibdatelong#1#2#3{% maintainers: check me
     \iffieldundef{#3}
       {}
-      {\mkdatezeros{\thefield{#3}}%
+      {\stripzeros{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\space%
+          \ifthenelse{\thefield{#2}=4}
+            {d'}
+            {\ifthenelse{\thefield{#2}=8}
+               {d'}
+               {\ifthenelse{\thefield{#2}=10}
+                  {d'}
+                  {de\nobreakspace}}}}}%
+    \iffieldundef{#2}
+      {}
+      {\mkbibmonth{\thefield{#2}}%
+       \iffieldundef{#1}
+         {}
+         {\space de\nobreakspace}}%
+    \iffieldundef{#1}
+      {}
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \protected\def\mkbibdateshort#1#2#3{% maintainers: check me
+    \iffieldundef{#3}
+      {}
+      {\stripzeros{\thefield{#3}}%
        \iffieldundef{#2}{}{\mbox{-}}}%
     \iffieldundef{#2}
       {}
-      {\mkdatezeros{\thefield{#2}}%
+      {\stripzeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\mbox{-}}}%
-    \thefield{#1}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}%
+  \savecommand\lbx@initnamehook
+  \savecommand\lbx@inittitlehook
   \savecommand\mkbibrangeterse
+  \savecommand\mkbibordedition
+  \savecommand\mkbibordseries
+  \let\lbx@initnamehook=\lbx@ca@smartof
+  \let\lbx@inittitlehook=\lbx@ca@smartof
   \protected\def\mkbibrangeterse{%
     \BibliographyWarning{%
       Date format 'terse' not applicable to\MessageBreak
       Catalan dates. Using format 'short' instead}%
     \mkbibrangefull{short}}%
-  \savecommand\mkbibordedition
-  \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibfemord}%
   \def\mkbibordseries{\mkbibfemord}%
 }
 
 \UndeclareBibliographyExtras{%
+  \restorecommand\lbx@initnamehook
+  \restorecommand\lbx@inittitlehook
   \restorecommand\mkbibrangeterse
-  \restorecommand\lbx@finalnamedelim
-  \restorecommand\lbx@finallistdelim
   \restorecommand\mkbibordedition
   \restorecommand\mkbibordseries
 }
@@ -75,11 +74,11 @@
 \DeclareBibliographyStrings{%
   bibliography     = {{Bibliografia}{Bibliografia}},
   references       = {{Refer\`encies}{Refer\`encies}},
-  shorthands       = {{Llista de abreviatures}{Abreviatures}},
+  shorthands       = {{Llista d'abreviatures}{Abreviatures}},
   editor           = {{editor}{ed\adddot}},
   editors          = {{editors}{eds\adddot}},
-  compiler         = {{compilador}{comp\adddot}}, % Revisar
-  compilers        = {{compiladors}{comps\adddot}}, % Revisar
+  compiler         = {{compilador}{comp\adddot}},% Revisar
+  compilers        = {{compiladors}{comps\adddot}},% Revisar
   redactor         = {{redactor}{red\adddot}},
   redactors        = {{redactors}{reds\adddot}},
   reviser          = {{revisor}{rev\adddot}},
@@ -88,7 +87,7 @@
   founders         = {{fundadors}{funds\adddot}},
   continuator      = {{continuador}{cont\adddot}},
   continuators     = {{continuadors}{conts\adddot}},
-  collaborator     = {{co\l.laborador}{co\l.l\adddot}},  %require babel
+  collaborator     = {{co\l.laborador}{co\l.l\adddot}},% \l* -> catalan.ldf (babel)
   collaborators    = {{co\l.laboradors}{co\l.ls\adddot}},
   translator       = {{traductor}{trad\adddot}},
   translators      = {{traductors}{trads\adddot}},
@@ -97,92 +96,96 @@
   annotator        = {{anotador}{anot\adddot}},
   annotators       = {{anotadors}{anots\adddot}},
   commentary       = {{comentari}{com\adddot}},
-  annotations      = {{notes}{notes}},
+  annotations      = {{notes}{n\adddot}},
   introduction     = {{introducci\'o}{intr\adddot}},
   foreword         = {{pr\`oleg}{pr\`ol\adddot}},
-  afterword        = {{ep{\'\i}leg}{ep{\'\i}l\adddot}},
+  afterword        = {{ep{\'\i}leg}{ep\adddot}},
   editortr         = {{editor i traductor}{ed\adddotspace i trad\adddot}},
   editorstr        = {{editors i traductors}{eds\adddotspace i trads\adddot}},
   editorco         = {{editor i comentarista}{ed\adddotspace i com\adddot}},
-  editorsco        = {{editors i comentaristes}{eds\adddotspac i coms\adddot}},
+  editorsco        = {{editors i comentaristes}{eds\adddotspace i coms\adddot}},
   editoran         = {{editor i anotador}{ed\adddotspace i anot\adddot}},
   editorsan        = {{editors i anotadors}{eds\adddotspace i anots\adddot}},
-  editorin         = {{editor i autor de la introducci\'o}{ed\adddotspace i autor de la intr\addot}},
-  editorsin        = {{editors i autors de la introducci\'o}{eds\adddotspace i autors de la intr\adddot}},
-  editorfo         = {{editor i autor del pr\`oleg}{ed\adddotspace i autor del pr\`ol\addot}},
-  editorsfo        = {{editors i autors del pr\`oleg}{eds\adddotspace i autors del pr\`ol\addot}},
+  editorin         = {{editor i autor de la introducci\'o}
+                      {ed\adddotspace i aut\adddotspace de la intr\adddot}},
+  editorsin        = {{editors i autors de la introducci\'o}
+                      {eds\adddotspace i auts\adddotspace de la intr\adddot}},
+  editorfo         = {{editor i autor del pr\`oleg}
+                      {ed\adddotspace i aut\adddotspace del pr\`ol\adddot}},
+  editorsfo        = {{editors i autors del pr\`oleg}
+                      {eds\adddotspace i auts\adddotspace del pr\`ol\adddot}},
   editoraf         = {{editor i autor de l'ep{\'\i}leg} %
-                      {ed\adddotspace i aut\adddot de l'ep{\`\i}\adddot}},
+                      {ed\adddotspace i aut\adddotspace de l'ep\adddot}},
   editorsaf        = {{editors i autors de l'ep{\'\i}leg} %
-                      {eds\adddotspace i auts\adddotspace de l'ep{\`\i}\adddot}},
+                      {eds\adddotspace i auts\adddotspace de l'ep\adddot}},
   editortrco       = {{editor, traductor i comentarista}
-                      {ed.,\addabbrvspace trad\adddot i com\adddot}},
+                      {ed.,\addabbrvspace trad\adddotspace i com\adddot}},
   editorstrco      = {{editors, traductors i comentaristes}
-                      {eds.,\addabbrvspace trads\adddot i coms\adddot}},
+                      {eds.,\addabbrvspace trads\adddotspace i coms\adddot}},
   editortran       = {{editor, traductor i anotador}
-                      {ed.,\addabbrvspace trad\adddot i anot\adddot}},
+                      {ed.,\addabbrvspace trad\adddotspace i anot\adddot}},
   editorstran      = {{editors, traductors i anotadors}
-                      {eds.,\addabbrvspace trads\adddot i anots\adddot}},
+                      {eds.,\addabbrvspace trads\adddotspace i anots\adddot}},
   editortrin       = {{editor, traductor i autor de la introducci\'o}
-                      {ed.,\addabbrvspace trad\adddot i aut\adddot de la intr\adddot}},
+                      {ed.,\addabbrvspace trad\adddotspace i aut\adddotspace de la intr\adddot}},
   editorstrin      = {{editors, traductors i autors de la introducci\'o}
-                      {eds.,\addabbrvspace trads\adddot i auts\adddot de la intr\adddot}},
+                      {eds.,\addabbrvspace trads\adddotspace i auts\adddotspace de la intr\adddot}},
   editortrfo       = {{editor, traductor i autor del pr\`oleg}
-                      {ed.,\addabbrvspace trad\adddot i aut\adddot del pr\`ol\adddot}},
+                      {ed.,\addabbrvspace trad\adddotspace i aut\adddotspace del pr\`ol\adddot}},
   editorstrfo      = {{editors, traductors i autors del pr\`oleg}
-                      {eds.,\addabbrvspace trads\adddot i auts\adddot del pr\`ol\adddot}},
+                      {eds.,\addabbrvspace trads\adddotspace i auts\adddotspace del pr\`ol\adddot}},
   editortraf       = {{editor, traductor i autor de l'ep{\'\i}leg}
-                      {ed.,\addabbrvspace trad\adddot i aut\adddot de l'ep{\'\i}l\adddot}},
+                      {ed.,\addabbrvspace trad\adddotspace i aut\adddotspace de l'ep\adddot}},
   editorstraf      = {{editors, traductors i autors de l'ep{\'\i}leg}
-                      {eds.,\addabbrvspace trads\adddot i auts\adddot de l'ep{\'\i}l\adddot}},
+                      {eds.,\addabbrvspace trads\adddotspace i auts\adddotspace de l'ep\adddot}},
   editorcoin       = {{editor, comentarista i autor de la introducci\'o}
-                      {ed.,\addabbrvspace com\adddot i aut\adddot de la intr\adddot}},
+                      {ed.,\addabbrvspace com\adddotspace i aut\adddotspace de la intr\adddot}},
   editorscoin      = {{editors, comentaristes i autors de la introducci\'o}
-                      {eds.,\addabbrvspace coms\adddot i auts\adddot de la intr\adddot}},
+                      {eds.,\addabbrvspace coms\adddotspace i auts\adddotspace de la intr\adddot}},
   editorcofo       = {{editor, comentarista i autor del pr\`oleg}
                       {ed.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot}},
   editorscofo      = {{editors, comentaristes i autors del pr\`oleg}
                       {eds.,\addabbrvspace coms\adddotspace i auts\adddotspace del pr\`ol\adddot}},
-  editorcoaf       = {{editor, comentarista i autor de l'ep{\`\i}leg}
-                      {ed.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep{\'\i}l\adddot}},
-  editorscoaf      = {{editors, comentaristes i autors de l'ep{\`\i}leg}
-                      {eds.,\addabbrvspace coms\adddotspace i auts\adddotspace de l'ep{\'\i}l\adddot}},
+  editorcoaf       = {{editor, comentarista i autor de l'ep{\'\i}leg}
+                      {ed.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep\adddot}},
+  editorscoaf      = {{editors, comentaristes i autors de l'ep{\'\i}leg}
+                      {eds.,\addabbrvspace coms\adddotspace i auts\adddotspace de l'ep\adddot}},
   editoranin       = {{editor, anotador i autor de la introducci\'o}
                       {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace de la intr\adddot}},
-  editorsanin      = {{editors, anotadors i autors de la introducci\`o}
+  editorsanin      = {{editors, anotadors i autors de la introducci\'o}
                       {eds.,\addabbrvspace anots\adddotspace i auts\adddotspace de la intr\adddot}}, 
   editoranfo       = {{editor, anotador i autor del pr\`oleg}
                       {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace del pr\`ol\adddot}},
   editorsanfo      = {{editors, anotadors i autors del pr\`oleg}
                       {eds.,\addabbrvspace anots\adddotspace i auts\adddotspace del pr\`ol\adddot}},
-  editoranaf       = {{editor, anotador i autor de l'ep{\`\i}leg}
-                      {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep{\`\i}l\adddot}},
-  editorsanaf      = {{editors, anotadors i autors de l'ep{\`\i}leg}
-                      {eds.,\addabbrvspace anots\adddotspace i auts\adddotspace de l'ep{\`\i}l\adddot}},
+  editoranaf       = {{editor, anotador i autor de l'ep{\'\i}leg}
+                      {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}},
+  editorsanaf      = {{editors, anotadors i autors de l'ep{\'\i}leg}
+                      {eds.,\addabbrvspace anots\adddotspace i auts\adddotspace de l'ep\adddot}},
   editortrcoin     = {{editor, traductor, comentarista i autor de la introducci\'o}
-                      {ed.,\addabbrevspace trad.,\addabbrevspace com\adddotspace i aut\adddotspace de la intr\adddot}},
+                      {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace i aut\adddotspace de la intr\adddot}},
   editorstrcoin    = {{editors, traductors, comentaristes i autors de la introducci\'o}
-                      {eds.,\addabbrevspace trads.,\addabbrevspace coms\adddotspace i aut\adddotspace de la intr\adddot}},
+                      {eds.,\addabbrvspace trads.,\addabbrvspace coms\adddotspace i aut\adddotspace de la intr\adddot}},
   editortrcofo     = {{editor, traductor, comentarista i autor del pr\`oleg}
-                      {ed.,\addabbrvspace trad.,\addabbrevspace com\adddotspace i aut\adddotspace del pr\`ol\adddot }},
+                      {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot }},
   editorstrcofo    = {{editors, traductors, comentaristes i autors del pr\`oleg}
-                      {eds.,\addabbrvspace trads.,\addabbrevspace coms\adddotspace i auts\adddotspace del pr\`ol\adddot }},
+                      {eds.,\addabbrvspace trads.,\addabbrvspace coms\adddotspace i auts\adddotspace del pr\`ol\adddot }},
   editortrcoaf     = {{editor, traductor, comentarista i autor de l'ep{\'\i}leg}
-                      {ed,.\addabbrevspace trad.,\addabbrevspace com\adddotspace i aut\adddotspace de l'ep{\'\i}l\adddot}},
+                      {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep\adddot}},
   editorstrcoaf    = {{editors, traductors, comentaristes i autors de l'ep{\'\i}leg}
-                      {eds,.\addabbrevspace trads.,\addabbrevspace coms\adddotspace i auts\adddotspace de l'ep{\'\i}l\adddot}},
+                      {eds.,\addabbrvspace trads.,\addabbrvspace coms\adddotspace i auts\adddotspace de l'ep\adddot}},
   editortranin     = {{editor, traductor, anotador i autor de la introducci\'o}
-                      {ed.,\addabbrevspace trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de la intr\adddot}},
+                      {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de la intr\adddot}},
   editorstranin    = {{editors, traductors, anotadors i autors de la introducci\'o}
-                      {eds.,\addabbrevspace trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de la intr\adddot}},
+                      {eds.,\addabbrvspace trads.,\addabbrvspace anots\adddotspace i auts\adddotspace de la intr\adddot}},
   editortranfo     = {{editor, traductor, anotador i autor del pr\`oleg}
-                      {ed.,\addabrevspace trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de pr\`ol\adddot}},
+                      {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de pr\`ol\adddot}},
   editorstranfo    = {{editors, traductors, anotadors i autors del pr\`oleg}
-                      {eds.,\addabrevspace trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de pr\`ol\adddot}},
-  editortranaf     = {{editor, traductor, anotador i autor de l'ep{\'\i}eg}
-                      {ed.,\addabbrevspace trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de l'ep{\'\i}l\addot}},
-  editorstranaf    = {{editors, traductors, anotadors i autors de l'ep{\'\i}eg}
-                      {eds.,\addabbrevspace trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de l'ep{\'\i}l\addot}},
+                      {eds.,\addabbrvspace trads.,\addabbrvspace anots\adddotspace i auts\adddotspace de pr\`ol\adddot}},
+  editortranaf     = {{editor, traductor, anotador i autor de l'ep{\'\i}leg}
+                      {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}},
+  editorstranaf    = {{editors, traductors, anotadors i autors de l'ep{\'\i}leg}
+                      {eds.,\addabbrvspace trads.,\addabbrvspace anots\adddotspace i auts\adddotspace de l'ep\adddot}},
   translatorco     = {{traductor i comentarista}
                       {trad\adddotspace i com\adddot}},
   translatorsco    = {{traductors i comentaristes}
@@ -200,178 +203,183 @@
   translatorsfo    = {{traductors i autors del pr\`oleg}
                       {trads\adddotspace i auts\adddotspace del pr\`ol\adddot}},
   translatoraf     = {{traductor i autor de l'ep{\'\i}leg}
-                      {trad\adddotspace i aut\adddotspace de l'ep{\'\i}l\adddot}},
+                      {trad\adddotspace i aut\adddotspace de l'ep\adddot}},
   translatorsaf    = {{traductors i autors de l'ep{\'\i}leg}
-                      {trads\adddotspace i auts\adddotspace de l'ep{\'\i}l\adddot}},
+                      {trads\adddotspace i auts\adddotspace de l'ep\adddot}},
   translatorcoin   = {{traductor, comentarista i autor de la introducci\'o}
-                      {trad.,\addabbrevspace com\adddotspace i aut\adddotspace de la intr\adddotspace}},
+                      {trad.,\addabbrvspace com\adddotspace i aut\adddotspace de la intr\adddotspace}},
   translatorscoin  = {{traductors, comentaristes i autors de la introducci\'o}
-                      {trads.,\addabbrevspace coms\adddotspace i auts\adddotspace de la intr\adddotspace}},
+                      {trads.,\addabbrvspace coms\adddotspace i auts\adddotspace de la intr\adddotspace}},
   translatorcofo   = {{traductor, comentarista i autor del pr\`oleg}
-                      {trad.,\addabbrevspace com\adddotspace i aut\adddotspace del pr\`ol\adddot}},
+                      {trad.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot}},
   translatorscofo  = {{traductors, comentaristes i autors del pr\`oleg}
-                      {trads.,\addabbrevspace coms\adddotspace i auts\adddotspace del pr\`ol\adddot}},
+                      {trads.,\addabbrvspace coms\adddotspace i auts\adddotspace del pr\`ol\adddot}},
   translatorcoaf   = {{traductor, comentarista i autor de l'ep{\'\i}leg}
-                      {trad.,\addabbrevspace com\adddotspace i aut\adddotspace de l'ep{\'\i}l\adddot}},
+                      {trad.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep\adddot}},
   translatorscoaf  = {{traductors, comentaristes i autors de l'ep{\'\i}leg}
-                      {trads.,\addabbrevspace coms\adddotspace i auts\adddotspace de l'ep{\'\i}l\adddot}},
+                      {trads.,\addabbrvspace coms\adddotspace i auts\adddotspace de l'ep\adddot}},
   translatoranin   = {{traductor, anotador i autor de la introducci\'o}
-                      {trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de la intr\adddot}},
+                      {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de la intr\adddot}},
   translatorsanin  = {{traductors, anotadors i autors de la introducci\'o}
-                      {trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de la intr\adddot}},
+                      {trads.,\addabbrvspace anots\adddotspace i auts\adddotspace de la intr\adddot}},
   translatoranfo   = {{traductor, anotador i autor del pr\`oleg}
-                      {trad.,\addabbrevspace anot\adddotspace i aut\adddotspace del pr\`ol\adddot}},
+                      {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace del pr\`ol\adddot}},
   translatorsanfo  = {{traductors, anotadors i autors del pr\`oleg}
-                      {trads.,\addabbrevspace anots\adddotspace i auts\adddotspace del pr\`ol\adddot}},
+                      {trads.,\addabbrvspace anots\adddotspace i auts\adddotspace del pr\`ol\adddot}},
   translatoranaf   = {{traductor, anotador i autor de l'ep{\'\i}leg}
-                      {trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de l'ep{\'\i}l\adddot}},
+                      {trad.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep\adddot}},
   translatorsanaf  = {{traductors, anotadors i autors de l'ep{\'\i}leg}
-                      {trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de l'ep{\'\i}l\adddot}},
+                      {trads.,\addabbrvspace anots\adddotspace i auts\adddotspace de l'ep\adddot}},
   byauthor         = {{per}{per}},
-  byeditor         = {{edici\'o a cura de}{ed\adddotspace de}},
-  bycompiler       = {{compilaci\'o a cura de}{comp\adddotspace de}},
-  byredactor       = {{redacci\'o a cura de}{red\adddotspace de}},
-  byreviser        = {{revisió a cura de}{rev\adddotspace de}},
-  byfounder        = {{fundat per}{\fund\adddotspace per}},
+  byeditor         = {{edici\'o a cura \smartof}{ed\adddotspace\smartof}},
+  bycompiler       = {{compilaci\'o a cura \smartof}{comp\adddotspace\smartof}},
+  byredactor       = {{redacci\'o a cura \smartof}{red\adddotspace\smartof}},
+  byreviser        = {{revisi\'o a cura \smartof}{rev\adddotspace\smartof}},
+  byreviewer       = {{revisi\'o a cura \smartof}{rev\adddotspace\smartof}},
+  byfounder        = {{fundat per}{fund\adddotspace per}},
   bycontinuator    = {{continuat per}{cont\adddotspace per}},
-  bycollaborator   = {{amb la co\l.laboraci\'o de}{amb la co\l.l\adddotspace de}},
-  bytranslator     = {{traducció \lbx@fromlang\ a cura de}{trad\adddotspace\lbx@fromlang\ de}},
-  bycommentator    = {{comentaris a cura de}{com\adddotspace de}},
-  byannotator      = {{notes a cura de}{notes de}},
-  withcommentator  = {{amb comentaris a cura de}{amb com\adddotspace a cura de}},
-  withannotator    = {{amb notes a cura de}{amb notes de}},
-  withintroduction = {{amb la introducci\'o a cura de}{amb la intr\adddotspace de}},
-  withforeword     = {{amb el pr\`oleg a cura de}{amb el pr\`ol\adddotspace de}},
-  withafterword    = {{amb l'ep{\'\i}leg a cura de}{amb l'ep{\'\i}l\adddotspace de}},
-  byeditortr       = {{edici\'o i traducci\'o \lbx@fromlang\ a cura de}%
-                      {ed\adddotspace i trad\adddotspace\lbx@fromlang\ de}},
-  byeditorco       = {{edició i comentaris a cura de}%
-                      {ed\adddotspace i com\adddotspace de}},
-  byeditoran       = {{edició i notes a cura de}%
-                      {ed\adddotspace i not\adddotspace de}},
-  byeditorin       = {{edició i introduccio a cura de}%
-                      {ed\adddotspace i intr\adddotspace de}},
-  byeditorfo       = {{edició i pr\`oleg a cura de}%
-                      {ed\adddotspace i pr\`ol\adddotspace de}},
-  byeditoraf       = {{edició i ep{\'\i}leg a cura de}%
-                      {ed\adddotspace i ep{\'\i}l\adddotspace de}},
-  byeditortrco     = {{edici\'o, traducci\'o \lbx@fromlang\ i comentaris a cura de}%
-                      {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i com\adddotspace de}},
-  byeditortran     = {{edici\'o, traducci\'o \lbx@fromlang\ i notes a cura de}%
-                      {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i not\adddotspace de}},
-  byeditortrin     = {{edici\'o, traducci\'o \lbx@fromlang\ i introducci\'o a cura de}%
-                      {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i intr\adddotspace de}},
-  byeditortrfo     = {{edici\'o, traducci\'o \lbx@fromlang\ i pr\`oleg a cura de}%
-                      {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i pr\`ol\adddotspace de}},
-  byeditortraf     = {{edici\'o, traducci\'o \lbx@fromlang\ i ep{\'\i}leg a cura de}%
-                      {ed\adddot,\addabbrvspace trad\adddotspace\lbx@fromlang\ i ep{\'\i}l\adddotspace de}},
-  byeditorcoin     = {{edici\'o, comentaris i introducci\'o a cura de}
-                      {ed\adddot,\addabbrvspace com\adddotspace i intr\adddotspace de}},
-  byeditorcofo     = {{edici\'o, comentaris i pr\`oleg a cura de}
-                      {ed\adddot com\adddotspace i pr\`ol\adddotspace de}},
-  byeditorcoaf     = {{edici\'o, comentaris i ep{\'\i}leg a cura de}%
-                      {ed\adddot, com\adddotspace i epil\adddotspace de}},
-  byeditoranin     = {{edici\'o, notes i introducci\'o a cura de}%
-                      {ed\adddot, not\adddotspace i introd\adddotspace de}},
-  byeditoranfo     = {{edici\'o, notes i pr\`oleg a cura de}%
-                      {ed.,\addabbrvspace not\adddotspace ì pr\'ol\adddotspace de}},
-  byeditoranaf     = {{edici\'o, notes i ep{\'\i}leg a cura de}%
-                      {ed.,\addabbrvspace not\adddotspace i ep{\'\i}l\adddotspace de}},
-  byeditortrcoin   = {{edici\'o, traducció \lbx@fromlang, comentaris i introducci\'o a cura de}%
-                      {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i intr\adddotspace de}},
-  byeditortrcofo   = {{edici\'o, traducció \lbx@fromlang, comentaris i pr\`oleg a cura de}%
-                      {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i pr\`ol\adddotspace de}},
-  byeditortrcoaf   = {{edici\'o, traducci\'o \lbx@fromlang, comentaris i ep{\'\i}leg a cura de}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ i ep\'{i}l\adddot\ de}},
-  byeditortranin   = {{edici\'o, traducci\'o \lbx@fromlang, notes i introducci\'o a cura de}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i intr\adddot\ de}},
-  byeditortranfo   = {{edici\'o, traducci\'o \lbx@fromlang, notes i pr\`oleg a cura de}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i pr\`ol\adddot\ de}},
-  byeditortranaf   = {{edici\'o, traducci\'o \lbx@fromlang, notes i ep{\'\i}leg a cura de}%
-                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i ep{\'\i}l\adddot\ de}},
-  bytranslatorco   = {{traducci\'o \lbx@fromlang\ i comentaris a cura de}%
-                      {trad\adddot\ \lbx@fromlang\ i com\adddot\ de}},
-  bytranslatoran   = {{traducci\'o \lbx@fromlang\ i notes a cura de}%
-                      {trad\adddot\ \lbx@fromlang\ i not\adddot\ de}},
-  bytranslatorin   = {{traducci\'o \lbx@fromlang\ i introducci\`o a cura de}%
-                      {trad\adddot\ \lbx@fromlang\ i introd\adddot\ de}},
-  bytranslatorfo   = {{traducci\'o \lbx@fromlang\ i pr\`oleg a cura de}%
-                      {trad\adddot\ \lbx@fromlang\ i pr\`ol\adddot\ de}},
-  bytranslatoraf   = {{traducci\'o \lbx@fromlang\ i ep{\'\i}leg a cura de}%
-                      {trad\adddot\ \lbx@fromlang\ i ep{\'\i}l\adddot\ de}},
-  bytranslatorcoin = {{traducci\'o \lbx@fromlang, comentaris i introducci\'o a cura de}%
-                      {trad\adddot\ \lbx@fromlang, com\adddot\ i introd\adddot\ de}},
-  bytranslatorcofo = {{traducci\'o \lbx@fromlang, comentaris i pr\`oleg a cura de}%
-                      {trad\adddot\ \lbx@fromlang, com\adddot\ i pr\`ol\adddot\ de}},
-  bytranslatorcoaf = {{traducci\'o \lbx@fromlang, comentaris i ep{\'\i}leg a cura de}%
-                      {trad\adddot\ \lbx@fromlang, com\adddot\ i ep{\'\i}l\adddot\ de}},
-  bytranslatoranin = {{traducci\'o \lbx@fromlang, notes i introducci\'o a cura de}%
-                      {trad\adddot\ \lbx@fromlang, anot\adddot\ i introd\adddot\ de}},
-  bytranslatoranfo = {{traducci\'o \lbx@fromlang, notes i pr\`oleg a cura de}%
-                      {trad\adddot\ \lbx@fromlang, not\adddot\ i pr\'ol\adddot\ de}},
-  bytranslatoranaf = {{traducci\'o \lbx@fromlang, notes i ep{\'\i}leg a cura de}%
-                      {trad\adddot\ \lbx@fromlang, not\adddot\ i ep{\'\i}l\adddot\ de}},
+  bycollaborator   = {{amb la co\l.laboraci\'o \smartof}{amb la co\l.l\adddotspace\smartof}},
+  bytranslator     = {{traducci\'o \lbx@fromlang\ a cura \smartof}{trad\adddotspace\lbx@fromlang\ \smartof}},
+  bycommentator    = {{comentaris a cura \smartof}{com\adddotspace\smartof}},
+  byannotator      = {{notes a cura \smartof}{notes \smartof}},
+  withcommentator  = {{amb comentaris a cura \smartof}{amb com\adddotspace\smartof}},
+  withannotator    = {{amb notes a cura \smartof}{amb notes \smartof}},
+  withintroduction = {{amb una introducci\'o a cura \smartof}{amb una intr\adddotspace\smartof}},
+  withforeword     = {{amb el pr\`oleg a cura \smartof}{amb el pr\`ol\adddotspace\smartof}},
+  withafterword    = {{amb l'ep{\'\i}leg a cura \smartof}{amb l'ep\adddotspace\smartof}},
+  byeditortr       = {{edici\'o i traducci\'o \lbx@fromlang\ a cura \smartof}%
+                      {ed\adddotspace i trad\adddotspace\lbx@fromlang\ \smartof}},
+  byeditorco       = {{edici\'o i comentaris a cura \smartof}%
+                      {ed\adddotspace i com\adddotspace\smartof}},
+  byeditoran       = {{edici\'o i notes a cura \smartof}%
+                      {ed\adddotspace i not\adddotspace\smartof}},
+  byeditorin       = {{edici\'o i introducci\'o a cura \smartof}%
+                      {ed\adddotspace i intr\adddotspace\smartof}},
+  byeditorfo       = {{edici\'o i pr\`oleg a cura \smartof}%
+                      {ed\adddotspace i pr\`ol\adddotspace\smartof}},
+  byeditoraf       = {{edici\'o i ep{\'\i}leg a cura \smartof}%
+                      {ed\adddotspace i ep\adddotspace\smartof}},
+  byeditortrco     = {{edici\'o, traducci\'o \lbx@fromlang\ i comentaris a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i com\adddotspace\smartof}},
+  byeditortran     = {{edici\'o, traducci\'o \lbx@fromlang\ i notes a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i not\adddotspace\smartof}},
+  byeditortrin     = {{edici\'o, traducci\'o \lbx@fromlang\ i introducci\'o a cura \smartof}%
+                      {ed,,\addabbrvspace trad\adddotspace\lbx@fromlang\ i intr\adddotspace\smartof}},
+  byeditortrfo     = {{edici\'o, traducci\'o \lbx@fromlang\ i pr\`oleg a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i pr\`ol\adddotspace\smartof}},
+  byeditortraf     = {{edici\'o, traducci\'o \lbx@fromlang\ i ep{\'\i}leg a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddotspace\lbx@fromlang\ i ep\adddotspace\smartof}},
+  byeditorcoin     = {{edici\'o, comentaris i introducci\'o a cura \smartof}
+                      {ed.,\addabbrvspace com\adddotspace i intr\adddotspace\smartof}},
+  byeditorcofo     = {{edici\'o, comentaris i pr\`oleg a cura \smartof}
+                      {ed.,\addabbrvspace com\adddotspace i pr\`ol\adddotspace\smartof}},
+  byeditorcoaf     = {{edici\'o, comentaris i ep{\'\i}leg a cura \smartof}%
+                      {ed.,\addabbrvspace com\adddotspace i ep\adddotspace\smartof}},
+  byeditoranin     = {{edici\'o, notes i introducci\'o a cura \smartof}%
+                      {ed.,\addabbrvspace not\adddotspace i introd\adddotspace\smartof}},
+  byeditoranfo     = {{edici\'o, notes i pr\`oleg a cura \smartof}%
+                      {ed.,\addabbrvspace not\adddotspace ì pr\'ol\adddotspace\smartof}},
+  byeditoranaf     = {{edici\'o, notes i ep{\'\i}leg a cura \smartof}%
+                      {ed.,\addabbrvspace not\adddotspace i ep\adddotspace\smartof}},
+  byeditortrcoin   = {{edici\'o, traducci\'o \lbx@fromlang, comentaris i introducci\'o a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i intr\adddotspace\smartof}},
+  byeditortrcofo   = {{edici\'o, traducci\'o \lbx@fromlang, comentaris i pr\`oleg a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i pr\`ol\adddotspace\smartof}},
+  byeditortrcoaf   = {{edici\'o, traducci\'o \lbx@fromlang, comentaris i ep{\'\i}leg a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ i ep\adddot\ \smartof}},
+  byeditortranin   = {{edici\'o, traducci\'o \lbx@fromlang, notes i introducci\'o a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i intr\adddot\ \smartof}},
+  byeditortranfo   = {{edici\'o, traducci\'o \lbx@fromlang, notes i pr\`oleg a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i pr\`ol\adddot\ \smartof}},
+  byeditortranaf   = {{edici\'o, traducci\'o \lbx@fromlang, notes i ep{\'\i}leg a cura \smartof}%
+                      {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i ep\adddot\ \smartof}},
+  bytranslatorco   = {{traducci\'o \lbx@fromlang\ i comentaris a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang\ i com\adddot\ \smartof}},
+  bytranslatoran   = {{traducci\'o \lbx@fromlang\ i notes a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang\ i not\adddot\ \smartof}},
+  bytranslatorin   = {{traducci\'o \lbx@fromlang\ i introducci\'o a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang\ i intr\adddot\ \smartof}},
+  bytranslatorfo   = {{traducci\'o \lbx@fromlang\ i pr\`oleg a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang\ i pr\`ol\adddot\ \smartof}},
+  bytranslatoraf   = {{traducci\'o \lbx@fromlang\ i ep{\'\i}leg a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang\ i ep\adddot\ \smartof}},
+  bytranslatorcoin = {{traducci\'o \lbx@fromlang, comentaris i introducci\'o a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang, com\adddot\ i introd\adddot\ \smartof}},
+  bytranslatorcofo = {{traducci\'o \lbx@fromlang, comentaris i pr\`oleg a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang, com\adddot\ i pr\`ol\adddot\ \smartof}},
+  bytranslatorcoaf = {{traducci\'o \lbx@fromlang, comentaris i ep{\'\i}leg a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang, com\adddot\ i ep\adddot\ \smartof}},
+  bytranslatoranin = {{traducci\'o \lbx@fromlang, notes i introducci\'o a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang, not\adddot\ i introd\adddot\ \smartof}},
+  bytranslatoranfo = {{traducci\'o \lbx@fromlang, notes i pr\`oleg a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang, not\adddot\ i pr\`ol\adddot\ \smartof}},
+  bytranslatoranaf = {{traducci\'o \lbx@fromlang, notes i ep{\'\i}leg a cura \smartof}%
+                      {trad\adddot\ \lbx@fromlang, not\adddot\ i ep\adddot\ \smartof}},
   and              = {{i}{i}},
   andothers        = {{et al\adddot}{et al\adddot}},
   andmore          = {{i m\'es}{i m\'es}},
   volume           = {{volum}{vol\adddot}},
   volumes          = {{volums}{vols\adddot}},
+  involumes        = {{en}{en}},
   jourvol          = {{volum}{vol\adddot}},
   jourser          = {{s\`erie}{s\`er\adddot}},
-  book             = {{llibre}{llib\addot}},
+  book             = {{llibre}{ll\adddot}},
   part             = {{part}{part}},
   issue            = {{n\'umero}{n\'um\adddot}},
-  newseries        = {{nova s\`erie}{n\adddotspace s\`er\adddot}},
-  oldseries        = {{antiga s\`erie}{ant\adddotspace s\`er\adddot}},
+  newseries        = {{s\`erie nova}{s\`er\adddotspace nova}},
+  oldseries        = {{s\`erie antiga}{s\`er\adddotspace ant\adddot}},
   edition          = {{edici\'o}{ed\adddot}},
   reprint          = {{reimpressi\'o}{reimpr\adddot}},
-  reprintof        = {{reimpressi\'o de}{reimpr\adddotspace de}},
+  reprintof        = {{reimpressi\'o \smartof}{reimpr\adddotspace\smartof}},
   reprintas        = {{reimpr\`es com}{reimpr\adddotspace com}},
-  reprintfrom      = {{reimpr\`es de}{reimpr\adddotspace de}},
-  reviewof         = {{revisió de}{rev\adddotspace de}},
-  translationof    = {{traducci\'o de}{trad\adddotspace de}},
-  translationas    = {{tradu\"{\i}it com}{trad\adddotspace com}},
-  translationfrom  = {{tradu\"{\i}t del}{trad\adddotspace del}},
+  reprintfrom      = {{reimpr\`es \smartof}{reimpr\adddotspace\smartof}},
+  reviewof         = {{revisi\'o \smartof}{rev\adddotspace\smartof}},
+  translationof    = {{traducci\'o \smartof}{trad\adddotspace\smartof}},
+  translationas    = {{tradu{\"\i}t com}{trad\adddotspace com}},
+  translationfrom  = {{tradu{\"\i}t del}{trad\adddotspace del}},% FIXME: smartdel
   origpubas        = {{publicat originalment com}{pub\adddotspace orig\adddotspace com}},
-  origpubin        = {{publicat originalment a}{pub\adddotspace orig\adddotspace a}},
+  origpubin        = {{publicat originalment el}{pub\adddotspace orig\adddotspace el}},
   astitle          = {{com}{com}},
   bypublisher      = {{per}{per}},
-  page             = {{p\`agina}{p\adddot}},
-  pages            = {{p\`agines}{pp\adddot}},
+  page             = {{p\`agina}{p\`ag\adddot}},
+  pages            = {{p\`agines}{p\`ag\adddot}},
   column           = {{columna}{col\adddot}},
   columns          = {{columnes}{cols\adddot}},
   line             = {{l{\'\i}nia}{l{\'\i}n\adddot}}, 
   lines            = {{l{\'\i}nies}{l{\'\i}ns\adddot}},
-  verse            = {{vers}{ver\adddot}}, 
-  verses           = {{versos}{vers\adddot}},
+  nodate           = {{sine data}{s\adddot d\adddot}},
+  verse            = {{vers}{v\adddot}}, 
+  verses           = {{versos}{v\adddot}},
   section          = {{apartat}{\S}},
-  sections         = {{apartats}{\S\S}},
-  paragraph        = {{par\`agraf}{par\adddot}},
-  paragraphs       = {{par\`agrafs}{pars\adddot}},
+  sections         = {{apartats}{\S}},
+  paragraph        = {{par\`agraf}{\P}},
+  paragraphs       = {{par\`agrafs}{\P}},
   in               = {{a}{a}},
-  inseries         = {{a}{a}},
-  ofseries         = {{de}{de}},
+  inseries         = {{\smartof}{\smartof}},
+  ofseries         = {{\smartof}{\smartof}},
   number           = {{n\'umero}{n\'um\adddot}},
   chapter          = {{cap{\'\i}tol}{cap\adddot}},
   mathesis         = {{tesi de m\`aster}{tesi de m\`aster}},
   phdthesis        = {{tesi doctoral}{tesi doct\adddot}},
+  candthesis       = {{tesi de candidatura}{tesi de cand\adddotspace}},
   resreport        = {{informe de recerca}{inf\adddotspace de rec\adddot}},
   techreport       = {{informe t\`ecnic}{inf\adddotspace t\`ec\adddot}},
   software         = {{programari}{prog\adddot}},
   datacd           = {{CD de dades}{CD de dades}},
   audiocd          = {{CD d'\`audio}{CD d'\`audio}},
   version          = {{versi\'o}{ver\adddot}},
-  url              = {{url}{url}},
-%  url              = {{adreça}{adr\adddot}},
-  urlseen          = {{visitat \ifthenelse{\thefield{urlday}=1}{l'}{el\space}}{vis\adddotspace}},
+  url              = {{adre\c{c}a}{adr\adddot}},
+  urlfrom          = {{disponible a}{disp\adddotspace a}},
+  urlseen          = {{consultat}{cons\adddotspace}},
   inpreparation    = {{en preparaci\'o}{en prep\adddot}},
-  inpress          = {{a impremta}{a impr\adddot}}, % Per revisar
-  submitted        = {{enviat}{env\adddot}}, % Per revisar
+  inpress          = {{a impremta}{a impr\adddot}},% Per revisar
+  prepublished     = {{pre-publicat}{pre-publicat}},
+  submitted        = {{enviat}{env\adddot}},% Per revisar
   forthcoming      = {{disponible en breu}{disp\adddotspace en breu}},
-  citedas          = {{citat en endavant com}{cit\adddotspace en endavant com}},
-  thiscite         = {{aquesta citaci\'o}{cit\adddot}},
-  seenote          = {{vegeu la nota}{veg\adddotspace la not\adddot}},
-  quotedin         = {{citat a}{cit\adddot a}},
+  citedas          = {{d'ara endavant citat com}{d'ara end\adddotspace cit\adddotspace com}},
+  thiscite         = {{aquesta citaci\'o}{a\adddotspace cit\adddot}},
+  seenote          = {{vegeu la nota}{v\adddotspace la n\adddot}},
+  quotedin         = {{citat a}{cit\adddotspace a}},
   idem             = {{{\'\i}dem}{{\'\i}d\adddot}},
   idemsf           = {{{\'\i}dem}{{\'\i}d\adddot}},
   idemsm           = {{{\'\i}dem}{{\'\i}d\adddot}},
@@ -380,17 +388,17 @@
   idempm           = {{{\'\i}dem}{{\'\i}d\adddot}},
   idempn           = {{{\'\i}dem}{{\'\i}d\adddot}},
   idempp           = {{{\'\i}dem}{{\'\i}d\adddot}},
-  ibidem           = {{ib{\'\i}dem}{ib{\'\i}d\adddot}},
+  ibidem           = {{ib{\'\i}dem}{ib\adddot}},
   opcit            = {{\`op\adddotspace cit\adddot}{\`op\adddotspace cit\adddot}},
   loccit           = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
   confer           = {{cf\adddot}{cf\adddot}},
-  sequens          = {{s\adddot}{s\adddot}},
-  sequentes        = {{ss\adddot}{ss\adddot}},
+  sequens          = {{seq\adddot}{seq\adddot}},
+  sequentes        = {{et seq\adddot}{et seq\adddot}},
   passim           = {{p\`assim}{p\`assim}},
-  see              = {{vegeu}{veg\adddot}},
-  seealso          = {{vegeu tamb\'e}{veg\adddotspace tamb\'e}},
-  backrefpage      = {{vegeu la p\`agina}{veg\adddotspace la p\`ag\adddot}},
-  backrefpages     = {{vegeu les p\`agines}{veg\adddotspace les p\`ag\adddot}},
+  see              = {{vegeu}{v\adddot}},
+  seealso          = {{vegeu tamb\'e}{v\adddotspace tamb\'e}},
+  backrefpage      = {{vegeu la p\`agina}{v\adddotspace la p\`ag\adddot}},
+  backrefpages     = {{vegeu les p\`agines}{v\adddotspace les p\`ag\adddot}},
   january          = {{gener}{gen\adddot}},
   february         = {{febrer}{feb\adddot}},
   march            = {{mar\c{c}}{mar\adddot}},
@@ -405,8 +413,9 @@
   december         = {{desembre}{des\adddot}},
   langamerican     = {{angl\`es americ\`a}{ang\adddotspace amer\adddot}},
   langbrazilian    = {{portugu\`es brasiler}{port\adddotspace bras\adddot}},
-  langcroatian     = {{croat}{croat}},
   langcatalan      = {{catal\`a}{catal\`a}},
+  langczech        = {{txec}{txec}},
+  langcroatian     = {{croat}{croat}},
   langdanish       = {{dan\`es}{dan\adddot}},
   langdutch        = {{neerland\`es}{neerland\`es}},
   langenglish      = {{angl\`es}{ang\adddot}},
@@ -414,18 +423,19 @@
   langfrench       = {{franc\`es}{fran\adddot}},
   langgerman       = {{alemany}{alem\adddot}},
   langgreek        = {{grec}{grec}},
-  langitalian      = {{italià}{ital\adddot}},
+  langitalian      = {{itali\`a}{ital\adddot}},
   langlatin        = {{llat{\'\i}}{llat{\'\i}}},
   langnorwegian    = {{noruec}{noruec}},
   langportuguese   = {{portugu\`es}{port\adddot}},
   langrussian      = {{rus}{rus}},
   langspanish      = {{castell\`a}{cast\adddot}},
   langswedish      = {{suec}{suec}},
-  fromamerican     = {{de l'anglès americ\`a}{de l'ang\adddotspace amer\adddot}},
+  fromamerican     = {{de l'angl\`es americ\`a}{de l'ang\adddotspace amer\adddot}},
   frombrazilian    = {{del portugu\`es brasiler}{del port\adddot bras\adddot}},
-  fromcroatian     = {{del croat}{del croat}},
   fromcatalan      = {{del catal\`a}{del catal\`a}},
-  fromdanish       = {{del dan\`es}{del dan\ès}},
+  fromcroatian     = {{del croat}{del croat}},
+  fromczech        = {{del txec}{del txec}},
+  fromdanish       = {{del dan\`es}{del dan\`es}},
   fromdutch        = {{del neerland\`es}{del neerl\adddot}},
   fromenglish      = {{de l'angl\`es}{de l'ang\adddot}},
   fromfinnish      = {{del fin\`es}{del fin\`es}},
@@ -439,7 +449,6 @@
   fromrussian      = {{del rus}{del rus}},
   fromspanish      = {{del castell\`a}{del cast\adddot}},
   fromswedish      = {{del suec}{del suec}},
-  countryct        = {{Catalunya}{CT}},
   countryde        = {{Alemanya}{DE}},
   countryeu        = {{Uni\'o Europea}{UE}},
   countryep        = {{Uni\'o Europea}{UE}},
@@ -451,16 +460,80 @@
   patenteu         = {{patent europea}{pat\adddot\ eur\adddot}},
   patentfr         = {{patent francesa}{pat\adddot\ fran\adddot}},
   patentuk         = {{patent brit\`anica}{pat\adddot\ brit\adddot\adddot}},
-  patentus         = {{patent americana}{pat\adddot\ amer\adddot}},
+  patentus         = {{patent estatunidenca}{pat\adddot\ EUA}},
   patreq           = {{so\l.licitud de patent}{so\l.l\adddotspace de pat\adddot}},
   patreqde         = {{so\l.licitud de patent alemana}{so\l.l\adddotspace de pat\adddot\ alem\adddot}},
   patreqeu         = {{so\l.licitud de patent europea}{so\l.l\adddotspace de pat\adddot\ eur\adddot}},
   patreqfr         = {{so\l.licitud de patent francesa}{so\l.l\adddotspace de pat\adddot\ fran\adddot}},
   patrequk         = {{so\l.licitud de patent brit\`anica}{so\l.l\adddotspace de pat\adddot\ brit\adddot}},
-  patrequs         = {{so\l.licitud de patent americana}{so\l.l\adddotspace de pat\adddot\ amer\adddot}},
+  patrequs         = {{so\l.licitud de patent estatunidenca}{so\l.l\adddotspace de pat\adddot\ EUA}},
   file             = {{fitxer}{fitx\adddot}},
   library          = {{biblioteca}{bibl\adddot}},
-  abstract         = {{resum}{resum}}, 
-  annotation       = {{nota}{not\adddot}}, 
+  abstract         = {{resum}{res\adddot}}, 
+  annotation       = {{nota}{n\adddot}}, 
 }
-\endinput
\ No newline at end of file
+
+\begingroup
+\catcode`\&=3
+
+\gdef\lbx@ca@smartof{%
+  \iftoggle{smartof}{\lbx@ca@smartof@i}{\@gobble}}
+
+\protected\long\gdef\lbx@ca@smartof@i#1{%
+  \global\togglefalse{smartof}%
+  \begingroup
+  \def\forceD##1{a\relax}%
+  \def\forceDE##1{x\relax}%
+  \def\do##1{\let##1\@empty}%
+  \abx@dosingleaccents
+  \abx@dodoubleaccents
+  \def\i{i}\def\j{j}%
+  \def\AE{a}\def\ae{a}%
+  \def\OE{o}\def\oe{o}%
+  \def\O{o}\def\o{o}%
+  \let\IeC\@firstofone
+  \let\@tabacckludge\@gobble
+  \ifnum\catcode`\"=\active
+    \uccode`\~=`\"
+    \uppercase{\let~\@empty}%
+  \fi
+  \ifnum\catcode`\~=\active
+    \let~\@empty
+  \fi
+  \let\protect\noexpand
+  \lowercase{\edef\lbx@tempa{#1}}%
+  \expandafter\futurelet
+  \expandafter\lbx@tempa
+  \expandafter\lbx@ca@smartof@ii
+  \lbx@tempa&}
+
+\gdef\lbx@ca@smartof@ii{%
+  \ifcat\bgroup\noexpand\lbx@tempa
+    \def\lbx@tempa##1{\futurelet\lbx@tempa\lbx@ca@smartof@ii##1}%
+  \else\ifcat\noexpand~\noexpand\lbx@tempa
+    \def\lbx@tempa##1{\futurelet\lbx@tempa\lbx@ca@smartof@ii}%
+  \else\if a\noexpand\lbx@tempa
+    \let\lbx@tempa\lbx@ca@smartof@d
+  \else\if e\noexpand\lbx@tempa
+    \let\lbx@tempa\lbx@ca@smartof@d
+  \else\if i\noexpand\lbx@tempa
+    \let\lbx@tempa\lbx@ca@smartof@d
+  \else\if o\noexpand\lbx@tempa
+    \let\lbx@tempa\lbx@ca@smartof@d
+  \else\if u\noexpand\lbx@tempa
+    \let\lbx@tempa\lbx@ca@smartof@d
+  \else\if y\noexpand\lbx@tempa
+    \let\lbx@tempa\lbx@ca@smartof@d
+  \else\if h\noexpand\lbx@tempa
+    \def\lbx@tempa##1{\futurelet\lbx@tempa\lbx@ca@smartof@ii}%
+  \else
+    \let\lbx@tempa\lbx@ca@smartof@de
+  \fi\fi\fi\fi\fi\fi\fi\fi\fi
+  \lbx@tempa}
+
+\gdef\lbx@ca@smartof@d#1&{\endgroup d'}
+\gdef\lbx@ca@smartof@de#1&{\endgroup de\space}
+
+\endgroup
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx
new file mode 100644
index 00000000000..9edca35358c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/croatian.lbx
@@ -0,0 +1,509 @@
+\ProvidesFile{croatian.lbx}
+[\abx@lbxid]
+
+% Translator's note:
+% - Most translations have been made gender neutral,
+%   as there's no intrinsic biblatex support for the opposite
+
+\DeclareRedundantLanguages{croatian}{croatian}
+
+\DeclareBibliographyExtras{%
+  \protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}%
+  \protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}%
+  \let\finalandcomma=\empty
+  \protected\def\mkbibordinal#1{\stripzeros{#1}\adddot}%
+  \protected\def\mkbibmascord{\mkbibordinal}%
+  \protected\def\mkbibfemord{\mkbibordinal}%
+  \protected\def\mkbibneutord{\mkbibordinal}%
+  \protected\def\mkbibdatelong#1#2#3{%
+    \iffieldundef{#3}
+      {}
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}{}{\nobreakspace}}%
+    \iffieldundef{#2}
+      {}
+      {\iffieldundef{#3}
+         {\mkbibmonth{\thefield{#2}}}
+         {\lbx@cr@mkbibmonth{\thefield{#2}}}%
+       \iffieldundef{#1}{}{\space}}%
+    \iffieldbibstring{#1}
+      {\bibstring{\thefield{#1}}}
+      {\mkbibordinal{\thefield{#1}}}}%
+  \protected\def\mkbibdateshort#1#2#3{%
+    \iffieldundef{#3}
+      {}
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}
+      {}
+      {\mkbibordinal{\thefield{#2}}}%
+    \iffieldbibstring{#1}
+      {\bibstring{\thefield{#1}}}
+      {\mkbibordinal{\thefield{#1}}}}%
+  \savecommand\mkbibordedition
+  \savecommand\mkbibordseries
+  \def\mkbibordedition{\mkbibordinal}%
+  \def\mkbibordseries{\mkbibfemord}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkbibordedition
+  \restorecommand\mkbibordseries
+}
+
+\NewBibliographyString{% Month name variants used after day
+  datejanuary,
+  datefebruary,
+  datemarch,
+  dateapril,
+  datemay,
+  datejune,
+  datejuly,
+  dateaugust,
+  dateseptember,
+  dateoctober,
+  datenovember,
+  datedecember%
+}
+
+\DeclareBibliographyStrings{%
+  bibliography     = {{Bibliografija}{Bibliografija}},
+  references       = {{Literatura}{Literatura}},
+  shorthands       = {{Popis kratica}{Kratice}},
+  editor           = {{urednik}{ur\adddot}},% gender biased
+  editors          = {{urednici}{ur\adddot}},
+  compiler         = {{sastavlja\v{c}}{sastavlja\v{c}}},% gender biased
+  compilers        = {{sastavlja\v{c}i}{sastavlja\v{c}i}},
+  redactor         = {{redaktor}{redaktor}},% gender biased
+  redactors        = {{redaktori}{redaktori}},
+  reviser          = {{korektor}{korektor}},% gender biased
+  revisers         = {{korektori}{korektori}},
+  founder          = {{zasniva\v{c}}{zasniva\v{c}}},% gender biased
+  founders         = {{zasniva\v{c}i}{zasniva\v{c}i}},
+  continuator      = {{nastavlja\v{c}}{nastavlja\v{c}i}},% gender biased
+  continuators     = {{nastavlja\v{c}i}{nastavlja\v{c}i}},
+  collaborator     = {{suradnik}{sur\adddot}},% gender biased
+  collaborators    = {{suradnici}{sur\adddot}},
+  translator       = {{prijevod}{prev\adddot}},
+  translators      = {{prijevod}{prev\adddot}},
+  commentator      = {{komentator}{komentator}},% gender biased
+  commentators     = {{komentatori}{komentatori}},
+  annotator        = {{autor bilje\v{z}aka}{autor bilje\v{z}aka}},% gender biased
+  annotators       = {{autori bilje\v{z}aka}{autori bilje\v{z}aka}},
+  commentary       = {{komentar}{komentar}},
+  annotations      = {{bilje\v{s}ke}{bilje\v{s}ke}},
+  introduction     = {{uvod}{uvod}},
+  foreword         = {{predgovor}{predgovor}},
+  afterword        = {{pogovor}{pogovor}},
+  editortr         = {{prijevod i obrada}{ur\adddotspace i prev\adddot}},
+  editorstr        = {{prijevod i obrada}{ur\adddotspace i prev\adddot}},
+  editorco         = {{obrada i komentari}% gender neutral 
+                      {obrada i komentari}},
+  editorsco        = {{obrada i komentari}%
+                      {obrada i komentari}},
+  editoran         = {{obrada i bilje\v{s}ke}%
+                      {obrada i bilje\v{s}ke}},
+  editorsan        = {{obrada i bilje\v{s}ke}%
+                      {obrada i bilje\v{s}ke}},
+  editorin         = {{obrada i uvod}%
+                      {obrada i uvod}},
+  editorsin        = {{obrada i uvod}%
+                      {obrada i uvod}},
+  editorfo         = {{obrada i predgovor}%
+                      {obrada i predgovor}},
+  editorsfo        = {{obrada i predgovor}%
+                      {obrada i predgovor}},
+  editoraf         = {{obrada i pogovor}%
+                      {obrada i pogovor}},
+  editorsaf        = {{obrada i pogovor}%
+                      {obrada i pogovor}},
+  editortrco       = {{prijevod, obrada i komentari}%
+                      {prijevod, obrada i komentari}},
+  editorstrco      = {{prijevod, obrada i komentari}%
+                      {prijevod, obrada i komentari}},
+  editortran       = {{prijevod, obrada i bilje\v{s}ke}%
+                      {prijevod, obrada i bilje\v{s}ke}},
+  editorstran      = {{prijevod, obrada i bilje\v{s}ke}%
+                      {prijevod, obrada i bilje\v{s}ke}},
+  editortrin       = {{prijevod, obrada i uvod}%
+                      {prijevod, obrada i uvod}},
+  editorstrin      = {{prijevod, obrada i uvod}%
+                      {prijevod, obrada i uvod}},
+  editortrfo       = {{prijevod, obrada i predgovor}%
+                      {prijevod, obrada i predgovor}},
+  editorstrfo      = {{prijevod, obrada i predgovor}%
+                      {prijevod, obrada i predgovor}},
+  editortraf       = {{prijevod, obrada i pogovor}%
+                      {prijevod, obrada i pogovor}},
+  editorstraf      = {{prijevod, obrada i pogovor}%
+                      {prijevod, obrada i pogovor}},
+  editorcoin       = {{obrada, uvod i komentari}%
+                      {obrada, uvod i komentari}},
+  editorscoin      = {{obrada, uvod i komentari}%
+                      {obrada, uvod i komentari}},
+  editorcofo       = {{obrada, predgovor i komentari}%
+                      {obrada, predgovor i komentari}},
+  editorscofo      = {{obrada, predgovor i komentari}%
+                      {obrada, predgovor i komentari}},
+  editorcoaf       = {{obrada, komentari i pogovor}%
+                      {obrada, komentari i pogovor}},
+  editorscoaf      = {{obrada, komentari i pogovor}%
+                      {obrada, komentari i pogovor}},
+  editoranin       = {{obrada, uvod i bilje\v{s}ke}%
+                      {obrada, uvod i bilje\v{s}ke}},
+  editorsanin      = {{obrada, uvod i bilje\v{s}ke}%
+                      {obrada, uvod i bilje\v{s}ke}},
+  editoranfo       = {{obrada, predgovor i bilje\v{s}ke}%
+                      {obrada, predgovor i bilje\v{s}ke}},
+  editorsanfo      = {{obrada, predgovor i bilje\v{s}ke}%
+                      {obrada, predgovor i bilje\v{s}ke}},
+  editoranaf       = {{obrada, bilje\v{s}ke i pogovor}%
+                      {obrada, bilje\v{s}ke i pogovor}},
+  editorsanaf      = {{obrada, bilje\v{s}ke i pogovor}%
+                      {obrada, bilje\v{s}ke i pogovor}},
+  editortrcoin     = {{prijevod, obrada, uvod i komentari}%
+                      {prijevod, obrada, uvod i komentari}},
+  editorstrcoin    = {{prijevod, obrada, uvod i komentari}%
+                      {prijevod, obrada, uvod i komentari}},
+  editortrcofo     = {{prijevod, obrada, predgovor i komentari}%
+                      {prijevod, obrada, predgovor i komentari}},
+  editorstrcofo    = {{prijevod, obrada, predgovor i komentari}%
+                      {prijevod, obrada, predgovor i komentari}},
+  editortrcoaf     = {{prijevod, obrada, komentari i pogovor}%
+                      {prijevod, obrada, komentari i pogovor}},
+  editorstrcoaf    = {{prijevod, obrada, komentari i pogovor}%
+                      {prijevod, obrada, komentari i pogovor}},
+  editortranin     = {{prijevod, obrada, uvod i bilje\v{s}ke}%
+                      {prijevod, obrada, uvod i bilje\v{s}ke}},
+  editorstranin    = {{prijevod, obrada, uvod i bilje\v{s}ke}%
+                      {prijevod, obrada, uvod i bilje\v{s}ke}},
+  editortranfo     = {{prijevod, obrada, predgovor i bilje\v{s}ke}%
+                      {prijevod, obrada, predgovor i bilje\v{s}ke}},
+  editorstranfo    = {{prijevod, obrada, predgovor i bilje\v{s}ke}%
+                      {prijevod, obrada, predgovor i bilje\v{s}ke}},
+  editortranaf     = {{prijevod, obrada, bilje\v{s}ke i pogovor}%
+                      {prijevod, obrada, bilje\v{s}ke i pogovor}},
+  editorstranaf    = {{prijevod, obrada, bilje\v{s}ke i pogovor}%
+                      {prijevod, obrada, bilje\v{s}ke i pogovor}},
+  translatorco     = {{prijevod i komentari}%
+                      {prijevod i komentari}},
+  translatorsco    = {{prijevod i komentari}%
+                      {prijevod i komentari}},
+  translatoran     = {{prijevod i bilje\v{s}ke}%
+                      {prijevod i bilje\v{s}ke}},
+  translatorsan    = {{prijevod i bilje\v{s}ke}%
+                      {prijevod i bilje\v{s}ke}},
+  translatorin     = {{prijevod i uvod}%
+                      {prijevod i uvod}},
+  translatorsin    = {{prijevod i uvod}%
+                      {prijevod i uvod}},
+  translatorfo     = {{prijevod i predgovor}%
+                      {prijevod i predgovor}},
+  translatorsfo    = {{prijevod i predgovor}%
+                      {prijevod i predgovor}},
+  translatoraf     = {{prijevod i pogovor}%
+                      {prijevod i pogovor}},
+  translatorsaf    = {{prijevod i pogovor}%
+                      {prijevod i pogovor}},
+  translatorcoin   = {{prijevod, uvod i komentari}%
+                      {prijevod, uvod i komentari}},
+  translatorscoin  = {{prijevod, uvod i komentari}%
+                      {prijevod, uvod i komentari}},
+  translatorcofo   = {{prijevod, predgovor i komentari}%
+                      {prijevod, predgovor i komentari}},
+  translatorscofo  = {{prijevod, predgovor i komentari}%
+                      {prijevod, predgovor i komentari}},
+  translatorcoaf   = {{prijevod, komentari i pogovor}%
+                      {prijevod, komentari i pogovor}},
+  translatorscoaf  = {{prijevod, komentari i pogovor}%
+                      {prijevod, komentari i pogovor}},
+  translatoranin   = {{prijevod, uvod i bilje\v{s}ke}%
+                      {prijevod, uvod i bilje\v{s}ke}},
+  translatorsanin  = {{prijevod, uvod i bilje\v{s}ke}%
+                      {prijevod, uvod i bilje\v{s}ke}},
+  translatoranfo   = {{prijevod, predgovor i bilje\v{s}ke}%
+                      {prijevod, predgovor i bilje\v{s}ke}},
+  translatorsanfo  = {{prijevod, predgovor i bilje\v{s}ke}%
+                      {prijevod, predgovor i bilje\v{s}ke}},
+  translatoranaf   = {{prijevod, bilje\v{s}ke i pogovor}%
+                      {prijevod, bilje\v{s}ke i pogovor}},
+  translatorsanaf  = {{prijevod, bilje\v{s}ke i pogovor}%
+                      {prijevod, bilje\v{s}ke i pogovor}},
+  byauthor         = {{autor\addcolon}{autor\addcolon}},% gender biased
+  byeditor         = {{obrada\addcolon}{ur\adddot}},%
+  bycompiler       = {{sastavlja\v{c}\addcolon}{sast\adddot}},% gender biased
+  byredactor       = {{redaktura\addcolon}{red\adddot}},
+  byreviser        = {{korektura\addcolon}{kor\adddot}},
+% byreviewer       = {{}{}},% FIXME: missing
+  byfounder        = {{zapo\v{c}eo\addcolon}{zapo\v{c}eo\addcolon}},% gender biased
+  bycontinuator    = {{nastavio\addcolon}{nastavio\addcolon}},% gender biased
+  bycollaborator   = {{u suradnji s}{u sur\adddot s}},
+  bytranslator     = {{prijevod \lbx@lfromlang\addcolon}%
+                      {prev\adddot \lbx@sfromlang\addcolon}},
+  bycommentator    = {{komentari\addcolon}{komentari\addcolon}},
+  byannotator      = {{bilje\v{s}ke\addcolon}{bilje\v{s}ke\addcolon}},
+  withcommentator  = {{komentari\addcolon}{komentari\addcolon}},
+  withannotator    = {{bilje\v{s}ke\addcolon}{bilje\v{s}ke\addcolon}},
+  withintroduction = {{uvod\addcolon}{uvod\addcolon}},
+  withforeword     = {{predgovor\addcolon}{predgovor\addcolon}},
+  withafterword    = {{pogovor\addcolon}{pogovor\addcolon}},
+  byeditortr       = {{prijevod \lbx@lfromlang\ i obrada\addcolon}%
+                      {prijevod \lbx@lfromlang\ i obrada\addcolon}},
+  byeditorco       = {{obrada i komentari\addcolon}%
+                      {obrada i komentari\addcolon}},
+  byeditoran       = {{obrada i bilje\v{s}ke\addcolon}%
+                      {obrada i bilje\v{s}ke\addcolon}},
+  byeditorin       = {{obrada i uvod\addcolon}%
+                      {obrada i uvod\addcolon}},
+  byeditorfo       = {{obrada i predgovor\addcolon}%
+                      {obrada i predgovor\addcolon}},
+  byeditoraf       = {{obrada i pogovor\addcolon}%
+                      {obrada i pogovor\addcolon}},
+  byeditortrco     = {{prijevod \lbx@lfromlang, obrada i komentari\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada i komentari\addcolon}},
+  byeditortran     = {{prijevod \lbx@lfromlang, obrada i bilje\v{s}ke\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada i bilje\v{s}ke\addcolon}},
+  byeditortrin     = {{prijevod \lbx@lfromlang, obrada i uvod\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada i uvod\addcolon}},
+  byeditortrfo     = {{prijevod \lbx@lfromlang, obrada i predgovor\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada i predgovor\addcolon}},
+  byeditortraf     = {{prijevod \lbx@lfromlang, obrada i pogovor\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada i pogovor\addcolon}},
+  byeditorcoin     = {{obrada, uvod i komentari\addcolon}%
+                      {obrada, uvod i komentari\addcolon}},
+  byeditorcofo     = {{obrada, predgovor i komentari\addcolon}%
+                      {obrada, predgovor i komentari\addcolon}},
+  byeditorcoaf     = {{obrada, komentari i pogovor\addcolon}%
+                      {obrada, komentari i pogovor\addcolon}},
+  byeditoranin     = {{obrada, uvod i bilje\v{s}ke\addcolon}%
+                      {obrada, uvod i bilje\v{s}ke\addcolon}},
+  byeditoranfo     = {{obrada, predgovor i bilje\v{s}ke\addcolon}%
+                      {obrada, predgovor i bilje\v{s}ke\addcolon}},
+  byeditoranaf     = {{obrada, bilje\v{s}ke i pogovor\addcolon}%
+                      {obrada, bilje\v{s}ke i pogovor\addcolon}},
+  byeditortrcoin   = {{prijevod \lbx@lfromlang, obrada, uvod i komentari\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada, uvod i komentari\addcolon}},
+  byeditortrcofo   = {{prijevod \lbx@lfromlang, obrada, predgovor i komentari\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada, predgovor i komentari\addcolon}},
+  byeditortrcoaf   = {{prijevod \lbx@lfromlang, obrada, komentari i pogovor\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada, komentari i pogovor\addcolon}},
+  byeditortranin   = {{prijevod \lbx@lfromlang, obrada, uvod i bilje\v{s}ke\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada, uvod i bilje\v{s}ke\addcolon}},
+  byeditortranfo   = {{prijevod \lbx@lfromlang, obrada, predgovor i bilje\v{s}ke\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada, predgovor i bilje\v{s}ke\addcolon}},
+  byeditortranaf   = {{prijevod \lbx@lfromlang, obrada, bilje\v{s}ke i pogovor\addcolon}%
+                      {prijevod \lbx@lfromlang, obrada, bilje\v{s}ke i pogovor\addcolon}},
+  bytranslatorco   = {{prijevod \lbx@lfromlang\ i komentari\addcolon}%
+                      {prijevod \lbx@lfromlang\ i komentari\addcolon}},
+  bytranslatoran   = {{prijevod \lbx@lfromlang\ i bilje\v{s}ke\addcolon}%
+                      {prijevod \lbx@lfromlang\ i bilje\v{s}ke\addcolon}},
+  bytranslatorin   = {{prijevod \lbx@lfromlang\ i uvod\addcolon}%
+                      {prijevod \lbx@lfromlang\ i uvod\addcolon}},
+  bytranslatorfo   = {{prijevod \lbx@lfromlang\ i predgovor\addcolon}%
+                      {prijevod \lbx@lfromlang\ i predgovor\addcolon}},
+  bytranslatoraf   = {{prijevod \lbx@lfromlang\ i pogovor\addcolon}%
+                      {prijevod \lbx@lfromlang\ i pogovor\addcolon}},
+  bytranslatorcoin = {{prijevod \lbx@lfromlang, uvod i komentari\addcolon}%
+                      {prijevod \lbx@lfromlang, uvod i komentari\addcolon}},
+  bytranslatorcofo = {{prijevod \lbx@lfromlang, predgovor i komentari\addcolon}%
+                      {prijevod \lbx@lfromlang, predgovor i komentari\addcolon}},
+  bytranslatorcoaf = {{prijevod \lbx@lfromlang, komentari i pogovor\addcolon}%
+                      {prijevod \lbx@lfromlang, komentari i pogovor\addcolon}},
+  bytranslatoranin = {{prijevod \lbx@lfromlang, uvod i bilje\v{s}ke\addcolon}%
+                      {prijevod \lbx@lfromlang, uvod i bilje\v{s}ke\addcolon}},
+  bytranslatoranfo = {{prijevod \lbx@lfromlang, predgovor i bilje\v{s}ke\addcolon}%
+                      {prijevod \lbx@lfromlang, predgovor i bilje\v{s}ke\addcolon}},
+  bytranslatoranaf = {{prijevod \lbx@lfromlang, bilje\v{s}ke i pogovor\addcolon}%
+                      {prijevod \lbx@lfromlang, bilje\v{s}ke i pogovor\addcolon}},
+  and              = {{i}{i}},
+  andothers        = {{i drugi}{i dr\adddot}},
+  andmore          = {{i drugi}{i dr\adddot}},
+  volume           = {{sv\adddot}{sv\adddot}},
+  volumes          = {{sv\adddot}{sv\adddot}},
+% involumes        = {{}{}},% FIXME: missing
+  jourvol          = {{sv\adddot}{sv\adddot}},
+  jourser          = {{serija}{serija}},
+% book             = {{}{}},% FIXME: missing
+% part             = {{}{}},% FIXME: missing
+% issue            = {{}{}},% FIXME: missing
+  newseries        = {{nova serija}{nova serija}},
+  oldseries        = {{stara serija}{stara serija}},
+  edition          = {{izdanje}{izdanje}},
+  reprint          = {{pretisak}{pretisak}},
+  reprintof        = {{pretisak}{pretisak}},
+  reprintas        = {{iznova otisnuto kao}{iznova otisnuto kao}},
+% reprintfrom      = {{}{}},% FIXME: missing
+% translationof    = {{}{}},% FIXME: missing
+% translationas    = {{}{}},% FIXME: missing
+% translationfrom  = {{}{}},% FIXME: missing
+% reviewof         = {{}{}},% FIXME: missing
+% origpubas        = {{}{}},% FIXME: missing
+% origpubin        = {{}{}},% FIXME: missing
+% astitle          = {{}{}},% FIXME: missing
+% bypublisher      = {{}{}},% FIXME: missing
+  page             = {{stranica}{str\adddot}},
+  pages            = {{stranice}{str\adddot}},
+  column           = {{stupac}{stupac}},
+  columns          = {{stupci}{stupci}},
+  line             = {{linija}{l\adddot}},
+  lines            = {{linije}{ll\adddot}},
+  nodate           = {{no date}{n\adddot d\adddot}},% FIXME
+  verse            = {{stih}{stih}},
+  verses           = {{stihovi}{stihovi}},
+  section          = {{odjeljak}{\S}},
+  sections         = {{odjeljci}{\S\S}},
+  paragraph        = {{stavak}{st\adddot}},
+  paragraphs       = {{stavci}{st\adddot}},
+  in               = {{}{}},% FIXME: check
+  inseries         = {{u seriji}{u seriji}},
+  ofseries         = {{iz serije}{iz serije}},
+  number           = {{broj}{br\adddot}},
+  chapter          = {{poglavlje}{pogl\adddot}},
+  mathesis         = {{magistarski rad}{mag\adddotspace rad}},
+  phdthesis        = {{doktorska disertacija}{disertacija}},
+% candthesis       = {{}{}},% FIXME: missing
+  resreport        = {{znanstveno izvje\v{s}\'{c}e}{zn\adddotspace izv\adddot}},
+  techreport       = {{tehni\v{c}ko izvje\v{s}\'{c}e}{teh\adddotspace izv\adddot}},
+  software         = {{softver}{softver}},
+  datacd           = {{CD-ROM}{CD-ROM}},
+  audiocd          = {{audio CD}{audio CD}},
+  version          = {{verzija}{verzija}},
+  url              = {{adresa}{adresa}},
+% urlfrom          = {{}{}},% FIXME: missing
+  urlseen          = {{pogledano}{pogledano}},
+  inpreparation    = {{u pripremi}{u pripremi}},
+  submitted        = {{predan}{predan}},
+% forthcoming      = {{}{}},% FIXME: missing
+  inpress          = {{u tisku}{u tisku}},
+% prepublished     = {{}{}},% FIXME: missing
+  citedas          = {{dalje citirano kao}{dalje citirano kao}},
+  thiscite         = {{napose}{napose}},
+  seenote          = {{vidi bilje\v{s}ku}{v\adddotspace bilj\adddot}},
+  quotedin         = {{citirano u}{citirano u}},
+  idem             = {{idem}{idem}},
+  idemsm           = {{idem}{idem}},
+  idemsf           = {{eadem}{eadem}},
+  idemsn           = {{idem}{idem}},
+  idempm           = {{eidem}{eidem}},
+  idempf           = {{eaedem}{eaedem}},
+  idempn           = {{eadem}{eadem}},
+  idempp           = {{eidem}{eidem}},
+  ibidem           = {{ibidem}{ibid\adddot}},
+  opcit            = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+  loccit           = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
+  confer           = {{usporedi}{usp\adddot}},
+  sequens          = {{sq\adddot}{sq\adddot}},
+  sequentes        = {{sqq\adddot}{sqq\adddot}},
+  passim           = {{passim}{pass\adddot}},
+  see              = {{vidi}{v\adddot}},
+  seealso          = {{pogledaj i}{pogl\adddotspace i}},
+  backrefpage      = {{citirano na stranci}{cit\adddotspace na str\adddot}},
+  backrefpages     = {{cited on pages}{cit\adddotspace na str\adddot}},
+  january          = {{sije\v{c}anj}{sije\v{c}anj}},
+  february         = {{velja\v{c}a}{velja\v{c}a}},
+  march            = {{o\v{z}ujak}{o\v{z}ujak}},
+  april            = {{travanj}{travanj}},
+  may              = {{svibanj}{svibanj}},
+  june             = {{lipanj}{lipanj}},
+  july             = {{srpanj}{srpanj}},
+  august           = {{kolovoz}{kolovoz}},
+  september        = {{rujan}{rujan}},
+  october          = {{listopad}{listopad}},
+  november         = {{studeni}{studeni}},
+  december         = {{prosinac}{prosinac}},
+  datejanuary      = {{sije\v{c}nja}{sije\v{c}nja}},
+  datefebruary     = {{velja\v{c}e}{velja\v{c}e}},
+  datemarch        = {{o\v{z}ujka}{o\v{z}ujka}},
+  dateapril        = {{travnja}{travnja}},
+  datemay          = {{svibnja}{svibnja}},
+  datejune         = {{lipnja}{lipnja}},
+  datejuly         = {{srpnja}{srpnja}},
+  dateaugust       = {{kolovoza}{kolovoza}},
+  dateseptember    = {{rujna}{rujna}},
+  dateoctober      = {{listopada}{listopada}},
+  datenovember     = {{studenoga}{studenoga}},
+  datedecember     = {{prosinca}{prosinca}},
+  langamerican     = {{engleski}{engleski}},
+  langbrazilian    = {{portugalski}{portugalski}},
+% langcatalan      = {{}{}},% FIXME: missing
+  langcroatian     = {{hrvatski}{hrvatski}},
+% langczech        = {{}{}},% FIXME: missing
+  langdanish       = {{danski}{danski}},
+  langdutch        = {{nizozemski}{nizozemski}},
+  langenglish      = {{engleski}{engleski}},
+% langfinnish      = {{}{}},% FIXME: missing
+  langfrench       = {{francuski}{francuski}},
+  langgerman       = {{njema\v{c}ki}{njema\v{c}ki}},
+  langgreek        = {{gr\v{c}ki}{gr\v{c}ki}},
+  langitalian      = {{talijanski}{talijanski}},
+  langlatin        = {{latinski}{latinski}},
+  langnorwegian    = {{norve\v{s}ki}{norve\v{s}ki}},
+  langportuguese   = {{portugalski}{portugalski}},
+% langrussian      = {{}{}},% FIXME: missing
+  langspanish      = {{\v{s}panjolski}{\v{s}panjolski}},
+  langswedish      = {{\v{s}vedski}{\v{s}vedski}},
+  fromamerican     = {{s engleskog}{s engleskog}},
+  frombrazilian    = {{s portugalskog}{s portugalskog}},
+% fromcatalan      = {{}{}},% FIXME: missing
+  fromcroatian     = {{s hrvatskog}{s hrvatskog}},
+% fromczech        = {{}{}},% FIXME: missing
+  fromdanish       = {{s danskog}{s danskog}},
+  fromdutch        = {{s nizozemskog}{s nizozemskog}},
+  fromenglish      = {{s engleskog}{s engleskog}},
+% fromfinnish      = {{}{}},% FIXME: missing
+  fromfrench       = {{s francuskog}{s francuskog}},
+  fromgerman       = {{s njema\v{c}kog}{s njema\v{c}kog}},
+  fromgreek        = {{s gr\v{c}kog}{s gr\v{c}kog}},
+  fromitalian      = {{s talijanskog}{s talijanskog}},
+  fromlatin        = {{s latinskog}{s latinskog}},
+  fromnorwegian    = {{s norve\v{s}kog}{s norve\v{s}kog}},
+  fromportuguese   = {{s portugalskog}{s portugalskog}},
+% fromrussian      = {{}{}},% FIXME: missing
+  fromspanish      = {{sa \v{s}panjolskog}{sa \v{s}panjolskog}},
+  fromswedish      = {{sa \v{s}vedskog}{sa \v{s}vedskog}},
+  countryde        = {{Njema\v{c}ka}{DE}},
+  countryeu        = {{Europska unija}{EU}},
+  countryep        = {{Europska unija}{EP}},
+  countryfr        = {{Francuska}{FR}},
+  countryuk        = {{Velika Britanija}{GB}},
+  countryus        = {{Sjedinjene Ameri\v{c}ke Dr\v{z}ave}{US}},
+  patent           = {{patent}{pat\adddot}},
+  patentde         = {{njema\v{c}ki patent}{njema\v{c}ki pat\adddot}},
+  patenteu         = {{europski patent}{europski pat\adddot}},
+  patentfr         = {{francuski patent}{francuski pat\adddot}},
+  patentuk         = {{britanski patent}{britanski pat\adddot}},
+  patentus         = {{US patent}{US pat\adddot}},
+  patreq           = {{patentni zahtjev}{pat\adddot\ zahtjev}},
+  patreqde         = {{njema\v{c}ki patentni zahtjev}%
+                      {njem\adddotspace pat\adddotspace zahtjev}},
+  patreqeu         = {{europski patentni zahtjev}{EU pat\adddotspace zahtjev}},
+  patreqfr         = {{francuski patentni zahtjev}%
+                      {franc\adddotspace pat\adddotspace zahtjev}},
+  patrequk         = {{britanskipatentni zahtjev}%
+                      {britanski pat\adddotspace zahtjev}},
+  patrequs         = {{US patentni zahtjev}{US pat\adddot\ zahtjev}},
+  file             = {{datoteka}{datoteka}},
+  library          = {{biblioteka}{biblioteka}},
+  abstract         = {{sa\v{z}etak}{sa\v{z}etak}},
+  annotation       = {{bilje\v{s}ka}{bilje\v{s}ka}},
+}
+
+\protected\gdef\lbx@cr@mkbibmonth#1{%
+  \ifcase0#1\relax
+    #1\BibliographyWarning{Month out of range}%
+  \or\abx@bibmonth{datejanuary}%
+  \or\abx@bibmonth{datefebruary}%
+  \or\abx@bibmonth{datemarch}%
+  \or\abx@bibmonth{dateapril}%
+  \or\abx@bibmonth{datemay}%
+  \or\abx@bibmonth{datejune}%
+  \or\abx@bibmonth{datejuly}%
+  \or\abx@bibmonth{dateaugust}%
+  \or\abx@bibmonth{dateseptember}%
+  \or\abx@bibmonth{dateoctober}%
+  \or\abx@bibmonth{datenovember}%
+  \or\abx@bibmonth{datedecember}%
+  \else
+    #1\BibliographyWarning{Month out of range}%
+  \fi}%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx
index 8e80f901604..f84f020fc3e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx
@@ -21,7 +21,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -31,407 +31,367 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}
-	 {}
-	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
-    \mkdatezeros{\thefield{#1}}}%
+	       {}
+	       {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
+          \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
 }
 
 \DeclareBibliographyStrings{%
-bibliography     = {{Bibliografie}{Bibliografie}},
-references       = {{Odkazy}{Odkazy}},
-shorthands       = {{Seznam zkratek}{Zkratky}},
-editor           = {{editor}{ed\adddot}},
-editors          = {{edito\v{r}i}{ed\adddot}},
-compiler         = {{sestavil}{sest\adddot}},
-compilers        = {{sestavili}{sest\adddot}},
-redactor         = {{redaktor}{red\adddot}},
-redactors        = {{redakto\v{r}i}{red\adddot}},
-founder          = {{zakladatel}{zakl\adddot}},
-founders         = {{zakladatel\'{e}}{zakl\adddot}},
-continuator      = {{pokra\v{c}ovatel}{pokr\adddot}}, % FIXME: unsure
-continuators     = {{pokra\v{c}ovatel\'{e}}{pokr\adddot}}, % FIXME: unsure
-collaborator     = {{spolupracovn\'{i}k}{spoluprac\adddot}},  % FIXME: unsure
-collaborators    = {{spolupracovn\'{i}ci}{spoluprac\adddot}}, % FIXME: unsure
-translator       = {{p\v{r}ekladatel}{p\v{r}ekl\adddot}},
-translators      = {{p\v{r}ekladatel\'{e}}{p\v{r}ekl\adddot}},
-commentator      = {{koment\'{a}tor}{kom\adddot}},
-commentators     = {{koment\'{a}to\v{r}i}{kom\adddot}},
-annotator        = {{anot\'{a}tor}{anot\adddot}},
-annotators       = {{anot\'{a}to\v{r}i}{anot\adddot}},
-commentary       = {{koment\'{a}tor}{komm\adddot}}, % FIXME: unsure
-annotations      = {{anotatace}{anot\adddot}},
-introduction     = {{\'{u}vod}{\'{u}v\adddot}},
-foreword         = {{p\v{r}edmluva}{p\v{r}edml\adddot}},
-afterword        = {{doslov}{dosl\adddot}},
-editortr         = {{editor a p\v{r}ekladatel}%
-{ed\adddotspace a p\v{r}ekl\adddot}},
-editorstr        = {{edito\v{r}i a p\v{r}ekladatel\'{e}}%
-{ed\adddotspace a p\v{r}ekl\adddot}},
-editorco         = {{editor a koment\'{a}tor}%
-{ed\adddotspace a kom\adddot}},
-editorsco        = {{editor a koment\'{a}to\v{r}i}%
-{ed\adddotspace a kom\adddot}},
-editoran         = {{editor a anot\'{a}tor}%
-{ed\adddotspace a anot\adddot}},
-editorsan        = {{editor a anot\'{a}to\v{r}i}%
-{ed\adddotspace a anot\adddot}},
-editorin         = {{editor a \'{u}vod}%
-{ed\adddotspace \'{u}v\adddot}},
-editorsin        = {{edito\v{r}i a \'{u}vod}%
-{ed\adddotspace a \'{u}v\adddot}},
-editorfo         = {{editor a p\v{r}edmluva}%
-{ed\adddotspace a p\v{r}edml\adddot}},
-editorsfo        = {{edito\v{r}i a p\v{r}edmluva}%
-{ed\adddotspace a p\v{r}edml\adddot}},
-editoraf         = {{editor a doslov}%
-{ed\adddotspace a dosl\adddot}},
-editorsaf        = {{edito\v{r}i a  doslov}%
-{ed\adddotspace a dosl\adddot}},
-editortrco       = {{editor, p\v{r}eklad\ a koment\'{a}tor}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a kom\adddot}}, % FIXME: hruznost
-editorstrco      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a koment\'{a}to\v{r}i}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a kom\adddot}},
-editortran       = {{editor, p\v{r}ekladatel\ a anot\'{a}tor}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a anot\adddot}},
-editorstran      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a anot\'{a}to\v{r}i}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a anot\adddot}},
-editortrin       = {{editor, p\v{r}ekladatel\ a \'{u}vod}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a \'{u}vod\adddot}},
-editorstrin      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a \'{u}vod}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a \'{u}vod\adddot}},
-editortrfo       = {{editor, p\v{r}ekladatel\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a p\v{r}edml\adddot}},
-editorstrfo      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a p\v{r}edml\adddot}},
-editortraf       = {{editor, p\v{r}ekladatel\ a  doslov}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a afterw\adddot}},
-editorstraf      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a  doslov}%
-{ed.,\addabbrvspace p\v{r}ekl\adddot\ a afterw\adddot}},
-editorcoin       = {{editor, koment\'{a}tor\ a \'{u}vod}%
-{ed.,\addabbrvspace kom\adddot\ a \'{u}vod\adddot}},
-editorscoin      = {{edito\v{r}i, koment\'{a}to\v{r}i\ a \'{u}vod}%
-{ed.,\addabbrvspace kom\adddot\ a \'{u}vod\adddot}},
-editorcofo       = {{editor, koment\'{a}tor\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace kom\adddot\ a p\v{r}edml\adddot}},
-editorscofo      = {{edito\v{r}i, koment\'{a}to\v{r}i\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace kom\adddot\ a p\v{r}edml\adddot}},
-editorcoaf       = {{editor, koment\'{a}tor\ a  doslov}%
-{ed.,\addabbrvspace kom\adddot\ a dosl\adddot}},
-editorscoaf      = {{edito\v{r}i, koment\'{a}to\v{r}i\ a  doslov}%
-{ed.,\addabbrvspace kom\adddot\ a dosl\adddot}},
-editoranin       = {{editor, anot\'{a}tor\ a \'{u}vod}%
-{ed.,\addabbrvspace anot\adddot\ a \'{u}vod\adddot}},
-editorsanin      = {{edito\v{r}i, anot\'{a}to\v{r}i\ a \'{u}vod}%
-{ed.,\addabbrvspace anot\adddot\ a \'{u}vod\adddot}},
-editoranfo       = {{editor, anot\'{a}tor\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace anot\adddot\ a p\v{r}edml\adddot}},
-editorsanfo      = {{edito\v{r}i, anot\'{a}to\v{r}i\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace anot\adddot\ a p\v{r}edml\adddot}},
-editoranaf       = {{editor, anot\'{a}tor\ a  doslov}%
-{ed.,\addabbrvspace anot\adddot\ a dosl\adddot}},
-editorsanaf      = {{edito\v{r}i, anot\'{a}to\v{r}i\ a  doslov}%
-{ed.,\addabbrvspace anot\adddot\ a dosl\adddot}},
-editortrcoin     = {{editor, p\v{r}ekladatel, koment\'{a}tor\ a \'{u}vod}%
-{ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a \'{u}vod\adddot}},
-editorstrcoin    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, koment\'{a}to\v{r}i\ a \'{u}vod}%
-{ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a \'{u}vod\adddot}},
-editortrcofo     = {{editor, p\v{r}ekladatel, koment\'{a}tor\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a p\v{r}edml\adddot}},
-editorstrcofo    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, koment\'{a}to\v{r}i\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a p\v{r}edml\adddot}},
-editortrcoaf     = {{editor, p\v{r}ekladatel, koment\'{a}tor\ a  doslov}%
-{ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a dosl\adddot}},
-editorstrcoaf    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, koment\'{a}to\v{r}i\ a  doslov}%
-{ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a dosl\adddot}},
-editortranin     = {{editor, p\v{r}ekladatel, anot\'{a}tor\ a \'{u}vod}%
-{ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a \'{u}vod\adddot}},
-editorstranin    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, anot\'{a}to\v{r}i\ a \'{u}vod}%
-{ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a \'{u}vod\adddot}},
-editortranfo     = {{editor, p\v{r}ekladatel, anot\'{a}tor\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}},
-editorstranfo    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, anot\'{a}to\v{r}i\ a p\v{r}edmluva}%
-{ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}},
-editortranaf     = {{editor, p\v{r}ekladatel, anot\'{a}tor\ a  doslov}%
-{ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a dosl\adddot}},
-editorstranaf    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, anot\'{a}to\v{r}i\ a  doslov}%
-{ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a dosl\adddot}},
-translatorco     = {{p\v{r}ekladatel a koment\'{a}tor}%
-{p\v{r}ekl\adddot\ a kom\adddot}},
-translatorsco    = {{p\v{r}ekladatel\'{e} a koment\'{a}to\v{r}i}%
-{p\v{r}ekl\adddot\ a kom\adddot}},
-translatoran     = {{p\v{r}ekladatel a anot\'{a}tor}%
-{p\v{r}ekl\adddot\ a anot\adddot}},
-translatorsan    = {{p\v{r}ekladatel\'{e} a anot\'{a}to\v{r}i}%
-{p\v{r}ekl\adddot\ a anot\adddot}},
-translatorin     = {{p\v{r}eklad a \'{u}vod}%
-{p\v{r}ekl\adddot\ a \'{u}vod\adddot}},
-translatorsin    = {{p\v{r}eklad a \'{u}vod}%
-{p\v{r}ekl\adddot\ a \'{u}vod\adddot}},
-translatorfo     = {{p\v{r}eklad a p\v{r}edmluva}%
-{p\v{r}ekl\adddot\ a p\v{r}edml\adddot}},
-translatorsfo    = {{p\v{r}eklad a p\v{r}edmluva}%
-{p\v{r}ekl\adddot\ a p\v{r}edml\adddot}},
-translatoraf     = {{p\v{r}eklad a  doslov}%
-{p\v{r}ekl\adddot\ a dosl\adddot}},
-translatorsaf    = {{p\v{r}eklad a  doslov}%
-{p\v{r}ekl\adddot\ a dosl\adddot}},
-translatorcoin   = {{p\v{r}eklad, koment\'{a}\v{r}\ a \'{u}vod}%
-{p\v{r}ekl., kom\adddot\ a \'{u}vod\adddot}},
-translatorscoin  = {{p\v{r}eklad, koment\'{a}\v{r}\ a \'{u}vod}%
-{p\v{r}ekl., kom\adddot\ a \'{u}vod\adddot}},
-translatorcofo   = {{p\v{r}eklad, koment\'{a}\v{r}\ a p\v{r}edmluva}%
-{p\v{r}ekl., kom\adddot\ a p\v{r}edml\adddot}},
-translatorscofo  = {{p\v{r}eklad, koment\'{a}\v{r}\ a p\v{r}edmluva}%
-{p\v{r}ekl., kom\adddot\ a p\v{r}edml\adddot}},
-translatorcoaf   = {{p\v{r}eklad, koment\'{a}\v{r}\ a  doslov}%
-{p\v{r}ekl., kom\adddot\ a dosl\adddot}},
-translatorscoaf  = {{p\v{r}eklad, koment\'{a}\v{r}\ a  doslov}%
-{p\v{r}ekl., kom\adddot\ a dosl\adddot}},
-translatoranin   = {{p\v{r}eklad, anotace,\ a \'{u}vod}%
-{p\v{r}ekl., anot\adddot\ a \'{u}vod\adddot}},
-translatorsanin  = {{p\v{r}eklad, anotace,\ a \'{u}vod}%
-{p\v{r}ekl., anot\adddot\ a \'{u}vod\adddot}},
-translatoranfo   = {{p\v{r}eklad, anotace,\ a p\v{r}edmluva}%
-{p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}},
-translatorsanfo  = {{p\v{r}eklad, anotace,\ a p\v{r}edmluva}%
-{p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}},
-translatoranaf   = {{p\v{r}eklad, anotace,\ a  doslov}%
-{p\v{r}ekl., anot\adddot\ a dosl\adddot}},
-translatorsanaf  = {{p\v{r}eklad, anotace,\ a  doslov}%
-{p\v{r}ekl., anot\adddot\ a dosl\adddot}},
-byauthor         = {{by}{by}},
-byeditor         = {{editov\'{a}no}{ed\adddotspace}},
-bycompiler       = {{sestaveno}{comp\adddotspace}},
-byredactor       = {{redigov\'{a}no}{red\adddotspace}},
-byfounder        = {{zalo\v{z}eno}{found\adddotspace}},
-bycontinuator    = {{pokra\v{c}ov\'{a}no}{cont\adddotspace}},
-bycollaborator   = {{ve spolupr\'{a}ci s}{ve spol\adddotspace s}}, % FIXME: unsure
-bytranslator     = {{p\v{r}elo\v{z}eno \lbx@lfromlang}{p\v{r}el\adddot\ \lbx@sfromlang}},
-bycommentator    = {{komentov\'{a}no}{kom\adddotspace}},
-byannotator      = {{anotov\'{a}no}{anot\adddotspace}},
-withcommentator  = {{s koment\'{a}\v{r}em}{s kom\adddotspace}}, %mozna: s komentarem od?
-withannotator    = {{s anotacemi od}{s anot\adddot\ od}},
-withintroduction = {{s \'{u}vodem od}{u \'{u}v\adddot\ od}},
-withforeword     = {{s p\v{r}edmluvou od}{s p\v{r}edml\adddot\ od}},
-withafterword    = {{s doslovem}{s dosl\adddot\ }},
-byeditortr       = {{editov\'{a}no a p\v{r}elo\v{z}eno \lbx@lfromlang\ }%
-{ed\adddotspace a p\v{r}el\adddot\ \lbx@sfromlang\ }},
-byeditorco       = {{editov\'{a}no a komentov\'{a}no}%
-{ed\adddotspace a kom\adddot\ }},
-byeditoran       = {{editov\'{a}no a anotov\'{a}no}%
-{ed\adddotspace a anot\adddot\ }},
-byeditorin       = {{editov\'{a}no, s \'{u}vodem}%
-{ed.,\addabbrvspace s \'{u}vodem}},
-byeditorfo       = {{editov\'{a}no, s p\v{r}edmluvou}%
-{ed.,\addabbrvspace s p\v{r}edml., }},
-byeditoraf       = {{editov\'{a}no, s doslovem}%
-{ed.,\addabbrvspace s dosl.,}},
-byeditortrco     = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no}%
-{ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a kom\adddot\ }},
-byeditortran     = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no}%
-{ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a anot\adddot\ }},
-byeditortrin     = {{editov\'{a}no a p\v{r}elo\v{z}eno \lbx@lfromlang, s  \'{u}vodem}%
-{ed\adddotspace a p\v{r}el\adddot\ \lbx@sfromlang, s \'{u}vodem}},
-byeditortrfo     = {{editov\'{a}no a p\v{r}elo\v{z}eno \lbx@lfromlang, s p\v{r}edmluvou}%
-{ed\adddotspace a p\v{r}el\adddot\ \lbx@sfromlang, s p\v{r}edmluvou}},
-byeditortraf     = {{editov\'{a}no a p\v{r}elo\v{z}eno \lbx@lfromlang, s doslovem}%
-{ed\adddotspace a p\v{r}ekl\adddot\ \lbx@sfromlang, s doslovem}},
-byeditorcoin     = {{editov\'{a}no a komentov\'{a}no, s \'{u}vodem}%
-{ed\adddotspace a kom., s \'{u}vodem}},
-byeditorcofo     = {{editov\'{a}no a komentov\'{a}no, s p\v{r}edmluvou}%
-{ed\adddotspace a kom., s p\v{r}edml\adddot}},
-byeditorcoaf     = {{editov\'{a}no a komentov\'{a}no, s doslovem}%
-{ed\adddotspace a kom., s dosl.}},
-byeditoranin     = {{editov\'{a}no a anotov\'{a}no, s \'{u}vodem}%
-{ed\adddotspace a anot., s \'{u}vodem}},
-byeditoranfo     = {{editov\'{a}no a anotov\'{a}no, s p\v{r}edmluvou}%
-{ed\adddotspace a anot., s p\v{r}edml\adddot}},
-byeditoranaf     = {{editov\'{a}no a anotov\'{a}no, s doslovem}%
-{ed\adddotspace a anot., s dosl\adddot}},
-byeditortrcoin   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s \'{u}vodem}%
-{ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s \'{u}vodem}},
-byeditortrcofo   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s p\v{r}edmluvou }%
-{ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s p\v{r}edml\adddot}},
-byeditortrcoaf   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s doslovem}%
-{ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s dosl\adddot}},
-byeditortranin   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s \'{u}vodem}%
-{ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a anot\adddot, s \'{u}vodem}},
-byeditortranfo   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s p\v{r}edmluvou}%
-{ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a anot, s p\v{r}edml\adddot}},
-byeditortranaf   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s doslovem}%
-{ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a anot, s dosl\adddot}},
-bytranslatorco   = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no}%
-{p\v{r}el\adddot\ \lbx@sfromlang\ a kom\adddot\ }},
-bytranslatoran   = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no}%
-{p\v{r}el\adddot\ \lbx@sfromlang\ a anot\adddot\ }},
-bytranslatorin   = {{p\v{r}elo\v{z}eno \lbx@lfromlang, s \'{u}vodem}%
-{p\v{r}el\adddot\ \lbx@sfromlang, s \'{u}vodem}},
-bytranslatorfo   = {{p\v{r}elo\v{z}eno \lbx@lfromlang, s p\v{r}edmluvou}%
-{p\v{r}el\adddot\ \lbx@sfromlang, s p\v{r}edml\adddot}},
-bytranslatoraf   = {{p\v{r}elo\v{z}eno \lbx@lfromlang, s doslovem}%
-{p\v{r}el\adddot\ \lbx@sfromlang, s dosl\adddot}},
-bytranslatorcoin = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s \'{u}vodem}%
-{p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s \'{u}vodem}},
-bytranslatorcofo = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s p\v{r}edmluvou}%
-{p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s p\v{r}edml\adddot}},
-bytranslatorcoaf = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}ns doslovem}%
-{p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s dosl\adddot}},
-bytranslatoranin = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s \'{u}vodem}%
-{p\v{r}el\adddot\ \lbx@sfromlang\ a anot., s \'{u}vodem}},
-bytranslatoranfo = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s p\v{r}edmluvou}%
-{p\v{r}el\adddot\ \lbx@sfromlang\ a anot., s p\v{r}edml\adddot}},
-bytranslatoranaf = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s doslovem}%
-{p\v{r}el\adddot\ \lbx@sfromlang\ a anot., s dosl\adddot}},
-and              = {{a}{a}},
-andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
-andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
-volume           = {{svazek}{sv\adddot}},
-volumes          = {{svazky}{sv\adddot}},
-involumes        = {{in}{in}},
-jourvol          = {{ro\v{c}n\'ik}{ro\v{c}\adddot}},
-jourser          = {{\v{r}ada}{\v{r}\adddot}}, % m\r{u}\v{z}e b\'{a}t t\'{e}\v{z} s\'{e}rie, ale \v{r}ada zn\'{i} l\'{e}pe
-book             = {{kniha}{kniha}},
-part             = {{\v{c}\'{a}st}{\v{c}\'{a}st}},
-issue            = {{\v{c}\'{i}slo}{\v{c}\'{i}slo}},
-newseries        = {{nov\'{a} \v{r}ada}{n. \v{r}ada\adddot}}, % FIXME: unsure
-oldseries        = {{star\'{a} \v{r}ada}{st. \v{r}ada\adddot}},
-edition          = {{vyd\'{a}n\'{i}}{vyd\adddot}},
-reprint          = {{reprint}{repr\adddot}},
-reprintof        = {{reprint}{repr\adddotspace}},
-reprintas        = {{reprintov\'{a}no jako}{repr\adddotspace jako}},
-reprintfrom      = {{reprintov\'{a}no z}{repr\adddotspace z}},
-reviewof         = {{review of}{rev\adddotspace of}},
-translationof    = {{p\v{r}eklad}{p\v{r}ekl\adddotspace}},
-translationas    = {{p\v{r}elo\v{z}eno jako}{p\v{r}el\adddotspace jako}},
-translationfrom  = {{p\v{r}elo\v{z}eno z}{p\v{r}el\adddotspace}},
-origpubas        = {{p\r{u}vodn\v{e} vyd\'{a}no jako}{p\r{u}v\adddotspace vyd\adddotspace jako}},
-origpubin        = {{p\r{u}vodn\v{e} vyd\'{a}no v}{p\r{u}v\adddotspace vyd\adddotspace v}},
-astitle          = {{jako}{as}},
-bypublisher      = {{od}{od}}, % nejist\'{e}
-page             = {{strana}{s\adddot}},
-pages            = {{strany}{s\adddot}},
-column           = {{sloupek}{sl\adddot}}, % nebo sloupec?
-columns          = {{sloupce}{sl\adddot}},
-line             = {{\v{r}\'{a}dek}{\v{r}\adddot}},
-lines            = {{\v{r}\'{a}dky}{\v{r}\adddot}},
-verse            = {{ver\v{s}}{v\adddot}},
-verses           = {{ver\v{s}e}{v\adddot}},
-section          = {{sekce}{\S}},
-sections         = {{sekce}{\S\S}},
-paragraph        = {{odstavec}{ods\adddot}},
-paragraphs       = {{odstavce}{ods\adddot}},
-in               = {{in}{in}}, % Pouziti napriklad u sborniku nebo
-inseries         = {{in}{in}}, % casopisu, zni to lip new "v".
-% V pripade potreby pouzit lokalni lbx soubor
-ofseries         = {{z}{z}},   % taky prostor pro lokalni lbx
-number           = {{\v{c}\'{i}slo}{\v{c}\adddot}},
-chapter          = {{kapitola}{kap\adddot}},
-mathesis         = {{diplomov\'{a} pr\'{a}ce}{dipl\addabbrvspace}},
-phdthesis        = {{diserta\v{c}n\'{i}\addabbrvspace pr\'{a}ce}{dis\addabbrvspace}},
-candthesis       = {{kandid\'{a}tsk\'{a} pr\'{a}ce}{kand\adddotspace pr\adddotspace}}, % mozna,
-resreport        = {{v\'{y}zkumn\'{a} zpr\'{a}va}{v\'{y}zk\adddot\ zpr\adddot}},
-techreport       = {{technick\'{a} zpr\'{a}va}{tech\adddotspace zpr\adddot}},
-software         = {{po\v{c}\'{i}ta\v{c}ov\'{y} software}{soft\adddot}},
-datacd           = {{CD-ROM}{CD-ROM}},
-audiocd          = {{audio CD}{audio CD}},
-version          = {{verze}{ver\adddotspace}},
-urlseen          = {{citov\'ano}{cit\adddot}},
-url              = {{url}{url}},
-%url              = {{Dostupn\'y z WWW}{WWW}},
-inpreparation    = {{v p\v{r}\'{i}prav\v{e}}{v p\v{r}\'{i}prav\v{e}}},
-submitted        = {{odesl\'{a}no}{odes\adddotspace}},
-forthcoming      = {{budouc\'{i}}{bud\adddotspace}},
-inpress          = {{v tisku}{v tisku}},
-prepublished     = {{p\v{r}ed publikov\'{a}n\'{i}m}{p\v{r}ed \adddotspace}},
-citedas          = {{d\'{a}le citov\'{a}no jako}{d\'{a}le citov\'{a}no jako}},
-thiscite         = {{zvl\'{a}\v{s}t\v{e}}{zvl\adddot}},
-seenote          = {{viz pozn\'{a}mka}{viz poz\adddot}},
-quotedin         = {{citov\'{a}no v}{cit\adddotspace v}},
-idem             = {{idem}{idem}},
-idemsm           = {{idem}{idem}},
-idemsf           = {{eadem}{eadem}},
-idemsn           = {{idem}{idem}},
-idempm           = {{eidem}{eidem}},
-idempf           = {{eaedem}{eaedem}},
-idempn           = {{eadem}{eadem}},
-idempp           = {{eidem}{eidem}},
-ibidem           = {{ibidem}{ibid\adddot}},
-opcit            = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
-loccit           = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
-confer           = {{cf\adddot}{cf\adddot}},
-sequens          = {{sq\adddot}{sq\adddot}},
-sequentes        = {{sqq\adddot}{sqq\adddot}},
-passim           = {{passim}{pass\adddot}},
-see              = {{viz}{viz}},
-seealso          = {{viz t\'{e}\v{z}}{viz t\'{e}\v{z}}},
-backrefpage      = {{citov\'{a}no na stran\v{e}}{cit\adddotspace na s\adddot}},
-backrefpages     = {{citov\'{a}no na stran\'{a}ch}{cit\adddotspace na s\adddot}},
-january          = {{ledna}{led\adddot}},
-february         = {{\'{u}nora}{\'{u}n\adddot}},
-march            = {{b\v{r}ezna}{b\v{r}ez\adddot}},
-april            = {{dubna}{dub\adddot}},
-may              = {{kvetna}{kv\v{e}t\adddot}},
-june             = {{\v{c}ervna}{\v{c}erv\adddot}},
-july             = {{\v{c}ervence}{\v{c}vc}},
-august           = {{srpna}{srp\adddot}},
-september        = {{z\'{a}\v{r}\'{i}}{z\'{a}\v{r}\adddot}},
-october          = {{\v{r}\'{i}jna}{\v{r}\'{i}j\adddot}},
-november         = {{listopadu}{lis\adddot}},
-december         = {{prosince}{pros\adddot}},
-langamerican     = {{americk\'{a} angli\v{c}tina}{am\adddot angl\adddot}},
-langbrazilian    = {{brazilsk\'{a} portugal\v{s}tina}{braz\adddot portugal\adddot}},
-langcroatian     = {{chorvat\v{s}tina}{chorv\adddot}},
-langdanish       = {{d\'{a}n\v{s}tina}{d\'{a}n\adddot}},
-langdutch        = {{holand\v{s}tina}{hol.\adddot}},
-langenglish      = {{angli\v{c}tina}{angl\adddot}},
-langfinnish      = {{fin\v{s}tina}{fin\adddot}},
-langfrench       = {{francouz\v{s}tina}{franc\adddot}},
-langgerman       = {{n\v{e}m\v{c}ina}{n\v{e}m\adddot}},
-langgreek        = {{\v{r}e\v{c}tina}{\v{r}e\v{c}\adddot}},
-langitalian      = {{ital\v{s}tina}{ital\adddot}},
-langlatin        = {{latina}{lat\adddot}},
-langnorwegian    = {{nor\v{s}tina}{nor\v{s}\adddot}},
-langportuguese   = {{portugal\v{s}tina}{port\adddot}},
-langspanish      = {{\v{s}pan\v{e}l\v{s}tina}{\v{s}pa\v{n}\adddot}},
-langswedish      = {{\v{s}v\'{e}d\v{s}tina}{\v{s}v\'{e}d\adddot}},
-fromamerican     = {{z americk\'{e} angli\v{c}tiny}{z amer\adddot angl\adddot}},
-frombrazilian    = {{z brazilsk\'{e} portugal\v{s}tiny}{z braz\adddotspace port\adddot}},
-fromcroatian     = {{z chorvat\v{s}tiny}{z chorv.}},
-fromdanish       = {{z d\'{a}n\v{s}tiny}{z d\'{a}n\adddot}},
-fromdutch        = {{z holand\v{s}tiny}{z hol\adddot}},
-fromenglish      = {{z angli\v{c}tiny}{z angl\adddot}},
-fromfinnish       = {{z fin\v{s}tiny}{z fin.}},
-fromfrench       = {{z francouz\v{s}tiny}{z franc\adddot}},
-fromgerman       = {{z n\v{e}m\v{c}iny}{z n\v{e}m\adddot}},
-fromgreek        = {{z \v{r}e\v{c}tiny}{z \v{r}e\v{c}\adddot}},
-fromitalian      = {{z ital\v{s}tiny}{z ital\adddot}},
-fromlatin        = {{z latiny}{z lat\adddot}},
-fromnorwegian    = {{z nor\v{s}tiny}{z nor\adddot}},
-fromportuguese   = {{z portugal\v{s}tiny}{z portugal\v{s}tiny}},
-fromspanish      = {{ze \v{s}pan\v{e}l\v{s}tiny}{ze \v{s}pa\v{n}\adddot}},
-fromswedish      = {{ze \v{s}v\'{e}d\v{s}tiny}{ze \v{s}v\'{e}d\adddot}},
-countryde        = {{N\v{e}mecko}{DE}},
-countryeu        = {{Evropsk\'{a} unie}{EU}},
-countryep        = {{Evropsk\'{a} unie}{EP}},
-countryfr        = {{Francie}{FR}},
-countryuk        = {{Velk\'{a} Brit\'{a}nie}{GB}},
-countryus        = {{Spojen\'{e} St\'{a}ty Americk\'{e}}{US}},
-patent           = {{patent}{pat\adddot}},
-patentde         = {{n\v{e}meck\'{y} patent}{n\v{e}m\adddot\ pat\adddot}},
-patenteu         = {{evropsk\'{y} patent}{evr\adddot\ pat\adddot}},
-patentfr         = {{francouzsk\'{y} patent}{franc\adddot\ pat\adddot}},
-patentuk         = {{britsk\'{y} patent}{britsk\'{y} pat\adddot}},
-patentus         = {{americk\'{y} patent}{US\adddotspace pat\adddot}},
-patreq           = {{patentov\'{a} \v{z}\'{a}dost}{pat\adddot\ \v{z}\'{a}d\adddot}},
-patreqde         = {{n\v{e}meck\'{a} patentov\'{a} \v{z}\'{a}dost}{n\v{e}meck\'{a} pat\adddot\ \v{z}\'{a}d\adddot}},
-patreqeu         = {{evropsk\'{a} patentov\'{a} \v{z}\'{a}dost}{ev\adddot\ pat\adddot\ \v{z}\'{a}d\adddot}},
-patreqfr         = {{francouzsk\'{a} patentov\'{a} \v{z}\'{a}dost}{franc\adddot\ pat\adddot\ \v{z}\'{a}d\adddot}},
-patrequk         = {{britsk\'{a} patentov\'{a} \v{z}\'{a}dost}{brit\adddot\ pat\adddot\ \v{z}\'{a}d\adddot}},
-patrequs         = {{US\adddotspace patentov\'{a} \v{z}\'{a}dost}{US\adddotspace pat\adddot\ \v{z}\'{a}d\adddot}},
-file             = {{soubor}{soub\adddot}},
-library          = {{knihovna}{knih\adddot}},
-abstract         = {{abstrakt}{abst\adddot}},
-annotation       = {{anotace}{anot\adddot}},
+  bibliography     = {{Bibliografie}{Bibliografie}},
+  references       = {{Odkazy}{Odkazy}},
+  shorthands       = {{Seznam zkratek}{Zkratky}},
+  editor           = {{editor}{ed\adddot}},
+  editors          = {{edito\v{r}i}{ed\adddot}},
+  compiler         = {{sestavil}{sest\adddot}},
+  compilers        = {{sestavili}{sest\adddot}},
+  redactor         = {{redaktor}{red\adddot}},
+  redactors        = {{redakto\v{r}i}{red\adddot}},
+  founder          = {{zakladatel}{zakl\adddot}},
+  founders         = {{zakladatel\'{e}}{zakl\adddot}},
+  continuator      = {{pokra\v{c}ovatel}{pokr\adddot}},% FIXME: unsure
+  continuators     = {{pokra\v{c}ovatel\'{e}}{pokr\adddot}},% FIXME: unsure
+  collaborator     = {{spolupracovn\'{i}k}{spoluprac\adddot}},% FIXME: unsure
+  collaborators    = {{spolupracovn\'{i}ci}{spoluprac\adddot}},% FIXME: unsure
+  translator       = {{p\v{r}ekladatel}{p\v{r}ekl\adddot}},
+  translators      = {{p\v{r}ekladatel\'{e}}{p\v{r}ekl\adddot}},
+  commentator      = {{koment\'{a}tor}{kom\adddot}},
+  commentators     = {{koment\'{a}to\v{r}i}{kom\adddot}},
+  annotator        = {{anot\'{a}tor}{anot\adddot}},
+  annotators       = {{anot\'{a}to\v{r}i}{anot\adddot}},
+  commentary       = {{koment\'{a}tor}{komm\adddot}},% FIXME: unsure
+  annotations      = {{anotatace}{anot\adddot}},
+  introduction     = {{\'{u}vod}{\'{u}v\adddot}},
+  foreword         = {{p\v{r}edmluva}{p\v{r}edml\adddot}},
+  afterword        = {{doslov}{dosl\adddot}},
+  editortr         = {{editor a p\v{r}ekladatel}{ed\adddotspace a p\v{r}ekl\adddot}},
+  editorstr        = {{edito\v{r}i a p\v{r}ekladatel\'{e}}{ed\adddotspace a p\v{r}ekl\adddot}},
+  editorco         = {{editor a koment\'{a}tor}{ed\adddotspace a kom\adddot}},
+  editorsco        = {{editor a koment\'{a}to\v{r}i}{ed\adddotspace a kom\adddot}},
+  editoran         = {{editor a anot\'{a}tor}{ed\adddotspace a anot\adddot}},
+  editorsan        = {{editor a anot\'{a}to\v{r}i}{ed\adddotspace a anot\adddot}},
+  editorin         = {{editor a \'{u}vod}{ed\adddotspace \'{u}v\adddot}},
+  editorsin        = {{edito\v{r}i a \'{u}vod}{ed\adddotspace a \'{u}v\adddot}},
+  editorfo         = {{editor a p\v{r}edmluva}{ed\adddotspace a p\v{r}edml\adddot}},
+  editorsfo        = {{edito\v{r}i a p\v{r}edmluva}{ed\adddotspace a p\v{r}edml\adddot}},
+  editoraf         = {{editor a doslov}{ed\adddotspace a dosl\adddot}},
+  editorsaf        = {{edito\v{r}i a  doslov}{ed\adddotspace a dosl\adddot}},
+  editortrco       = {{editor, p\v{r}eklad\ a koment\'{a}tor}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a kom\adddot}},% FIXME: hruznost
+  editorstrco      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a koment\'{a}to\v{r}i}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a kom\adddot}},
+  editortran       = {{editor, p\v{r}ekladatel\ a anot\'{a}tor}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a anot\adddot}},
+  editorstran      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a anot\'{a}to\v{r}i}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a anot\adddot}},
+  editortrin       = {{editor, p\v{r}ekladatel\ a \'{u}vod}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a \'{u}vod\adddot}},
+  editorstrin      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a \'{u}vod}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a \'{u}vod\adddot}},
+  editortrfo       = {{editor, p\v{r}ekladatel\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a p\v{r}edml\adddot}},
+  editorstrfo      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a p\v{r}edml\adddot}},
+  editortraf       = {{editor, p\v{r}ekladatel\ a  doslov}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a afterw\adddot}},
+  editorstraf      = {{edito\v{r}i, p\v{r}ekladatel\'{e}\ a  doslov}%
+                      {ed.,\addabbrvspace p\v{r}ekl\adddot\ a afterw\adddot}},
+  editorcoin       = {{editor, koment\'{a}tor\ a \'{u}vod}%
+                      {ed.,\addabbrvspace kom\adddot\ a \'{u}vod\adddot}},
+  editorscoin      = {{edito\v{r}i, koment\'{a}to\v{r}i\ a \'{u}vod}%
+                      {ed.,\addabbrvspace kom\adddot\ a \'{u}vod\adddot}},
+  editorcofo       = {{editor, koment\'{a}tor\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace kom\adddot\ a p\v{r}edml\adddot}},
+  editorscofo      = {{edito\v{r}i, koment\'{a}to\v{r}i\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace kom\adddot\ a p\v{r}edml\adddot}},
+  editorcoaf       = {{editor, koment\'{a}tor\ a  doslov}%
+                      {ed.,\addabbrvspace kom\adddot\ a dosl\adddot}},
+  editorscoaf      = {{edito\v{r}i, koment\'{a}to\v{r}i\ a  doslov}%
+                      {ed.,\addabbrvspace kom\adddot\ a dosl\adddot}},
+  editoranin       = {{editor, anot\'{a}tor\ a \'{u}vod}%
+                      {ed.,\addabbrvspace anot\adddot\ a \'{u}vod\adddot}},
+  editorsanin      = {{edito\v{r}i, anot\'{a}to\v{r}i\ a \'{u}vod}%
+                      {ed.,\addabbrvspace anot\adddot\ a \'{u}vod\adddot}},
+  editoranfo       = {{editor, anot\'{a}tor\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace anot\adddot\ a p\v{r}edml\adddot}},
+  editorsanfo      = {{edito\v{r}i, anot\'{a}to\v{r}i\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace anot\adddot\ a p\v{r}edml\adddot}},
+  editoranaf       = {{editor, anot\'{a}tor\ a  doslov}{ed.,\addabbrvspace anot\adddot\ a dosl\adddot}},
+  editorsanaf      = {{edito\v{r}i, anot\'{a}to\v{r}i\ a  doslov}%
+                      {ed.,\addabbrvspace anot\adddot\ a dosl\adddot}},
+  editortrcoin     = {{editor, p\v{r}ekladatel, koment\'{a}tor\ a \'{u}vod}%
+                      {ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a \'{u}vod\adddot}},
+  editorstrcoin    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, koment\'{a}to\v{r}i\ a \'{u}vod}%
+                      {ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a \'{u}vod\adddot}},
+  editortrcofo     = {{editor, p\v{r}ekladatel, koment\'{a}tor\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a p\v{r}edml\adddot}},
+  editorstrcofo    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, koment\'{a}to\v{r}i\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a p\v{r}edml\adddot}},
+  editortrcoaf     = {{editor, p\v{r}ekladatel, koment\'{a}tor\ a  doslov}%
+                      {ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a dosl\adddot}},
+  editorstrcoaf    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, koment\'{a}to\v{r}i\ a  doslov}%
+                      {ed.,\addabbrvspace p\v{r}ekl., kom\adddot\ a dosl\adddot}},
+  editortranin     = {{editor, p\v{r}ekladatel, anot\'{a}tor\ a \'{u}vod}%
+                      {ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a \'{u}vod\adddot}},
+  editorstranin    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, anot\'{a}to\v{r}i\ a \'{u}vod}%
+                      {ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a \'{u}vod\adddot}},
+  editortranfo     = {{editor, p\v{r}ekladatel, anot\'{a}tor\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}},
+  editorstranfo    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, anot\'{a}to\v{r}i\ a p\v{r}edmluva}%
+                      {ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}},
+  editortranaf     = {{editor, p\v{r}ekladatel, anot\'{a}tor\ a  doslov}%
+                      {ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a dosl\adddot}},
+  editorstranaf    = {{edito\v{r}i, p\v{r}ekladatel\'{e}, anot\'{a}to\v{r}i\ a  doslov}%
+                      {ed.,\addabbrvspace p\v{r}ekl., anot\adddot\ a dosl\adddot}},
+  translatorco     = {{p\v{r}ekladatel a koment\'{a}tor}{p\v{r}ekl\adddot\ a kom\adddot}},
+  translatorsco    = {{p\v{r}ekladatel\'{e} a koment\'{a}to\v{r}i}{p\v{r}ekl\adddot\ a kom\adddot}},
+  translatoran     = {{p\v{r}ekladatel a anot\'{a}tor}{p\v{r}ekl\adddot\ a anot\adddot}},
+  translatorsan    = {{p\v{r}ekladatel\'{e} a anot\'{a}to\v{r}i}{p\v{r}ekl\adddot\ a anot\adddot}},
+  translatorin     = {{p\v{r}eklad a \'{u}vod}{p\v{r}ekl\adddot\ a \'{u}vod\adddot}},
+  translatorsin    = {{p\v{r}eklad a \'{u}vod}{p\v{r}ekl\adddot\ a \'{u}vod\adddot}},
+  translatorfo     = {{p\v{r}eklad a p\v{r}edmluva}{p\v{r}ekl\adddot\ a p\v{r}edml\adddot}},
+  translatorsfo    = {{p\v{r}eklad a p\v{r}edmluva}{p\v{r}ekl\adddot\ a p\v{r}edml\adddot}},
+  translatoraf     = {{p\v{r}eklad a  doslov}{p\v{r}ekl\adddot\ a dosl\adddot}},
+  translatorsaf    = {{p\v{r}eklad a  doslov}{p\v{r}ekl\adddot\ a dosl\adddot}},
+  translatorcoin   = {{p\v{r}eklad, koment\'{a}\v{r}\ a \'{u}vod}{p\v{r}ekl., kom\adddot\ a \'{u}vod\adddot}},
+  translatorscoin  = {{p\v{r}eklad, koment\'{a}\v{r}\ a \'{u}vod}{p\v{r}ekl., kom\adddot\ a \'{u}vod\adddot}},
+  translatorcofo   = {{p\v{r}eklad, koment\'{a}\v{r}\ a p\v{r}edmluva}{p\v{r}ekl., kom\adddot\ a p\v{r}edml\adddot}},
+  translatorscofo  = {{p\v{r}eklad, koment\'{a}\v{r}\ a p\v{r}edmluva}{p\v{r}ekl., kom\adddot\ a p\v{r}edml\adddot}},
+  translatorcoaf   = {{p\v{r}eklad, koment\'{a}\v{r}\ a  doslov}{p\v{r}ekl., kom\adddot\ a dosl\adddot}},
+  translatorscoaf  = {{p\v{r}eklad, koment\'{a}\v{r}\ a  doslov}{p\v{r}ekl., kom\adddot\ a dosl\adddot}},
+  translatoranin   = {{p\v{r}eklad, anotace,\ a \'{u}vod}{p\v{r}ekl., anot\adddot\ a \'{u}vod\adddot}},
+  translatorsanin  = {{p\v{r}eklad, anotace,\ a \'{u}vod}{p\v{r}ekl., anot\adddot\ a \'{u}vod\adddot}},
+  translatoranfo   = {{p\v{r}eklad, anotace,\ a p\v{r}edmluva}{p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}},
+  translatorsanfo  = {{p\v{r}eklad, anotace,\ a p\v{r}edmluva}{p\v{r}ekl., anot\adddot\ a p\v{r}edml\adddot}},
+  translatoranaf   = {{p\v{r}eklad, anotace,\ a  doslov}{p\v{r}ekl., anot\adddot\ a dosl\adddot}},
+  translatorsanaf  = {{p\v{r}eklad, anotace,\ a  doslov}{p\v{r}ekl., anot\adddot\ a dosl\adddot}},
+  byauthor         = {{by}{by}},
+  byeditor         = {{editov\'{a}no}{ed\adddotspace}},
+  bycompiler       = {{sestaveno}{comp\adddotspace}},
+  byredactor       = {{redigov\'{a}no}{red\adddotspace}},
+  byfounder        = {{zalo\v{z}eno}{found\adddotspace}},
+  bycontinuator    = {{pokra\v{c}ov\'{a}no}{cont\adddotspace}},
+  bycollaborator   = {{ve spolupr\'{a}ci s}{ve spol\adddotspace s}},% FIXME: unsure
+  bytranslator     = {{p\v{r}elo\v{z}eno \lbx@lfromlang}{p\v{r}el\adddot\ \lbx@sfromlang}},
+  bycommentator    = {{komentov\'{a}no}{kom\adddotspace}},
+  byannotator      = {{anotov\'{a}no}{anot\adddotspace}},
+  withcommentator  = {{s koment\'{a}\v{r}em}{s kom\adddotspace}},%mozna: s komentarem od?
+  withannotator    = {{s anotacemi od}{s anot\adddot\ od}},
+  withintroduction = {{s \'{u}vodem od}{u \'{u}v\adddot\ od}},
+  withforeword     = {{s p\v{r}edmluvou od}{s p\v{r}edml\adddot\ od}},
+  withafterword    = {{s doslovem}{s dosl\adddot\ }},
+  byeditortr       = {{editov\'{a}no a p\v{r}elo\v{z}eno \lbx@lfromlang\ }%
+                      {ed\adddotspace a p\v{r}el\adddot\ \lbx@sfromlang\ }},
+  byeditorco       = {{editov\'{a}no a komentov\'{a}no}{ed\adddotspace a kom\adddot\ }},
+  byeditoran       = {{editov\'{a}no a anotov\'{a}no}{ed\adddotspace a anot\adddot\ }},
+  byeditorin       = {{editov\'{a}no, s \'{u}vodem}{ed.,\addabbrvspace s \'{u}vodem}},
+  byeditorfo       = {{editov\'{a}no, s p\v{r}edmluvou}{ed.,\addabbrvspace s p\v{r}edml., }},
+  byeditoraf       = {{editov\'{a}no, s doslovem}{ed.,\addabbrvspace s dosl.,}},
+  byeditortrco     = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no}%
+                      {ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a kom\adddot\ }},
+  byeditortran     = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no}%
+                      {ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a anot\adddot\ }},
+  byeditortrin     = {{editov\'{a}no a p\v{r}elo\v{z}eno \lbx@lfromlang, s  \'{u}vodem}%
+                      {ed\adddotspace a p\v{r}el\adddot\ \lbx@sfromlang, s \'{u}vodem}},
+  byeditortrfo     = {{editov\'{a}no a p\v{r}elo\v{z}eno \lbx@lfromlang, s p\v{r}edmluvou}%
+                      {ed\adddotspace a p\v{r}el\adddot\ \lbx@sfromlang, s p\v{r}edmluvou}},
+  byeditortraf     = {{editov\'{a}no a p\v{r}elo\v{z}eno \lbx@lfromlang, s doslovem}%
+                      {ed\adddotspace a p\v{r}ekl\adddot\ \lbx@sfromlang, s doslovem}},
+  byeditorcoin     = {{editov\'{a}no a komentov\'{a}no, s \'{u}vodem}{ed\adddotspace a kom., s \'{u}vodem}},
+  byeditorcofo     = {{editov\'{a}no a komentov\'{a}no, s p\v{r}edmluvou}{ed\adddotspace a kom., s p\v{r}edml\adddot}},
+  byeditorcoaf     = {{editov\'{a}no a komentov\'{a}no, s doslovem}{ed\adddotspace a kom., s dosl.}},
+  byeditoranin     = {{editov\'{a}no a anotov\'{a}no, s \'{u}vodem}{ed\adddotspace a anot., s \'{u}vodem}},
+  byeditoranfo     = {{editov\'{a}no a anotov\'{a}no, s p\v{r}edmluvou}{ed\adddotspace a anot., s p\v{r}edml\adddot}},
+  byeditoranaf     = {{editov\'{a}no a anotov\'{a}no, s doslovem}{ed\adddotspace a anot., s dosl\adddot}},
+  byeditortrcoin   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s \'{u}vodem}%
+                      {ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s \'{u}vodem}},
+  byeditortrcofo   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s p\v{r}edmluvou }%
+                      {ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s p\v{r}edml\adddot}},
+  byeditortrcoaf   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s doslovem}%
+                      {ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s dosl\adddot}},
+  byeditortranin   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s \'{u}vodem}%
+                      {ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a anot\adddot, s \'{u}vodem}},
+  byeditortranfo   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s p\v{r}edmluvou}%
+                      {ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a anot, s p\v{r}edml\adddot}},
+  byeditortranaf   = {{editov\'{a}no, p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s doslovem}%
+                      {ed.,\addabbrvspace p\v{r}el\adddot\ \lbx@sfromlang\ a anot, s dosl\adddot}},
+  bytranslatorco   = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang\ a kom\adddot\ }},
+  bytranslatoran   = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang\ a anot\adddot\ }},
+  bytranslatorin   = {{p\v{r}elo\v{z}eno \lbx@lfromlang, s \'{u}vodem}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang, s \'{u}vodem}},
+  bytranslatorfo   = {{p\v{r}elo\v{z}eno \lbx@lfromlang, s p\v{r}edmluvou}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang, s p\v{r}edml\adddot}},
+  bytranslatoraf   = {{p\v{r}elo\v{z}eno \lbx@lfromlang, s doslovem}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang, s dosl\adddot}},
+  bytranslatorcoin = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s \'{u}vodem}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s \'{u}vodem}},
+  bytranslatorcofo = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}no, s p\v{r}edmluvou}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s p\v{r}edml\adddot}},
+  bytranslatorcoaf = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a komentov\'{a}ns doslovem}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang\ a kom., s dosl\adddot}},
+  bytranslatoranin = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s \'{u}vodem}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang\ a anot., s \'{u}vodem}},
+  bytranslatoranfo = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s p\v{r}edmluvou}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang\ a anot., s p\v{r}edml\adddot}},
+  bytranslatoranaf = {{p\v{r}elo\v{z}eno \lbx@lfromlang\ a anotov\'{a}no, s doslovem}%
+                      {p\v{r}el\adddot\ \lbx@sfromlang\ a anot., s dosl\adddot}},
+  and              = {{a}{a}},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  volume           = {{svazek}{sv\adddot}},
+  volumes          = {{svazky}{sv\adddot}},
+  involumes        = {{in}{in}},
+  jourvol          = {{ro\v{c}n\'ik}{ro\v{c}\adddot}},
+  jourser          = {{\v{r}ada}{\v{r}\adddot}},% m\r{u}\v{z}e b\'{a}t t\'{e}\v{z} s\'{e}rie, ale \v{r}ada zn\'{i} l\'{e}pe
+  book             = {{kniha}{kniha}},
+  part             = {{\v{c}\'{a}st}{\v{c}\'{a}st}},
+  issue            = {{\v{c}\'{i}slo}{\v{c}\'{i}slo}},
+  newseries        = {{nov\'{a} \v{r}ada}{n. \v{r}ada\adddot}},% FIXME: unsure
+  oldseries        = {{star\'{a} \v{r}ada}{st. \v{r}ada\adddot}},
+  edition          = {{vyd\'{a}n\'{i}}{vyd\adddot}},
+  reprint          = {{reprint}{repr\adddot}},
+  reprintof        = {{reprint}{repr\adddotspace}},
+  reprintas        = {{reprintov\'{a}no jako}{repr\adddotspace jako}},
+  reprintfrom      = {{reprintov\'{a}no z}{repr\adddotspace z}},
+  reviewof         = {{review of}{rev\adddotspace of}},
+  translationof    = {{p\v{r}eklad}{p\v{r}ekl\adddotspace}},
+  translationas    = {{p\v{r}elo\v{z}eno jako}{p\v{r}el\adddotspace jako}},
+  translationfrom  = {{p\v{r}elo\v{z}eno z}{p\v{r}el\adddotspace}},
+  origpubas        = {{p\r{u}vodn\v{e} vyd\'{a}no jako}{p\r{u}v\adddotspace vyd\adddotspace jako}},
+  origpubin        = {{p\r{u}vodn\v{e} vyd\'{a}no v}{p\r{u}v\adddotspace vyd\adddotspace v}},
+  astitle          = {{jako}{as}},
+  bypublisher      = {{od}{od}},% nejist\'{e}
+  page             = {{strana}{s\adddot}},
+  pages            = {{strany}{s\adddot}},
+  column           = {{sloupek}{sl\adddot}},% nebo sloupec?
+  columns          = {{sloupce}{sl\adddot}},
+  line             = {{\v{r}\'{a}dek}{\v{r}\adddot}},
+  lines            = {{\v{r}\'{a}dky}{\v{r}\adddot}},
+  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
+  verse            = {{ver\v{s}}{v\adddot}},
+  verses           = {{ver\v{s}e}{v\adddot}},
+  section          = {{sekce}{\S}},
+  sections         = {{sekce}{\S\S}},
+  paragraph        = {{odstavec}{ods\adddot}},
+  paragraphs       = {{odstavce}{ods\adddot}},
+  in               = {{in}{in}},% Pouziti napriklad u sborniku nebo
+  inseries         = {{in}{in}},% casopisu, zni to lip new "v".
+  % V pripade potreby pouzit lokalni lbx soubor
+  ofseries         = {{z}{z}},% taky prostor pro lokalni lbx
+  number           = {{\v{c}\'{i}slo}{\v{c}\adddot}},
+  chapter          = {{kapitola}{kap\adddot}},
+  mathesis         = {{diplomov\'{a} pr\'{a}ce}{dipl\addabbrvspace}},
+  phdthesis        = {{diserta\v{c}n\'{i}\addabbrvspace pr\'{a}ce}{dis\addabbrvspace}},
+  candthesis       = {{kandid\'{a}tsk\'{a} pr\'{a}ce}{kand\adddotspace pr\adddotspace}},% mozna,
+  resreport        = {{v\'{y}zkumn\'{a} zpr\'{a}va}{v\'{y}zk\adddot\ zpr\adddot}},
+  techreport       = {{technick\'{a} zpr\'{a}va}{tech\adddotspace zpr\adddot}},
+  software         = {{po\v{c}\'{i}ta\v{c}ov\'{y} software}{soft\adddot}},
+  datacd           = {{CD-ROM}{CD-ROM}},
+  audiocd          = {{audio CD}{audio CD}},
+  version          = {{verze}{ver\adddotspace}},
+  url              = {{dostupn\'y z WWW}{WWW}},
+% urlfrom          = {{}{}},% FIXME: missing
+  urlseen          = {{citov\'ano}{cit\adddot}},
+  inpreparation    = {{v p\v{r}\'{i}prav\v{e}}{v p\v{r}\'{i}prav\v{e}}},
+  submitted        = {{odesl\'{a}no}{odes\adddotspace}},
+  forthcoming      = {{budouc\'{i}}{bud\adddotspace}},
+  inpress          = {{v tisku}{v tisku}},
+  prepublished     = {{p\v{r}ed publikov\'{a}n\'{i}m}{p\v{r}ed \adddotspace}},
+  citedas          = {{d\'{a}le citov\'{a}no jako}{d\'{a}le citov\'{a}no jako}},
+  thiscite         = {{zvl\'{a}\v{s}t\v{e}}{zvl\adddot}},
+  seenote          = {{viz pozn\'{a}mka}{viz poz\adddot}},
+  quotedin         = {{citov\'{a}no v}{cit\adddotspace v}},
+  idem             = {{idem}{idem}},
+  idemsm           = {{idem}{idem}},
+  idemsf           = {{eadem}{eadem}},
+  idemsn           = {{idem}{idem}},
+  idempm           = {{eidem}{eidem}},
+  idempf           = {{eaedem}{eaedem}},
+  idempn           = {{eadem}{eadem}},
+  idempp           = {{eidem}{eidem}},
+  ibidem           = {{ibidem}{ibid\adddot}},
+  opcit            = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+  loccit           = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
+  confer           = {{cf\adddot}{cf\adddot}},
+  sequens          = {{sq\adddot}{sq\adddot}},
+  sequentes        = {{sqq\adddot}{sqq\adddot}},
+  passim           = {{passim}{pass\adddot}},
+  see              = {{viz}{viz}},
+  seealso          = {{viz t\'{e}\v{z}}{viz t\'{e}\v{z}}},
+  backrefpage      = {{citov\'{a}no na stran\v{e}}{cit\adddotspace na s\adddot}},
+  backrefpages     = {{citov\'{a}no na stran\'{a}ch}{cit\adddotspace na s\adddot}},
+  january          = {{ledna}{led\adddot}},
+  february         = {{\'{u}nora}{\'{u}n\adddot}},
+  march            = {{b\v{r}ezna}{b\v{r}ez\adddot}},
+  april            = {{dubna}{dub\adddot}},
+  may              = {{kvetna}{kv\v{e}t\adddot}},
+  june             = {{\v{c}ervna}{\v{c}erv\adddot}},
+  july             = {{\v{c}ervence}{\v{c}vc}},
+  august           = {{srpna}{srp\adddot}},
+  september        = {{z\'{a}\v{r}\'{i}}{z\'{a}\v{r}\adddot}},
+  october          = {{\v{r}\'{i}jna}{\v{r}\'{i}j\adddot}},
+  november         = {{listopadu}{lis\adddot}},
+  december         = {{prosince}{pros\adddot}},
+  langamerican     = {{americk\'{a} angli\v{c}tina}{am\adddot angl\adddot}},
+  langbrazilian    = {{brazilsk\'{a} portugal\v{s}tina}{braz\adddot portugal\adddot}},
+% langcatalan      = {{}{}},% FIXME: missing
+  langcroatian     = {{chorvat\v{s}tina}{chorv\adddot}},
+% langczech        = {{}{}},% FIXME: missing
+  langdanish       = {{d\'{a}n\v{s}tina}{d\'{a}n\adddot}},
+  langdutch        = {{holand\v{s}tina}{hol.\adddot}},
+  langenglish      = {{angli\v{c}tina}{angl\adddot}},
+  langfinnish      = {{fin\v{s}tina}{fin\adddot}},
+  langfrench       = {{francouz\v{s}tina}{franc\adddot}},
+  langgerman       = {{n\v{e}m\v{c}ina}{n\v{e}m\adddot}},
+  langgreek        = {{\v{r}e\v{c}tina}{\v{r}e\v{c}\adddot}},
+  langitalian      = {{ital\v{s}tina}{ital\adddot}},
+  langlatin        = {{latina}{lat\adddot}},
+  langnorwegian    = {{nor\v{s}tina}{nor\v{s}\adddot}},
+  langportuguese   = {{portugal\v{s}tina}{port\adddot}},
+  langspanish      = {{\v{s}pan\v{e}l\v{s}tina}{\v{s}pa\v{n}\adddot}},
+  langswedish      = {{\v{s}v\'{e}d\v{s}tina}{\v{s}v\'{e}d\adddot}},
+  fromamerican     = {{z americk\'{e} angli\v{c}tiny}{z amer\adddot angl\adddot}},
+  frombrazilian    = {{z brazilsk\'{e} portugal\v{s}tiny}{z braz\adddotspace port\adddot}},
+% fromcatalan      = {{}{}},% FIXME: missing
+  fromcroatian     = {{z chorvat\v{s}tiny}{z chorv.}},
+% fromczech        = {{}{}},% FIXME: missing
+  fromdanish       = {{z d\'{a}n\v{s}tiny}{z d\'{a}n\adddot}},
+  fromdutch        = {{z holand\v{s}tiny}{z hol\adddot}},
+  fromenglish      = {{z angli\v{c}tiny}{z angl\adddot}},
+  fromfinnish      = {{z fin\v{s}tiny}{z fin.}},
+  fromfrench       = {{z francouz\v{s}tiny}{z franc\adddot}},
+  fromgerman       = {{z n\v{e}m\v{c}iny}{z n\v{e}m\adddot}},
+  fromgreek        = {{z \v{r}e\v{c}tiny}{z \v{r}e\v{c}\adddot}},
+  fromitalian      = {{z ital\v{s}tiny}{z ital\adddot}},
+  fromlatin        = {{z latiny}{z lat\adddot}},
+  fromnorwegian    = {{z nor\v{s}tiny}{z nor\adddot}},
+  fromportuguese   = {{z portugal\v{s}tiny}{z portugal\v{s}tiny}},
+  fromspanish      = {{ze \v{s}pan\v{e}l\v{s}tiny}{ze \v{s}pa\v{n}\adddot}},
+  fromswedish      = {{ze \v{s}v\'{e}d\v{s}tiny}{ze \v{s}v\'{e}d\adddot}},
+  countryde        = {{N\v{e}mecko}{DE}},
+  countryeu        = {{Evropsk\'{a} unie}{EU}},
+  countryep        = {{Evropsk\'{a} unie}{EP}},
+  countryfr        = {{Francie}{FR}},
+  countryuk        = {{Velk\'{a} Brit\'{a}nie}{GB}},
+  countryus        = {{Spojen\'{e} St\'{a}ty Americk\'{e}}{US}},
+  patent           = {{patent}{pat\adddot}},
+  patentde         = {{n\v{e}meck\'{y} patent}{n\v{e}m\adddot\ pat\adddot}},
+  patenteu         = {{evropsk\'{y} patent}{evr\adddot\ pat\adddot}},
+  patentfr         = {{francouzsk\'{y} patent}{franc\adddot\ pat\adddot}},
+  patentuk         = {{britsk\'{y} patent}{britsk\'{y} pat\adddot}},
+  patentus         = {{americk\'{y} patent}{US\adddotspace pat\adddot}},
+  patreq           = {{patentov\'{a} \v{z}\'{a}dost}{pat\adddot\ \v{z}\'{a}d\adddot}},
+  patreqde         = {{n\v{e}meck\'{a} patentov\'{a} \v{z}\'{a}dost}{n\v{e}meck\'{a} pat\adddot\ \v{z}\'{a}d\adddot}},
+  patreqeu         = {{evropsk\'{a} patentov\'{a} \v{z}\'{a}dost}{ev\adddot\ pat\adddot\ \v{z}\'{a}d\adddot}},
+  patreqfr         = {{francouzsk\'{a} patentov\'{a} \v{z}\'{a}dost}{franc\adddot\ pat\adddot\ \v{z}\'{a}d\adddot}},
+  patrequk         = {{britsk\'{a} patentov\'{a} \v{z}\'{a}dost}{brit\adddot\ pat\adddot\ \v{z}\'{a}d\adddot}},
+  patrequs         = {{US\adddotspace patentov\'{a} \v{z}\'{a}dost}{US\adddotspace pat\adddot\ \v{z}\'{a}d\adddot}},
+  file             = {{soubor}{soub\adddot}},
+  library          = {{knihovna}{knih\adddot}},
+  abstract         = {{abstrakt}{abst\adddot}},
+  annotation       = {{anotace}{anot\adddot}},
 }
+
 \endinput
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
index f15367e8f92..583b70f34a6 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/danish.lbx
@@ -21,7 +21,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -30,7 +30,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\adddot}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
 }
 
 \DeclareBibliographyStrings{%
@@ -39,30 +39,28 @@
   shorthands       = {{Fortegnelse over forkortelser}{Forkortelsesfortegnelse}},
   editor           = {{redakt\o r}{red\adddot}},
   editors          = {{redakt\o rer}{red\adddot}},
-  compiler         = {{redakt\o r}{red\adddot}},
-  compilers        = {{redakt\o rer}{red\adddot}},
+  compiler         = {{kompilator}{kompilator}},
+  compilers        = {{kompilatorer}{kompilatorer}},
 % alternative translation:
-% compiler         = {{kompilator}{kompilator}},
-% compilers        = {{kompilatorer}{kompilatorer}},
-% FIXME: redactor and editor are the same string;
-% need to find a noun corresponding to "bearbejdet af"
-  redactor         = {{redakt\o r}{red\adddot}},
+% compiler         = {{redakt\o r}{red\adddot}},
+% compilers        = {{redakt\o rer}{red\adddot}},
+  redactor         = {{redakt\o r}{red\adddot}},% FIXME: redactor and editor are the same string; need to find a noun corresponding to "bearbejdet af"
   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
+% reviser          = {{}{}},% FIXME: missing
+% revisers         = {{}{}},% FIXME: missing
+% founder          = {{}{}},% FIXME: missing
+% founders         = {{}{}},% FIXME: missing
+% continuator      = {{}{}},% FIXME: missing
+% continuators     = {{}{}},% FIXME: missing
+% collaborator     = {{}{}},% FIXME: missing
+% collaborators    = {{}{}},% FIXME: missing
   translator       = {{overs\ae tter}{overs\adddot}},
   translators      = {{overs\ae ttere}{overs\adddot}},
   commentator      = {{kommentator}{komm\adddot}},
   commentators     = {{kommentatorer}{komm\adddot}},
   annotator        = {{fortolker}{fortolker}},
   annotators       = {{fortolkere}{fortolkere}},
-% alternative translation:
+% alternative translations:
 % annotator        = {{kommentator}{kommentator}},
 % annotators       = {{kommentatorer}{kommentatorer}},
   commentary       = {{kommentar}{komm\adddot}},
@@ -72,87 +70,88 @@
   introduction     = {{indledning}{indl\adddot}},
   foreword         = {{forord}{forord}},
   afterword        = {{efterord}{efterord}},
-% 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         = {{}{}},% 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
   byauthor         = {{af}{af}},
   byeditor         = {{udgivet af}{udg\adddotspace af}},
   bycompiler       = {{kompileret af}{komp\adddotspace af}},
   byredactor       = {{bearbejdet af}{bearb\adddotspace af}},
-% byreviser        = {{}{}}, % FIXME: missing
-% byreviewer       = {{}{}}, % FIXME: missing
-% byfounder        = {{}{}}, % FIXME: missing
-% bycontinuator    = {{}{}}, % FIXME: missing
-% bycollaborator   = {{}{}}, % FIXME: missing
+% byreviser        = {{}{}},% FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
+% byfounder        = {{}{}},% FIXME: missing
+% bycontinuator    = {{}{}},% FIXME: missing
+% bycollaborator   = {{}{}},% FIXME: missing
   bytranslator     = {{oversat \lbx@lfromlang\ af}{oversat \lbx@sfromlang\ af}},
   bycommentator    = {{kommenteret af}{komm\adddot\ af}},
-  byannotator      = {{forklaret af}{forkl\adddot\ af}}, 
-% byannotator      = {{fortolket af}{fortolket af}}, % alternative translation
+  byannotator      = {{forklaret af}{forkl\adddot\ af}},
+% alternative translation
+% byannotator      = {{fortolket af}{fortolket af}},
   withcommentator  = {{med en kommentar af}{med en komm\adddot\ af}},
   withannotator    = {{med en forklaring af}{med en forkl\adddot\ af}},
   withintroduction = {{med en indledning af}{med en indl\adddot\ af}},
@@ -227,81 +226,76 @@
   bytranslatoranaf = {{oversat \lbx@lfromlang, forklaret og med et efterord skrevet af}%
                       {oversat \lbx@sfromlang, forkl\adddot\ og med et efterord skrev\adddot\ af}},
   and              = {{og}{og}},
-% FIXME: spacing after abbreviation dot?
-  andothers        = {{med flere}{m.fl\adddot}},
-% FIXME: spacing after abbreviation dot?
-  andmore          = {{med flere}{m.fl\adddot}},
+  andothers        = {{med flere}{m.fl\adddot}},% FIXME: spacing after abbreviation dot?
+  andmore          = {{med flere}{m.fl\adddot}},% FIXME: spacing after abbreviation dot?
   volume           = {{bind}{bd\adddot}},
   volumes          = {{bind}{bd\adddot}}, 
   involumes        = {{i}{i}},
   jourvol          = {{\aa rgang}{\aa g\adddot}},
   jourser          = {{serie}{ser\adddot}},
-% book             = {{}{}}, % FIXME: missing
-% part             = {{}{}}, % FIXME: missing
-% issue            = {{}{}}, % FIXME: missing
-% FIXME: spacing after abbreviation dot?
-  newseries        = {{ny serie}{n.s\adddot}},
-% FIXME: spacing after abbreviation dot?
-  oldseries        = {{gammel serie}{g.s\adddot}},
+% book             = {{}{}},% FIXME: missing
+% part             = {{}{}},% FIXME: missing
+% issue            = {{}{}},% FIXME: missing
+  newseries        = {{ny serie}{n.s\adddot}},% FIXME: spacing after abbreviation dot?
+  oldseries        = {{gammel serie}{g.s\adddot}},% FIXME: spacing after abbreviation dot?
   edition          = {{udgave}{udg\adddot}},
   reprint          = {{eftertryk}{eftertryk}},
-% alternative translation:
-% reprint          = {{genoptryk}{genoptryk}},
   reprintof        = {{eftertryk af}{eftertryk af}},
-% alternative translation:
-% reprintof        = {{genoptryk af}{genoptryk af}},
   reprintas        = {{eftertryk i}{eftertryk i}},
-% alternative translation:
+  reprintfrom      = {{eftertryk fra}{eftertryk fra}},% FIXME: check
+% alternative translations:
+% reprint          = {{genoptryk}{genoptryk}},
+% reprintof        = {{genoptryk af}{genoptryk af}},
 % reprintas        = {{genoptrykt i}{genoptrykt i}},
 % reprintas        = {{genoptrykt som}{genoptrykt som}},
-  reprintfrom      = {{eftertryk fra}{eftertryk fra}}, % FIXME: check
-  translationof    = {{overs\ae ttelse af}{overs\ae ttelse af}}, % FIXME: check
-  translationas    = {{oversat som}{oversat som}}, % FIXME: check
-  translationfrom  = {{oversat fra}{oversat fra}}, % FIXME: check
-% reviewof         = {{}{}}, % FIXME: missing
-  origpubas        = {{oprindelig udgivet som}{oprindelig udgivet som}}, % FIXME: check
-  origpubin        = {{oprindeligt udgivet i}{oprindeligt udgivet i}}, % FIXME: check
-  astitle          = {{i}{i}}, % FIXME: check
-  bypublisher      = {{af}{af}}, % FIXME: check
+  translationof    = {{overs\ae ttelse af}{overs\ae ttelse af}},% FIXME: check
+  translationas    = {{oversat som}{oversat som}},% FIXME: check
+  translationfrom  = {{oversat fra}{oversat fra}},% FIXME: check
+% reviewof         = {{}{}},% FIXME: missing
+  origpubas        = {{oprindelig udgivet som}{oprindelig udgivet som}},% FIXME: check
+  origpubin        = {{oprindeligt udgivet i}{oprindeligt udgivet i}},% FIXME: check
+  astitle          = {{i}{i}},% FIXME: check
+  bypublisher      = {{af}{af}},% FIXME: check
   page             = {{side}{s\adddot}},
   pages            = {{sider}{s\adddot}},
   column           = {{spalte}{sp\adddot}},
   columns          = {{spalter}{sp\adddot}},
   line             = {{linje}{l\adddot}},
   lines            = {{linjer}{l\adddot}},
+  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   verse            = {{vers}{v\adddot}},
   verses           = {{vers}{v\adddot}},
-  section          = {{afsnit}{\S}},   % FIXME: check
-  sections         = {{afsnit}{\S\S}}, % FIXME: check
-% alternative translation:
+  section          = {{afsnit}{\S}},% FIXME: check
+  sections         = {{afsnit}{\S\S}},% FIXME: check
+% alternative translations:
 % section          = {{paragraf}{\S}},
 % sections         = {{paragrafer}{\S\S}},
-% paragraph        = {{}{}}, % FIXME: missing
-% paragraphs       = {{}{}}, % FIXME: missing
+% paragraph        = {{}{}},% FIXME: missing
+% paragraphs       = {{}{}},% FIXME: missing
   in               = {{i}{i}},
   inseries         = {{r\ae kken}{r\ae kken}},
   ofseries         = {{af r\ae kken}{af r\ae kken}},
   number           = {{nummer}{nr\adddot}},
   chapter          = {{kapitel}{kap\adddot}},
-  mathesis         = {{speciale}{speciale}}, % FIXME: check
+  mathesis         = {{speciale}{speciale}},% FIXME: check
   phdthesis        = {{ph.d.-afhandling}{ph.d.-afh\adddot}},
-  candthesis       = {{kandidatafhandling}{kandidatafh\adddot}}, % FIXME: check
+  candthesis       = {{kandidatafhandling}{kandidatafh\adddot}},% FIXME: check
   resreport        = {{forskningsrapport}{forskningsrap\adddot}},
   techreport       = {{teknisk rapport}{tek\adddot\ rap\adddot}},
   software         = {{software}{software}}, 
   datacd           = {{data-cd}{data-cd}}, 
   audiocd          = {{lyd-cd}{lyd-cd}},
   version          = {{version}{vers\adddot}},
-  url              = {{url}{url}},
-%  url              = {{side}{side}},
+  url              = {{side}{side}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{sidst set}{sidst set}},
-% inpreparation    = {{}{}}, % FIXME: missing
-% submitted        = {{}{}}, % FIXME: missing
-% forthcoming      = {{}{}}, % FIXME: missing
-% inpress          = {{}{}}, % FIXME: missing
-% prepublished     = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}},% FIXME: missing
+% submitted        = {{}{}},% FIXME: missing
+% forthcoming      = {{}{}},% FIXME: missing
+% inpress          = {{}{}},% FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   citedas          = {{herefter citeret som}{herefter cit\adddot\ som}},
-% thiscite         = {{}{}}, % FIXME: missing
+% thiscite         = {{}{}},% FIXME: missing
   seenote          = {{se note}{se note}},
 % alternative translation:
 % seenote          = {{se anm\ae rkning}{se anm\adddot}},
@@ -315,17 +309,14 @@
   idempn           = {{de samme}{de~s\adddot}},
   idempp           = {{de samme}{de~s\adddot}},
   ibidem           = {{ibidem}{ibid\adddot}},
-% FIXME: spacing after abbreviation dot?
-  opcit            = {{op.\adddotspace cit\adddot}{op.\adddotspace cit\adddot}},
-% FIXME: spacing after abbreviation dot?
-  loccit           = {{loc.\adddotspace cit\adddot}{loc.\adddotspace cit\adddot}},
+  opcit            = {{op.\adddotspace cit\adddot}{op.\adddotspace cit\adddot}},% FIXME: spacing after abbreviation dot?
+  loccit           = {{loc.\adddotspace cit\adddot}{loc.\adddotspace cit\adddot}},% FIXME: spacing after abbreviation dot?
   confer           = {{sammenlign}{smlg\adddot}},
   sequens          = {{sq\adddot}{sq\adddot}},
   sequentes        = {{sqq\adddot}{sqq\adddot}},
   passim           = {{passim}{pass\adddot}},
   see              = {{se}{s\adddot}},
-% FIXME: spacing after abbreviation dot?
-  seealso          = {{se ogs\aa}{s.\aa\adddot}},
+  seealso          = {{se ogs\aa}{s.\aa\adddot}},% FIXME: spacing after abbreviation dot?
   backrefpage      = {{se side}{se s\adddot}},
   backrefpages     = {{se sider}{se s\adddot}},
   january          = {{januar}{jan\adddot}},
@@ -341,39 +332,43 @@
   november         = {{november}{nov\adddot}},
   december         = {{december}{dec\adddot}},
   langamerican     = {{amerikansk}{amerikansk}},
-% langbrazilian    = {{}{}}, % FIXME: missing
-% langcroatian     = {{}{}}, % FIXME: missing
-% langdanish       = {{}{}}, % FIXME: missing
-% langdutch        = {{}{}}, % FIXME: missing
+% langbrazilian    = {{}{}},% FIXME: missing
+% langcatalan      = {{}{}},% FIXME: missing
+% langcroatian     = {{}{}},% FIXME: missing
+% langczech        = {{}{}},% FIXME: missing
+% langdanish       = {{}{}},% FIXME: missing
+% langdutch        = {{}{}},% FIXME: missing
   langenglish      = {{engelsk}{engelsk}},
-% langfinnish      = {{}{}}, % FIXME: missing
+% langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{fransk}{fransk}},
   langgerman       = {{tysk}{tysk}},
   langgreek        = {{gr\ae sk}{gr\ae sk}},
   langitalian      = {{italiensk}{italiensk}},
   langlatin        = {{latin}{latin}},
   langnorwegian    = {{norsk}{norsk}},
-% langportuguese   = {{}{}}, % FIXME: missing
-% langrussian      = {{}{}}, % FIXME: missing
+% langportuguese   = {{}{}},% FIXME: missing
+% langrussian      = {{}{}},% FIXME: missing
   langspanish      = {{spansk}{spansk}},
-% langswedish      = {{}{}}, % FIXME: missing
+% langswedish      = {{}{}},% FIXME: missing
   fromamerican     = {{fra amerikansk}{fra amerikansk}},
-% frombrazilian    = {{}{}}, % FIXME: missing
-% fromcroatian     = {{}{}}, % FIXME: missing
-% fromdanish       = {{}{}}, % FIXME: missing
-% fromdutch        = {{}{}}, % FIXME: missing
+% frombrazilian    = {{}{}},% FIXME: missing
+% fromcatalan      = {{}{}},% FIXME: missing
+% fromcroatian     = {{}{}},% FIXME: missing
+% fromczech        = {{}{}},% FIXME: missing
+% fromdanish       = {{}{}},% FIXME: missing
+% fromdutch        = {{}{}},% FIXME: missing
   fromenglish      = {{fra engelsk}{fra engelsk}},
-% fromfinnish      = {{}{}}, % FIXME: missing
+% fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{fra fransk}{fra fransk}},
   fromgerman       = {{fra tysk}{fra tysk}},
   fromgreek        = {{fra gr\ae sk}{fra gr\ae sk}},
   fromitalian      = {{fra italiensk}{fra italiensk}},
   fromlatin        = {{fra latin}{fra latin}},
   fromnorwegian    = {{fra norsk}{fra norsk}},
-% fromportuguese   = {{}{}}, % FIXME: missing
-% fromrussian      = {{}{}}, % FIXME: missing
+% fromportuguese   = {{}{}},% FIXME: missing
+% fromrussian      = {{}{}},% FIXME: missing
   fromspanish      = {{fra spansk}{fra spansk}},
-% fromswedish      = {{}{}}, % FIXME: missing
+% fromswedish      = {{}{}},% FIXME: missing
   countryde        = {{Tyskland}{DE}},
   countryeu        = {{Europ\ae iske Union}{EU}},
   countryep        = {{Europ\ae iske Union}{EP}},
@@ -392,10 +387,10 @@
   patreqfr         = {{ans\o gning om fransk patent}{fra\adddot\ pat\adddot\ ans\o gn\adddot}},
   patrequk         = {{ans\o gning om britisk patent}{britisk pat\adddot\ ans\o gn\adddot}},
   patrequs         = {{ans\o gning om amerikansk patent}{am\adddot pat\adddot\ ans\o gn\adddot}},
-% file             = {{}{}}, % FIXME: missing
-% library          = {{}{}}, % FIXME: missing
-% abstract         = {{}{}}, % FIXME: missing
-% annotation       = {{}{}}, % FIXME: missing
+% file             = {{}{}},% FIXME: missing
+% library          = {{}{}},% FIXME: missing
+% abstract         = {{}{}},% FIXME: missing
+% annotation       = {{}{}},% FIXME: missing
 }
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
index 0c02417c179..4a2afbf0687 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/dutch.lbx
@@ -41,7 +41,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -51,7 +51,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\mbox{-}}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
 }
 
 \DeclareBibliographyStrings{%
@@ -221,7 +221,7 @@
   bycontinuator    = {{opgevolgd door}{opgev\adddot\addabbrvspace door}},
   byredactor       = {{geredigeerd door}{red\adddot\ door}},
   byreviser        = {{nagekeken door}{nagek\adddot\addabbrvspace door}},
-% byreviewer       = {{}{}}, % FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
   bycollaborator   = {{met medewerking van}{m\adddot m\adddot v}},
   bytranslator     = {{vertaald \lbx@lfromlang\ door}{vert\adddot\ \lbx@lfromlang\ door}},
   bycommentator    = {{becommentarieerd door}{comm\adddot\ door}},
@@ -308,9 +308,9 @@
   volumes          = {{delen}{delen}},
   jourvol          = {{jaargang}{jrg\adddot}},
   jourser          = {{reeks}{reeks}},
-% book             = {{}{}}, % FIXME: missing
-% part             = {{}{}}, % FIXME: missing
-% issue            = {{}{}}, % FIXME: missing
+% book             = {{}{}},% FIXME: missing
+% part             = {{}{}},% FIXME: missing
+% issue            = {{}{}},% FIXME: missing
   newseries        = {{nieuwe reeks}{nieuwe reeks}},
   oldseries        = {{oude reeks}{oude reeks}},
   edition          = {{editie}{ed\adddot}},
@@ -323,20 +323,20 @@
   reprint          = {{herdruk}{herdr\adddot}},
   reprintof        = {{herdruk van}{herdr\adddotspace van}},
   reprintas        = {{herdrukt als}{herdr\adddotspace als}},
-  reprintfrom      = {{herdrukt uit}{herdr\adddotspace uit}}, % FIXME: check
-  translationof    = {{translation of}{trans\adddotspace of}}, % FIXME: check
-  translationas    = {{translated as}{trans\adddotspace as}}, % FIXME: check
-  translationfrom  = {{vertaald van}{vert\adddotspace van}}, % FIXME: check
-% reviewof         = {{}{}}, % FIXME: missing
-  origpubas        = {{}{}}, % FIXME: missing
-  origpubin        = {{}{}}, % FIXME: missing
-  astitle          = {{als}{als}}, % FIXME: check
-  bypublisher      = {{door}{door}}, % FIXME: check
+  reprintfrom      = {{herdrukt uit}{herdr\adddotspace uit}},% FIXME: check
+  translationof    = {{translation of}{trans\adddotspace of}},% FIXME: check
+  translationas    = {{translated as}{trans\adddotspace as}},% FIXME: check
+  translationfrom  = {{vertaald van}{vert\adddotspace van}},% FIXME: check
+% reviewof         = {{}{}},% FIXME: missing
+% origpubas        = {{}{}},% FIXME: missing
+% origpubin        = {{}{}},% FIXME: missing
+  astitle          = {{als}{als}},% FIXME: check
+  bypublisher      = {{door}{door}},% FIXME: check
   inpreparation    = {{in voorbereiding}{in voorbereiding}},
   submitted        = {{ingediend}{ingedied}},
-% forthcoming      = {{}{}}, % FIXME: missing
+% forthcoming      = {{}{}},% FIXME: missing
   inpress          = {{in druk}{in druk}},
-% prepublished     = {{}{}}, % FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   page             = {{pagina}{p\adddot}},
   pages            = {{pagina's}{p\adddot}},
   column           = {{kolom}{kol\adddot}},
@@ -349,6 +349,7 @@
   verses           = {{verzen}{v\adddot}},
   line             = {{regel}{r\adddot}},
   lines            = {{regels}{r\adddot}},
+  nodate           = {{geen\space datum}{{}n\adddot d\adddot}},
   mathesis         = {{masterscriptie}{masterscriptie}},
   phdthesis        = {{proefschrift}{proefschrift}},
   resreport        = {{onderzoeksrapport}{onderzoeksrap\adddot}},
@@ -359,8 +360,8 @@
   and              = {{en}{en}},
   andothers        = {{en andere}{e\adddot a\adddot}},
   andmore          = {{en andere}{e\adddot a\adddot}},
-  url              = {{url}{url}},
-%  url              = {{addres}{addres}},
+  url              = {{addres}{addres}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{bezocht op}{bezocht op}},
   file             = {{bestand}{bestand}},
   library          = {{bibliotheek}{bibliotheek}},
@@ -403,11 +404,13 @@
   december         = {{december}{dec}},
   langamerican     = {{Amerikaans Engels}{Amerikaans Engels}},
   langbrazilian    = {{Braziliaans Portugeens}{Braziliaans Portugees}},
-% langcroatian     = {{}{}}, % FIXME: missing
+% langcatalan      = {{}{}},% FIXME: missing
+% langcroatian     = {{}{}},% FIXME: missing
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{Deens}{Deens}},
   langdutch        = {{Nederlands}{Nederlands}},
   langenglish      = {{Engels}{Engels}},
-% langfinnish      = {{}{}}, % FIXME: missing
+% langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{Frans}{Frans}},
   langgerman       = {{Duits}{Duits}},
   langgreek        = {{Grieks}{Grieks}},
@@ -415,16 +418,18 @@
   langlatin        = {{Latijn}{Latijn}},
   langnorwegian    = {{Noors}{Noors}},
   langportuguese   = {{Portugees}{Portugees}},
-% langrussian      = {{}{}}, % FIXME: missing
+% langrussian      = {{}{}},% FIXME: missing
   langspanish      = {{Spaans}{Spaans}},
   langswedish      = {{Zweeds}{Zweeds}},
   fromamerican     = {{uit het Amerikaans Engels}{uit het Amerikaans Engels}},
   frombrazilian    = {{uit het Braziliaans Portugees}{uit het Braziliaans Portugees}},
-% fromcroatian     = {{}{}}, % FIXME: missing
+% fromcatalan      = {{}{}},% FIXME: missing
+% fromcroatian     = {{}{}},% FIXME: missing
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{uit het Deens}{uit het Deens}},
   fromdutch        = {{uit het Nederlands}{uit het Nederlands}},
   fromenglish      = {{uit het Engels}{uit het Engels}},
-% fromfinnish      = {{}{}}, % FIXME: missing
+% fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{uit het Frans}{uit het Frans}},
   fromgerman       = {{uit het Duits}{uit het Duits}},
   fromgreek        = {{uit het Grieks}{uit het Grieks}},
@@ -432,7 +437,7 @@
   fromlatin        = {{uit het Latijn}{uit het Latijn}},
   fromnorwegian    = {{uit het Noors}{uit het Noors}},
   fromportuguese   = {{uit het Portugees}{uit het Portugees}},
-% fromrussian      = {{}{}}, % FIXME: missing
+% fromrussian      = {{}{}},% FIXME: missing
   fromspanish      = {{uit het Spaans}{uit het Spaans}},
   fromswedish      = {{uit het Zweeds}{uit het Zweeds}},
   countryde        = {{Duitsland}{DE}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
index 5d0f80764d2..8e3fef482c5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/english.lbx
@@ -32,19 +32,23 @@ canadian,australian,newzealand,USenglish,UKenglish}
       {}
       {\stripzeros{\thefield{#3}}%
        \iffieldundef{#1}{}{,\space}}%
-    \stripzeros{\thefield{#1}}}%
+     \iffieldbibstring{#1}
+       {\bibstring{\thefield{#1}}}
+       {\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#2}
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#3}
          {\iffieldundef{#1}{}{/}}
-	 {/}}%
+         {/}}%
     \iffieldundef{#3}
       {}
       {\mkdatezeros{\thefield{#3}}%
        \iffieldundef{#1}{}{/}}%
-    \mkdatezeros{\thefield{#1}}}%
+     \iffieldbibstring{#1}
+       {\bibstring{\thefield{#1}}}
+       {\mkdatezeros{\thefield{#1}}}}%
   \savecommand\mkbibrangecomp
   \savecommand\mkbibrangecompextra
   \savecommand\mkbibrangeterse
@@ -80,10 +84,10 @@ canadian,australian,newzealand,USenglish,UKenglish}
   revisers         = {{revisers}{rev\adddot}},
   founder          = {{founder}{found\adddot}},
   founders         = {{founders}{found\adddot}},
-  continuator      = {{continued}{cont\adddot}}, % FIXME: unsure
-  continuators     = {{continued}{cont\adddot}}, % FIXME: unsure
-  collaborator     = {{collaborator}{collab\adddot}},  % FIXME: unsure
-  collaborators    = {{collaborators}{collab\adddot}}, % FIXME: unsure
+  continuator      = {{continued}{cont\adddot}},% FIXME: unsure
+  continuators     = {{continued}{cont\adddot}},% FIXME: unsure
+  collaborator     = {{collaborator}{collab\adddot}},% FIXME: unsure
+  collaborators    = {{collaborators}{collab\adddot}},% FIXME: unsure
   translator       = {{translator}{trans\adddot}},
   translators      = {{translators}{trans\adddot}},
   commentator      = {{commentator}{comm\adddot}},
@@ -239,7 +243,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
   byreviewer       = {{reviewed by}{rev\adddotspace by}},
   byfounder        = {{founded by}{found\adddotspace by}},
   bycontinuator    = {{continued by}{cont\adddotspace by}},
-  bycollaborator   = {{in collaboration with}{in collab\adddotspace with}}, % FIXME: unsure
+  bycollaborator   = {{in collaboration with}{in collab\adddotspace with}},% FIXME: unsure
   bytranslator     = {{translated \lbx@lfromlang\ by}{trans\adddot\ \lbx@sfromlang\ by}},
   bycommentator    = {{commented by}{comm\adddot\ by}},
   byannotator      = {{annotated by}{annot\adddot\ by}},
@@ -348,6 +352,7 @@ canadian,australian,newzealand,USenglish,UKenglish}
   columns          = {{columns}{cols\adddot}},
   line             = {{line}{l\adddot}},
   lines            = {{lines}{ll\adddot}},
+  nodate           = {{no date}{n\adddot d\adddot}},
   verse            = {{verse}{v\adddot}},
   verses           = {{verses}{vv\adddot}},
   section          = {{section}{\S}},
@@ -368,7 +373,8 @@ canadian,australian,newzealand,USenglish,UKenglish}
   datacd           = {{CD-ROM}{CD-ROM}},
   audiocd          = {{audio CD}{audio CD}},
   version          = {{version}{version}},
-  url              = {{url}{url}},
+  url              = {{address}{address}},
+  urlfrom          = {{available from}{available from}},
   urlseen          = {{visited on}{visited on}},
   inpreparation    = {{in preparation}{in preparation}},
   submitted        = {{submitted}{submitted}},
@@ -412,7 +418,9 @@ canadian,australian,newzealand,USenglish,UKenglish}
   december         = {{December}{Dec\adddot}},
   langamerican     = {{American}{American}},
   langbrazilian    = {{Brazilian}{Brazilian}},
+  langcatalan      = {{Catalan}{Catalan}},
   langcroatian     = {{Croatian}{Croatian}},
+  langczech        = {{Czech}{Czech}},
   langdanish       = {{Danish}{Danish}},
   langdutch        = {{Dutch}{Dutch}},
   langenglish      = {{English}{English}},
@@ -429,7 +437,9 @@ canadian,australian,newzealand,USenglish,UKenglish}
   langswedish      = {{Swedish}{Swedish}},
   fromamerican     = {{from the American}{from the American}},
   frombrazilian    = {{from the Brazilian}{from the Brazilian}},
+  fromcatalan      = {{from the Catalan}{from the Catalan}},
   fromcroatian     = {{from the Croatian}{from the Croatian}},
+  fromczech        = {{from the Czech}{from the Czech}},
   fromdanish       = {{from the Danish}{from the Danish}},
   fromdutch        = {{from the Dutch}{from the Dutch}},
   fromenglish      = {{from the English}{from the English}},
@@ -491,49 +501,49 @@ canadian,australian,newzealand,USenglish,UKenglish}
     {}
     {\printtext[#2date]{%
        \iffieldsequal{#2year}{#2endyear}
-	 {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-	 {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+         {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+         {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
        \iffieldundef{#2endyear}
-	 {}
-	 {\iffieldequalstr{#2endyear}{}
+         {}
+         {\iffieldequalstr{#2endyear}{}
             {\mbox{\bibdatedash}}
-	    {\bibdatedash
-	     \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+            {\bibdatedash
+             \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
 
 \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
   \iffieldundef{#2year}
     {}
     {\printtext[#2date]{%
        \iffieldsequal{#2year}{#2endyear}
-	 {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-	 {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+         {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+         {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
        \iffieldundef{#2endyear}
-	 {\printfield{extrayear}}
-	 {\iffieldequalstr{#2endyear}{}
+         {\printfield{extrayear}}
+         {\iffieldequalstr{#2endyear}{}
             {\printfield{extrayear}%
-	     \mbox{\bibdatedash}}
-	    {\bibdatedash
-	     \iffieldsequal{#2year}{#2endyear}
-	       {\iffieldsequal{#2month}{#2endmonth}
-        	  {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
-		  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
-	       {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-	     \printfield{extrayear}}}}}}
+             \mbox{\bibdatedash}}
+            {\bibdatedash
+             \iffieldsequal{#2year}{#2endyear}
+               {\iffieldsequal{#2month}{#2endmonth}
+                  {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+                  {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+               {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+             \printfield{extrayear}}}}}}
 
 \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
   \iffieldundef{#2year}
     {}
     {\printtext[#2date]{%
        \iffieldsequal{#2year}{#2endyear}
-	 {\csuse{mkbibdate#1}{}{#2month}{#2day}}
-	 {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+         {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+         {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
        \iffieldundef{#2endyear}
-	 {\printfield{extrayear}}
-	 {\iffieldequalstr{#2endyear}{}
+         {\printfield{extrayear}}
+         {\iffieldequalstr{#2endyear}{}
             {\printfield{extrayear}%
-	     \mbox{\bibdatedash}}
-	    {\bibdatedash
-	     \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
-	     \printfield{extrayear}}}}}}
+          \mbox{\bibdatedash}}
+         {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+       \printfield{extrayear}}}}}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
index 930334fea5e..bb8000bf566 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/finnish.lbx
@@ -2,7 +2,6 @@
 [\abx@lbxid]
 
 % Translator's notes:
-%
 % Some translations look akward but they are made in such a way
 % that they look as good as possible in running text.
 % Source for some items in translations: Kielikello 3/1998.
@@ -29,7 +28,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -41,7 +40,7 @@
        \iffieldundef{#1}
 	 {}
 	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
   \savecommand\lbx@lfromlang
   \savecommand\lbx@sfromlang
   \def\lbx@lfromlang{%
@@ -69,30 +68,30 @@
   bibliography     = {{Kirjallisuusluettelo}{Kirjallisuus}},
   references       = {{Viitteet}{Viitteet}},
   shorthands       = {{Lyhenteet}{Lyhenteet}},
-  editor           = {{toimittanut}{toim\adddot}},  % Abbreviation is the same
-  editors          = {{toimittaneet}{toim\adddot}}, % in singular and plural.
-  compiler         = {{koontanut}{koontanut}},      % FIXME: unsure.
-  compilers        = {{koontaneet}{koontaneet}},    % FIXME: unsure.
-  redactor         = {{toimittanut}{toim\adddot}},  % FIXME: unsure.
-  redactors        = {{toimittaneet}{toim\adddot}}, % FIXME: unsure.
-% reviser          = {{}{}}, % FIXME: missing
-% revisers         = {{}{}}, % FIXME: missing
-% founder          = {{}{}}, % FIXME: missing.
-% founders         = {{}{}}, % FIXME: missing.
-% continuator      = {{}{}}, % FIXME: missing.
-% continuators     = {{}{}}, % FIXME: missing.
-% collaborator     = {{}{}}, % FIXME: missing.
-% collaborators    = {{}{}}, % FIXME: missing.
+  editor           = {{toimittanut}{toim\adddot}},
+  editors          = {{toimittaneet}{toim\adddot}},% Abbreviation is the same in singular and plural.
+  compiler         = {{koontanut}{koontanut}},% FIXME: unsure
+  compilers        = {{koontaneet}{koontaneet}},% FIXME: unsure
+  redactor         = {{toimittanut}{toim\adddot}},% FIXME: unsure
+  redactors        = {{toimittaneet}{toim\adddot}},% FIXME: unsure
+% reviser          = {{}{}},% FIXME: missing
+% revisers         = {{}{}},% FIXME: missing
+% founder          = {{}{}},% FIXME: missing
+% founders         = {{}{}},% FIXME: missing
+% continuator      = {{}{}},% FIXME: missing
+% continuators     = {{}{}},% FIXME: missing
+% collaborator     = {{}{}},% FIXME: missing
+% collaborators    = {{}{}},% FIXME: missing
   translator       = {{k\"a\"ant\"anyt}{k\"a\"ant\adddot}},
   translators      = {{k\"a\"ant\"anyt}{k\"a\"ant\adddot}},
   commentator      = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},
   commentators     = {{kommentaarin kirjoittaneet}{kommentaarin kirjoittaneet}},
-  annotator        = {{selityksin varustanut}{selityksin varustanut}},   % FIXME: unsure.
-  annotators       = {{selityksin varustaneet}{selityksin varustaneet}}, % FIXME: unsure.
+  annotator        = {{selityksin varustanut}{selityksin varustanut}},% FIXME: unsure
+  annotators       = {{selityksin varustaneet}{selityksin varustaneet}},% FIXME: unsure
   commentary       = {{kommentaari}{kommentaari}},
-  annotations      = {{selitykset}{selitykset}},   % FIXME: unsure.
+  annotations      = {{selitykset}{selitykset}},% FIXME: unsure
   introduction     = {{johdanto}{johdanto}},
-  foreword         = {{esipuhe}{esipuhe}},         % Is "alkusanat" better?
+  foreword         = {{esipuhe}{esipuhe}},% Is "alkusanat" better?
   afterword        = {{j\"alkisanat}{j\"alkisanat}},
   editortr         = {{toimittanut ja k\"a\"ant\"anyt}%
                       {toim\adddotspace ja k\"a\"ant\adddot}},
@@ -102,9 +101,9 @@
                       {toimittanut ja kommentaarin kirjottanut}},
   editorsco        = {{toimittaneet ja kommentaarin kirjoittaneet}%
                       {toimittaneet ja kommentaarin kirjoittaneet}},
-  editoran         = {{toimittanut ja selityksin varustanut}%    % FIXME: unsure.
+  editoran         = {{toimittanut ja selityksin varustanut}% FIXME: unsure
                       {toimittanut ja selityksin varustanut}},
-  editorsan        = {{toimittaneet ja selityksin varustaneet}%  % FIXME: unsure.
+  editorsan        = {{toimittaneet ja selityksin varustaneet,% FIXME: unsure
                       {toimittaneet ja selityksin varustaneet}},
   editorin         = {{toimittanut ja johdannon kirjoittanut}%
                       {toimittanut ja johdannon kirjoittanut}},
@@ -122,9 +121,9 @@
                       {toimittanut, k\"a\"ant\"anyt ja kommentaarin kirjoittanut}},
   editorstrco      = {{toimittaneet, k\"a\"ant\"aneet ja kommentaarin kirjoittaneet}%
                       {toimittaneet, k\"a\"ant\"aneet ja kommentaarin kirjoittaneet}},
-  editortran       = {{toimittanut, k\"a\"ant\"anyt ja selityksin varustanut}%    % FIXME: unsure.
+  editortran       = {{toimittanut, k\"a\"ant\"anyt ja selityksin varustanut}% FIXME: unsure
                       {toimittanut, k\"a\"ant\"anyt ja selityksin varustanut}},
-  editorstran      = {{toimittaneet, k\"a\"ant\"aneet ja selityksin varustaneet}% % FIXME: unsure.
+  editorstran      = {{toimittaneet, k\"a\"ant\"aneet ja selityksin varustaneet}% FIXME: unsure
                       {toimittaneet, k\"a\"ant\"aneet ja selityksin varustaneet}},
   editortrin       = {{toimittanut, k\"a\"ant\"anyt ja johdannon kirjoittanut}%
                       {toimittanut, k\"a\"ant\"anyt ja johdannon kirjoittanut}},
@@ -233,17 +232,17 @@
   byauthor         = {{kirjoittanut}{kirj\adddot}},
   byeditor         = {{toimittanut}{toim\adddot}},
   bycompiler       = {{koontanut}{koontanut}},
-  byredactor       = {{toimittanut}{toim\adddot}}, % FIXME: unsure.
-% byreviser        = {{}{}}, % FIXME: missing
-% byreviewer       = {{}{}}, % FIXME: missing
-% byfounder        = {{}{}}, % FIXME: missing
-% bycontinuator    = {{}{}}, % FIXME: missing
-% bycollaborator   = {{}{}}, % FIXME: missing
+  byredactor       = {{toimittanut}{toim\adddot}},% FIXME: unsure
+% byreviser        = {{}{}},% FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
+% byfounder        = {{}{}},% FIXME: missing
+% bycontinuator    = {{}{}},% FIXME: missing
+% bycollaborator   = {{}{}},% FIXME: missing
   bytranslator     = {{\lbx@lfromlang k\"a\"ant\"anyt}{\lbx@sfromlang k\"a\"ant\adddot}},
-  bycommentator    = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},  % FIXME: unsure.
-  byannotator      = {{selityksin varustanut}{selityksin varustanut}},          % FIXME: unsure.
-  withcommentator  = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},  % FIXME: unsure.
-  withannotator    = {{selityksin varustanut}{selityksin varustanut}},          % FIXME: unsure.
+  bycommentator    = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},% FIXME: unsure
+  byannotator      = {{selityksin varustanut}{selityksin varustanut}},% FIXME: unsure
+  withcommentator  = {{kommentaarin kirjoittanut}{kommentaarin kirjoittanut}},% FIXME: unsure
+  withannotator    = {{selityksin varustanut}{selityksin varustanut}},% FIXME: unsure
   withintroduction = {{johdannon kirjottanut}{johdannon kirjottanut}},
   withforeword     = {{esipuheen kirjoittanut}{esipuheen kirjoittanut}},
   withafterword    = {{j\"alkisanat kirjoittanut}{j\"alkisanat kirjoittanut}},
@@ -320,37 +319,38 @@
   andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
   volume           = {{volyymi}{vol\adddot}},
   volumes          = {{volyymit}{vol\adddot}},
-  involumes        = {{tilavuusosaan}{tilavuusosaan}}, % FIXME: unsure.
+  involumes        = {{tilavuusosaan}{tilavuusosaan}},% FIXME: unsure
   jourvol          = {{volyymi}{vol\adddot}},
   jourser          = {{sarja}{sarja}},
-% book             = {{}{}}, % FIXME: missing
-% part             = {{}{}}, % FIXME: missing
-% issue            = {{}{}}, % FIXME: missing
+% book             = {{}{}},% FIXME: missing
+% part             = {{}{}},% FIXME: missing
+% issue            = {{}{}},% FIXME: missing
   newseries        = {{uusi sarja}{uusi sarja}},
   oldseries        = {{vanha sarja}{vanha sarja}},
   edition          = {{painos}{painos}},
   reprint          = {{j\"alkipainos}{j\"alkipainos}},
   reprintof        = {{julkaistu aiemmin nimell\"a}{julkaistu aiemmin nimell\"a}},
   reprintas        = {{julkaistu uudelleen nimell\"a}{julkaistu uudelleen nimell\"a}},
-% reprintfrom      = {{}{}}, % FIXME: missing
-% translationof    = {{}{}}, % FIXME: missing
-% translationas    = {{}{}}, % FIXME: missing
-% translationfrom  = {{}{}}, % FIXME: missing
-% reviewof         = {{}{}}, % FIXME: missing
-% origpubas        = {{}{}}, % FIXME: missing
-% origpubin        = {{}{}}, % FIXME: missing
-% astitle          = {{}{}}, % FIXME: missing
-% bypublisher      = {{}{}}, % FIXME: missing
+% reprintfrom      = {{}{}},% FIXME: missing
+% translationof    = {{}{}},% FIXME: missing
+% translationas    = {{}{}},% FIXME: missing
+% translationfrom  = {{}{}},% FIXME: missing
+% reviewof         = {{}{}},% FIXME: missing
+% origpubas        = {{}{}},% FIXME: missing
+% origpubin        = {{}{}},% FIXME: missing
+% astitle          = {{}{}},% FIXME: missing
+% bypublisher      = {{}{}},% FIXME: missing
   page             = {{sivu}{s\adddot}},
   pages            = {{sivut}{s\adddot}},
-  column           = {{palsta}{palsta}},     % Here "sarake" is wrong!
-  columns          = {{palstat}{palstat}},   % Here "sarakkeet" is wrong!
+  column           = {{palsta}{palsta}},% Here "sarake" is wrong!
+  columns          = {{palstat}{palstat}},% Here "sarakkeet" is wrong!
   line             = {{rivi}{rivi}},
   lines            = {{rivit}{rivit}},
+  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   verse            = {{s\"ae}{s\"ae}},
   verses           = {{s\"akeet}{s\"akeet}},
-  section          = {{kohta}{kohta}},      % Bad translation, but "pyk\"al\"a" is no better.
-  sections         = {{kohdat}{kohdat}},    % Bad translation, but "pyk\"al\"at" is no better.
+  section          = {{kohta}{kohta}},% Bad translation, but "pyk\"al\"a" is no better.
+  sections         = {{kohdat}{kohdat}},% Bad translation, but "pyk\"al\"at" is no better.
   paragraph        = {{kappale}{kappale}},
   paragraphs       = {{kappaleet}{kappaleet}},
   in               = {{teoksessa}{teoksessa}},
@@ -358,27 +358,28 @@
   ofseries         = {{sarjassa}{sarjassa}},
   number           = {{numero}{nro}},
   chapter          = {{luku}{luku}},
-  mathesis         = {{tutkielma}{tutkielma}},     % FIXME: unsure.
+  mathesis         = {{tutkielma}{tutkielma}},% FIXME: unsure
   phdthesis        = {{tohtorinv\"ait\"oskirja}{tohtorinv\"ait\"oskirja}},
-  candthesis       = {{kandidat}{kandidat}},       % FIXME: unsure.
+  candthesis       = {{kandidat}{kandidat}},% FIXME: unsure
   resreport        = {{tutkimusraportti}{tutkimusraportti}},
   techreport       = {{tekninen raportti}{tekninen raportti}},
   software         = {{ohjelmisto}{ohjelmisto}},
-  datacd           = {{data-CD}{data-CD}},   % Is {CD-ROM}{CD-ROM}} better?
+  datacd           = {{data-CD}{data-CD}},% Is {CD-ROM}{CD-ROM}} better?
   audiocd          = {{\"a\"ani-CD}{\"a\"ani-CD}},
   version          = {{versio}{versio}},
   url              = {{url}{url}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{viitattu}{viitattu}},
-% inpreparation    = {{}{}}, % FIXME: missing
-% submitted        = {{}{}}, % FIXME: missing
-% forthcoming      = {{}{}}, % FIXME: missing
-% inpress          = {{}{}}, % FIXME: missing
-% prepublished     = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}},% FIXME: missing
+% submitted        = {{}{}},% FIXME: missing
+% forthcoming      = {{}{}},% FIXME: missing
+% inpress          = {{}{}},% FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   citedas          = {{jatkossa}{jatkossa}}, 
-% thiscite         = {{}{}}, % FIXME: missing
+% thiscite         = {{}{}},% FIXME: missing
   seenote          = {{katso viite}{katso viite}},
   quotedin         = {{lainattu teoksessa}{lainattu teoksessa}},
-  idem             = {{idem}{id\adddot}},  % It its not necessary to translate Latin phrases.
+  idem             = {{idem}{id\adddot}},% It its not necessary to translate Latin phrases.
   idemsf           = {{idem}{id\adddot}},
   idemsm           = {{idem}{id\adddot}},
   idemsn           = {{idem}{id\adddot}},
@@ -387,7 +388,7 @@
   idempn           = {{idem}{id\adddot}},
   idempp           = {{idem}{id\adddot}},
   ibidem           = {{ibidem}{ibid\adddot}},
-  opcit		   = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+  opcit            = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
   loccit           = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
   confer           = {{cf\adddot}{cf\adddot}},
   sequens          = {{sq\adddot}{sq\adddot}},
@@ -411,11 +412,13 @@
   december         = {{joulukuuta}{joulukuuta}},
   langamerican     = {{amerikanenglanti}{amerikanenglanti}},
   langbrazilian    = {{brasilianportugali}{brasilianportugali}},
-% langcroatian     = {{}{}}, % FIXME: missing
-  langdanish	   = {{tanska}{tanska}},
+% langcatalan      = {{}{}},% FIXME: missing
+% langcroatian     = {{}{}},% FIXME: missing
+% langczech        = {{}{}},% FIXME: missing
+  langdanish       = {{tanska}{tanska}},
   langdutch        = {{hollanti}{hollanti}},
   langenglish      = {{englanti}{englanti}},
-% langfinnish      = {{}{}}, % FIXME: missing
+% langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{ranska}{ranska}},
   langgerman       = {{saksa}{saksa}},
   langgreek        = {{kreikka}{kreikka}},
@@ -423,16 +426,18 @@
   langlatin        = {{latina}{latina}},
   langnorwegian    = {{norja}{norja}},
   langportuguese   = {{portugali}{portugali}},
-% langrussian      = {{}{}}, % FIXME: missing
+% langrussian      = {{}{}},% FIXME: missing
   langspanish      = {{espanja}{espanja}},
   langswedish      = {{ruotsi}{ruotsi}},
   fromamerican     = {{englannin kielest\"a}{englannin kielest\"a}},
   frombrazilian    = {{portugalin kielest\"a}{portugalin kielest\"a}},
-% fromcroatian     = {{}{}}, % FIXME: missing
+% fromcatalan      = {{}{}},% FIXME: missing
+% fromcroatian     = {{}{}},% FIXME: missing
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{tanskan kielest\"a}{tanskan kielest\"a}},
   fromdutch        = {{hollannin kielest\"a}{hollannin kielest\"a}},
   fromenglish      = {{englannin kielest\"a}{englannin kielest\"a}},
-% fromfinnish      = {{}{}}, % FIXME: missing
+% fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{ranskan kielest\"a}{ranskan kielest\"a}},
   fromgerman       = {{saksan kielest\"a}{saksan kielest\"a}},
   fromgreek        = {{kreikan kielest\"a}{kreikan kielest\"a}},
@@ -440,7 +445,7 @@
   fromlatin        = {{latinan kielest\"a}{latinan kielest\"a}},
   fromnorwegian    = {{norjan kielest\"a}{norjan kielest\"a}},
   fromportuguese   = {{portugalin kielest\"a}{portugalin kielest\"a}},
-% fromrussian      = {{}{}}, % FIXME: missing
+% fromrussian      = {{}{}},% FIXME: missing
   fromspanish      = {{espanjan kielest\"a}{espanjan kielest\"a}},
   fromswedish      = {{ruotsin kielest\"a}{ruotsin kielest\"a}},
   countryde        = {{Saksa}{DE}},
@@ -464,7 +469,7 @@
   file             = {{tiedosto}{tiedosto}},
   library          = {{kirjasto}{kirjasto}},
   abstract         = {{tiivistelm\"a}{tiivistelm\"a}},
-  annotation       = {{selitykset}{selitykset}},   % FIXME: unsure.
+  annotation       = {{selitykset}{selitykset}},% FIXME: unsure
 }
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index 84f54d93fe7..ce546a6db5a 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -26,7 +26,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -36,7 +36,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
   \providecommand*{\FDP@thinspace}{\addnbthinspace}% FDP@* -> frenchb.ldf (babel)
   \providecommand*{\FDP@colonspace}{\addnbspace}%
   \def\abx@semicolon{%
@@ -52,10 +52,12 @@
     \ifdim\lastkern>\z@\unkern\fi
     \FDP@thinspace\abx@puncthook{?}}%
   \savecommand\lbx@initnamehook
+  \savecommand\lbx@inittitlehook
   \savecommand\mkbibnamelast
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \let\lbx@initnamehook=\lbx@fr@smartof
+  \let\lbx@inittitlehook=\lbx@fr@smartof
   \protected\def\mkbibnamelast#1{%
     \textsc{\textnohyphenation{#1}}}%
   \def\mkbibordedition{\mkbibfemord}%
@@ -64,6 +66,7 @@
 
 \UndeclareBibliographyExtras{%
   \restorecommand\lbx@initnamehook
+  \restorecommand\lbx@inittitlehook
   \restorecommand\mkbibnamelast
   \restorecommand\mkbibordedition
   \restorecommand\mkbibordseries
@@ -334,8 +337,8 @@
   edition          = {{\'edition}{\'ed\adddot}},
   reprint          = {{r\'eimpression}{r\'eimpr\adddot}},
   reprintof        = {{r\'eimpression \smartof}{r\'eimpr\adddotspace\smartof}},
-  reprintas        = {{r\'eimpression sous le titre}{r\'eimpr\adddot sous le titre}},
-  reprintfrom      = {{r\'eimpression \`a partir \smartof}{r\'eimpr\adddot \`a part\adddotspace\smartof}},
+  reprintas        = {{r\'eimpression sous le titre}{r\'eimpr\adddotspace sous le titre}},
+  reprintfrom      = {{r\'eimpression \`a partir \smartof}{r\'eimpr\adddotspace \`a part\adddotspace\smartof}},
   translationof    = {{traduction \smartof}{trad\adddotspace\smartof}},
   translationas    = {{traduit sous le titre}{trad\adddotspace sous le titre}},
   translationfrom  = {{traduit \smartof}{trad\adddotspace\smartof}},
@@ -350,6 +353,7 @@
   columns          = {{colonnes}{col\adddot}},
   line             = {{ligne}{l\adddot}},
   lines            = {{lignes}{l\adddot}},
+  nodate           = {{pas\space de\space date}{{}p\adddot d\adddot}},
   verse            = {{vers}{v\adddot}},
   verses           = {{vers}{v\adddot}},
   section          = {{section}{\S}},
@@ -370,8 +374,8 @@
   datacd           = {{c\'ed\'erom}{c\'ed\'erom}},
   audiocd          = {{disque compact audio}{CD}},
   version          = {{version}{version}},
-  url              = {{url}{url}},
-%  url              = {{disponible \`a l'adresse}{disp\adddotspace \`a l'adr\adddot}}
+  url              = {{adresse}{adresse}},
+  urlfrom          = {{disponible \`a l'adresse}{disp\adddotspace \`a l'adr\adddot}},
   urlseen          = {{visit\'e le}{visit\'e le}},
   inpreparation    = {{en pr\'eparation}{en pr\'ep\adddot}},
   submitted        = {{soumis}{soumis}},
@@ -415,7 +419,9 @@
   december         = {{d\'ecembre}{d\'ec\adddot}},
   langamerican     = {{am\'ericain}{am\'ericain}},
   langbrazilian    = {{br\'esilien}{br\'esilien}},
+% langcatalan      = {{}{}},% FIXME: missing
   langcroatian     = {{croate}{croate}},
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{danois}{danois}},
   langdutch        = {{n\'eerlandais}{n\'eerlandais}},
   langenglish      = {{anglais}{anglais}},
@@ -432,7 +438,9 @@
   langswedish      = {{su\'edois}{su\'edois}},
   fromamerican     = {{de l'am\'ericain}{de l'am\'ericain}},
   frombrazilian    = {{du br\'esilien}{du br\'esilien}},
+% fromcatalan      = {{}{}},% FIXME: missing
   fromcroatian     = {{du croate}{du croate}},
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{du danois}{du danois}},
   fromdutch        = {{du n\'eerlandais}{du n\'eerlandais}},
   fromenglish      = {{de l'anglais}{de l'anglais}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
index 41b9039739a..6e159da04ec 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/german.lbx
@@ -22,7 +22,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -34,7 +34,7 @@
        \iffieldundef{#1}
 	 {}
 	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
   \savecommand\lbx@lfromlang
   \savecommand\lbx@sfromlang
   \def\lbx@lfromlang{%
@@ -222,7 +222,7 @@
   bycompiler       = {{kompiliert von}{komp\adddotspace von}},
   byredactor       = {{bearbeitet von}{bearb\adddotspace von}},
   byreviser        = {{\"uberarbeitet von}{\"uberarb\adddotspace von}},
-% byreviewer       = {{}{}}, % FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
   byfounder        = {{begr\"undet von}{begr\adddotspace von}},
   bycontinuator    = {{fortgef\"urt von}{fortgef\adddotspace von}},
   bycollaborator   = {{unter Mitarbeit von}{unter Mitarb\adddotspace von}},
@@ -307,7 +307,7 @@
   andmore          = {{u.\,a\adddot}{u.\,a\adddot}},
   volume           = {{Band}{Bd\adddot}},
   volumes          = {{B\"ande}{Bde\adddot}},
-  involumes        = {{in}{in}}, % FIXME: unsure
+  involumes        = {{in}{in}},% FIXME: unsure
   jourvol          = {{Jahrgang}{Jg\adddot}},
   jourser          = {{Serie}{Ser\adddot}},
   book             = {{Buch}{Buch}},
@@ -319,21 +319,22 @@
   reprint          = {{Nachdruck}{Nachdr\adddot}},
   reprintof        = {{Nachdruck von}{Nachdr\adddotspace von}},
   reprintas        = {{Nachdruck unter dem Titel}{Nachdr\adddotspace unter dem Titel}},
-% reprintfrom      = {{}{}}, % FIXME: missing
-% translationof    = {{}{}}, % FIXME: missing
-% translationas    = {{}{}}, % FIXME: missing
-% translationfrom  = {{}{}}, % FIXME: missing
-% reviewof         = {{}{}}, % FIXME: missing
-% origpubas        = {{}{}}, % FIXME: missing
-% origpubin        = {{}{}}, % FIXME: missing
-% astitle          = {{}{}}, % FIXME: missing
-% bypublisher      = {{}{}}, % FIXME: missing
+% reprintfrom      = {{}{}},% FIXME: missing
+% translationof    = {{}{}},% FIXME: missing
+% translationas    = {{}{}},% FIXME: missing
+% translationfrom  = {{}{}},% FIXME: missing
+% reviewof         = {{}{}},% FIXME: missing
+% origpubas        = {{}{}},% FIXME: missing
+% origpubin        = {{}{}},% FIXME: missing
+% astitle          = {{}{}},% FIXME: missing
+% bypublisher      = {{}{}},% FIXME: missing
   page             = {{Seite}{S\adddot}},
   pages            = {{Seiten}{S\adddot}},
   column           = {{Spalte}{Sp\adddot}},
   columns          = {{Spalten}{Sp\adddot}},
   line             = {{Zeile}{Z\adddot}},
   lines            = {{Zeilen}{Z\adddot}},
+  nodate           = {{ohne\space Datum}{{}o\adddot D\adddot}},
   verse            = {{Vers}{V\adddot}},
   verses           = {{Verse}{V\adddot}},
   section          = {{Paragraph}{\S}},
@@ -347,15 +348,15 @@
   chapter          = {{Kapitel}{Kap\adddot}},
   mathesis         = {{Magisterarbeit}{Magisterarb\adddot}},
   phdthesis        = {{Dissertation}{Diss\adddot}},
-% candthesis       = {{}{}}, % FIXME: missing
+% candthesis       = {{}{}},% FIXME: missing
   resreport        = {{Forschungsbericht}{Forschungsber\adddot}},
   techreport       = {{Technischer Bericht}{Techn\adddotspace Ber\adddot}},
   software         = {{Com\-pu\-ter-Soft\-ware}{Soft\-ware}},
   datacd           = {{CD-ROM}{CD-ROM}},
   audiocd          = {{Audio-CD}{Audio-CD}},
   version          = {{Version}{Version}},
-  url              = {{url}{url}},
-%  url              = {{Adresse}{Adresse}},
+  url              = {{Adresse}{Adresse}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{besucht am}{besucht am}},
   inpreparation    = {{in Vorbereitung}{in Vorbereitung}},
   submitted        = {{eingereicht}{eingereicht}},
@@ -399,7 +400,9 @@
   december         = {{Dezember}{Dez\adddot}},
   langamerican     = {{Amerikanisch}{Amerikanisch}},
   langbrazilian    = {{Brasilianisch}{Brasilianisch}},
+% langcatalan      = {{}{}},% FIXME: missing
   langcroatian     = {{Kroatisch}{Kroatisch}},
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{D\"anisch}{D\"anisch}},
   langdutch        = {{Niederl\"andisch}{Niederl\"andisch}},
   langenglish      = {{Englisch}{Englisch}},
@@ -416,7 +419,9 @@
   langswedish      = {{Schwedisch}{Schwedisch}},
   fromamerican     = {{aus dem Amerikanischen}{aus dem Amerikanischen}},
   frombrazilian    = {{aus dem Brasilianischen}{aus dem Brasilianischen}},
+% fromcatalan      = {{}{}},% FIXME: missing
   fromcroatian     = {{aus dem Kroatischen}{aus dem Kroatischen}},
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{aus dem D\"anischen}{aus dem D\"anischen}},
   fromdutch        = {{aus dem Niederl\"andischen}{aus dem Niederl\"andischen}},
   fromenglish      = {{aus dem Englischen}{aus dem Englischen}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
index 8c8d077db44..0e0f91f8bbc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/greek.lbx
@@ -2,13 +2,13 @@
 [\abx@lbxid]
 
 % Translator's notes:
-%
+% 
 % The translations should be OK but should also be tested against
 % enough real data. Especially:
-%
+% 
 % a) Abbreviations should be checked
 % b) Issues concerning grammatical gender have not been studied
-
+%
 % This file requires UTF-8 support!
 
 \lbx@ifutfinput
@@ -42,7 +42,7 @@
   \DeclareCapitalPunctuation{.!;?}%
   \let\finalandcomma=\empty
   \protected\def\bibrangedash{%
-    \textemdash\penalty\hyphenpenalty}% breakable dash
+    \textendash\penalty\hyphenpenalty}% breakable dash
   \protected\def\bibdatedash{\bibrangedash}%
   \let\finalandcomma=\empty
   \protected\def\mkbibordinal{\mkbibmascord}%
@@ -60,7 +60,9 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}
+      {\bibstring{\thefield{#1}}}
+      {\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -70,7 +72,9 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}
+      {\bibstring{\thefield{#1}}}
+      {\mkdatezeros{\thefield{#1}}}}%
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibfemord}%
@@ -93,8 +97,8 @@
   compilers        = {{συντάκτες}{συντάκτες}},
   redactor         = {{συντάκτης}{συντάκτης}},
   redactors        = {{συντάκτες}{συντάκτες}},
-% reviser          = {{}{}}, % FIXME: missing
-% revisers         = {{}{}}, % FIXME: missing
+% reviser          = {{}{}},% FIXME: missing
+% revisers         = {{}{}},% FIXME: missing
   founder          = {{αρχικός δημιουργός}{αρχικός δημιουργός}},
   founders         = {{αρχικοί δημιουργοί}{αρχικοί δημιουργοί}},
   continuator      = {{συνεχιστής}{συνεχιστής}},
@@ -103,8 +107,8 @@
   collaborators    = {{συνεργάτες}{συνεργάτες}},
   translator       = {{μεταφραστής}{μεταφραστής}},
   translators      = {{μεταφραστές}{μεταφραστές}},
-  commentator      = {{υπομνηματιστής}{υπομνηματιστής}}, % FIXME: unsure!
-  commentators     = {{υπομνηματιστές}{υπομνηματιστές}}, % FIXME: unsure!
+  commentator      = {{υπομνηματιστής}{υπομνηματιστής}},% FIXME: unsure
+  commentators     = {{υπομνηματιστές}{υπομνηματιστές}},% FIXME: unsure
   annotator        = {{υπομνηματιστής}{υπομνηματιστής}},
   annotators       = {{υπομνηματιστές}{υπομνηματιστές}},
   commentary       = {{ερμηνευτικές σημειώσεις}{ερμηνευτικές σημειώσεις}},
@@ -252,8 +256,8 @@
   byeditor         = {{επιμέλεια υπό}{επιμέλεια υπό}},
   bycompiler       = {{σύνταξη υπό}{σύνταξη υπό}}
   byredactor       = {{σύνταξη υπό}{σύναταξη υπό}},
-% byreviser        = {{}{}}, % FIXME: missing
-% byreviewer       = {{}{}}, % FIXME: missing
+% byreviser        = {{}{}},% FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
   byfounder        = {{αρχική δημιουργία από}{αρχική δημιουργία από}}
   bycontinuator    = {{συνέχεια από}{συνέχεια από}}
   bycollaborator   = {{συνεργασία από}{συνεργασία από}}
@@ -265,72 +269,73 @@
   withintroduction = {{εισαγωγή υπό}{εισαγωγή υπό}},
   withforeword     = {{πρόλογος υπό}{πρόλογος υπό}},
   withafterword    = {{επίλογος υπό}{επίλογος υπό}},
-% byeditortr       = {{}{}}, % FIXME: missing
-% byeditorco       = {{}{}}, % FIXME: missing
-% byeditoran       = {{}{}}, % FIXME: missing
-% byeditorin       = {{}{}}, % FIXME: missing
-% byeditorfo       = {{}{}}, % FIXME: missing
-% byeditoraf       = {{}{}}, % FIXME: missing
-% byeditortrco     = {{}{}}, % FIXME: missing
-% byeditortran     = {{}{}}, % FIXME: missing
-% byeditortrin     = {{}{}}, % FIXME: missing
-% byeditortrfo     = {{}{}}, % FIXME: missing
-% byeditortraf     = {{}{}}, % FIXME: missing
-% byeditorcoin     = {{}{}}, % FIXME: missing
-% byeditorcofo     = {{}{}}, % FIXME: missing
-% byeditorcoaf     = {{}{}}, % FIXME: missing
-% byeditoranin     = {{}{}}, % FIXME: missing
-% byeditoranfo     = {{}{}}, % FIXME: missing
-% byeditoranaf     = {{}{}}, % FIXME: missing
-% byeditortrcoin   = {{}{}}, % FIXME: missing
-% byeditortrcofo   = {{}{}}, % FIXME: missing
-% byeditortrcoaf   = {{}{}}, % FIXME: missing
-% byeditortranin   = {{}{}}, % FIXME: missing
-% byeditortranfo   = {{}{}}, % FIXME: missing
-% byeditortranaf   = {{}{}}, % FIXME: missing
-% bytranslatorco   = {{}{}}, % FIXME: missing
-% bytranslatoran   = {{}{}}, % FIXME: missing
-% bytranslatorin   = {{}{}}, % FIXME: missing
-% bytranslatorfo   = {{}{}}, % FIXME: missing
-% bytranslatoraf   = {{}{}}, % FIXME: missing
-% bytranslatorcoin = {{}{}}, % FIXME: missing
-% bytranslatorcofo = {{}{}}, % FIXME: missing
-% bytranslatorcoaf = {{}{}}, % FIXME: missing
-% bytranslatoranin = {{}{}}, % FIXME: missing
-% bytranslatoranfo = {{}{}}, % FIXME: missing
-% bytranslatoranaf = {{}{}}, % FIXME: missing
+% byeditortr       = {{}{}},% FIXME: missing
+% byeditorco       = {{}{}},% FIXME: missing
+% byeditoran       = {{}{}},% FIXME: missing
+% byeditorin       = {{}{}},% FIXME: missing
+% byeditorfo       = {{}{}},% FIXME: missing
+% byeditoraf       = {{}{}},% FIXME: missing
+% byeditortrco     = {{}{}},% FIXME: missing
+% byeditortran     = {{}{}},% FIXME: missing
+% byeditortrin     = {{}{}},% FIXME: missing
+% byeditortrfo     = {{}{}},% FIXME: missing
+% byeditortraf     = {{}{}},% FIXME: missing
+% byeditorcoin     = {{}{}},% FIXME: missing
+% byeditorcofo     = {{}{}},% FIXME: missing
+% byeditorcoaf     = {{}{}},% FIXME: missing
+% byeditoranin     = {{}{}},% FIXME: missing
+% byeditoranfo     = {{}{}},% FIXME: missing
+% byeditoranaf     = {{}{}},% FIXME: missing
+% byeditortrcoin   = {{}{}},% FIXME: missing
+% byeditortrcofo   = {{}{}},% FIXME: missing
+% byeditortrcoaf   = {{}{}},% FIXME: missing
+% byeditortranin   = {{}{}},% FIXME: missing
+% byeditortranfo   = {{}{}},% FIXME: missing
+% byeditortranaf   = {{}{}},% FIXME: missing
+% bytranslatorco   = {{}{}},% FIXME: missing
+% bytranslatoran   = {{}{}},% FIXME: missing
+% bytranslatorin   = {{}{}},% FIXME: missing
+% bytranslatorfo   = {{}{}},% FIXME: missing
+% bytranslatoraf   = {{}{}},% FIXME: missing
+% bytranslatorcoin = {{}{}},% FIXME: missing
+% bytranslatorcofo = {{}{}},% FIXME: missing
+% bytranslatorcoaf = {{}{}},% FIXME: missing
+% bytranslatoranin = {{}{}},% FIXME: missing
+% bytranslatoranfo = {{}{}},% FIXME: missing
+% bytranslatoranaf = {{}{}},% FIXME: missing
   and              = {{και}{και}},
   andothers        = {{κ.ά\adddot}{κ.ά\adddot}},
   andmore          = {{κ.ά\adddot}{κ.ά\adddot}},
   volume           = {{τόμος}{τόμ\adddot}},
   volumes          = {{τόμοι}{τόμοι}},
-  involumes        = {{σε}{σε}}, % FIXME: check
+  involumes        = {{σε}{σε}},% FIXME: check
   jourvol          = {{τόμος}{τόμ\adddot}},
   jourser          = {{σειρά}{σειρά}},
-% book             = {{}{}}, % FIXME: missing
-% part             = {{}{}}, % FIXME: missing
-% issue            = {{}{}}, % FIXME: missing
+% book             = {{}{}},% FIXME: missing
+% part             = {{}{}},% FIXME: missing
+% issue            = {{}{}},% FIXME: missing
   newseries        = {{νέα σειρά}{νέα σειρά}},
   oldseries        = {{παλαιά σειρά}{παλαιά σειρά}},
   edition          = {{έκδοση}{έκδοση}},
   reprint          = {{ανατύπωση}{ανατύπωση}},
   reprintof        = {{ανατύπωση του}{ανατύπωση του}},
   reprintas        = {{ανατύπωση ως}{ανατύπωση ως}},
-% reprintfrom      = {{}{}}, % FIXME: missing
-% translationof    = {{}{}}, % FIXME: missing
-% translationas    = {{}{}}, % FIXME: missing
-% translationfrom  = {{}{}}, % FIXME: missing
-% reviewof         = {{}{}}, % FIXME: missing
-% origpubas        = {{}{}}, % FIXME: missing
-% origpubin        = {{}{}}, % FIXME: missing
-% astitle          = {{}{}}, % FIXME: missing
-  bypublisher      = {{υπό}{υπό}}, % FIXME: check
+% reprintfrom      = {{}{}},% FIXME: missing
+% translationof    = {{}{}},% FIXME: missing
+% translationas    = {{}{}},% FIXME: missing
+% translationfrom  = {{}{}},% FIXME: missing
+% reviewof         = {{}{}},% FIXME: missing
+% origpubas        = {{}{}},% FIXME: missing
+% origpubin        = {{}{}},% FIXME: missing
+% astitle          = {{}{}},% FIXME: missing
+  bypublisher      = {{υπό}{υπό}},% FIXME: check
   page             = {{σελίδα}{σ\adddot}},
   pages            = {{σελίδες}{σσ\adddot}},
   column           = {{στήλη}{στ\adddot}},
   columns          = {{στήλες}{στήλες}},
   line             = {{γραμμή}{γραμ\adddot}},
   lines            = {{γραμμές}{γραμμές}},
+  nodate           = {{χωρίς\space ημερομηνία}{{}χ\adddot η\adddot}},
   verse            = {{στίχος}{στίχ\adddot}},
   verses           = {{στίχοι}{στίχοι}},
   section          = {{ενότητα}{εντότητα}},
@@ -346,7 +351,7 @@
                       {Μεταπτ/κή διπλ\adddot\ εργασ\adddot}},
   phdthesis        = {{Διδακτορική διατριβή}
                       {Διδακτορική διατρ\adddot}},
-% candthesis       = {{}{}}, % FIXME: missing
+% candthesis       = {{}{}},% FIXME: missing
   resreport        = {{αδημοσίευτη ερευνητική εργασία}
                       {αδημοσίευτη ερευνητική εργασία}},
   techreport       = {{αδημοσίευτη ερευνητική εργασία}
@@ -355,14 +360,14 @@
   datacd           = {{CD-ROM}{CD-ROM}},
   audiocd          = {{ακουστικό CD}{ακουστικό CD}},
   version          = {{έκδοση}{έκδ\adddot}},
-  url              = {{url}{url}},
-%  url              = {{διεύθυνση}{διεύθν\adddot}},
+  url              = {{διεύθυνση}{διεύθν\adddot}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{επίσκεψη}{επίσκεψη}},
-% inpreparation    = {{}{}}, % FIXME: missing
-  submitted        = {{υποβληθέν}{υποβληθέν}}, % FIXME: gender?
-% forthcoming      = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}},% FIXME: missing
+  submitted        = {{υποβληθέν}{υποβληθέν}},% FIXME: gender?
+% forthcoming      = {{}{}},% FIXME: missing
   inpress          = {{υπό έκδοση}{υπό έκδ.}},
-% prepublished     = {{}{}}, % FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   citedas          = {{εφεξής θα αναφέρεται ως}{εφεξής θα αναφέρεται ως}},
   thiscite         = {{αυτή η αναφορά}{αυτή η αναφορά}},
   seenote          = {{βλέπε σημείωση}{βλ\adddot\ σημ\adddot}},
@@ -377,13 +382,13 @@
   % pm=plural masculine
   % pn=plural neuter
   % pp=plural (group of mixed gender)
-  idemsf           = {{του ίδιου}{του ίδιου}}, % FIXME: gender?
-  idemsm           = {{του ίδιου}{του ίδιου}}, % FIXME: gender?
-  idemsn           = {{του ίδιου}{του ίδιου}}, % FIXME: gender?
-  idempf           = {{του ίδιου}{του ίδιου}}, % FIXME: gender?
-  idempm           = {{του ίδιου}{του ίδιου}}, % FIXME: gender?
-  idempn           = {{του ίδιου}{του ίδιου}}, % FIXME: gender?
-  idempp           = {{του ίδιου}{του ίδιου}}, % FIXME: gender?
+  idemsf           = {{του ίδιου}{του ίδιου}},% FIXME: gender?
+  idemsm           = {{του ίδιου}{του ίδιου}},% FIXME: gender?
+  idemsn           = {{του ίδιου}{του ίδιου}},% FIXME: gender?
+  idempf           = {{του ίδιου}{του ίδιου}},% FIXME: gender?
+  idempm           = {{του ίδιου}{του ίδιου}},% FIXME: gender?
+  idempn           = {{του ίδιου}{του ίδιου}},% FIXME: gender?
+  idempp           = {{του ίδιου}{του ίδιου}},% FIXME: gender?
   ibidem           = {{στο ίδιο}{στο ίδιο}},
   opcit            = {{όπου παραπάνω}{ό.π\adddot}},
   loccit           = {{όπου παραπάνω}{ό.π\adddot}},
@@ -393,8 +398,8 @@
   passim           = {{σποράδην}{σποράδην}},
   see              = {{βλέπε}{βλ\adddot}},
   seealso          = {{βλέπε επίσης}{βλ\adddot\ επίσης}},
-% backrefpage      = {{}{}}, % FIXME: missing
-% backrefpages     = {{}{}}, % FIXME: missing
+% backrefpage      = {{}{}},% FIXME: missing
+% backrefpages     = {{}{}},% FIXME: missing
   january          = {{Ιανουάριος}{Ιαν\adddot}},
   february         = {{Φεβρουάριος}{Φεβ\adddot}},
   march            = {{Μάρτιος}{Μαρ\adddot}},
@@ -421,11 +426,13 @@
   datedecember     = {{Δεκεμβρίου}{Δεκ\adddot}},
   langamerican     = {{Αγγλικά}{Αγγλικά}}
   langbrazilian    = {{Βραζιλιάνικα}{Βραζιλιάνικα}},
-% langcroatian     = {{}{}}, % FIXME: missing
+% langcatalan      = {{}{}},% FIXME: missing
+% langcroatian     = {{}{}},% FIXME: missing
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{Δανέζικα}{Δανέζικα}},
   langdutch        = {{Ολλανδικά}{Ολλανδικά}},
   langenglish      = {{Αγγλικά}{Αγγλικά}},
-% langfinnish      = {{}{}}, % FIXME: missing
+% langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{Γαλλικά}{Γαλλικά}},
   langgerman       = {{Γερμανικά}{Γερμανικά}},
   langgreek        = {{Ελληνικά}{Ελληνικά}},
@@ -433,16 +440,18 @@
   langlatin        = {{Λατινικά}{Λατινικά}},
   langnorwegian    = {{Νορβηγικά}{Νορβηγικά}},
   langportuguese   = {{Πορτογαλικά}{Πορτογαλικά}},
-% langrussian      = {{}{}}, % FIXME: missing
+% langrussian      = {{}{}},% FIXME: missing
   langspanish      = {{Ισπανικά}{Ισπανικά}},
   langswedish      = {{Σουηδικά}{Σουηδικά}},
   fromamerican     = {{από τα Αγγλικά}{από τα Αγγλικά}},
   frombrazilian    = {{από τα Βραζιλιάνικα}{από τα Βραζιλιάνικα}},
-% fromcroatian     = {{}{}}, % FIXME: missing
+% fromcatalan      = {{}{}},% FIXME: missing
+% fromcroatian     = {{}{}},% FIXME: missing
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{από τα Δανέζικα}{από τα Δανέζικα}},
   fromdutch        = {{από τα Ολλανδικά}{από τα Ολλανδικά}},
   fromenglish      = {{από τα Αγγλικά}{από τα Αγγλικά}},
-% fromfinnish      = {{}{}}, % FIXME: missing
+% fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{από τα Γαλλικά}{από τα Γαλλικά}},
   fromgerman       = {{από τα Γερμανικά}{από τα Γερμανικά}},
   fromgreek        = {{από τα Ελληνικά}{από τα Ελληνικά}},
@@ -450,7 +459,7 @@
   fromlatin        = {{από τα Λατινικά}{από τα Λατινικά}},
   fromnorwegian    = {{από τα Νορβηγικά}{από τα Νορβηγικά}},
   fromportuguese   = {{από τα Πορτογαλικά}{από τα Πορτογαλικά}},
-% fromrussian      = {{}{}}, % FIXME: missing
+% fromrussian      = {{}{}},% FIXME: missing
   fromspanish      = {{από τα Ισπανικά}{από τα Ισπανικά}},
   fromswedish      = {{από τα Σουηδικά}{από τα Σουηδικά}},
   countryde        = {{Γερμανία}{DE}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
index 073bee39d02..671347cba54 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
@@ -1,14 +1,11 @@
-% icelandic.lbx, originally based on danish.lbx.
-% Baldur Kristinsson, June 2012.
+\ProvidesFile{icelandic.lbx}
+[\abx@lbxid]
 
-% STATUS OF THIS FILE
+% Translator's notes:
 % - Translated by a native speaker (Baldur Kristinsson).
 % - Many bibstrings remain untranslated.
 % - Needs fine tuning, since grammatical peculiarities of Icelandic
 %   make straight translations difficult.
-% - Last worked on: 2012-06-15
-
-\ProvidesFile{icelandic.lbx}
 
 \DeclareRedundantLanguages{icelandic}{icelandic}
 
@@ -31,7 +28,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -40,7 +37,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\adddot}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
   % Later, it would be more elegant to reverse the order of the name and the localized
   % bibstrings, in order to avoid problems with regard to declension. This has to be done
   % in a coordinated manner, however, and a lot of macros would have to be redefined
@@ -74,13 +71,12 @@
   redactors        = {{ritstj\adddot}{ritstj\adddot}},
   reviser          = {{endursk\adddot}{endursk\adddot}},
   revisers         = {{endursk\adddot}{endursk\adddot}},
-% founder          = {{}{}}, % FIXME: missing
-% founders         = {{}{}}, % FIXME: missing
-% continuator      = {{}{}}, % FIXME: missing
-% continuators     = {{}{}}, % FIXME: missing
-% collaborator     = {{}{}}, % FIXME: missing
-% collaborators    = {{}{}}, % FIXME: missing
-%
+% founder          = {{}{}},% FIXME: missing
+% founders         = {{}{}},% FIXME: missing
+% continuator      = {{}{}},% FIXME: missing
+% continuators     = {{}{}},% FIXME: missing
+% collaborator     = {{}{}},% FIXME: missing
+% collaborators    = {{}{}},% FIXME: missing
 % FIXME: A great deal of conflation here, as well as simplifications in order
 % to avoid problems associated with declension:
   translator       = {{\'y\adddot}{\'y\adddot}},
@@ -94,84 +90,83 @@
   introduction     = {{inngangur}{inng\adddot}},
   foreword         = {{form\'ali:}{form\'ali:}},
   afterword        = {{eftirm\'ali:}{eftirm\'ali:}},
-% 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         = {{}{}},% 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
   byauthor         = {{h\"of.:}{h\"of.:}},
   byeditor         = {{gefi \'ut af}{gefi \'ut af}},
   bycompiler       = {{teki saman af}{teki saman af}},
   byredactor       = {{endurskoa af}{endurskoa af}},
-% byreviser        = {{}{}}, % FIXME: missing
-% byreviewer       = {{}{}}, % FIXME: missing
-% byfounder        = {{}{}}, % FIXME: missing
-% bycontinuator    = {{}{}}, % FIXME: missing
-% bycollaborator   = {{}{}}, % FIXME: missing
-%
+% byreviser        = {{}{}},% FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
+% byfounder        = {{}{}},% FIXME: missing
+% bycontinuator    = {{}{}},% FIXME: missing
+% bycollaborator   = {{}{}},% FIXME: missing
 % FIXME: For most of the keys below, the better way would be to postpend
 % rather than prepend the localized bibstrings. That would however require a
 % redefinition of many macros. Later, perhaps...
@@ -256,7 +251,7 @@
   andmore          = {{o\adddot fl\adddot}{o\adddot fl\adddot}},
   volume           = {{bindi}{bindi}},
   volumes          = {{bindi}{bindi}}, 
-% involumes        = {{}{}}, % FIXME: missing
+% involumes        = {{}{}},% FIXME: missing
   jourvol          = {{\'argangur}{\'arg\adddot}},
   jourser          = {{r\"o}{r\"o}},
   book             = {{b\'ok}{b\'ok}},
@@ -268,20 +263,21 @@
   reprint          = {{endurprentun}{endurprentun}},
   reprintof        = {{endurprentun \'a}{endurprentun \'a}},
   reprintas        = {{endurprenta sem}{endurprenta sem}},
-% reprintfrom      = {{}{}}, % FIXME: missing
-% translationof    = {{}{}}, % FIXME: missing
-% translationas    = {{}{}}, % FIXME: missing
-% translationfrom  = {{}{}}, % FIXME: missing
-% reviewof         = {{}{}}, % FIXME: missing
-% origpubas        = {{}{}}, % FIXME: missing
-% origpubin        = {{}{}}, % FIXME: missing
-% astitle          = {{}{}}, % FIXME: missing
+% reprintfrom      = {{}{}},% FIXME: missing
+% translationof    = {{}{}},% FIXME: missing
+% translationas    = {{}{}},% FIXME: missing
+% translationfrom  = {{}{}},% FIXME: missing
+% reviewof         = {{}{}},% FIXME: missing
+% origpubas        = {{}{}},% FIXME: missing
+% origpubin        = {{}{}},% FIXME: missing
+% astitle          = {{}{}},% FIXME: missing
   page             = {{bls\adddot}{bls\adddot}},
   pages            = {{bls\adddot}{bls\adddot}},
   column           = {{d\'alkur}{dlk\adddot}},
   columns          = {{d\'alkar}{dlk\adddot}},
   line             = {{l\'{\i}na}{l\adddot}},
   lines            = {{l\'{\i}nur}{l\adddot}},
+  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   verse            = {{erindi}{er\adddot}},
   verses           = {{erindi}{er\adddot}},
   section          = {{grein}{\S}},
@@ -295,21 +291,21 @@
   chapter          = {{kafli}{k\adddot}},
   mathesis         = {{meistarapr\'ofsritger}{meistararitg\adddot}},
   phdthesis        = {{doktorsritger}{doktorsritg\adddot}},
-% candthesis       = {{}{}}, % FIXME: missing
+% candthesis       = {{}{}},% FIXME: missing
   resreport        = {{ranns\'oknarsk\'yrsla}{ranns\'oknarsk\'yrsla}},
   techreport       = {{t\ae{}knileg sk\'yrsla}{t\ae{}knileg sk\'yrsla}},
   software         = {{hugb\'unaur}{hugb\'unaur}}, 
   datacd           = {{gagnadiskur}{gagnadiskur}}, 
   audiocd          = {{hlj\'odiskur}{hlj\'odiskur}},
   version          = {{\'utg\'afa}{\'utg\adddot}},
-  url              = {{url}{url}},
-%  url              = {{vefsl\'o}{vefsl\'o}},
+  url              = {{vefsl\'o}{vefsl\'o}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{skoa}{skoa}},
   inpreparation    = {{\'{\i} vinnslu}{\'{\i} vinnslu}},
   submitted        = {{afhent til birtingar}{afhent til birtingar}},
   forthcoming      = {{mun birtast}{mun birtast}},
   inpress          = {{\'{\i} prentun}{\'{\i} prentun}},
-% prepublished     = {{}{}}, % FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   citedas          = {{h\'er eftir skammstafa}{h\'er eftir skst\adddot}},
   seenote          = {{sj\'a athugasemd}{sj\'a aths\adddot}},
   quotedin         = {{tilvitnun samkv\ae{}mt}{tilvitnun skv\adddot}},
@@ -345,39 +341,43 @@
   november         = {{n\'ovember}{n\'ov\adddot}},
   december         = {{desember}{des\adddot}},
   langamerican     = {{bandar\'{\i}ska}{bandar\'{\i}ska}},
-% langbrazilian    = {{}{}}, % FIXME: missing
-% langcroatian     = {{}{}}, % FIXME: missing
-% langdanish       = {{}{}}, % FIXME: missing
-% langdutch        = {{}{}}, % FIXME: missing
+% langbrazilian    = {{}{}},% FIXME: missing
+% langcatalan      = {{}{}},% FIXME: missing
+% langcroatian     = {{}{}},% FIXME: missing
+% langczech        = {{}{}},% FIXME: missing
+% langdanish       = {{}{}},% FIXME: missing
+% langdutch        = {{}{}},% FIXME: missing
   langenglish      = {{enska}{enska}},
-% langfinnish      = {{}{}}, % FIXME: missing
+% langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{franska}{franska}},
   langgerman       = {{\'yska}{\'yska}},
   langgreek        = {{gr\'{\i}ska}{gr\'{\i}ska}},
   langitalian      = {{\'{\i}talska}{\'{\i}talska}},
   langlatin        = {{lat\'{\i}na}{lat\'{\i}na}},
   langnorwegian    = {{norska}{norska}},
-% langportuguese   = {{}{}}, % FIXME: missing
-% langrussian      = {{}{}}, % FIXME: missing
+% langportuguese   = {{}{}},% FIXME: missing
+% langrussian      = {{}{}},% FIXME: missing
   langspanish      = {{sp\ae{}nska}{sp\ae{}nska}},
-% langswedish      = {{}{}}, % FIXME: missing
+% langswedish      = {{}{}},% FIXME: missing
   fromamerican     = {{\'ur bandar\'{\i}sku}{\'ur bandar\'{\i}sku}},
-% frombrazilian    = {{}{}}, % FIXME: missing
-% fromcroatian     = {{}{}}, % FIXME: missing
-% fromdanish       = {{}{}}, % FIXME: missing
-% fromdutch        = {{}{}}, % FIXME: missing
+% frombrazilian    = {{}{}},% FIXME: missing
+% fromcatalan      = {{}{}},% FIXME: missing
+% fromcroatian     = {{}{}},% FIXME: missing
+% fromczech        = {{}{}},% FIXME: missing
+% fromdanish       = {{}{}},% FIXME: missing
+% fromdutch        = {{}{}},% FIXME: missing
   fromenglish      = {{\'ur ensku}{\'ur ensku}},
-% fromfinnish      = {{}{}}, % FIXME: missing
+% fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{\'ur fr\"onsku}{\'ur fr\"onsku}},
   fromgerman       = {{\'ur \'ysku}{\'ur \'ysku}},
   fromgreek        = {{\'ur gr\'{\i}sku}{\'ur gr\'{\i}sku}},
   fromitalian      = {{\'ur \'{\i}t\"olsku}{\'ur \'{\i}t\"olsku}},
   fromlatin        = {{\'ur lat\'{\i}nu}{\'ur lat\'{\i}nu}},
   fromnorwegian    = {{\'ur norsku}{\'ur norsku}},
-% fromportuguese   = {{}{}}, % FIXME: missing
-% fromrussian      = {{}{}}, % FIXME: missing
+% fromportuguese   = {{}{}},% FIXME: missing
+% fromrussian      = {{}{}},% FIXME: missing
   fromspanish      = {{\'ur sp\ae{}nsku}{\'ur sp\ae{}nsku}},
-% fromswedish      = {{}{}}, % FIXME: missing
+% fromswedish      = {{}{}},% FIXME: missing
   countryde        = {{\'yskaland}{DE}},
   countryeu        = {{Evr\'opusambandi}{EU}},
   countryep        = {{Evr\'opusambandi}{EP}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
index b7f3fef5cb0..95e74f1b3b2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
@@ -1,9 +1,6 @@
 \ProvidesFile{italian.lbx}
 [\abx@lbxid]
 
-% Changes:
-% 2010-11-10 Update by Andrea Marchitelli
-
 \DeclareRedundantLanguages{italian}{italian}
 
 \DeclareBibliographyExtras{%
@@ -26,7 +23,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -36,7 +33,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibfemord}%
@@ -58,12 +55,12 @@
   compilers        = {{compilatori}{comp\adddot}}, 
   redactor         = {{redattore}{red\adddot}},
   redactors        = {{redattori}{red\adddot}},
-% reviser          = {{}{}}, % FIXME: missing
-% revisers         = {{}{}}, % FIXME: missing
-% founder          = {{}{}}, % FIXME: missing
-% founders         = {{}{}}, % FIXME: missing
-% continuator      = {{}{}}, % FIXME: missing
-% continuators     = {{}{}}, % FIXME: missing
+% reviser          = {{}{}},% FIXME: missing
+% revisers         = {{}{}},% FIXME: missing
+% founder          = {{}{}},% FIXME: missing
+% founders         = {{}{}},% FIXME: missing
+% continuator      = {{}{}},% FIXME: missing
+% continuators     = {{}{}},% FIXME: missing
   collaborator     = {{collaboratore}{con la collab\adddotspace di}},
   collaborators    = {{collaboratore}{con la collab\adddotspace di}},
   translator       = {{traduttore}{trad\adddot}},
@@ -77,83 +74,83 @@
   introduction     = {{introduzione}{introd\adddot}},
   foreword         = {{prefazione}{pref\adddot}},
   afterword        = {{postfazione}{postf\adddot}},
-% 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         = {{}{}},% 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
   byauthor         = {{di}{di}},
   byeditor         = {{a cura di}{a cura di}},
   bycompiler       = {{compilato da}{comp\adddotspace da}},
   byredactor       = {{redatto da}{red\adddotspace da}},
-% byreviser        = {{}{}}, % FIXME: missing
-% byreviewer       = {{}{}}, % FIXME: missing
-% byfounder        = {{}{}}, % FIXME: missing
-% bycontinuator    = {{}{}}, % FIXME: missing
-% bycollaborator   = {{}{}}, % FIXME: missing
+% byreviser        = {{}{}},% FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
+% byfounder        = {{}{}},% FIXME: missing
+% bycontinuator    = {{}{}},% FIXME: missing
+% bycollaborator   = {{}{}},% FIXME: missing
   bytranslator     = {{tradotto \lbx@lfromlang\ da}{trad\adddot\ \lbx@sfromlang\ da}},
   bycommentator    = {{commentato da}{comm\adddot\ da}},
   byannotator      = {{annotato da}{annot\adddot\ da}},
@@ -235,37 +232,38 @@
   andmore          = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
   volume           = {{volume}{vol\adddot}},
   volumes          = {{volumi}{voll\adddot}},
-  involumes        = {{in}{in}}, % FIXME: unsure
+  involumes        = {{in}{in}},% FIXME: unsure
   jourvol          = {{volume}{vol\adddot}},
   jourser          = {{serie}{ser\adddot}},
-% book             = {{}{}}, % FIXME: missing
-% part             = {{}{}}, % FIXME: missing
-% issue            = {{}{}}, % FIXME: missing
+% book             = {{}{}},% FIXME: missing
+% part             = {{}{}},% FIXME: missing
+% issue            = {{}{}},% FIXME: missing
   newseries        = {{nuova serie}{nuova ser\adddot}},
   oldseries        = {{vecchia serie}{vecchia ser\adddot}},
   edition          = {{edizione}{ed\adddot}},
   reprint          = {{ristampa}{rist\adddotspace}}, 
   reprintof        = {{ristampa di}{rist\adddotspace di}},
-% reprintas        = {{}{}}, % FIXME: missing
-% reprintfrom      = {{}{}}, % FIXME: missing
-% translationof    = {{}{}}, % FIXME: missing
-% translationas    = {{}{}}, % FIXME: missing
-% translationfrom  = {{}{}}, % FIXME: missing
-% reviewof         = {{}{}}, % FIXME: missing
-% origpubas        = {{}{}}, % FIXME: missing
-% origpubin        = {{}{}}, % FIXME: missing
-% astitle          = {{}{}}, % FIXME: missing
-% bypublisher      = {{}{}}, % FIXME: missing
+% reprintas        = {{}{}},% FIXME: missing
+% reprintfrom      = {{}{}},% FIXME: missing
+% translationof    = {{}{}},% FIXME: missing
+% translationas    = {{}{}},% FIXME: missing
+% translationfrom  = {{}{}},% FIXME: missing
+% reviewof         = {{}{}},% FIXME: missing
+% origpubas        = {{}{}},% FIXME: missing
+% origpubin        = {{}{}},% FIXME: missing
+% astitle          = {{}{}},% FIXME: missing
+% bypublisher      = {{}{}},% FIXME: missing
   page             = {{pagina}{p\adddot}},
   pages            = {{pagine}{pp\adddot}},
   column           = {{colonna}{col\adddot}},  
   columns          = {{colonne}{coll\adddot}},
   line             = {{riga}{r\adddot}},  
   lines            = {{righe}{rr\adddot}}, 
+  nodate           = {{senza\space data}{{}n\adddot d\adddot}},
   verse            = {{verso}{v\adddot}},
   verses           = {{versi}{vv\adddot}},
-% section          = {{}{\S}},   % FIXME: missing
-% sections         = {{}{\S\S}}, % FIXME: missing
+% section          = {{}{\S}},% FIXME: missing
+% sections         = {{}{\S\S}},% FIXME: missing
   paragraph        = {{paragrafo}{par\adddot}},
   paragraphs       = {{paragrafi}{par\adddot}},
   in               = {{in}{in}},
@@ -275,23 +273,23 @@
   chapter          = {{capitolo}{cap\adddot}},
   mathesis         = {{tesi di laurea magistrale}{tesi di laurea mag\adddot}},
   phdthesis        = {{tesi di dottorato}{tesi di dott\adddot}},
-% candthesis       = {{}{}}, % FIXME: missing
+% candthesis       = {{}{}},% FIXME: missing
   resreport        = {{rapporto di ricerca}{rapporto di ricerca}}, 
   techreport       = {{rapporto tecnico}{rapp\adddotspace tecn\adddot}},
-% software         = {{}{}}, % FIXME: missing
-% datacd           = {{}{}}, % FIXME: missing
-% audiocd          = {{}{}}, % FIXME: missing
+% software         = {{}{}},% FIXME: missing
+% datacd           = {{}{}},% FIXME: missing
+% audiocd          = {{}{}},% FIXME: missing
   version          = {{versione}{ver\adddot}}, 
-  url              = {{url}{url}},
-%  url              = {{indirizzo}{indirizzo}},
+  url              = {{indirizzo}{indirizzo}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{visitato il}{visitato il}},
-% inpreparation    = {{}{}}, % FIXME: missing
-% submitted        = {{}{}}, % FIXME: missing
-% forthcoming      = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}},% FIXME: missing
+% submitted        = {{}{}},% FIXME: missing
+% forthcoming      = {{}{}},% FIXME: missing
   inpress          = {{in stampa}{in stampa}}, 
-% prepublished     = {{}{}}, % FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   citedas          = {{citato come}{cit\adddotspace come}},
-% thiscite         = {{}{}}, % FIXME: missing
+% thiscite         = {{}{}},% FIXME: missing
   seenote          = {{vedi nota}{v\adddotspace nota}},
   quotedin         = {{citato da}{cit\adddotspace da}}, 
   idem             = {{idem}{idem}},
@@ -327,11 +325,13 @@
   december         = {{dicembre}{dic\adddot}},
   langamerican     = {{americano}{americano}},
   langbrazilian    = {{brasiliano}{brasiliano}},
-% langcroatian     = {{}{}}, % FIXME: missing
+% langcatalan      = {{}{}},% FIXME: missing
+% langcroatian     = {{}{}},% FIXME: missing
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{danese}{danese}},
   langdutch        = {{olandese}{olandese}},
   langenglish      = {{inglese}{inglese}},
-% langfinnish      = {{}{}}, % FIXME: missing
+% langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{francese}{francese}},
   langgerman       = {{tedesco}{tedesco}},
   langgreek        = {{greco}{greco}},
@@ -339,16 +339,18 @@
   langlatin        = {{latino}{latino}},
   langnorwegian    = {{norvegese}{norvegese}},
   langportuguese   = {{portoghese}{portoghese}},
-% langrussian      = {{}{}}, % FIXME: missing
+% langrussian      = {{}{}},% FIXME: missing
   langspanish      = {{spagnolo}{spagnolo}},
   langswedish      = {{svedese}{svedese}},
   fromamerican     = {{dall'americano}{dall'americano}},
   frombrazilian    = {{dall brasiliano}{dall brasiliano}},
-% fromcroatian     = {{}{}}, % FIXME: missing
+% fromcatalan      = {{}{}},% FIXME: missing
+% fromcroatian     = {{}{}},% FIXME: missing
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{dal danese}{dal danese}},
   fromdutch        = {{dall'olandese}{dall'olandese}},
   fromenglish      = {{dall'inglese}{dall'inglese}},
-% fromfinnish      = {{}{}}, % FIXME: missing
+% fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{dal francese}{dal francese}},
   fromgerman       = {{dal tedesco}{dal tedesco}},
   fromgreek        = {{dal greco}{dal greco}},
@@ -356,7 +358,7 @@
   fromlatin        = {{dal latino}{dal latino}},
   fromnorwegian    = {{dal norvegese}{dal norvegese}},
   fromportuguese   = {{dall portoghese}{dall portoghese}},
-% fromrussian      = {{}{}}, % FIXME: missing
+% fromrussian      = {{}{}},% FIXME: missing
   fromspanish      = {{dallo spagnolo}{dallo spagnolo}},
   fromswedish      = {{dal svedese}{dal svedese}},
   countryde        = {{Germania}{DE}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
index 31aefee0c3e..a00bf1cdfd5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/newzealand.lbx
@@ -12,7 +12,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
 }
 
 \InheritBibliographyStrings{english}
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
index 25613b9c7d7..438c9603afe 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/norwegian.lbx
@@ -21,7 +21,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -30,7 +30,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\adddot}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
 }
 
 \DeclareBibliographyStrings{%
@@ -315,6 +315,7 @@
   columns          = {{spalter}{sp\adddot}},
   line             = {{linje}{l\adddot}},
   lines            = {{linjer}{l\adddot}},
+  nodate           = {{udatert}{udatert}},
   verse            = {{vers}{v\adddot}},
   verses           = {{vers}{v\adddot}},
   section          = {{avsnitt}{avsn\adddot}},
@@ -327,7 +328,7 @@
   number           = {{nummer}{nr\adddot}},
   chapter          = {{kapittel}{kap\adddot}},
   mathesis         = {{masteroppgave}{masteroppg\adddot}},
-  phdthesis        = {{ph.d-avhandling}{ph.d.-avh\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}},
@@ -335,8 +336,8 @@
   datacd           = {{data-cd}{data-cd}},
   audiocd          = {{lyd-cd}{lyd-cd}},
   version          = {{versjon}{versjon}},
-  url              = {{url}{url}},
-%  url              = {{side}{side}},
+  url              = {{side}{side}},
+  urlfrom          = {{tilgjengelig fra}{tilgj\adddotspace fra}},
   urlseen          = {{sjekket}{sjekket}},
   inpreparation    = {{under utarbeidelse}{under utarb\adddot}},
   submitted        = {{innsendt}{innsendt}},
@@ -380,7 +381,9 @@
   december         = {{desember}{des\adddot}},
   langamerican     = {{amerikansk-engelsk}{amerikansk-engelsk}},
   langbrazilian    = {{brasiliansk-portugisisk}{brasiliansk-portugisisk}},
+  langcatalan      = {{katalansk}{katalansk}},
   langcroatian     = {{kroatisk}{kroatisk}},
+  langczech        = {{tsjekkisk}{tsjekkisk}},
   langdanish       = {{dansk}{dansk}},
   langdutch        = {{nederlandsk}{nederlandsk}},
   langenglish      = {{engelsk}{engelsk}},
@@ -397,7 +400,9 @@
   langswedish      = {{svensk}{svensk}},
   fromamerican     = {{fra amerikansk-engelsk}{fra amerikansk-engelsk}},
   frombrazilian    = {{fra brasiliansk-portugisisk}{fra brasiliansk-portugisisk}},
+  fromcatalan      = {{fra katalansk}{fra katalansk}},
   fromcroatian     = {{fra kroatisk}{fra kroatisk}},
+  fromczech        = {{fra tsjekkisk}{fra tsjekkisk}},
   fromdanish       = {{fra dansk}{fra dansk}},
   fromdutch        = {{fra nederlandsk}{fra nederlandsk}},
   fromenglish      = {{fra engelsk}{fra engelsk}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
index d66df14c25d..a47628ac04e 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/nynorsk.lbx
@@ -241,7 +241,8 @@
   origpubin        = {{opphavleg utgitt i}{opph\adddot\ utg\adddot\ i}},
   mathesis         = {{masteroppg{\aa}ve}{masteroppg\adddot}},
   candthesis       = {{hovudoppg{\aa}ve}{hovudoppg\adddot}},
-  url              = {{url}{url}},
+  resreport        = {{forskingsrapport}{forsk.rapp\adddot}},
+  urlfrom          = {{tilgjengeleg fr{\aa}}{tilgj\adddotspace fr{\aa}}},
   urlseen          = {{sjekka}{sjekka}},
   inpreparation    = {{under utarbeiding}{under utarb\adddot}},
   forthcoming      = {{under utgiving}{under utgiv\adddot}},
@@ -264,7 +265,9 @@
   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}},
+  fromcatalan      = {{fr{\aa} katalansk}{fr{\aa} katalansk}},
   fromcroatian     = {{fr{\aa} kroatisk}{fr{\aa} kroatisk}},
+  fromczech        = {{fr{\aa} tsjekkisk}{fr{\aa} tsjekkisk}},
   fromdanish       = {{fr{\aa} dansk}{fr{\aa} dansk}},
   fromdutch        = {{fr{\aa} nederlandsk}{fr{\aa} nederlandsk}},
   fromenglish      = {{fr{\aa} engelsk}{fr{\aa} engelsk}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx
new file mode 100644
index 00000000000..d60051ab629
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/polish.lbx
@@ -0,0 +1,497 @@
+\ProvidesFile{polish.lbx}

+[\abx@lbxid]

+

+\DeclareRedundantLanguages{polish}{polish}

+

+\DeclareBibliographyExtras{%

+  \protected\def\bibrangedash{\textendash\penalty\hyphenpenalty}%

+  \protected\def\bibdatedash{\addnbthinspace\textendash\addhpthinspace}%

+  \let\finalandcomma=\empty

+  \protected\def\mkbibordinal#1{\stripzeros{#1}}%

+  \protected\def\mkbibmascord{\mkbibordinal}%

+  \protected\def\mkbibfemord{\mkbibordinal}%

+  \protected\def\mkbibneutord{\mkbibordinal}%

+  \protected\def\mkbibdatelong#1#2#3{%

+    \iffieldundef{#3}

+      {}

+      {\mkbibordinal{\thefield{#3}}%

+       \iffieldundef{#2}{}{\nobreakspace}}%

+    \iffieldundef{#2}

+      {}

+      {\iffieldundef{#3}

+         {\mkbibmonth{\thefield{#2}}}

+         {\lbx@pl@mkbibmonth{\thefield{#2}}}%

+       \iffieldundef{#1}{}{\space}}%

+    \iffieldbibstring{#1}

+      {\bibstring{\thefield{#1}}}

+      {\stripzeros{\thefield{#1}}}}%

+  \protected\def\mkbibdateshort#1#2#3{%

+    \iffieldundef{#3}

+      {}

+      {\mkdatezeros{\thefield{#3}}\adddot

+       \iffieldundef{#2}{}{\thinspace}}%

+    \iffieldundef{#2}

+      {}

+      {\mkdatezeros{\thefield{#2}}%

+       \iffieldundef{#1}

+	 {}

+	 {\iffieldundef{#3}{/}{\adddot\thinspace}}}%

+    \iffieldbibstring{#1}

+      {\bibstring{\thefield{#1}}}

+      {\mkdatezeros{\thefield{#1}}}}%

+  \savecommand\mkbibordedition

+  \savecommand\mkbibordseries

+  \def\mkbibordedition{\mkbibneutord}%

+  \def\mkbibordseries{\mkbibfemord}%

+}

+

+\UndeclareBibliographyExtras{%

+  \restorecommand\mkbibordedition

+  \restorecommand\mkbibordseries

+}

+

+\NewBibliographyString{% Month name variants used after day

+  datejanuary,

+  datefebruary,

+  datemarch,

+  dateapril,

+  datemay,

+  datejune,

+  datejuly,

+  dateaugust,

+  dateseptember,

+  dateoctober,

+  datenovember,

+  datedecember%

+}

+

+\DeclareBibliographyStrings{%

+  bibliography     = {{Bibliografia}{Bibliografia}},

+  references       = {{Bibliografia}{Bibliografia}},

+  shorthands       = {{lista skr\'{o}t\'{o}w}{skr\'{o}ty}},

+  editor           = {{edytor}{red\adddot}},% FIXME: unsure

+  editors          = {{edytory}{red\adddot}},% FIXME: unsure

+  compiler         = {{wykonawca}{ed\adddot}},% FIXME: unsure

+  compilers        = {{wykonawcy}{ed\adddot}},% FIXME: unsure

+  redactor         = {{redaktor}{red\adddot}},

+  redactors        = {{redaktorzy}{red\adddot}},

+  reviser          = {{korektor}{kor\adddot}},

+  revisers         = {{korektorzy}{kor\adddot}},

+  founder          = {{za\l o\.{z}yciel}{za\l \adddot}},

+  founders         = {{za\l o\.{z}yciele}{za\l \adddot}},

+  continuator      = {{nast\c{e}pca}{nast\adddot}}, 

+  continuators     = {{nast\c{e}pcy}{nast\adddot}}, 

+  collaborator     = {{uczestnik}{ucz\adddot}},

+  collaborators    = {{uczestnicy}{ucz\adddot}},  

+  translator       = {{t\l umacz}{t\l um\adddot}},

+  translators      = {{t\l umacze}{t\l um\adddot}},

+  commentator      = {{komentator}{kom\adddot}},

+  commentators     = {{komentatory}{kom\adddot}},

+  annotator        = {{uwaga}{uw\adddot}},

+  annotators       = {{uwagi}{uw\adddot}},

+  commentary       = {{komentarz}{kom\adddot}},

+  annotations      = {{komentarze}{kom\adddot}},

+  introduction     = {{wst\c{e}p}{wst\adddot}},

+  foreword         = {{przedmowa}{przedm\adddot}},

+  afterword        = {{pos\l owie}{pos\l \adddot}},

+  editortr         = {{redaktor i t\l umacz}{red\adddotspace i per\adddot}},

+  editorstr        = {{redaktory i t\l umacze}{red\adddotspace i per\adddot}},

+  editorco         = {{redaktor i komentator}{red\adddotspace i kom\adddot}},

+  editorsco        = {{redaktory i komentatorowie}%

+                      {red\adddotspace i kom\adddot}},% FIXME: check

+  editoran         = {{redaktor i autor uwag}%

+                      {red\adddotspace i aut\adddotspace uw\adddot}},

+  editorsan        = {{redaktorzy i autorzy uwag}%

+                      {red\adddotspace i aut\adddotspace uw\adddot}},

+  editorin         = {{redaktor i autor wst\c{e}pu}%

+                      {red\adddotspace i aut\adddotspace wst\adddot}},

+  editorsin        = {{redaktorzy i autorzy wst\c{e}pu}%

+                      {red\adddotspace i aut\adddotspace wst\adddot}},

+  editorfo         = {{redaktor i autor przedmowy}%

+                      {red\adddotspace i aut\adddotspace przedm\adddot}},

+  editorsfo        = {{redaktorzy i autorzy przedmowy}%

+                      {red\adddotspace i aut\adddotspace przedm\adddot}},

+  editoraf         = {{redaktor i autor pos\l owia}%

+                      {red\adddotspace i aut\adddotspace pos\l \adddot}},

+  editorsaf        = {{redaktorzy i autorzy pos\l owia}%

+                      {red\adddotspace i aut\adddotspace pos\l \adddot}},

+  editortrco       = {{redaktor, t\l umacz i komentator}%

+                      {red., t\l um\adddotspace i kom\adddot}},

+  editorstrco      = {{redaktorzy, t\l umacze i komentatory}%

+                      {red., t\l um\adddotspace i kom\adddot}},

+  editortran       = {{redaktor, t\l umacz i autor uwag}%

+                      {red., t\l um\adddotspace i aut\adddotspace uw\adddot}},

+  editorstran      = {{redaktorzy, t\l umacze i autorzy uwag}%

+                      {red., t\l um\adddotspace i aut\adddotspace uw\adddot}},

+  editortrin       = {{redaktor, t\l umacz i autor wst\c{e}pu}%

+                      {red., t\l um\adddotspace i aut\adddotspace wst\adddot}},

+  editorstrin      = {{redaktorzy, t\l umacze i autorzy wst\c{e}pu}%

+                      {red., t\l um\adddotspace i aut\adddotspace wst\adddot}},

+  editortrfo       = {{redaktor, t\l umacz i autor przedmowy}%

+                      {red., t\l um\adddotspace i aut\adddotspace przedm\adddot}},

+  editorstrfo      = {{redaktorzy, t\l umacze i autorzy przedmowy}%

+                      {red., t\l um\adddotspace i aut\adddotspace przedm\adddot}},

+  editortraf       = {{redaktor, t\l umacz i autor pos\l owia}%

+                      {red., t\l um\adddotspace i aut\adddotspace pos\l \adddot}},

+  editorstraf      = {{redaktorzy, t\l umacze i autorzy pos\l owia}%

+                      {red., t\l um\adddotspace i aut\adddotspace pos\l \adddot}},

+  editorcoin       = {{redaktor, komentator i autor wst\c{e}pu}%

+                      {red., kom\adddotspace i aut\adddotspace wst\adddot}},

+  editorscoin      = {{redaktorzy, komentatorzy i autorzy wst\c{e}pu}%

+                      {red., kom\adddotspace i aut\adddotspace wst\adddot}},

+  editorcofo       = {{redaktor, komentator i autor przedmowy}%

+                      {red., kom\adddotspace i aut\adddotspace przedm\adddot}},

+  editorscofo      = {{redaktorzy, komentatorzy i autorzy przedmowy}%

+                      {red., kom\adddotspace i aut\adddotspace przedm\adddot}},

+  editorcoaf       = {{redaktor, komentator i autor pos\l owia}%

+                      {red., kom\adddotspace i aut\adddotspace pos\l \adddot}},

+  editorscoaf      = {{redaktorzy, komentatorzy i autorzy pos\l owia}%

+                      {red., kom\adddotspace i aut\adddotspace pos\l \adddot}},

+  editoranin       = {{redaktor, autor uwag i autor wst\c{e}pu}%

+                      {red., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},

+  editorsanin      = {{redaktorzy, autorzy uwag i autorzy wst\c{e}pu}%

+                      {red., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},

+  editoranfo       = {{redaktor, autor uwag i autor przedmowy}%

+                      {red., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},

+  editorsanfo      = {{redaktorzy, autorzy uwag i autorzy przedmowy}%

+                      {red., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},

+  editoranaf       = {{redaktor, autor uwag i autor pos\l owia}%

+                      {red., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},

+  editorsanaf      = {{redaktorzy, autorzy uwag i autorzy pos\l owia}%

+                      {red., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},

+  editortrcoin     = {{redaktor, t\l umacz, komentator i autor wst\c{e}pu}%

+                      {red., t\l um., kom\adddotspace i aut\adddotspace wst\adddot}},

+  editorstrcoin    = {{redaktorzy, t\l umacze, komentatorzy i autorzy wst\c{e}pu}%

+                      {red., t\l um., kom\adddotspace i aut\adddotspace wst\adddot}},

+  editortrcofo     = {{redaktor, t\l umacz, komentator i autor przedmowy}%

+                      {red., t\l um., kom\adddotspace i aut\adddotspace przedm\adddot}},

+  editorstrcofo    = {{redaktorzy, t\l umacze, komentatorzy i autorzy przedmowy}%

+                      {red., t\l um., kom\adddotspace i aut\adddotspace przedm\adddot}},

+  editortrcoaf     = {{redaktor, t\l umacz, komentator i autor pos\l owia}%

+                      {red., t\l um., kom\adddotspace i aut\adddotspace pos\l \adddot}},

+  editorstrcoaf    = {{redaktorzy, t\l umacze, komentatorzy i autorzy pos\l owia}%

+                      {red., t\l um., kom\adddotspace i aut\adddotspace pos\l \adddot}},

+  editortranin     = {{redaktor, t\l umacz, autor uwag i autor wst\c{e}pu}%

+                      {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},

+  editorstranin    = {{redaktorzy, t\l umacze, autorzy uwag i autorzy wst\c{e}pu}%

+                      {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},

+  editortranfo     = {{redaktor, t\l umacz, autor uwag i autor przedmowy}%

+                      {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},

+  editorstranfo    = {{redaktorzy, t\l umacze, autorzy uwag i autorzy przedmowy}%

+                      {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},

+  editortranaf     = {{redaktor, t\l umacz, autor uwag i autor pos\l owia}%

+                      {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},

+  editorstranaf    = {{redaktorzy, t\l umacze, autorzy uwag i autorzy pos\l owia}%

+                      {red., t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},

+  translatorco     = {{t\l umacz i komentator}{t\l um\adddotspace i kom\adddot}},

+  translatorsco    = {{t\l umacze i komentatorzy}{t\l um\adddotspace i kom\adddot}},

+  translatoran     = {{t\l umacz i autor uwag}%

+                      {t\l um\adddotspace i aut\adddotspace uw\adddot}},

+  translatorsan    = {{t\l umacze i autorzy uwag}%

+                      {t\l um\adddotspace i aut\adddotspace uw\adddot}},

+  translatorin     = {{t\l umacz i autor wst\c{e}pu}%

+                      {t\l um\adddotspace i aut\adddotspace wst\adddot}},

+  translatorsin    = {{t\l umacze i autorzy wst\c{e}pu}%

+                      {t\l um\adddotspace i aut\adddotspace wst\adddot}},  

+  translatorfo     = {{t\l umacz i autor przedmowy}%

+                      {t\l um\adddotspace i aut\adddotspace przedm\adddot}},

+  translatorsfo    = {{t\l umacze i autorzy przedmowy}%

+                      {t\l um\adddotspace i aut\adddotspace przedm\adddot}},

+  translatoraf     = {{t\l umacz i autor pos\l owia}%

+                      {t\l um\adddotspace i aut\adddotspace pos\l \adddot}},

+  translatorsaf    = {{t\l umacze i autorzy pos\l owia}%

+                      {t\l um\adddotspace i aut\adddotspace pos\l \adddot}},

+  translatorcoin   = {{t\l umacz, autor uwag i autor wst\c{e}pu}%

+                      {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},

+  translatorscoin  = {{t\l umacze, autorzy uwag i autorzy wst\c{e}pu}%

+                      {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},

+  translatorcofo   = {{t\l umacz, autor uwag i autor przedmowy}%

+                      {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},

+  translatorscofo  = {{t\l umacze, autorzy uwag i autorzy przedmowy}%

+                      {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace przedm\adddot}},

+  translatorcoaf   = {{t\l umacz, autor uwag i autor pos\l owia}%

+                      {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},

+  translatorscoaf  = {{t\l umacze, autorzy uwag i autorzy posowia}%

+                      {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace pos\l \adddot}},

+  translatoranin   = {{t\l umacz, autor uwag i autor wst\c{e}pu}%

+                      {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},

+  translatorsanin  = {{t\l umacze, autorzy uwag i autorzy wst\c{e}pu}%

+                      {t\l um., aut\adddotspace uw\adddotspace i aut\adddotspace wst\adddot}},

+  translatoranfo   = {{t\l umacz, autor komentarzy i autor wst\c{e}pu}%

+                      {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace wst\adddot}},

+  translatorsanfo  = {{t\l umacze, autorzy komentarzy i autorzy przedmowy}%

+                      {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace przedm\adddot}},

+  translatoranaf   = {{t\l umacz, autor komentarzy i autor pos\l owia}%

+                      {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace pos\l \adddot}},

+  translatorsanaf  = {{t\l umacze, autorzy komentarzy i autorzy pos\l owia}%

+                      {t\l um., aut\adddotspace kom\adddotspace i aut\adddotspace pos\l \adddot}},

+  byauthor         = {{autorstwo}{aut\adddot}},% FIXME: unsure

+  byeditor         = {{wyedytowano}{wyed\adddot}},% FIXME: unsure

+  bycompiler       = {{wykonano}{wyk\adddot}},% FIXME: unsure

+  byredactor       = {{zredagowano}{zred\adddot}},

+  byreviser        = {{poprawione}{popr\adddot}},

+  byreviewer       = {{recenzja}{rec\adddot}},

+  byfounder        = {{za\l o\.{z}one}{za\l \adddot}},

+  bycontinuator    = {{przej\c{e}te}{przej\adddot}},

+  bycollaborator   = {{przy wsp\'{o}\l pracy}{przy wsp\adddot}},

+  bytranslator     = {{t\l umaczenie \lbx@lfromlang}{t\l um\adddotspace \lbx@sfromlang}},

+  bycommentator    = {{skomentowane przez}{skom\adddot}},

+  byannotator      = {{uwagi od}{uw\adddot}},

+  withcommentator  = {{komentarze}{kom\adddot}},

+  withannotator    = {{uwagi}{uw\adddot}},

+  withintroduction = {{wst\c{e}p}{wst\adddot}},

+  withforeword     = {{przedmowa}{przedm\adddot}},

+  withafterword    = {{pos\l owie}{pos\l \adddot}},

+  byeditortr       = {{t\l umaczenie \lbx@lfromlang, zredagowany przez}%

+                      {t\l um\adddotspace \lbx@sfromlang, zred\adddotspace przez}},

+  byeditorco       = {{zredagowany i skomentowany przez}%

+                      {zred\adddotspace i skom\adddotspace przez}},

+  byeditoran       = {{zredagowany i z uwagami}{zredag\adddotspace i z uw\adddot}},

+  byeditorin       = {{zredagowany, z wst\c{e}pem}{zred., z wst\adddot}},

+  byeditorfo       = {{zredagowany, z przedmow\c{a}}{zred., z przedm\adddot}},

+  byeditoraf       = {{zredagowany, z pos\l owiem}{zred., z pos\l \adddot}},

+  byeditortrco     = {{zredagowany, t\l umaczenie \lbx@lfromlang i komentarze }%

+                      {zred., t\l um\adddotspace \lbx@sfromlang i kom\adddot}},

+  byeditortran     = {{zredagowany, t\l umaczenie \lbx@lfromlang i uwagi}%

+                      {zred., t\l um\adddotspace \lbx@sfromlang i uw\adddot}},% FIXME: check

+  byeditortrin     = {{zredagowany, t\l umaczenie \lbx@lfromlang, wst\c{e}p}%

+                      {zred., t\l um\adddotspace \lbx@sfromlang, wst\adddot}},

+  byeditortrfo     = {{zredagowany, t\l umaczenie \lbx@lfromlang, przedmowa}%

+                      {zred., t\l um\adddotspace \lbx@sfromlang, przedm\adddot}},

+  byeditortraf     = {{zredagowany, t\l umaczenie \lbx@lfromlang, pos\l owie}%

+                      {zred\adddotspace t\l um\adddotspace \lbx@sfromlang, pos\l \adddot}},

+  byeditorcoin     = {{zredagowany, komentarze i wst\c{e}p}{zred., kom\adddotspace i wst\adddot}},

+  byeditorcofo     = {{zredagowany, komentarze i przedmowa}{zred., kom\adddotspace i przedm\adddot}},

+  byeditorcoaf     = {{zredagowany, komentarze i pos\l owie}{zred., kom\adddotspace i pos\l \adddot}},

+  byeditoranin     = {{zredagowany, uwagi i wst\c{e}p}{zred., uw\adddotspace i wst\adddot}},     

+  byeditoranfo     = {{zredagowany, uwagi i przedmowa}{zred., uw\adddotspace i przedm\adddot}},

+  byeditoranaf     = {{zredagowany, uwagi i pos\l owie}{zred., uw\adddotspace i pos\l \adddot}},

+  byeditortrcoin   = {{zredagowany, t\l umaczenie \lbx@lfromlang, komentarze i wst\c{e}p}%

+                      {zred., t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i wst\c{e}p\adddot}},

+  byeditortrcofo   = {{zredagowany, t\l umaczenie \lbx@lfromlang, komentarze i przedmowa}%

+                      {zred., t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i przedm\adddot}},

+  byeditortrcoaf   = {{zredagowany, t\l umaczenie \lbx@lfromlang, komentarze i pos\l owie}%

+                      {zred., t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i pos\l \adddot}},

+  byeditortranin   = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi i wst\c{e}p}%

+                      {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i wst\adddot}},

+  byeditortranfo   = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi  i przedmowa}%

+                      {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i przedm\adddot}},

+  byeditortranaf   = {{zredagowany, t\l umaczenie \lbx@lfromlang, uwagi i pos\l owie}%

+                      {zred., t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i pos\l \adddot}},

+  bytranslatorco   = {{t\l umaczenie \lbx@lfromlang i komentarze}%

+                      {t\l um\adddotspace \lbx@sfromlang i kom\adddot}},

+  bytranslatoran   = {{t\l umaczenie \lbx@lfromlang i uwagi}%

+                      {t\l um\adddotspace \lbx@sfromlang i uw\adddot}},

+  bytranslatorin   = {{t\l umaczenie \lbx@lfromlang i wst\c{e}p}%

+                      {t\l um\adddotspace \lbx@sfromlang i wst\adddot}},

+  bytranslatorfo   = {{t\l umaczenie \lbx@lfromlang i przedmowa}%

+                      {t\l um\adddotspace \lbx@sfromlang i przedm\adddot}},

+  bytranslatoraf   = {{t\l umaczenie \lbx@lfromlang i pos\l owie}%

+                      {t\l um\adddotspace \lbx@sfromlang i pos\l \adddot}},

+  bytranslatorcoin = {{t\l umaczenie \lbx@lfromlang, komentarze i wst\c{e}p}%

+                      {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i wst\adddot}},

+  bytranslatorcofo = {{t\l umaczenie \lbx@lfromlang, komentarze i przedmowa}%

+                      {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i przedm\adddot}},

+  bytranslatorcoaf = {{t\l umaczenie \lbx@lfromlang, komentarze i pos\l owie}%

+                      {t\l um\adddotspace \lbx@sfromlang, kom\adddotspace i pos\l \adddot}},

+  bytranslatoranin = {{t\l umaczenie \lbx@lfromlang, uwagi i wst\c{e}p}%

+                      {t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i wst\adddot}},

+  bytranslatoranfo = {{t\l umaczenie \lbx@lfromlang, uwagi i przedmowa}%

+                      {t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i przedm\adddot}},

+  bytranslatoranaf = {{t\l umaczenie \lbx@lfromlang, uwagi i pos\l owie}%

+                      {t\l um\adddotspace \lbx@sfromlang, uw\adddotspace i pos\l \adddot}},

+  and              = {{i}{i}},

+  andothers        = {{i inni}{i in\adddot}},

+  andmore          = {{i dalej}{i dal\adddot}}, %FIXME: unsure

+  volume           = {{tom}{t\adddot}},

+  volumes          = {{tomy}{t\adddot}},

+  involumes        = {{w}{w}},

+  jourvol          = {{tom}{t\adddot}},

+  jourser          = {{serja}{ser\adddot}},

+  book             = {{ksi\c{a}\.{z}ka}{ks\adddot}},

+  part             = {{cz\c{e}\'{s}\'{c}}{cz\adddot}},

+  issue            = {{wydanie}{wyd\adddot}},% FIXME: unsure,

+  newseries        = {{nowa serja}{now\adddotspace ser\adddot}},

+  oldseries        = {{stara serja}{star\adddotspace ser\adddot}},

+  edition          = {{wydruk}{wydr\adddot}},% FIXME: unsure

+  reprint          = {{przedruk}{przedr\adddot}},

+  reprintof        = {{przedruk}{przedr\adddot}},

+  reprintas        = {{przedrukowano jako}{przedr\adddotspace jako}},

+  reprintfrom      = {{przedrukowano z}{przedr\adddotspace z}},

+  translationof    = {{t\l umaczenie}{t\l um\adddot}},

+  translationas    = {{t\l umaczenie jako}{t\l um\adddotspace jako}},

+  translationfrom  = {{t\l umaczenie z}{t\l um\adddotspace z}},

+  reviewof         = {{recenzja na\addcolon}{rec\adddotspace na\addcolon}},

+  origpubas        = {{orginalnie wydano jako}%

+                      {org\adddotspace wyd\adddotspace jako}},

+  origpubin        = {{orginalnie wydano w}{org\adddotspace wyd\adddotspace w}},

+  astitle          = {{pod tytu\l em}{pod tyt\adddot}},

+  bypublisher      = {{przez wydawc\c{e}}{prz\adddotspace wyd\adddot}},

+  page             = {{strona}{s\adddot}},

+  pages            = {{strony}{s\adddot}},

+  column           = {{kolumna}{kol\adddot}},

+  columns          = {{kolumny}{kol\adddot}},

+  line             = {{linijka}{l\adddot}},

+  lines            = {{linijki}{l\adddot}},

+  nodate           = {{no date}{n\adddot d\adddot}},% FIXME

+  verse            = {{werset}{wer\adddot}},

+  verses           = {{wersety}{wer\adddot}},

+  section          = {{paragraf}{par\adddot}},% FIXME: check

+  sections         = {{paragrafy}{par\adddot}},% FIXME: check

+  paragraph        = {{akapit}{aka\adddot}},

+  paragraphs       = {{akapity}{aka\adddot}},

+  in               = {{w}{w}},

+  inseries         = {{w}{w}},

+  ofseries         = {{z}{z}},

+  number           = {{numer}{nr\adddot}},% FIXME: check

+  chapter          = {{rozdzia\l }{rozd\adddot}},

+  mathesis         = {{praca magisterska}{prac\adddotspace mag\adddot}},

+  phdthesis        = {{praca doktorska}{prac\adddotspace dokt\adddot}},

+  candthesis       = {{praca kandydacka}%

+                      {prac\adddotspace kand\adddot}},% FIXME: unsure

+  resreport        = {{sprawozdanie naukowe}{spraw\adddotspace nau\adddot}},

+  techreport       = {{sprawozdanie techniczne}{spraw\adddotspace tech\adddot}},

+  software         = {{oprogramowanie}{opr\adddot}},

+  datacd           = {{CD-ROM}{CD-ROM}},

+  audiocd          = {{audio CD}{audio CD}},

+  version          = {{wersja}{wer\adddot}},

+  url              = {{adres}{adr\adddot}},

+% urlfrom          = {{}{}},% FIXME: missing

+  urlseen          = {{termin wizyty}{term\adddotspace wiz\adddot}},

+  inpreparation    = {{przygotowanie}{przyg\adddot}},

+  submitted        = {{prezentacja}{prez\adddot}},

+  forthcoming      = {{przygotowanie}{przyg\adddot}},% FIXME: unsure

+  inpress          = {{wydrukowane}{wydruk\adddot}},

+  prepublished     = {{przedwydanie}{przedw\adddot}},

+  citedas          = {{cytowane dalej jako}{cyt\adddotspace dal\adddotspace jako}},

+  thiscite         = {{tutaj}{tut\adddot}},

+  seenote          = {{patrz uwag\c{e}}{patrz uw\adddot}},

+  quotedin         = {{cytat wed\l ug}{cyt\adddotspace wg\adddot}},

+  idem             = {{ten\.{z}e}{ten\.{z}e}},

+  idemsm           = {{ten\.{z}e}{ten\.{z}e}},

+  idemsf           = {{ta\.{z} sama}{ta\.{z} sama}},

+  idemsn           = {{ten sam}{ten sam}},

+  idempm           = {{ci sami}{ci sami}},

+  idempf           = {{ci sami}{ci sami}},

+  idempn           = {{ci sami}{ci sami}},

+  idempp           = {{ci sami}{ci sami}},

+  ibidem           = {{tam\.{z}e}{tam\.{z}e}},

+  opcit            = {{praca cytowana}{prac\adddotspace cyt\adddot}},

+  loccit           = {{miejsce cytowane}{miej\adddotspace cyt\adddot}},

+  confer           = {{por\'{o}wnaj}{por\adddot}},

+  sequens          = {{i nast\c{e}pna}{i nast\adddot}},

+  sequentes        = {{i nast\c{e}pni}{i nast\adddot}},

+  passim           = {{wsz\c{e}dzie}{wsz\c{e}dzie}},

+  see              = {{patrz}{p\adddot}},

+  seealso          = {{ratrz r\'{o}wnie\.{z}}{p\adddotspace r\'{o}wn\adddot}},

+  backrefpage      = {{cytowane na stronie}{cyt\adddotspace na s\adddot}},

+  backrefpages     = {{cytowane na stronach}{cyt\adddotspace na s\adddot}},

+  january          = {{stycze\'{n}}{sty\adddot}},

+  february         = {{luty}{lut\adddot}},

+  march            = {{marzec}{mar\adddot}},

+  april            = {{kwiecie\'{n}}{kw\adddot}},

+  may              = {{maj}{maj}},

+  june             = {{czerwiec}{czer\adddot}},

+  july             = {{lipiec}{lip\adddot}},

+  august           = {{sierpie\'{n}}{sierp\adddot}},

+  september        = {{wrzesie\'{n}}{wrz\adddot}},

+  october          = {{pa\'{z}dziernik}{pa\'{z}\adddot}},

+  november         = {{listopad}{list\adddot}},

+  december         = {{grudzie\'{n}}{grud\adddot}},

+  datejanuary      = {{stycznia}{sty\adddot}},

+  datefebruary     = {{lutego}{lut\adddot}},

+  datemarch        = {{marca}{mar\adddot}},

+  dateapril        = {{kwietnia}{kw\adddot}},

+  datemay          = {{maja}{maj\adddot}},

+  datejune         = {{czerwca}{czer\adddot}},

+  datejuly         = {{lipca}{lip\adddot}},

+  dateaugust       = {{sierpnia}{sierp\adddot}},

+  dateseptember    = {{wrze\'{s}nia}{wrz\adddot}},

+  dateoctober      = {{pa\'{z}dziernika}{pa\'{z}\adddot}},

+  datenovember     = {{listopada}{list\adddot}},

+  datedecember     = {{grudnia}{grud\adddot}},

+  langamerican     = {{ameryka\'{n}ski}{ameryka\'{n}ski}},

+  langbrazilian    = {{brazylijski}{brazylijski}},

+% langcatalan      = {{}{}},% FIXME: missing

+  langcroatian     = {{chorwacki}{chorwacki}},

+% langczech        = {{}{}},% FIXME: missing

+  langdanish       = {{du\'{n}ski}{du\'{n}ski}},

+  langdutch        = {{holenderski}{holenderski}},

+  langenglish      = {{angielski}{angielski}},

+  langfinnish      = {{fi\'{n}ski}{fi\'{n}ski}},

+  langfrench       = {{francuski}{francuski}},

+  langgerman       = {{niemiecki}{niemiecki}},

+  langgreek        = {{grecki}{grecki}},

+  langitalian      = {{w\l oski}{w\l oski}},

+  langlatin        = {{\l acina}{\l acina}},

+  langnorwegian    = {{norweski}{norweski}},

+  langportuguese   = {{portugalski}{portugalski}},

+  langrussian      = {{rosyjski}{rosyjski}},

+  langspanish      = {{hiszpa\'{n}ski}{hiszpa\'{n}ski}},

+  langswedish      = {{szwedzki}{szwedzki}},

+  fromamerican     = {{z ameryka\'{n}skiego}{z amer\adddot}},

+  frombrazilian    = {{z brazylijskiego}{z braz\adddot}},

+% fromcatalan      = {{}{}},% FIXME: missing

+  fromcroatian     = {{z chorwackiego}{z chorw\adddot}},

+% fromczech        = {{}{}},% FIXME: missing

+  fromdanish       = {{z du\'{n}skiego}{z du\'{n}\adddot}},

+  fromdutch        = {{z niderla\'{n}skiego}{z nid\adddot}},

+  fromenglish      = {{z angielskiego}{z ang\adddot}},

+  fromfinnish      = {{z fi\'{n}skiego}{z fi\'{n}\adddot}},

+  fromfrench       = {{z francuzkiego}{z fran\adddot}},

+  fromgerman       = {{z niemieckiego}{z niem\adddot}},

+  fromgreek        = {{z greckiego}{z grec\adddot}},

+  fromitalian      = {{z w\l oskiego}{z w\l os\adddot}},

+  fromlatin        = {{z \l aciny}{z \l at\adddot}},

+  fromnorwegian    = {{z norweskiego}{z norw\adddot}},

+  fromportuguese   = {{z portugalskiego}{z port\adddot}},

+  fromrussian      = {{z rosyjskiego}{z ros\adddot}},

+  fromspanish      = {{z hiszpa\'{n}skiego}{z hiszp\adddot}},

+  fromswedish      = {{ze szwedskiego}{ze szw\adddot}},

+  countryde        = {{Niemcy}{DE}},

+  countryeu        = {{Unia Europejska}{EU}},

+  countryep        = {{Unia Europejska}{EP}},

+  countryfr        = {{Francja}{FR}},

+  countryuk        = {{Wielka Brytania}{GB}},

+  countryus        = {{Stany Zjednoczone Ameryki}{US}},

+  patent           = {{patent}{pat\adddot}},

+  patentde         = {{patent Niemiec}{pat\adddotspace Niemiec}},

+  patenteu         = {{patent Europy}{pat\adddotspace Europy}},

+  patentfr         = {{patent Francji}{pat\adddotspace Francji}},

+  patentuk         = {{patent Wielkiej Brytanji}{pat\adddotspace Wielkiej Brytanji}},

+  patentus         = {{patent USA}{pat\adddotspace USA}},

+  patreq           = {{podanie na patent}{podanie na pat\adddot}},

+  patreqde         = {{podanie na patent Niemiec}%

+                      {podanie na pat\adddotspace Niemiec}},

+  patreqeu         = {{podanie na patent Europy}{podanie na pat\adddotspace Europy}},

+  patreqfr         = {{podanie na patent Francji}%

+                      {podanie na pat\adddotspace Francji}},

+  patrequk         = {{podanie na patent Wielkiej Brytanji}%

+                      {podanie na pat\adddotspace Wielkiej Brytanji}},

+  patrequs         = {{podanie na patent USA}{podanie na pat\adddotspace USA}},

+  file             = {{plik}{plik}},

+  library          = {{bibloteka}{bibl\adddot}},

+  abstract         = {{podsumowanie}{pod\adddot}},

+  annotation       = {{adnotacja}{adn\adddot}},

+}

+

+\protected\gdef\lbx@pl@mkbibmonth#1{%

+  \ifcase0#1\relax

+    #1\BibliographyWarning{Month out of range}%

+  \or\abx@bibmonth{datejanuary}%

+  \or\abx@bibmonth{datefebruary}%

+  \or\abx@bibmonth{datemarch}%

+  \or\abx@bibmonth{dateapril}%

+  \or\abx@bibmonth{datemay}%

+  \or\abx@bibmonth{datejune}%

+  \or\abx@bibmonth{datejuly}%

+  \or\abx@bibmonth{dateaugust}%

+  \or\abx@bibmonth{dateseptember}%

+  \or\abx@bibmonth{dateoctober}%

+  \or\abx@bibmonth{datenovember}%

+  \or\abx@bibmonth{datedecember}%

+  \else

+    #1\BibliographyWarning{Month out of range}%

+  \fi}%

+

+\endinput

diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
index 1a08ec4b19e..c80ba821c1c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/portuguese.lbx
@@ -1,11 +1,7 @@
 \ProvidesFile{portuguese.lbx}
 [\abx@lbxid]
 
-% Changes:
-% 2010-11-21 Update by Jos\'e Carlos Santos
-
-% Translator's notes:
-%
+% Translator's notes (Jos\'e Carlos Santos):
 % Recently (since January 2010) a change was introduced in the
 % way Portuguese is written and according to the new rules month
 % names should not be capitalized. These new rules are optional
@@ -33,7 +29,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\nobreakspace de\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -43,7 +39,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibfemord}%
@@ -65,8 +61,8 @@
   compilers        = {{compiladores}{comp\adddot}},
   redactor         = {{redator}{red\adddot}},
   redactors        = {{redatores}{red\adddot}},
-% reviser          = {{}{}}, % FIXME: missing
-% revisers         = {{}{}}, % FIXME: missing
+% reviser          = {{}{}},% FIXME: missing
+% revisers         = {{}{}},% FIXME: missing
   founder          = {{fundador}{fund\adddot}},
   founders         = {{fundadores}{fund\adddot}},
   continuator      = {{continuador}{cont\adddot}},
@@ -224,8 +220,8 @@
   byeditor         = {{editado por}{ed\adddotspace por}},
   bycompiler       = {{compilado por}{comp\adddotspace por}},
   byredactor       = {{redigido por}{red\adddotspace por}},
-% byreviser        = {{}{}}, % FIXME: missing
-% byreviewer       = {{}{}}, % FIXME: missing
+% byreviser        = {{}{}},% FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
   byfounder        = {{fundado por}{fund\adddotspace por}},
   bycontinuator    = {{continuado por}{cont\adddotspace por}},
   bycollaborator   = {{em colabora\c{a}\~o com}{em col\adddotspace com}},
@@ -313,30 +309,31 @@
   involumes        = {{em}{em}},
   jourvol          = {{volume}{vol\adddot}},
   jourser          = {{s\'erie}{s\'er\adddot}},
-% book             = {{}{}}, % FIXME: missing
-% part             = {{}{}}, % FIXME: missing
-% issue            = {{}{}}, % FIXME: missing
+% book             = {{}{}},% FIXME: missing
+% part             = {{}{}},% FIXME: missing
+% issue            = {{}{}},% FIXME: missing
   newseries        = {{nova s\'erie}{nova s\'er\adddot}},
   oldseries        = {{s\'erie antiga}{s\'er\adddot\ antiga}},
   edition          = {{edi\c{c}\~ao}{ed\adddot}},
   reprint          = {{reimpress\~ao}{reimpr\adddot}},
   reprintof        = {{reimpress\~ao de}{reimpr\adddotspace de}},
   reprintas        = {{reimpresso como}{reimpr\adddotspace como}},
-  reprintfrom      = {{reimpresso}{reimpr\adddot}}, % FIXME: check
-  translationof    = {{tradu\c{c}\~ao de}{trans\adddotspace de}}, % FIXME: check
-  translationas    = {{traduzido como}{trans\adddotspace como}}, % FIXME: check
-  translationfrom  = {{traduzido do}{trans\adddotspace do}}, % FIXME: check
-% reviewof         = {{}{}}, % FIXME: missing
-  origpubas        = {{originalmente publicado como}{orig\adddotspace pub\adddotspace como}}, % FIXME: check
-  origpubin        = {{originalmente publicado em}{orig\adddotspace pub\adddotspace em}}, % FIXME: check
-  astitle          = {{como}{como}}, % FIXME: check
-  bypublisher      = {{por}{por}}, % FIXME: check
+  reprintfrom      = {{reimpresso}{reimpr\adddot}},% FIXME: check
+  translationof    = {{tradu\c{c}\~ao de}{trans\adddotspace de}},% FIXME: check
+  translationas    = {{traduzido como}{trans\adddotspace como}},% FIXME: check
+  translationfrom  = {{traduzido do}{trans\adddotspace do}},% FIXME: check
+% reviewof         = {{}{}},% FIXME: missing
+  origpubas        = {{originalmente publicado como}{orig\adddotspace pub\adddotspace como}},% FIXME: check
+  origpubin        = {{originalmente publicado em}{orig\adddotspace pub\adddotspace em}},% FIXME: check
+  astitle          = {{como}{como}},% FIXME: check
+  bypublisher      = {{por}{por}},% FIXME: check
   page             = {{p\'agina}{p\adddot}},
   pages            = {{p\'aginas}{pp\adddot}},
   column           = {{coluna}{col\adddot}},
   columns          = {{colunas}{cols\adddot}},
   line             = {{linha}{l\adddot}},
   lines            = {{linhas}{ll\adddot}},
+  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   verse            = {{verso}{v\adddot}},
   verses           = {{versos}{vv\adddot}},
   section          = {{se\c{c}\~ao}{\S}},
@@ -350,21 +347,21 @@
   chapter          = {{cap\'\i tulo}{cap\adddot}},
   mathesis         = {{tese de mestrado}{tese de mestrado}},
   phdthesis        = {{tese de doutoramento}{tese de doutoramento}},
-% candthesis       = {{}{}}, % FIXME: missing
+% candthesis       = {{}{}},% FIXME: missing
   resreport        = {{relat\'orio de pesquisa}{rel\adddotspace de pesquisa}},
   techreport       = {{relat\'orio t\'ecnico}{rel\adddotspace t\'ec\adddot}},
   software         = {{software}{software}},
   datacd           = {{CD-ROM}{CD-ROM}},
   audiocd          = {{CD \'audio}{CD \'audio}},
   version          = {{vers\~ao}{vers\~ao}},
-  url              = {{url}{url}},
-%  url              = {{endere\c{c}o eletr\^onico}{endere\c{c}o}},
+  url              = {{endere\c{c}o eletr\^onico}{endere\c{c}o}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{acedido em}{acedido em}},
-% inpreparation    = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}},% FIXME: missing
   submitted        = {{submetido}{subm\adddot}},
-% forthcoming      = {{}{}}, % FIXME: missing
+% forthcoming      = {{}{}},% FIXME: missing
   inpress          = {{na imprensa}{na imp\addot}},
-% prepublished     = {{}{}}, % FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   citedas          = {{doravante citado como}{doravante citado como}},
   seenote          = {{ver nota}{ver nota}},
   quotedin         = {{apud}{apud}},
@@ -387,18 +384,6 @@
   seealso          = {{ver tamb\'em}{ver tamb\'em}},
   backrefpage      = {{ver p\'agina}{ver p\adddot}},
   backrefpages     = {{ver p\'aginas}{ver pp\adddot}},
-% january          = {{Janeiro}{Jan\adddot}},
-% february         = {{Fevereiro}{Fev\adddot}},
-% march            = {{Mar\c{c}o}{Mar\adddot}},
-% april            = {{Abril}{Abr\adddot}},
-% may              = {{Maio}{Mai\adddot}},
-% june             = {{Junho}{Jun\adddot}},
-% july             = {{Julho}{Jul\adddot}},
-% august           = {{Agosto}{Ago\adddot}},
-% september        = {{Setembro}{Set\adddot}},
-% october          = {{Outubro}{Out\adddot}},
-% november         = {{Novembro}{Nov\adddot}},
-% december         = {{Dezembro}{Dez\adddot}},
   january          = {{janeiro}{jan\adddot}},
   february         = {{fevereiro}{fev\adddot}},
   march            = {{mar\c{c}o}{mar\adddot}},
@@ -413,11 +398,13 @@
   december         = {{dezembro}{dez\adddot}},
   langamerican     = {{ingl\^es}{ingl\^es}},
   langbrazilian    = {{portugu{\^e}s}{portugu{\^e}s}},
-% langcroatian     = {{}{}}, % FIXME: missing
+% langcatalan      = {{}{}},% FIXME: missing
+% langcroatian     = {{}{}},% FIXME: missing
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{dinamarqu\^es}{dinamarqu\^es}},
   langdutch        = {{holand{\^e}s}{holand{\^e}s}},
   langenglish      = {{ingl\^es}{ingl\^es}},
-% langfinnish      = {{}{}}, % FIXME: missing
+% langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{franc\^es}{franc\^es}},
   langgerman       = {{alem\~ao}{alem\~ao}},
   langgreek        = {{grego}{grego}},
@@ -425,16 +412,18 @@
   langlatin        = {{latim}{latim}},
   langnorwegian    = {{noruegu\^es}{noruegu\^es}},
   langportuguese   = {{portugu{\^e}s}{portugu{\^e}s}},
-% langrussian      = {{}{}}, % FIXME: missing
+% langrussian      = {{}{}},% FIXME: missing
   langspanish      = {{espanhol}{espanhol}},
   langswedish      = {{sueco}{sueco}},
   fromamerican     = {{do ingl\^es}{do ingl\^es}},
   frombrazilian    = {{do portugu{\^e}s}{do portugu{\^e}s}},
-% fromcroatian     = {{}{}}, % FIXME: missing
+% fromcatalan      = {{}{}},% FIXME: missing
+% fromcroatian     = {{}{}},% FIXME: missing
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{do dinamarqu\^es}{do dinamarqu\^es}},
   fromdutch        = {{do holand{\^e}s}{do holand{\^e}s}},
   fromenglish      = {{do ingl\^es}{do ingl\^es}},
-% fromfinnish      = {{}{}}, % FIXME: missing
+% fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{do franc\^es}{do franc\^es}},
   fromgerman       = {{do alem\~ao}{do alem\~ao}},
   fromgreek        = {{do grego}{do grego}},
@@ -442,7 +431,7 @@
   fromlatin        = {{do latim}{do latim}},
   fromnorwegian    = {{do noruegu\^es}{do noruegu\^es}},
   fromportuguese   = {{do portugu{\^e}s}{do portugu{\^e}s}},
-% fromrussian      = {{}{}}, % FIXME: missing
+% fromrussian      = {{}{}},% FIXME: missing
   fromspanish      = {{do espanhol}{do espanhol}},
   fromswedish      = {{do sueco}{do sueco}},
   countryde        = {{Alemanha}{DE}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
index 9021892ae83..5d603f267f5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/russian.lbx
@@ -51,7 +51,7 @@
          {\mkbibmonth{\thefield{#2}}}
          {\lbx@ru@mkbibdatemonth{\thefield{#2}}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -61,7 +61,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\adddot}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
   \savecommand\mkbibordedition
   \savecommand\mkbibordseries
   \def\mkbibordedition{\mkbibneutord}%
@@ -357,6 +357,7 @@
   columns          = {{колонки}{кол\adddot}},
   line             = {{строка}{с\adddot}},
   lines            = {{строки}{с\adddot}},
+  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   verse            = {{стих}{ст\adddot}},
   verses           = {{стихи}{ст\adddot}},
   section          = {{параграф}{\S}},
@@ -377,14 +378,14 @@
   datacd           = {{CD-ROM}{CD-ROM}},
   audiocd          = {{audio CD}{audio CD}},
   version          = {{версия}{вер\adddot}},
-  url              = {{url}{url}},
-%  url              = {{адрес}{адр\adddot}},
+  url              = {{адрес}{адр\adddot}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{дата обращения}{дата\addabbrvspace обр\adddot}},
   inpreparation    = {{в\addabbrvspace подготовке}{в подг\adddot}},
   submitted        = {{представлено}{предст\adddot}},
   forthcoming      = {{в печати}{в печ\adddot}},
   inpress          = {{в\addabbrvspace печати}{в печ\adddot}},
-% prepublished     = {{}{}}, % FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   citedas          = {{далее цитируется как}{далее цит\addabbrvspace как}},
   thiscite         = {{здесь}{здесь}},
   seenote          = {{смотри сноску}{см\adddotspace сн\adddot}},
@@ -434,7 +435,9 @@
   datedecember     = {{декабря}{дек\adddot}},
   langamerican     = {{американский}{американский}},
   langbrazilian    = {{бразильский}{бразильский}},
+% langcatalan      = {{}{}},% FIXME: missing
   langcroatian     = {{хорватский}{хорватский}},
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{датский}{датский}},
   langdutch        = {{голландский}{голландский}},
   langenglish      = {{английский}{английский}},
@@ -451,7 +454,9 @@
   langswedish      = {{шведский}{шведский}},
   fromamerican     = {{с американского}{с\addabbrvspace амер\adddot}},
   frombrazilian    = {{с бразильского}{с\addabbrvspace браз\adddot}},
+% fromcatalan      = {{}{}},% FIXME: missing
   fromcroatian     = {{с хорватского}{с\addabbrvspace хорв\adddot}},
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{с датского}{с\addabbrvspace дат\adddot}},
   fromdutch        = {{с нидерландского}{с\addabbrvspace нидерл\adddot}},
   fromenglish      = {{с английского}{с\addabbrvspace англ\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
index f2cee215ee1..7388d558315 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/spanish.lbx
@@ -21,7 +21,7 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\nobreakspace de\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
@@ -31,7 +31,7 @@
       {}
       {\mkdatezeros{\thefield{#2}}%
        \iffieldundef{#1}{}{\mbox{-}}}%
-    \mkdatezeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
   \savecommand\mkbibrangeterse
   \protected\def\mkbibrangeterse{%
     \BibliographyWarning{%
@@ -64,106 +64,106 @@
   shorthands       = {{Lista de abreviaturas}{Abreviaturas}},
   editor           = {{editor}{ed\adddot}},
   editors          = {{editores}{eds\adddot}},
-% compiler         = {{}{}}, % FIXME: missing
-% compilers        = {{}{}}, % FIXME: missing
+% compiler         = {{}{}},% FIXME: missing
+% compilers        = {{}{}},% FIXME: missing
   redactor         = {{revisor}{rev\adddot}},
   redactors        = {{revisores}{revs\adddot}},
   reviser          = {{revisor}{rev\adddot}},
   revisers         = {{revisores}{revs\adddot}},
-% founder          = {{}{}}, % FIXME: missing
-% founders         = {{}{}}, % FIXME: missing
-% continuator      = {{}{}}, % FIXME: missing
-% continuators     = {{}{}}, % FIXME: missing
-% collaborator     = {{}{}}, % FIXME: missing
-% collaborators    = {{}{}}, % FIXME: missing
+% founder          = {{}{}},% FIXME: missing
+% founders         = {{}{}},% FIXME: missing
+% continuator      = {{}{}},% FIXME: missing
+% continuators     = {{}{}},% FIXME: missing
+% collaborator     = {{}{}},% FIXME: missing
+% collaborators    = {{}{}},% FIXME: missing
   translator       = {{traductor}{trad\adddot}},
   translators      = {{traductores}{trads\adddot}},
-% commentator      = {{}{}}, % FIXME: missing
-% commentators     = {{}{}}, % FIXME: missing
-% annotator        = {{}{}}, % FIXME: missing
-% annotators       = {{}{}}, % FIXME: missing
+% commentator      = {{}{}},% FIXME: missing
+% commentators     = {{}{}},% FIXME: missing
+% annotator        = {{}{}},% FIXME: missing
+% annotators       = {{}{}},% FIXME: missing
   commentary       = {{comentario}{com\adddot}},
   annotations      = {{notas}{notas}},
   introduction     = {{introduci\'on}{introd\adddot}},
   foreword         = {{pr\'ologo}{pr\'ol\adddot}},
   afterword        = {{ep\'{\i}logo}{ep\'{\i}l\adddot}},
-% 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         = {{}{}},% 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
   byauthor         = {{de}{de}},
   byeditor         = {{editado por}{ed\adddotspace por}},
-% bycompiler       = {{}{}}, % FIXME: missing
+% bycompiler       = {{}{}},% FIXME: missing
   byredactor       = {{revisado por}{rev\adddotspace por}},
   byreviser        = {{revisado por}{rev\adddotspace por}},
-% byreviewer       = {{}{}}, % FIXME: missing
-% byfounder        = {{}{}}, % FIXME: missing
-% bycontinuator    = {{}{}}, % FIXME: missing
-% bycollaborator   = {{}{}}, % FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
+% byfounder        = {{}{}},% FIXME: missing
+% bycontinuator    = {{}{}},% FIXME: missing
+% bycollaborator   = {{}{}},% FIXME: missing
   bytranslator     = {{traducido \lbx@lfromlang\ por}{trad\adddot\ \lbx@sfromlang\ por}},
   bycommentator    = {{comentado por}{com\adddot\ por}},
   byannotator      = {{anotado por}{anot\adddot\ por}},
@@ -242,42 +242,43 @@
                       {trad\adddot\ \lbx@sfromlang, anot\adddot\ y epil\adddot\ por}},
   and              = {{y}{y}},
   andothers        = {{y~col\adddot}{y~col\adddot}},
-% andmore          = {{}{}}, % FIXME: missing
+% andmore          = {{}{}},% FIXME: missing
   volume           = {{volumen}{vol\adddot}},
   volumes          = {{vol\'umenes}{vols\adddot}},
   involumes        = {{en}{en}},
   jourvol          = {{volumen}{vol\adddot}},
   jourser          = {{\'epoca}{\'ep\adddot}},
-% book             = {{}{}}, % FIXME: missing
-% part             = {{}{}}, % FIXME: missing
-% issue            = {{}{}}, % FIXME: missing
+% book             = {{}{}},% FIXME: missing
+% part             = {{}{}},% FIXME: missing
+% issue            = {{}{}},% FIXME: missing
   newseries        = {{nueva \'epoca}{n\adddotspace\'ep\adddot}},
   oldseries        = {{antigua \'epoca}{ant\adddotspace\'ep\adddot}},
   edition          = {{edici\'on}{ed\adddot}},
-% reprint          = {{}{}}, % FIXME: missing
-% reprintof        = {{}{}}, % FIXME: missing
-% reprintas        = {{}{}}, % FIXME: missing
-% reprintfrom      = {{}{}}, % FIXME: missing
-% reviewof         = {{}{}}, % FIXME: missing
-% translationof    = {{}{}}, % FIXME: missing
-% translationas    = {{}{}}, % FIXME: missing
-% translationfrom  = {{}{}}, % FIXME: missing
-  origpubas        = {{originalmente publicado como}{orig\adddotspace pub\adddotspace como}}, % FIXME: check
-  origpubin        = {{publicado originalmente en}{pub\adddot\ orig\adddot\ en}}, % FIXME: check
-% astitle          = {{}{}}, % FIXME: missing
-% bypublisher      = {{}{}}, % FIXME: missing
+% reprint          = {{}{}},% FIXME: missing
+% reprintof        = {{}{}},% FIXME: missing
+% reprintas        = {{}{}},% FIXME: missing
+% reprintfrom      = {{}{}},% FIXME: missing
+% reviewof         = {{}{}},% FIXME: missing
+% translationof    = {{}{}},% FIXME: missing
+% translationas    = {{}{}},% FIXME: missing
+% translationfrom  = {{}{}},% FIXME: missing
+  origpubas        = {{originalmente publicado como}{orig\adddotspace pub\adddotspace como}},% FIXME: check
+  origpubin        = {{publicado originalmente en}{pub\adddot\ orig\adddot\ en}},% FIXME: check
+% astitle          = {{}{}},% FIXME: missing
+% bypublisher      = {{}{}},% FIXME: missing
   page             = {{p\'agina}{p\'ag\adddot}},
   pages            = {{p\'aginas}{p\'ags\adddot}},
   column           = {{columna}{col\adddot}},
   columns          = {{columnas}{cols\adddot}},
-  line             = {{l\'inea}{lin\adddot}},   % FIXME: abbrev. unsure
-  lines            = {{l\'ineas}{lins\adddot}}, % FIXME: abbrev. unsure
-  verse            = {{verso}{ver\adddot}},   % FIXME: abbrev. unsure
-  verses           = {{versos}{vers\adddot}}, % FIXME: abbrev. unsure
-% section          = {{}{\S}},   % FIXME: missing
-% sections         = {{}{\S\S}}, % FIXME: missing
-% paragraph        = {{}{}}, % FIXME: missing
-% paragraphs       = {{}{}}, % FIXME: missing
+  line             = {{l\'inea}{lin\adddot}},% FIXME: abbrev. unsure
+  lines            = {{l\'ineas}{lins\adddot}},% FIXME: abbrev. unsure
+  nodate           = {{sin\space fecha}{{}s\adddot f\adddot}},
+  verse            = {{verso}{ver\adddot}},% FIXME: abbrev. unsure
+  verses           = {{versos}{vers\adddot}},% FIXME: abbrev. unsure
+% section          = {{}{\S}},% FIXME: missing
+% sections         = {{}{\S\S}},% FIXME: missing
+% paragraph        = {{}{}},% FIXME: missing
+% paragraphs       = {{}{}},% FIXME: missing
   in               = {{en}{en}},
   inseries         = {{en}{en}},
   ofseries         = {{de}{de}},
@@ -285,25 +286,25 @@
   chapter          = {{cap\'itulo}{cap\adddot}},
   mathesis         = {{Tesis de licenciatura}{Tesis de lic\adddot}},
   phdthesis        = {{Tesis doctoral}{Tesis doct\adddot}},
-% candthesis       = {{}{}}, % FIXME: missing
-% resreport        = {{}{}}, % FIXME: missing
+% candthesis       = {{}{}},% FIXME: missing
+% resreport        = {{}{}},% FIXME: missing
   techreport       = {{informe t\'ecnico}{inf\adddotspace t\'ec\adddot}},
-% software         = {{}{}}, % FIXME: missing
-% datacd           = {{}{}}, % FIXME: missing
-% audiocd          = {{}{}}, % FIXME: missing
+% software         = {{}{}},% FIXME: missing
+% datacd           = {{}{}},% FIXME: missing
+% audiocd          = {{}{}},% FIXME: missing
   version          = {{versi\'on}{versi\'on}},
-  url              = {{url}{url}},
-%  url              = {{direcci\'on}{direcci\'on}},
+  url              = {{direcci\'on}{direcci\'on}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{visitado}{visitado}},
-% inpreparation    = {{}{}}, % FIXME: missing
-% submitted        = {{}{}}, % FIXME: missing
-% forthcoming      = {{}{}}, % FIXME: missing
-% inpress          = {{}{}}, % FIXME: missing
-% prepublished     = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}},% FIXME: missing
+% submitted        = {{}{}},% FIXME: missing
+% forthcoming      = {{}{}},% FIXME: missing
+% inpress          = {{}{}},% FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   citedas          = {{citado en adelante como}{cit\adddotspace en adelante como}},
-% thiscite         = {{}{}}, % FIXME: missing
-% seenote          = {{}{}}, % FIXME: missing
-% quotedin         = {{}{}}, % FIXME: missing
+% thiscite         = {{}{}},% FIXME: missing
+% seenote          = {{}{}},% FIXME: missing
+% quotedin         = {{}{}},% FIXME: missing
   idem             = {{\'{\i}dem}{\'{\i}d\adddot}},
   idemsf           = {{\'{\i}dem}{\'{\i}d\adddot}},
   idemsm           = {{\'{\i}dem}{\'{\i}d\adddot}},
@@ -337,11 +338,13 @@
   december         = {{diciembre}{dic\adddot}},
   langamerican     = {{americano}{americano}},
   langbrazilian    = {{brasile\~no}{brasile\~no}},
-% langcroatian     = {{}{}}, % FIXME: missing
+% langcatalan      = {{}{}},% FIXME: missing
+% langcroatian     = {{}{}},% FIXME: missing
+% langczech        = {{}{}},% FIXME: missing
   langdanish       = {{dan\'es}{dan\'es}},
   langdutch        = {{neerland\'es}{neerland\'es}},
   langenglish      = {{ingl\'es}{ingl\'es}},
-% langfinnish      = {{}{}}, % FIXME: missing
+% langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{franc\'es}{franc\'es}},
   langgerman       = {{alem\'an}{alem\'an}},
   langgreek        = {{griego}{griego}},
@@ -349,16 +352,18 @@
   langlatin        = {{lat\'{\i}n}{lat\'{\i}n}},
   langnorwegian    = {{noruego}{noruego}},
   langportuguese   = {{portugu\'es}{portugu\'es}},
-% langrussian      = {{}{}}, % FIXME: missing
+% langrussian      = {{}{}},% FIXME: missing
   langspanish      = {{espa\~nol}{espa\~nol}},
   langswedish      = {{sueco}{sueco}},
   fromamerican     = {{del americano}{del americano}},
   frombrazilian    = {{del brasile\~no}{del brasile\~no}},
-% fromcroatian     = {{}{}}, % FIXME: missing
+% fromcatalan      = {{}{}},% FIXME: missing
+% fromcroatian     = {{}{}},% FIXME: missing
+% fromczech        = {{}{}},% FIXME: missing
   fromdanish       = {{del dan\'es}{del dan\'es}},
   fromdutch        = {{del neerland\'es}{del neerland\'es}},
   fromenglish      = {{del ingl\'es}{del ingl\'es}},
-% fromfinnish      = {{}{}}, % FIXME: missing
+% fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{del franc\'es}{del franc\'es}},
   fromgerman       = {{del alem\'an}{del alem\'an}},
   fromgreek        = {{del griego}{del griego}},
@@ -366,15 +371,15 @@
   fromlatin        = {{del lat\'{\i}n}{del lat\'{\i}n}},
   fromnorwegian    = {{del noruego}{del noruego}},
   fromportuguese   = {{del portugu\'es}{del portugu\'es}},
-% fromrussian      = {{}{}}, % FIXME: missing
+% fromrussian      = {{}{}},% FIXME: missing
   fromspanish      = {{del espa\~nol}{del espa\~nol}},
   fromswedish      = {{del sueco}{del sueco}},
   countryde        = {{Alemania}{DE}},
   countryeu        = {{Uni\'on Europea}{EU}},
   countryep        = {{Uni\'on Europea}{EP}},
   countryfr        = {{Francia}{FR}},
-  countryuk        = {{Reino Unido}{GB}}, % FIXME: "Reino Unido" or "Gran Breta\~na"?
-  countryus        = {{Estados Unidos de Am\'erica}{US}}, % FIXME: "Estados Unidos" only?
+  countryuk        = {{Reino Unido}{GB}},% FIXME: "Reino Unido" or "Gran Breta\~na"?
+  countryus        = {{Estados Unidos de Am\'erica}{US}},% FIXME: "Estados Unidos" only?
   patent           = {{patente}{pat\adddot}},
   patentde         = {{patente alemana}{pat\adddot\ alemana}},
   patenteu         = {{patente europea}{pat\adddot\ europea}},
@@ -387,10 +392,10 @@
   patreqfr         = {{solicitud de patente francesa}{solicitud de pat\adddot\ francesa}},
   patrequk         = {{solicitud de patente brit\'anica}{solicitud de pat\adddot\ brit\'anica}},
   patrequs         = {{solicitud de patente americana}{solicitud de pat\adddot\ americana}},
-% file             = {{}{}}, % FIXME: missing
-% library          = {{}{}}, % FIXME: missing
-% abstract         = {{}{}}, % FIXME: missing
-% annotation       = {{}{}}, % FIXME: missing
+% file             = {{}{}},% FIXME: missing
+% library          = {{}{}},% FIXME: missing
+% abstract         = {{}{}},% FIXME: missing
+% annotation       = {{}{}},% FIXME: missing
 }
 
 \protected\gdef\lbx@es@smartand{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
index 00a4ec9e945..07d3de3856b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/swedish.lbx
@@ -1,25 +1,22 @@
 \ProvidesFile{swedish.lbx}
 [\abx@lbxid]
 
-% Changes:
-% 2009-03-02 Update by Per Starb\"ack
-%
-% Notes by Per Starb\"ack:
-%
+% Translator's notes (Per Starb\"ack)
+% 
 % One of the sources used is:
-%
+% 
 % Hedberg, Sten. Bibliografiska referenser. SIS-STG Handbok 165.
 % Stockholm: Standardiseringskommissionen i Sverige (SIS), 1991. ISBN
 % 91-7162-323-X.
-%
+% 
 % which incorporates Swedish standard SS 03 82 07 which is a
 % translation of ISO 690, Documentation -- Bibliographic references --
 % Content, form and structure, 2. ed., 1987.
-%
+% 
 % In that standard lots of things aren't translated, but left as in
 % the original works. So in the same bibliography will be a work that
 % is "2. ed." and another that is "2. Aufl.".
-%
+% 
 % I've almost only used abbrevations found in the appendix
 % "Bibliografiska f\"orkortningar" there (though not a part of the
 % standard).
@@ -56,11 +53,11 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \stripzeros{\thefield{#1}}}%
+    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#1}
       {}
-      {\mkdatezeros{\thefield{#1}}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}%
        \iffieldundef{#2}{}{\mbox{-}}}%
     \iffieldundef{#2}
       {}
@@ -92,102 +89,102 @@
   compilers        = {{sammanst\"allare}{sammanst\adddot}},
   redactor         = {{redakt\"or}{red\adddot}},
   redactors        = {{redakt\"orer}{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
+% reviser          = {{}{}},% FIXME: missing
+% revisers         = {{}{}},% FIXME: missing
+% founder          = {{}{}},% FIXME: missing
+% founders         = {{}{}},% FIXME: missing
+% continuator      = {{}{}},% FIXME: missing
+% continuators     = {{}{}},% FIXME: missing
+% collaborator     = {{}{}},% FIXME: missing
+% collaborators    = {{}{}},% FIXME: missing
   translator       = {{\"overs\"attare}{\"overs\adddot}},
   translators      = {{\"overs\"attare}{\"overs\adddot}},
-  commentator      = {{kommentar}{komm\adddot}}, % "commentator" awkward, we use "commentary"
-  commentators     = {{kommentar}{komm\adddot}}, % "commentator" awkward, we use "commentary"
-  annotator        = {{f\"orklaringar}{f\"orkl\adddot}}, % "annotator" awkward, we use "annotations"
-  annotators       = {{f\"orklaringar}{f\"orkl\adddot}}, % "annotator" awkward, we use "annotations"
+  commentator      = {{kommentar}{komm\adddot}},% "commentator" awkward, we use "commentary"
+  commentators     = {{kommentar}{komm\adddot}},% "commentator" awkward, we use "commentary"
+  annotator        = {{f\"orklaringar}{f\"orkl\adddot}},% "annotator" awkward, we use "annotations"
+  annotators       = {{f\"orklaringar}{f\"orkl\adddot}},% "annotator" awkward, we use "annotations"
   commentary       = {{kommentar}{komm\adddot}},
   annotations      = {{f\"orklaringar}{f\"orkl\adddot}},
   introduction     = {{inledning}{inl\adddot}},
   foreword         = {{f\"orord}{f\"orord}},
   afterword        = {{efterord}{efterord}},
-% 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         = {{}{}},% 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
   byauthor         = {{av}{av}},
   byeditor         = {{utgiven av}{utg\adddotspace av}},
   bycompiler       = {{sammanst\"alld av}{sammanst\adddotspace av}},
   byredactor       = {{bearbetad av}{bearb\adddotspace av}},
-% byreviser        = {{}{}}, % FIXME: missing
-% byreviewer       = {{}{}}, % FIXME: missing
-% byfounder        = {{}{}}, % FIXME: missing
-% bycontinuator    = {{}{}}, % FIXME: missing
-% bycollaborator   = {{}{}}, % FIXME: missing
+% byreviser        = {{}{}},% FIXME: missing
+% byreviewer       = {{}{}},% FIXME: missing
+% byfounder        = {{}{}},% FIXME: missing
+% bycontinuator    = {{}{}},% FIXME: missing
+% bycollaborator   = {{}{}},% FIXME: missing
   bytranslator     = {{\"oversatt \lbx@lfromlang\ av}{\"overs\adddot\ \lbx@sfromlang\ av}},
   bycommentator    = {{kommenterad av}{kommenterad av}},
   byannotator      = {{f\"orklarad av}{f\"orklarad av}},
@@ -270,12 +267,12 @@
   andmore          = {{m.\,fl\adddot}{m.\,fl\adddot}},
   volume           = {{volym}{vol\adddot}},
   volumes          = {{volymer}{vol\adddot}},
-  involumes        = {{i}{i}}, % FIXME: unsure
+  involumes        = {{i}{i}},% FIXME: unsure
   jourvol          = {{\aa rg\aa ng}{\aa rg\adddot}},
   jourser          = {{serie}{ser\adddot}},
-% book             = {{}{}}, % FIXME: missing
-% part             = {{}{}}, % FIXME: missing
-% issue            = {{}{}}, % FIXME: missing
+% book             = {{}{}},% FIXME: missing
+% part             = {{}{}},% FIXME: missing
+% issue            = {{}{}},% FIXME: missing
   % Both "ny serie (N.S.)" and "ny f\"oljd (N.F.)" are common
   newseries        = {{ny f\"oljd}{N.\,F\adddot}},
   oldseries        = {{gammal f\"oljd}{gammal f\"oljd}},
@@ -287,21 +284,22 @@
   reprint          = {{nytryck}{nytr\adddot}},
   reprintof        = {{nytryck av}{nytr\adddotspace av}},
   reprintas        = {{nytryckt som}{nytr\adddotspace som}},
-  reprintfrom      = {{nytryckt fr\aa n}{nytryckt fr\aa n}}, % FIXME: check
-% translationof    = {{}{}}, % FIXME: missing
-% translationas    = {{}{}}, % FIXME: missing
-% translationfrom  = {{}{}}, % FIXME: missing
-% reviewof         = {{}{}}, % FIXME: missing
-% origpubas        = {{}{}}, % FIXME: missing
-% origpubin        = {{}{}}, % FIXME: missing
-% astitle          = {{}{}}, % FIXME: missing
-  bypublisher      = {{av}{av}}, % FIXME: check
+  reprintfrom      = {{nytryckt fr\aa n}{nytryckt fr\aa n}},% FIXME: check
+% translationof    = {{}{}},% FIXME: missing
+% translationas    = {{}{}},% FIXME: missing
+% translationfrom  = {{}{}},% FIXME: missing
+% reviewof         = {{}{}},% FIXME: missing
+% origpubas        = {{}{}},% FIXME: missing
+% origpubin        = {{}{}},% FIXME: missing
+% astitle          = {{}{}},% FIXME: missing
+  bypublisher      = {{av}{av}},% FIXME: check
   page             = {{sidan}{s\adddot}},
   pages            = {{sidorna}{s\adddot}},
   column           = {{spalt}{sp\adddot}},
   columns          = {{spalterna}{sp\adddot}},
   line             = {{rad}{r\adddot}},
   lines            = {{raderna}{r\adddot}},
+  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
   verse            = {{vers}{v\adddot}},
   verses           = {{verserna}{v\adddot}},
   section          = {{paragraf}{\S}},
@@ -317,7 +315,7 @@
   chapter          = {{kapitel}{kap\adddot}},
   mathesis         = {{examensarbete}{examensarb\adddot}},
   phdthesis        = {{doktorsavhandling}{diss\adddot}},
-  candthesis       = {{kandidatavhandling}{kand.avh}}, % FIXME: unsure
+  candthesis       = {{kandidatavhandling}{kand.avh}},% FIXME: unsure
   resreport        = {{forskningsrapport}{forskn.rapport}},
   techreport       = {{teknisk rapport}{tekn\adddotspace rapport}},
   % Hedberg (p. 57) uses "Datafil" and adds that it's possible to
@@ -326,19 +324,19 @@
   datacd           = {{data-cd}{data-cd}},
   audiocd          = {{ljud-cd}{ljud-cd}},
   version          = {{version}{version}},
-  url              = {{url}{url}},
-%  url              = {{webbadress}{URL}},
+  url              = {{webbadress}{URL}},
+% urlfrom          = {{}{}},% FIXME: missing
   urlseen          = {{senast h\"amtad}{h\"amtad}},
-% inpreparation    = {{}{}}, % FIXME: missing
-% submitted        = {{}{}}, % FIXME: missing
-% forthcoming      = {{}{}}, % FIXME: missing
-% inpress          = {{}{}}, % FIXME: missing
-% prepublished     = {{}{}}, % FIXME: missing
+% inpreparation    = {{}{}},% FIXME: missing
+% submitted        = {{}{}},% FIXME: missing
+% forthcoming      = {{}{}},% FIXME: missing
+% inpress          = {{}{}},% FIXME: missing
+% prepublished     = {{}{}},% FIXME: missing
   citedas          = {{h\"adanefter citerad som}{h\"adanefter cit\adddotspace som}},
-% thiscite         = {{}{}}, % FIXME: missing
+% thiscite         = {{}{}},% FIXME: missing
   seenote          = {{se not}{se not}},
   quotedin         = {{citerad i}{cit\adddotspace i}},
-  idem             = {{densamma}{dens\adddot}}, % or Latin: idem
+  idem             = {{densamma}{dens\adddot}},% or Latin: idem
   idemsf           = {{densamma}{dens\adddot}},
   idemsm           = {{densamme}{dens\adddot}},
   idemsn           = {{densamma}{dens\adddot}},
@@ -347,7 +345,7 @@
   idempn           = {{desamma}{desamma}},
   idempp           = {{desamma}{desamma}},
   ibidem           = {{ibidem}{ibid\adddot}},
-  opcit		   = {{a.\,a\adddot}{a.\,a\adddot}}, % or Latin: op. cit.
+  opcit            = {{a.\,a\adddot}{a.\,a\adddot}},% or Latin: op. cit.
   loccit           = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
   confer           = {{j\"amf\"or}{jfr}},
   sequens          = {{f\adddot}{f\adddot}},
@@ -370,38 +368,42 @@
   november         = {{november}{nov\adddot}},
   december         = {{december}{dec\adddot}},
   langamerican     = {{amerikanska}{amerikanska}},
-% langbrazilian    = {{}{}}, % FIXME: missing
-% langcroatian     = {{}{}}, % FIXME: missing
-  langdanish	   = {{danska}{danska}},
-% langdutch        = {{}{}}, % FIXME: missing
+% langbrazilian    = {{}{}},% FIXME: missing
+% langcatalan      = {{}{}},% FIXME: missing
+% langcroatian     = {{}{}},% FIXME: missing
+% langczech        = {{}{}},% FIXME: missing
+  langdanish       = {{danska}{danska}},
+% langdutch        = {{}{}},% FIXME: missing
   langenglish      = {{engelska}{engelska}},
-% langfinnish      = {{}{}}, % FIXME: missing
+% langfinnish      = {{}{}},% FIXME: missing
   langfrench       = {{franska}{franska}},
   langgerman       = {{tyska}{tyska}},
   langgreek        = {{grekiska}{grekiska}},
   langitalian      = {{italienska}{italienska}},
   langlatin        = {{latin}{latin}},
   langnorwegian    = {{norska}{norska}},
-% langportuguese   = {{}{}}, % FIXME: missing
-% langrussian      = {{}{}}, % FIXME: missing
+% langportuguese   = {{}{}},% FIXME: missing
+% langrussian      = {{}{}},% FIXME: missing
   langspanish      = {{spanska}{spanska}},
   langswedish      = {{svenska}{svenska}},
   fromamerican     = {{fr\aa n amerikanska}{fr\aa n amerikanska}},
-% frombrazilian    = {{}{}}, % FIXME: missing
-% fromcroatian     = {{}{}}, % FIXME: missing
-  fromdanish	   = {{fr\aa n danska}{fr\aa n danska}},
-% fromdutch        = {{}{}}, % FIXME: missing
+% frombrazilian    = {{}{}},% FIXME: missing
+% fromcatalan      = {{}{}},% FIXME: missing
+% fromcroatian     = {{}{}},% FIXME: missing
+% fromczech        = {{}{}},% FIXME: missing
+  fromdanish       = {{fr\aa n danska}{fr\aa n danska}},
+% fromdutch        = {{}{}},% FIXME: missing
   fromenglish      = {{fr\aa n engelska}{fr\aa n engelska}},
-% fromfinnish      = {{}{}}, % FIXME: missing
+% fromfinnish      = {{}{}},% FIXME: missing
   fromfrench       = {{fr\aa n franska}{fr\aa n franska}},
   fromgerman       = {{fr\aa n tyska}{fr\aa n tyska}},
   fromgreek        = {{fr\aa n grekiska}{fr\aa n grekiska}},
   fromitalian      = {{fr\aa n italienska}{fr\aa n italienska}},
   fromlatin        = {{fr\aa n latin}{fr\aa n latin}},
   fromnorwegian    = {{fr\aa n norska}{fr\aa n norska}},
-% fromportuguese   = {{}{}}, % FIXME: missing
-% fromrussian      = {{}{}}, % FIXME: missing
-  fromspanish	   = {{fr\aa n spanska}{fr\aa n spanska}},
+% fromportuguese   = {{}{}},% FIXME: missing
+% fromrussian      = {{}{}},% FIXME: missing
+  fromspanish      = {{fr\aa n spanska}{fr\aa n spanska}},
   fromswedish      = {{fr\aa n svenska}{fr\aa n svenska}},
   countryde        = {{Tyskland}{DE}},
   countryep        = {{Europeiska unionen}{EP}},