bib2gls (26nov17)

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

1 files changed, 116 insertions, 14 deletions

diff --git a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
index c48375fee45..52b02f19c5c 100644
--- a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
+++ b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
@@ -35,8 +35,11 @@ See the manual for further details.</entry>
 			directory.)</entry>
 <entry key="syntax.interpret">{0}		Switch on interpret mode (default).</entry>
 <entry key="syntax.no.interpret">{0}		Switch off interpret mode.</entry>
+<entry key="syntax.break.space">{0}		Interpret tilde character as normal space.</entry>
+<entry key="syntax.no.break.space">{0}	Interpret tilde character as a non-breaking space 
+			(default).</entry>
 
-<entry key="syntax.mfirstuc">{0} &lt;fields&gt;|all (or {1} &lt;fields&gt;|all)
+<entry key="syntax.mfirstuc">{0} &lt;fields&gt;|"all" (or {1} &lt;fields&gt;|"all")
 			Insert an empty group if fields start 
 			with certain problematic commands
 			to protect against case-changing commands
@@ -64,11 +67,11 @@ See the manual for further details.</entry>
 
 <entry key="syntax.check.shortcuts">{0} &lt;option&gt;
 			Check for the shortcut commands when 
-			search for dependencies.
+			searching for dependencies.
 			Permitted values of &lt;option&gt;:
-			''acronyms'' (or ''acro'')
-			''abbreviations'' (or ''abbr'')
-			''all'' (or ''true'')
+			''ac'', ''acronyms'' (or ''acro''),
+			''abbreviations'' (or ''abbr''),
+			''all'' (or ''true''),
 			''none'' (or ''false'')</entry>
 <entry key="syntax.check.nested">{0} &lt;list&gt;|"none"
 			Check each field listed in &lt;list&gt;
@@ -82,18 +85,35 @@ See the manual for further details.</entry>
 			Don''t check for potentially problematic
 			nested link text. (Equivalent to
 			{1} "none")</entry>
-<entry key="syntax.format.map">{0} &lt;key&gt;=&lt;value&gt;[,&lt;key&gt;=&lt;value&gt;]* (or {1}  &lt;key&gt;=&lt;value&gt;[,&lt;key&gt;=&lt;value&gt;]*)
+<entry key="syntax.format.map">{0} &lt;key&gt;:&lt;value&gt;[,&lt;key&gt;:&lt;value&gt;]* (or {1}  &lt;key&gt;:&lt;value&gt;[,&lt;key&gt;:&lt;value&gt;]*)
 			Set location format mappings.</entry>
 <entry key="syntax.group">{0} or {1}
 			Add ''group'' field to entries.</entry>
 <entry key="syntax.no.group">{0}
-			Don''t add ''group'' field to entries.</entry>
+			Don''t add ''group'' field to entries (default).</entry>
+<entry key="syntax.record.count">{0} or {1}
+			Add record count fields to entries.</entry>
+<entry key="syntax.no.record.count">{0}
+			Don''t add record count fields to entries.
+			(Automatically implements {1})</entry>
+<entry key="syntax.record.count.unit">{0} or {1}
+			Add unit record count fields to entries.
+			(Automatically implements {2})</entry>
+<entry key="syntax.no.record.count.unit">{0}
+			Don''t add unit record count fields to entries.</entry>
 <entry key="syntax.trim.fields">{0}
 			Trim leading and trailing spaces from fields.</entry>
 <entry key="syntax.no.trim.fields">{0}
 			Don''t trim leading and trailing spaces from fields (default).</entry>
+<entry key="syntax.expand.fields">{0}
+			Don''t write \glsnoexpandfields to the .glstex file.</entry>
+<entry key="syntax.no.expand.fields">{0}
+			Write \glsnoexpandfields to the .glstex file (default).</entry>
 <entry key="syntax.tex.encoding">{0} &lt;name&gt;
 			Set the character encoding for the output files.</entry>
+<entry key="syntax.packages">{0} &lt;list&gt; or {1} &lt;list&gt;
+			Instruct interpreter to pretend the listed 
+			packages have been used in the document.</entry>
 
 <entry key="message.reading">Reading {0}</entry>
 <entry key="message.writing">Writing {0}</entry>
@@ -103,21 +123,50 @@ See the manual for further details.</entry>
 <entry key="message.processing">Processing {0}</entry>
 <entry key="message.copying">Copying {0} -&gt; {1}</entry>
 <entry key="message.moving">Moving {0} -&gt; {1}</entry>
+<entry key="message.crossref.found">Entry {0}: found cross-reference ({1}): {2}</entry>
+<entry key="message.crossref.by">Entry {0} cross-referenced by {1}</entry>
+<entry key="message.checking.crossrefs">Checking cross-references for: {0}</entry>
+<entry key="message.dual.dep">Dual found: {0} (primary {1})</entry>
+<entry key="message.added.alias.dep">Adding alias {0} as dependency for {1}</entry>
 <entry key="message.added.dep">Added dependent: {0}</entry>
 <entry key="message.added.parent">Adding parent: {0}</entry>
+<entry key="message.selecting.all">Selecting all entries.</entry>
+<entry key="message.selecting.entry.records">Selecting entry {0} (has one or more records).</entry>
+<entry key="message.selecting.entry.record.match">Selecting entry {0} (matches record {1}).</entry>
+<entry key="message.selecting.entry.seerecord.match">Selecting entry {0} (matches cross-reference record {1}).</entry>
+<entry key="message.selecting.entry.suprecord.match">Selecting entry {0} (matches supplemental record {1}).</entry>
+<entry key="message.selecting.entry.crossresource.dep">Selecting entry {0} (cross-resource dependency).</entry>
+<entry key="message.selecting.entry.dualrecords">Selecting entry {0} (dual {1} has one or more records).</entry>
+<entry key="message.selecting.entry.dep">Selecting entry {0} (is dependency).</entry>
+<entry key="message.selecting.entry">Selecting entry {0}.</entry>
+<entry key="message.datetime.field.check">Checking entry {0} field {1} for date/time data (date:{2}, time:{3}).</entry>
+<entry key="message.field.notset">Field {0} not set for entry {1}</entry>
 <entry key="message.selection.mode">Selection mode: {0}</entry>
 <entry key="message.ignore.fields">Ignoring fields:</entry>
 <entry key="message.sort.mode">Sort mode: {0}</entry>
 <entry key="message.sort.field">Sort field: {0}</entry>
+<entry key="message.sort.date.locale">Date/time sort locale: {0}</entry>
+<entry key="message.sort.date.format">Date/time sort format: {0}</entry>
+<entry key="message.sort.numeric.locale">Numeric sort locale: {0}</entry>
+<entry key="message.sort.numeric.format">Numeric sort format: {0}</entry>
 <entry key="message.label.prefix">Label prefix: {0}</entry>
 <entry key="message.dual.label.prefix">Dual label prefix: {0}</entry>
+<entry key="message.tertiary.label.prefix">Tertiary label prefix: {0}</entry>
 <entry key="message.dual.sort.mode">Dual sort mode: {0}</entry>
 <entry key="message.dual.sort.field">Dual sort field: {0}</entry>
+<entry key="message.dual.sort.date.locale">Dual date/time sort locale: {0}</entry>
+<entry key="message.dual.sort.date.format">Dual date/time sort format: {0}</entry>
+<entry key="message.dual.sort.numeric.locale">Dual numeric sort locale: {0}</entry>
+<entry key="message.dual.sort.numeric.format">Dual numeric sort format: {0}</entry>
 <entry key="message.dual.entry.mappings">Dual entry mappings:</entry>
 <entry key="message.dual.symbol.mappings">Dual symbol mappings:</entry>
 <entry key="message.dual.abbreviation.mappings">Dual abbreviation mappings:</entry>
-<entry key="message.dual.entryabbreviation.mappings">Dual entry-abbreviation mappings:</entry>
+<entry key="message.dual.abbreviationentry.mappings">Dual abbreviation-entry mappings:</entry>
+<entry key="message.dual.indexentry.mappings">Dual index-entry mappings:</entry>
+<entry key="message.dual.indexsymbol.mappings">Dual index-symbol mappings:</entry>
+<entry key="message.dual.indexabbrv.mappings">Dual index-abbreviation mappings:</entry>
 <entry key="message.process.result">Processed returned: {0}</entry>
+<entry key="message.truncated">Truncating according to limit={0}.</entry>
 
 <entry key="message.log.file">Transcript written to {0}.</entry>
 <entry key="message.written">{0} written to {1}.</entry>
@@ -127,12 +176,25 @@ See the manual for further details.</entry>
 <entry key="message.1.entry">1 entry</entry>
 <entry key="message.2.entry">{0,number} entries</entry>
 
+<entry key="message.selected">{0} selected.</entry>
+<entry key="message.dual.selected">{0} dual selected.</entry>
+
 <entry key="message.1.sty">1 recognised package:</entry>
 <entry key="message.2.sty">{0,number} recognised packages:</entry>
 
+<entry key="message.initialising.resource">Initialising resource {0}.</entry>
+<entry key="message.parsing.resource.bib">Parsing bib files for resource {0}.</entry>
+<entry key="message.processing.resource">Processing resource {0}.</entry>
+<entry key="message.processing.master">Processing master {0}.</entry>
+<entry key="message.selecting.entries">Selecting entries for resource {0}.</entry>
+<entry key="message.cross-resource.dep.allowed">Cross-resource references allowed.</entry>
+<entry key="message.cross-resource.dep.notallowed">Cross-resource references disabled.</entry>
+<entry key="message.cross-resource.notallowed">Cross-resource references can''t be supported for resource set {0}.</entry>
 <entry key="message.checking.read">Checking read access for {0}</entry>
 <entry key="message.checking.write">Checking write access for {0}</entry>
 <entry key="message.setting.sort">Initialising collation keys (strength={0}, decomposition={1})</entry>
+<entry key="message.non_unique_sort">Sort value ''{0}'' (entry ''{1}'') not unique for the entry''s hierarchical level.</entry>
+<entry key="message.sort_suffix">Appending suffix ''{0}'' to the sort value ''{1}'' for entry ''{2}''.</entry>
 <entry key="message.no.fallback">Entry type ''{0}'' has no fallback for field: {1}</entry>
 <entry key="message.inconsistent.range">Inconsistent location format {0}
 with range started by {1}</entry>
@@ -148,19 +210,34 @@ into explicit range {1}</entry>
 Defaulting to: {0}.
 (Use {1} if this is incorrect.)</entry>
 <entry key="message.tex.charset">TeX character encoding: {0}</entry>
-<entry key="message.adding.target.record">Adding record {0} from aliased entry {1}.</entry>
+<entry key="message.adding.record">Adding record {0} to entry {1}''s record list.</entry>
+<entry key="message.adding.supplemental.record">Adding supplemental record {0} to entry {1}''s record list.</entry>
+<entry key="message.adding.counter.record">Adding record {0} to entry {1}''s {2} record list.</entry>
+<entry key="message.copying.record">Copying record {0} from entry {1} to entry {2}.</entry>
 <entry key="message.ignored.record">Ignoring record {0}.</entry>
+<entry key="message.clearing.records">Clearing entry {0}''s record list.</entry>
 <entry key="message.normalizing">Normalising {0} to {1}.</entry>
 <entry key="message.norm.distinct">Normalized {0} distinct from {1}.</entry>
 <entry key="message.no.norm">Can''t normalize {0}.</entry>
 <entry key="message.collator.rules">Collator rules: {0}.</entry>
 <entry key="message.no.collation.element">No collation element for: {0}.</entry>
 <entry key="message.break.points">Break points: {0}.</entry>
+<entry key="message.field.alias.check">Checking field aliases for {0}.</entry>
+<entry key="message.clearing.entry.aliases">Clearing entry type aliases.</entry>
+<entry key="message.setting.entry.aliases">Setting entry type aliases.</entry>
+<entry key="message.removing.missing.parent">Stripping missing parent ''{0}'' from entry {1}</entry>
+<entry key="message.missing.sort.fallback">Entry ''{0}'' missing sort field ''{1}''. Falling back on field ''{2}''.</entry>
 
 <entry key="tag.page">Page</entry>
 <entry key="tag.pages">Pages</entry>
 <entry key="tag.passim">passim</entry>
 
+<!-- Sentence terminators for use with check-end-punctuation.
+     Only characters that have the Unicode category
+     "Punctuation, Other" are checked.
+     -->
+<entry key="sentence.terminators">.?!</entry>
+
 <!--
      Letter groups usually only have the first character converted to upper case
      (for example, the digraph 'dz' is converted to 'Dz'). This doesn't apply
@@ -174,9 +251,19 @@ Defaulting to: {0}.
 <entry key="warning.removing">Removing {0}</entry>
 <entry key="warning.ignoring.unknown.entry.type">Ignoring unknown entry type: {0}</entry>
 <entry key="warning.ignoring.unknown.encoding">Ignoring unknown encoding: {0}</entry>
-<entry key="warning.can.find.arg">Can't detect argument for: \{0}</entry>
-<entry key="warning.no.default.sort">Can't determine sort value for: {0}
-(Using sort field ''{1}''.)</entry>
+<entry key="warning.ignoring.unknown.field">Ignoring unknown field: {0}</entry>
+<entry key="warning.entry.already.defined">Entry {0} is being defined in {1} but it has already been defined in a previous .glstex file.</entry>
+<entry key="warning.can.find.arg">Can''t detect argument for: \{0}</entry>
+<entry key="warning.no.default.sort">Can''t determine sort value for: {0}
+(Using sort field ''{1}''. Entry type: {2}.)
+Falling back on ID.</entry>
+<entry key="warning.cant.parse.sort">Can''t parse sort value ''{0}'' for: {1}
+</entry>
+<entry key="warning.cant.parse.pattern.sort">Can''t parse sort value ''{0}'' for ''{1}'' (pattern: ''{2}'')
+</entry>
+<entry key="warning.cant.parse.datetime.pattern">Can''t parse {0} value ''{1}'' (pattern: ''{2}'')</entry>
+<entry key="warning.deprecated.type">Entry type ''{0}'' deprecated. Use ''{1}'' instead.</entry>
+<entry key="warning.deprecated.option">Option ''{0}'' deprecated. Use ''{1}'' instead.</entry>
 <entry key="warning.missing.field">Entry ''{0}'' missing required field: {1}</entry>
 <entry key="warning.potential.nested.link">Entry ''{0}'' has potentially nested link text in field: {1}
 Consider using \glsps'{'{3}'}' or \glspt'{'{3}'}' instead of {2}'{'{3}'}'</entry>
@@ -218,6 +305,13 @@ Contains one or more special characters.</entry>
 <entry key="warning.alias.not.found">Can''t find target {0} for aliased entry {1}.
 Aliased entries must be in the same resource set as their target entries with option {2}={3}.</entry>
 <entry key="warning.deprecated">''{0}'' deprecated. Use ''{1}'' instead.</entry>
+<entry key="warning.identical">Identical sort values for ''{0}'' and ''{1}''</entry>
+<entry key="warning.identical.id">Falling back on ID</entry>
+<entry key="warning.identical.original_id">Falling back on original ID</entry>
+<entry key="warning.identical.none">No fallback</entry>
+<entry key="warning.identical.field">Falling back on ''{0}'' field (''{1}'' &lt;=&gt; ''{2}'' = {3})</entry>
+<entry key="warning.unknown.widest.fortype">Can''t determine widest level {0} entry for glossary type ''{1}''. Using fallback method.</entry>
+<entry key="warning.unknown.widest">Can''t determine widest level {0} entry for unknown glossary type. Using fallback method.</entry>
 
 <entry key="error.title">Error: {0}</entry>
 <entry key="error.alias.map.forbidden">The 'alias' field can't be mapped.</entry>
@@ -240,6 +334,9 @@ Have you indexed your entries using commands like \gls?</entry>
 <entry key="error.dir.not.found">Directory not found: {0}</entry>
 <entry key="error.not.dir">Not a directory: {0}</entry>
 <entry key="error.cant.open.log">Can't open log file: {0}</entry>
+<entry key="error.invalid.id">Invalid or missing id
+{0}</entry>
+<entry key="error.invalid.sort.value">Invalid sort method ''{0}'' given in option: {1}</entry>
 <entry key="error.invalid.opt.value">Invalid ''{0}'' value: {1}</entry>
 <entry key="error.invalid.opt.int.value">Invalid ''{0}'' value: {1} (number required)</entry>
 <entry key="error.invalid.opt.minint.value">Invalid ''{0}'' value: {1} (can''t be less than {2,number})</entry>
@@ -255,6 +352,7 @@ Value must be a list of size {2,number}</entry>
 The size of the first list ({2,number}) is not the same as the size of 
 the second list ({3,number}).</entry>
 <entry key="error.invalid.field">Invalid field ''{0}'' provided by option ''{1}''</entry>
+<entry key="error.invalid.entry.type">Invalid entry type ''{0}'' provided in option ''{1}''</entry>
 <entry key="error.openin.forbidden">Read access forbidden for file: {0}</entry>
 <entry key="error.openout.forbidden">Write access forbidden for file: {0}</entry>
 <entry key="error.forbidden.ext">Write access forbidden for extension: {0}</entry>
@@ -283,6 +381,9 @@ Error occurred before: {3}
 </entry>
 <entry key="error.invalid.sort.rule">Invalid syntax in sort rule:
 {0}</entry>
+<entry key="error.field.alias.trail">''field-aliases'' can''t contain both ''{0}={1}'' and ''{2}={0}'' (trails not permitted)</entry>
+<entry key="error.field.alias.identity">''field-aliases'' can''t contain identity mapping ''{0}={0}''</entry>
+<entry key="error.cyclic.sameas.type.category">Cyclic reference category='{'same as type'}' and type='{'same as category'}'</entry>
 
 <!--
     The following messages are used by convertgls2bib
@@ -291,7 +392,7 @@ Error occurred before: {3}
 <entry key="gls2bib.override.newdualentry">Overriding default definition of \\newdualentry with custom 
 definition. (Change \\newcommand to \\providecommand if you want 
 \\newdualentry[options]'{'label'}{'short'}{'long'}{'description'}'
-converted to @dualentryabbreviation.)</entry>
+converted to @dualabbreviationentry.)</entry>
 
 <!--
      The following messages are used by various parts of
@@ -332,7 +433,7 @@ converted to @dualentryabbreviation.)</entry>
 <entry key="tex.error.dimen_expected">Dimension expected</entry>
 <entry key="tex.error.missing_unit">Missing unit</entry>
 <entry key="tex.error.expected">Expected {0}</entry>
-<entry key="tex.error.undefined">Undefined command {0}</entry>
+<entry key="tex.error.undefined">Undefined command \{0}</entry>
 <entry key="tex.error.undefined_char">Undefined active character ''{0}''</entry>
 <entry key="tex.error.cs_expected">Control sequence expected (found ''{0}'')</entry>
 <entry key="tex.error.number_expected">Number expected (found ''{0}'')</entry>
@@ -370,4 +471,5 @@ converted to @dualentryabbreviation.)</entry>
 <entry key="bibtex.error.missing">Missing</entry>
 <entry key="bibtex.error.too_many_commas">Too many commas in name ''{0}''</entry>
 <entry key="bibtex.error.string_name_undefined">String name ''{0}'' undefined</entry>
+<entry key="bibtex.error.repeated_entry">Repeated entry ''{0}''</entry>
 </properties>