bib2gls (8may18)

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

4 files changed, 40 insertions, 7 deletions

diff --git a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar
index 4703f0d41ba..c48b91a643f 100755
--- a/Master/texmf-dist/scripts/bib2gls/bib2gls.jar
+++ b/Master/texmf-dist/scripts/bib2gls/bib2gls.jar
diff --git a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar
index 50367615e17..8825d59b2ee 100755
--- a/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar
+++ b/Master/texmf-dist/scripts/bib2gls/convertgls2bib.jar
diff --git a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
index 0e65ff8855d..078f5ce497e 100644
--- a/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
+++ b/Master/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
@@ -25,7 +25,8 @@ See the manual for further details.</entry>
 			Synonym: {1}</entry>
 <entry key="syntax.silent">{0}		Only display error messages.</entry>
 <entry key="syntax.locale">{0} &lt;lang&gt; (or {1} &lt;lang&gt;)
-			Use language resource file for &lt;lang&gt;.</entry>
+			Use language resource file for &lt;lang&gt;.
+			Also sets default document language.</entry>
 <entry key="syntax.log">{0} &lt;file&gt; (or {1} &lt;file&gt;)
 			Set transcript file name.</entry>
 <entry key="syntax.dir">{0} &lt;directory&gt; (or {1} &lt;directory&gt;)
@@ -141,7 +142,7 @@ See the manual for further details.</entry>
 <entry key="syntax.custom.packages">{0} &lt;list&gt; 
 			Instruct the interpreter to parse
 			the listed packages.</entry>
-<entry key="syntax.list.known.packages"> 
+<entry key="syntax.list.known.packages">{0}
 			List the packages known to the interpreter.</entry>
 
 <entry key="message.reading">Reading {0}</entry>
@@ -242,6 +243,12 @@ 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.charset">Encoding: {0}</entry>
+<entry key="message.detected.charset">Detected encoding: {0}</entry>
+<entry key="message.default.charset">Default encoding: {0}</entry>
+<entry key="message.null">not set</entry>
+<entry key="message.missing.id">id missing</entry>
+<entry key="message.default.locale">Default document locale: {0} {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>
@@ -347,6 +354,8 @@ Aliased entries must be in the same resource set as their target entries with op
 <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="warning.invalid.locale">Unrecognised locale: {0}. Using {1} instead.</entry>
+<entry key="warning.interpreter.needed.fallback">Interpreter needed to obtain fallback contents for field {0} (entry {1})</entry>
 
 <entry key="error.title">Error: {0}</entry>
 <entry key="error.alias.map.forbidden">The 'alias' field can't be mapped.</entry>
@@ -368,7 +377,7 @@ Have you indexed your entries using commands like \gls?</entry>
 (Did you forget to use the ''src'' key?)</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.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>
@@ -394,6 +403,7 @@ the second list ({3,number}).</entry>
 <entry key="error.forbidden.ext">Write access forbidden for extension: {0}</entry>
 <entry key="error.cant.open.process.stream">Unable to open input stream from process: {0}</entry>
 <entry key="error.cyclic.hierarchy">Cyclical hierarchy for entry: {0}</entry>
+<entry key="error.child.parent">Entry can''t be its own parent: {0}</entry>
 <entry key="error.duplicate.resource">Duplicate resource: {0}</entry>
 <entry key="error.nested.range">Nested location range: {0}
 Outer range started with: {1}</entry>
@@ -431,9 +441,9 @@ Use {1} {0} instead.</entry>
     The following messages are used by convertgls2bib
 -->
 
-<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'}'
+<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 @dualabbreviationentry.)</entry>
 
 <!--
@@ -488,6 +498,16 @@ converted to @dualabbreviationentry.)</entry>
 <entry key="tex.error.illegal_align">Illegal alignment {0}</entry>
 <entry key="tex.error.misplaced_omit">Misplaced \omit</entry>
 <entry key="tex.error.improper_alphabetic_constant">Improper alphabetic constant {0}</entry>
+<entry key="tex.error.register_expected">Register expected</entry>
+<entry key="tex.error.register_expected_but_found">Register expected (found ''{0}'')</entry>
+<entry key="tex.error.numeric register_expected">Numeric register expected</entry>
+<entry key="tex.error.register_not_numeric">Register ''{0}'' not numeric</entry>
+<entry key="tex.error.register_not_token">Register ''{0}'' not a token register</entry>
+<entry key="tex.error.generic">{0}</entry>
+<entry key="tex.error.file.not.found">File ''{0}'' not found.</entry>
+<entry key="tex.error.unexpandable">Can''t expand ''{0}''</entry>
+
+
 
 <entry key="latex.error.no_alignment">No alignment specifiers found</entry>
 <entry key="latex.error.undefined_counter">No counter ''{0}'' defined</entry>
@@ -500,11 +520,16 @@ converted to @dualabbreviationentry.)</entry>
 <entry key="latex.error.defined">''{0}'' already defined</entry>
 <entry key="latex.error.illegal_array_arg_char">Illegal character ''{0}'' in array arg</entry>
 <entry key="latex.error.lonely_item">Lonely \item</entry>
+<entry key="latex.package.error">Package {0} Error: {1}</entry>
+<entry key="latex.class.error">Class {0} Error: {1}</entry>
+<entry key="latex.illegal.argtype">Illegal argument type {0}</entry>
+<entry key="latex.package.not.loaded">Package ''{0}'' has not been loaded</entry>
 
 <entry key="bibtex.error.missing_value">Missing value</entry>
 <entry key="bibtex.error.expecting">Expecting ''{0}''</entry>
 <entry key="bibtex.error.expecting_or">Expecting ''{0}'' or ''{1}''</entry>
-<entry key="bibtex.error.missing_id">Missing identifier</entry>
+<entry key="bibtex.error.missing.id">Missing identifier</entry>
+<entry key="bibtex.error.invalid.id">Invalid identifier element {0}</entry>
 <entry key="bibtex.error.missing_field_part">Missing field value</entry>
 <entry key="bibtex.error.missing_field_name">Missing field identifier</entry>
 <entry key="bibtex.error.unbalanced_braces">Unbalanced braces</entry>
@@ -542,5 +567,13 @@ converted to @dualabbreviationentry.)</entry>
 
 <entry key="ifthen.invalid.condition">Invalid condition ''{0}''.</entry>
 
+<!--  inputenc messages -->
+
+<entry key="inputenc.unknown.encoding">Unknown encoding ''{0}''.</entry>
+
+<!-- color messages -->
+<entry key="color.unsupported">Unsupported ''{0}'' model colour {1}</entry>
+<entry key="color.invalid.specs">Invalid specification ''{0}'' for colour model {1}</entry>
+<entry key="color.unknown">Unknown named colour ''{0}''</entry>
 
 </properties>
diff --git a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar
index 257655baedb..7cd7ec5f7a8 100755
--- a/Master/texmf-dist/scripts/bib2gls/texparserlib.jar
+++ b/Master/texmf-dist/scripts/bib2gls/texparserlib.jar