From cef52bab184e6db0dac8ecfb4bdddc4d9da8263a Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Tue, 26 Sep 2017 15:44:55 +0200 Subject: [PATCH 01/47] Fix conflicts with multitype relations --- xsl/semanticnet.xsl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xsl/semanticnet.xsl b/xsl/semanticnet.xsl index 86df600..6b730d0 100644 --- a/xsl/semanticnet.xsl +++ b/xsl/semanticnet.xsl @@ -356,7 +356,7 @@ {id: ' - 2 + IsAntonymOf ', from: ' @@ -370,7 +370,7 @@ {id: ' - 2 + IsHypernymOf ', from: ' @@ -384,7 +384,7 @@ {id: ' - 2 + IsHyponymOf ', from: ' @@ -398,7 +398,7 @@ {id: ' - 2 + IsInstanceOf ', from: ' @@ -412,7 +412,7 @@ {id: ' - 2 + IsPartOf ', from: ' @@ -426,7 +426,7 @@ {id: ' - 2 + IsRelatedWith ', from: ' From bd4183ab78d8fb370388fc97a1aeeb39606f3ee2 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Mon, 2 Oct 2017 00:00:37 +0200 Subject: [PATCH 02/47] Improve usability of semantic net search box --- xsl/semanticnet.xsl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xsl/semanticnet.xsl b/xsl/semanticnet.xsl index 86df600..3db0d9e 100644 --- a/xsl/semanticnet.xsl +++ b/xsl/semanticnet.xsl @@ -323,9 +323,8 @@ - ' - - ' + {value:'', + label:''} , From abf2c06c0ef041ea1ab8ca52765e1ce9bbb3f190 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Thu, 12 Oct 2017 17:38:06 +0200 Subject: [PATCH 03/47] Update plugin detection to match new Oxygen XML webhelp plugins --- build_dita2termbrowser_template.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_dita2termbrowser_template.xml b/build_dita2termbrowser_template.xml index d26e910..3e9f239 100644 --- a/build_dita2termbrowser_template.xml +++ b/build_dita2termbrowser_template.xml @@ -14,7 +14,11 @@ + + + + From 2d0af6debcb403264c4a2dc396240fb40619e666 Mon Sep 17 00:00:00 2001 From: Lionel Moizeau Date: Tue, 24 Oct 2017 17:44:12 +0200 Subject: [PATCH 04/47] Refactoring framework (#29) * moved framework to plugin root to facilitate integration with Web Author * more refactoring, it works now * removed test files --- ...ramework => DOCTALES_Terminology.framework | 865 +++++++++++------- ...work => DOCTALES_Terminology_Map.framework | 0 .../DOCTALES Termmap (RelaxNG).dita | 0 .../DOCTALES Termmap (RelaxNG).properties | 0 .../{ => termmap}/DOCTALES Termmap.dita | 0 .../{ => termmap}/DOCTALES Termmap.properties | 0 .../DOCTALES SemanticNet (RelaxNG).dita | 0 .../DOCTALES SemanticNet (RelaxNG).properties | 0 .../{ => topic}/DOCTALES SemanticNet.dita | 0 .../DOCTALES SemanticNet.properties | 0 .../DOCTALES Termentry (RelaxNG).dita | 0 .../DOCTALES Termentry (RelaxNG).properties | 0 .../{ => topic}/DOCTALES Termentry.dita | 0 .../{ => topic}/DOCTALES Termentry.properties | 0 .../DOCTALES Termstats (RelaxNG).dita | 0 .../DOCTALES Termstats (RelaxNG).properties | 0 .../{ => topic}/DOCTALES Termstats.dita | 0 .../{ => topic}/DOCTALES Termstats.properties | 0 18 files changed, 559 insertions(+), 306 deletions(-) rename framework/DOCTALES_Terminology.framework => DOCTALES_Terminology.framework (95%) rename framework/DOCTALES_Terminology_Map.framework => DOCTALES_Terminology_Map.framework (100%) rename framework/templates/{ => termmap}/DOCTALES Termmap (RelaxNG).dita (100%) rename framework/templates/{ => termmap}/DOCTALES Termmap (RelaxNG).properties (100%) rename framework/templates/{ => termmap}/DOCTALES Termmap.dita (100%) rename framework/templates/{ => termmap}/DOCTALES Termmap.properties (100%) rename framework/templates/{ => topic}/DOCTALES SemanticNet (RelaxNG).dita (100%) rename framework/templates/{ => topic}/DOCTALES SemanticNet (RelaxNG).properties (100%) rename framework/templates/{ => topic}/DOCTALES SemanticNet.dita (100%) rename framework/templates/{ => topic}/DOCTALES SemanticNet.properties (100%) rename framework/templates/{ => topic}/DOCTALES Termentry (RelaxNG).dita (100%) rename framework/templates/{ => topic}/DOCTALES Termentry (RelaxNG).properties (100%) rename framework/templates/{ => topic}/DOCTALES Termentry.dita (100%) rename framework/templates/{ => topic}/DOCTALES Termentry.properties (100%) rename framework/templates/{ => topic}/DOCTALES Termstats (RelaxNG).dita (100%) rename framework/templates/{ => topic}/DOCTALES Termstats (RelaxNG).properties (100%) rename framework/templates/{ => topic}/DOCTALES Termstats.dita (100%) rename framework/templates/{ => topic}/DOCTALES Termstats.properties (100%) diff --git a/framework/DOCTALES_Terminology.framework b/DOCTALES_Terminology.framework similarity index 95% rename from framework/DOCTALES_Terminology.framework rename to DOCTALES_Terminology.framework index 1a584cf..5187e52 100644 --- a/framework/DOCTALES_Terminology.framework +++ b/DOCTALES_Terminology.framework @@ -1,5 +1,5 @@ - + document.types @@ -34,7 +34,7 @@ 6 - ${framework}/i18n/ + ${framework}/framework/i18n/ addIndex @@ -51,7 +51,7 @@ 7 - ${framework}/resources/ + ${framework}/framework/resources/ addIndex @@ -60,38 +60,31 @@ - - - classpath - - - 1 - - - - - - removeIndex - - - - - authorExtensionDescriptor/cssDescriptors - 16 + 17 - + + + ${framework}/framework/css/termentry.less + + + DOCTALES Termentry + + + false + + - removeIndex + addIndex - ${baseFramework}/css/actions/actions.css + @@ -108,7 +101,7 @@ removeIndex - ${baseFramework}/css/hints/hints.css + ${baseFramework}/css/actions/actions.css @@ -125,7 +118,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-hide-draft-comments.css + ${baseFramework}/css/hints/hints.css @@ -142,7 +135,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-table-show-colspec.css + ${baseFramework}/css/edit/alternate-hide-draft-comments.css @@ -159,7 +152,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-syntax-highlight.css + ${baseFramework}/css/edit/alternate-table-show-colspec.css @@ -176,7 +169,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-coloured-revisions.css + ${baseFramework}/css/edit/alternate-syntax-highlight.css @@ -193,7 +186,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-map-print-preview-layout.css + ${baseFramework}/css/edit/alternate-coloured-revisions.css @@ -210,7 +203,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-full-width-layout.css + ${baseFramework}/css/edit/alternate-map-print-preview-layout.css @@ -227,7 +220,7 @@ removeIndex - ${baseFramework}/css_classed/dita.css + ${baseFramework}/css/edit/alternate-full-width-layout.css @@ -366,33 +359,6 @@ ${baseFramework}/css/edit/style-basic.css - - - authorExtensionDescriptor/cssDescriptors - - - 0 - - - - - ${framework}/css/termentry.less - - - DOCTALES Termentry - - - false - - - - - addIndex - - - - - authorExtensionDescriptor/actionDescriptors @@ -412,10 +378,10 @@ ${i18n(doctales.move.element.up_description)} - ${framework}/icons/up_20.png + ${framework}/framework/icons/up_20.png - ${framework}/icons/up_16.png + ${framework}/framework/icons/up_16.png @@ -482,10 +448,10 @@ ${i18n(doctales.move.element.down_description)} - ${framework}/icons/down_20.png + ${framework}/framework/icons/down_20.png - ${framework}/icons/down_16.png + ${framework}/framework/icons/down_16.png @@ -552,10 +518,10 @@ ${i18n(doctales.element.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -614,10 +580,10 @@ ${i18n(doctales.termVariant.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -684,10 +650,10 @@ ${i18n(doctales.fullForm.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -834,10 +800,10 @@ ${i18n(doctales.abbreviation.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -984,10 +950,10 @@ ${i18n(doctales.acronym.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -1134,10 +1100,10 @@ ${i18n(doctales.verb.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -1284,10 +1250,10 @@ ${i18n(doctales.fullForm.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -1346,10 +1312,10 @@ ${i18n(doctales.abbreviation.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -1408,10 +1374,10 @@ ${i18n(doctales.relatedTerm.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -1470,10 +1436,10 @@ ${i18n(doctales.verb.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -1532,10 +1498,10 @@ ${i18n(doctales.attribute.number.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -1606,10 +1572,10 @@ ${i18n(doctales.attribute.case.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -1680,10 +1646,10 @@ ${i18n(doctales.termVariant.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -1742,10 +1708,10 @@ ${i18n(doctales.annotation.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -1836,10 +1802,10 @@ ${i18n(doctales.termContext.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -1909,10 +1875,10 @@ ${i18n(doctales.termSource.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -1981,10 +1947,10 @@ ${i18n(doctales.antonyms.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -2103,10 +2069,10 @@ ${i18n(doctales.partsOf.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -2223,10 +2189,10 @@ ${i18n(doctales.hypernyms.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -2343,10 +2309,10 @@ ${i18n(doctales.hyponyms.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -2463,10 +2429,10 @@ ${i18n(doctales.relatedTerms.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -2583,10 +2549,10 @@ ${i18n(doctales.definition.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -2659,10 +2625,10 @@ ${i18n(doctales.definition.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -2721,10 +2687,10 @@ ${i18n(doctales.equation-figure.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -2811,10 +2777,10 @@ ${i18n(doctales.note.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -2881,10 +2847,10 @@ ${i18n(doctales.partOfSpeech.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -2951,10 +2917,10 @@ ${i18n(doctales.fig.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -3026,10 +2992,10 @@ ${i18n(doctales.domains.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -3098,10 +3064,10 @@ ${i18n(doctales.definitionSource.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -3171,10 +3137,10 @@ ${i18n(doctales.sourceName.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -3241,10 +3207,10 @@ ${i18n(doctales.sourceReference.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -3335,10 +3301,10 @@ ${i18n(doctales.sourceName.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -3429,10 +3395,10 @@ ${i18n(doctales.sourceReference.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -3523,10 +3489,10 @@ ${i18n(doctales.agreedWith.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -3595,10 +3561,10 @@ ${i18n(doctales.relations.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -3665,10 +3631,10 @@ ${i18n(doctales.definitionSource.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -3727,10 +3693,10 @@ ${i18n(doctales.annotation.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -3789,10 +3755,10 @@ ${i18n(doctales.termContext.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -3851,10 +3817,10 @@ ${i18n(doctales.termSource.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -3913,10 +3879,10 @@ ${i18n(doctales.relations.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -3991,10 +3957,10 @@ ${i18n(doctales.antonyms.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -4053,10 +4019,10 @@ ${i18n(doctales.partsOf.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -4115,10 +4081,10 @@ ${i18n(doctales.hypernyms.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -4177,10 +4143,10 @@ ${i18n(doctales.hyponyms.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -4239,10 +4205,10 @@ ${i18n(doctales.relatedTerms.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -4301,10 +4267,10 @@ ${i18n(doctales.antonym.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -4358,10 +4324,10 @@ ${i18n(doctales.partOf.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -4415,10 +4381,10 @@ ${i18n(doctales.hypernym.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -4472,10 +4438,10 @@ ${i18n(doctales.hyponym.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -4529,10 +4495,10 @@ ${i18n(doctales.relatedTerm.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -4586,10 +4552,10 @@ ${i18n(doctales.termRelation.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -4648,10 +4614,10 @@ ${i18n(doctales.termCommitteeMember.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -4742,10 +4708,10 @@ ${i18n(doctales.agreedWith.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -4804,10 +4770,10 @@ ${i18n(doctales.termCommitteeMember.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -4866,10 +4832,10 @@ ${i18n(doctales.domain.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -4960,10 +4926,10 @@ ${i18n(doctales.domains.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -5022,10 +4988,10 @@ ${i18n(doctales.domain.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -5084,10 +5050,10 @@ ${i18n(doctales.partOfSpeech.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -5146,10 +5112,10 @@ ${i18n(doctales.termNotation.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -5208,10 +5174,10 @@ ${i18n(doctales.fig.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -5270,10 +5236,10 @@ ${i18n(doctales.note.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -5332,10 +5298,10 @@ ${i18n(doctales.keyref.termRelation_description)} - ${framework}/icons/link_20.png + ${framework}/framework/icons/link_20.png - ${framework}/icons/link_16.png + ${framework}/framework/icons/link_16.png @@ -5446,10 +5412,10 @@ ${i18n(doctales.image.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -5508,10 +5474,10 @@ ${i18n(doctales.fullForm.renameTo_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -5570,10 +5536,10 @@ ${i18n(doctales.verb.renameTo_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -5632,10 +5598,10 @@ ${i18n(doctales.acronym.renameTo_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -5694,10 +5660,10 @@ ${i18n(doctales.abbreviation.renameTo)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -5756,10 +5722,10 @@ ${i18n(doctales.instancesOf.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -5876,10 +5842,10 @@ ${i18n(doctales.instanceOf.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -5933,10 +5899,10 @@ ${i18n(doctales.instancesOf.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -5995,10 +5961,10 @@ ${i18n(doctales.termRelation.add_description)} - ${framework}/icons/link_20.png + ${framework}/framework/icons/link_20.png - ${framework}/icons/link_16.png + ${framework}/framework/icons/link_16.png @@ -6052,10 +6018,10 @@ ${i18n(doctales.open.termRelation_description)} - ${framework}/icons/link_20.png + ${framework}/framework/icons/link_20.png - ${framework}/icons/link_16.png + ${framework}/framework/icons/link_16.png @@ -6175,10 +6141,10 @@ ${i18n(doctales.hypernym.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6237,10 +6203,10 @@ ${i18n(doctales.instanceOf.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6299,10 +6265,10 @@ ${i18n(doctales.antonym.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6361,10 +6327,10 @@ ${i18n(doctales.partOf.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6423,10 +6389,10 @@ ${i18n(doctales.hyponym.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6485,10 +6451,10 @@ ${i18n(doctales.acronym.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6547,10 +6513,10 @@ ${i18n(doctales.equation-figure.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6609,10 +6575,10 @@ ${i18n(doctales.alt.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6671,10 +6637,10 @@ ${i18n(doctales.alt.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -6741,10 +6707,10 @@ ${i18n(doctales.termContextText.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6819,10 +6785,10 @@ ${i18n(doctales.termContextSource.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -6881,10 +6847,10 @@ ${i18n(doctales.termContextText.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -6951,10 +6917,10 @@ doctales.dummy - ${framework}/icons/dummy_24.png + ${framework}/framework/icons/dummy_24.png - ${framework}/icons/dummy_16.png + ${framework}/framework/icons/dummy_16.png @@ -7008,10 +6974,10 @@ - ${framework}/icons/link_20.png + ${framework}/framework/icons/link_20.png - ${framework}/icons/link_16.png + ${framework}/framework/icons/link_16.png @@ -7070,10 +7036,10 @@ ${i18n(doctales.altDefinition.add_description)} - ${framework}/icons/add_20.png + ${framework}/framework/icons/add_20.png - ${framework}/icons/add_16.png + ${framework}/framework/icons/add_16.png @@ -7146,10 +7112,10 @@ ${i18n(doctales.altDefinition.delete_description)} - ${framework}/icons/delete_20.png + ${framework}/framework/icons/delete_20.png - ${framework}/icons/delete_16.png + ${framework}/framework/icons/delete_16.png @@ -7562,7 +7528,7 @@ - ${framework}/icons/termentry-icon16.png + ${framework}/framework/icons/termentry-icon16.png @@ -7601,7 +7567,7 @@ - ${framework}/icons/termentry-icon16.png + ${framework}/framework/icons/termentry-icon16.png @@ -7978,13 +7944,13 @@ templatesLocations - 7 + 1 - + ${frameworkDir}/framework/templates - removeIndex + addIndex @@ -7992,10 +7958,10 @@ - templatesLocations + xmlCatalogs - 6 + 1 @@ -8009,16 +7975,16 @@ - templatesLocations + xmlCatalogs - 5 + 1 - + ${framework}/catalog-dita.xml - removeIndex + addIndex @@ -8026,16 +7992,16 @@ - templatesLocations + description - 4 + -1 - + Framework for DITA terminology management - removeIndex + set @@ -8043,10 +8009,10 @@ - templatesLocations + doctypeRules - 3 + 28 @@ -8060,10 +8026,10 @@ - templatesLocations + doctypeRules - 2 + 27 @@ -8077,10 +8043,10 @@ - templatesLocations + doctypeRules - 1 + 26 @@ -8094,10 +8060,10 @@ - templatesLocations + doctypeRules - 0 + 25 @@ -8111,16 +8077,16 @@ - templatesLocations + doctypeRules - 0 + 24 - ${frameworkDir}/templates + - addIndex + removeIndex @@ -8128,10 +8094,10 @@ - xmlCatalogs + doctypeRules - 3 + 23 @@ -8145,10 +8111,10 @@ - xmlCatalogs + doctypeRules - 2 + 22 @@ -8162,10 +8128,10 @@ - xmlCatalogs + doctypeRules - 1 + 21 @@ -8179,10 +8145,10 @@ - xmlCatalogs + doctypeRules - 0 + 20 @@ -8196,16 +8162,16 @@ - xmlCatalogs + doctypeRules - 0 + 19 - ${frameworks}/catalog-dita.xml + - addIndex + removeIndex @@ -8213,16 +8179,16 @@ - description + doctypeRules - -1 + 18 - Framework for DITA terminology management + - set + removeIndex @@ -8719,7 +8685,7 @@ 7 - ${framework}/rules/termentry.sch + ${framework}/framework/rules/termentry.sch @@ -8910,17 +8876,6 @@ false - - - ${framework}/css_classed/dita.css - - - <Old - Compatibility Mode> - - - false - - ${framework}/css/edit/alternate-full-width-layout.css @@ -9192,6 +9147,26 @@ + + + oxy:allows-child-element("*", "class", " topic/p ") + + + + + fragment + <p/> + + + insertPosition + After + + + + + ro.sync.ecss.extensions.commons.operations.InsertFragmentOperation + + ancestor-or-self::*[contains(@class," topic/p ")] @@ -11461,7 +11436,7 @@ oxy:current-selected-element()[self::*[contains(@class," topic/tbody ") or conta - + self::* or oxy:current-selected-element()[self::*[contains(@class," topic/topic ")]] @@ -14977,15 +14952,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima - ${configured.ditaot.dir}/plugins/*/template_folders/* ${frameworkDir}/templates/topic - ${frameworkDir}/templates/topic-xsd - ${frameworkDir}/templates/plugin - ${configured.ditaot.dir}/org.dita-ng.doctypes_oxygen_templates/topic-rng - ${configured.ditaot.dir}/plugins/net.sourceforge.dita4publishers.doctypes/oxygen_templates/topic (Dita 4 Publishers) - ${configured.ditaot.dir}/plugins/org.oasis-open.dita.v1_3/oxygen_templates/DITA 1.3/topic-rng - ${configured.ditaot.dir}/plugins/mathml/oxygen_templates/MathML - ${configured.ditaot.dir}/plugins/org.oasis.xdita/oxygen_templates/LW (Lightweight) DITA/topic-lw @@ -15157,6 +15124,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Composite* + + + + + + * + + + * + + + * + + @@ -15183,6 +15176,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Concept* + + + + + + * + + + * + + + * + + @@ -15209,6 +15228,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Reference* + + + + + + * + + + * + + + * + + @@ -15235,6 +15280,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Task* + + + + + + * + + + * + + + * + + * @@ -15261,6 +15332,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 General Task* + + + + + + * + + + * + + + * + + @@ -15287,6 +15384,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Topic* + + + + + + * + + + * + + + * + + @@ -15313,6 +15436,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Glossary* + + + + + + * + + + * + + + * + + * @@ -15339,6 +15488,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Learning Overview* + + + + + + * + + + * + + + * + + * @@ -15365,6 +15540,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Learning Content* + + + + + + * + + + * + + + * + + * @@ -15391,6 +15592,32 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Learning Plan* + + + + + + * + + + * + + + * + + * @@ -15428,7 +15655,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - *-//OASIS//DTD DITA Learning Assessment* + *-//OASIS//DTD DITA 1.3 Learning Summary* @@ -15454,10 +15681,36 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * + *-//OASIS//DTD DITA Learning Assessment* + + + + + + * + + + * + + * + + + + * + + + * + + + * + + + *-//OASIS//DTD DITA 1.3 Learning Assessment* + - ro.sync.ecss.extensions.dita.topic.DITATopicCustomRuleMatcher + * @@ -16134,7 +16387,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima - 2 + 5 diff --git a/framework/DOCTALES_Terminology_Map.framework b/DOCTALES_Terminology_Map.framework similarity index 100% rename from framework/DOCTALES_Terminology_Map.framework rename to DOCTALES_Terminology_Map.framework diff --git a/framework/templates/DOCTALES Termmap (RelaxNG).dita b/framework/templates/termmap/DOCTALES Termmap (RelaxNG).dita similarity index 100% rename from framework/templates/DOCTALES Termmap (RelaxNG).dita rename to framework/templates/termmap/DOCTALES Termmap (RelaxNG).dita diff --git a/framework/templates/DOCTALES Termmap (RelaxNG).properties b/framework/templates/termmap/DOCTALES Termmap (RelaxNG).properties similarity index 100% rename from framework/templates/DOCTALES Termmap (RelaxNG).properties rename to framework/templates/termmap/DOCTALES Termmap (RelaxNG).properties diff --git a/framework/templates/DOCTALES Termmap.dita b/framework/templates/termmap/DOCTALES Termmap.dita similarity index 100% rename from framework/templates/DOCTALES Termmap.dita rename to framework/templates/termmap/DOCTALES Termmap.dita diff --git a/framework/templates/DOCTALES Termmap.properties b/framework/templates/termmap/DOCTALES Termmap.properties similarity index 100% rename from framework/templates/DOCTALES Termmap.properties rename to framework/templates/termmap/DOCTALES Termmap.properties diff --git a/framework/templates/DOCTALES SemanticNet (RelaxNG).dita b/framework/templates/topic/DOCTALES SemanticNet (RelaxNG).dita similarity index 100% rename from framework/templates/DOCTALES SemanticNet (RelaxNG).dita rename to framework/templates/topic/DOCTALES SemanticNet (RelaxNG).dita diff --git a/framework/templates/DOCTALES SemanticNet (RelaxNG).properties b/framework/templates/topic/DOCTALES SemanticNet (RelaxNG).properties similarity index 100% rename from framework/templates/DOCTALES SemanticNet (RelaxNG).properties rename to framework/templates/topic/DOCTALES SemanticNet (RelaxNG).properties diff --git a/framework/templates/DOCTALES SemanticNet.dita b/framework/templates/topic/DOCTALES SemanticNet.dita similarity index 100% rename from framework/templates/DOCTALES SemanticNet.dita rename to framework/templates/topic/DOCTALES SemanticNet.dita diff --git a/framework/templates/DOCTALES SemanticNet.properties b/framework/templates/topic/DOCTALES SemanticNet.properties similarity index 100% rename from framework/templates/DOCTALES SemanticNet.properties rename to framework/templates/topic/DOCTALES SemanticNet.properties diff --git a/framework/templates/DOCTALES Termentry (RelaxNG).dita b/framework/templates/topic/DOCTALES Termentry (RelaxNG).dita similarity index 100% rename from framework/templates/DOCTALES Termentry (RelaxNG).dita rename to framework/templates/topic/DOCTALES Termentry (RelaxNG).dita diff --git a/framework/templates/DOCTALES Termentry (RelaxNG).properties b/framework/templates/topic/DOCTALES Termentry (RelaxNG).properties similarity index 100% rename from framework/templates/DOCTALES Termentry (RelaxNG).properties rename to framework/templates/topic/DOCTALES Termentry (RelaxNG).properties diff --git a/framework/templates/DOCTALES Termentry.dita b/framework/templates/topic/DOCTALES Termentry.dita similarity index 100% rename from framework/templates/DOCTALES Termentry.dita rename to framework/templates/topic/DOCTALES Termentry.dita diff --git a/framework/templates/DOCTALES Termentry.properties b/framework/templates/topic/DOCTALES Termentry.properties similarity index 100% rename from framework/templates/DOCTALES Termentry.properties rename to framework/templates/topic/DOCTALES Termentry.properties diff --git a/framework/templates/DOCTALES Termstats (RelaxNG).dita b/framework/templates/topic/DOCTALES Termstats (RelaxNG).dita similarity index 100% rename from framework/templates/DOCTALES Termstats (RelaxNG).dita rename to framework/templates/topic/DOCTALES Termstats (RelaxNG).dita diff --git a/framework/templates/DOCTALES Termstats (RelaxNG).properties b/framework/templates/topic/DOCTALES Termstats (RelaxNG).properties similarity index 100% rename from framework/templates/DOCTALES Termstats (RelaxNG).properties rename to framework/templates/topic/DOCTALES Termstats (RelaxNG).properties diff --git a/framework/templates/DOCTALES Termstats.dita b/framework/templates/topic/DOCTALES Termstats.dita similarity index 100% rename from framework/templates/DOCTALES Termstats.dita rename to framework/templates/topic/DOCTALES Termstats.dita diff --git a/framework/templates/DOCTALES Termstats.properties b/framework/templates/topic/DOCTALES Termstats.properties similarity index 100% rename from framework/templates/DOCTALES Termstats.properties rename to framework/templates/topic/DOCTALES Termstats.properties From 63bc721fd6d925d0e6bcd2931b7e138aa96d5d7f Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 25 Oct 2017 17:20:58 +0200 Subject: [PATCH 05/47] Decrease framework priority, because other frameworks should be able to override --- DOCTALES_Terminology.framework | 508 +-------------------------------- 1 file changed, 13 insertions(+), 495 deletions(-) diff --git a/DOCTALES_Terminology.framework b/DOCTALES_Terminology.framework index 5187e52..e3612bb 100644 --- a/DOCTALES_Terminology.framework +++ b/DOCTALES_Terminology.framework @@ -7944,7 +7944,7 @@ templatesLocations - 1 + 9 ${frameworkDir}/framework/templates @@ -8007,210 +8007,6 @@ - - - doctypeRules - - - 28 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 27 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 26 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 25 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 24 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 23 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 22 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 21 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 20 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 19 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 18 - - - - - - removeIndex - - - - - - - - doctypeRules - - - 17 - - - - - - removeIndex - - - - - doctypeRules @@ -8749,7 +8545,7 @@ -1 - 4 + 3 set @@ -14952,7 +14748,15 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima + ${configured.ditaot.dir}/plugins/*/template_folders/* ${frameworkDir}/templates/topic + ${frameworkDir}/templates/topic-xsd + ${frameworkDir}/templates/plugin + ${configured.ditaot.dir}/org.dita-ng.doctypes_oxygen_templates/topic-rng + ${configured.ditaot.dir}/plugins/net.sourceforge.dita4publishers.doctypes/oxygen_templates/topic (Dita 4 Publishers) + ${configured.ditaot.dir}/plugins/org.oasis-open.dita.v1_3/oxygen_templates/DITA 1.3/topic-rng + ${configured.ditaot.dir}/plugins/mathml/oxygen_templates/MathML + ${configured.ditaot.dir}/plugins/org.oasis.xdita/oxygen_templates/LW (Lightweight) DITA/topic-lw @@ -15124,32 +14928,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Composite* - - - - - - * - - - * - - - * - - @@ -15176,32 +14954,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Concept* - - - - - - * - - - * - - - * - - @@ -15228,32 +14980,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Reference* - - - - - - * - - - * - - - * - - @@ -15280,32 +15006,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Task* - - - - - - * - - - * - - - * - - * @@ -15332,32 +15032,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 General Task* - - - - - - * - - - * - - - * - - @@ -15384,32 +15058,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Topic* - - - - - - * - - - * - - - * - - @@ -15436,32 +15084,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Glossary* - - - - - - * - - - * - - - * - - * @@ -15488,32 +15110,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Learning Overview* - - - - - - * - - - * - - - * - - * @@ -15540,32 +15136,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Learning Content* - - - - - - * - - - * - - - * - - * @@ -15592,32 +15162,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Learning Plan* - - - - - - * - - - * - - - * - - * @@ -15644,32 +15188,6 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - - - * - - - * - - - * - - - *-//OASIS//DTD DITA 1.3 Learning Summary* - - - - - - * - - - * - - - * - - * @@ -15707,10 +15225,10 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima * - *-//OASIS//DTD DITA 1.3 Learning Assessment* + * - + ro.sync.ecss.extensions.dita.topic.DITATopicCustomRuleMatcher * @@ -16387,7 +15905,7 @@ self::image[empty(parent::imagemap)] or oxy:current-selected-element()[self::ima - 5 + 2 From cf9d0ca680c4b7a836977715e91972b7acb818a2 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 27 Oct 2017 11:19:22 +0200 Subject: [PATCH 06/47] Add vis.js library earlier --- build_dita2termbrowser_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_dita2termbrowser_template.xml b/build_dita2termbrowser_template.xml index 3e9f239..99153dc 100644 --- a/build_dita2termbrowser_template.xml +++ b/build_dita2termbrowser_template.xml @@ -209,7 +209,7 @@ - + From 97c26b7bd6ec35341272e0eb0d8d9ee3a1ec9775 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 27 Oct 2017 12:36:04 +0200 Subject: [PATCH 07/47] Load termstats libraries earlier to fix oXygen webhelp issues --- build_dita2termbrowser_template.xml | 14 ++++++++++++++ .../webhelp-skin/header/termbrowser-classic.xml | 3 --- .../webhelp-skin/header/termbrowser-html5.xml | 3 --- .../webhelp-skin/header/termbrowser-reponsive.xml | 3 --- xsl/terminology-stats-xml2html.xsl | 7 ++++++- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/build_dita2termbrowser_template.xml b/build_dita2termbrowser_template.xml index 99153dc..116ccf2 100644 --- a/build_dita2termbrowser_template.xml +++ b/build_dita2termbrowser_template.xml @@ -107,6 +107,17 @@ + + + + + + + + + + + @@ -124,6 +135,9 @@ + + + Replace <div class="div stats"> placeholder element of: ${output.dir}\${termstats.base}.html diff --git a/framework/webhelp-skin/header/termbrowser-classic.xml b/framework/webhelp-skin/header/termbrowser-classic.xml index 5082959..6fbd710 100644 --- a/framework/webhelp-skin/header/termbrowser-classic.xml +++ b/framework/webhelp-skin/header/termbrowser-classic.xml @@ -3,7 +3,4 @@ - - - \ No newline at end of file diff --git a/framework/webhelp-skin/header/termbrowser-html5.xml b/framework/webhelp-skin/header/termbrowser-html5.xml index 2917665..67d4212 100644 --- a/framework/webhelp-skin/header/termbrowser-html5.xml +++ b/framework/webhelp-skin/header/termbrowser-html5.xml @@ -4,7 +4,4 @@ - - - \ No newline at end of file diff --git a/framework/webhelp-skin/header/termbrowser-reponsive.xml b/framework/webhelp-skin/header/termbrowser-reponsive.xml index 5082959..6fbd710 100644 --- a/framework/webhelp-skin/header/termbrowser-reponsive.xml +++ b/framework/webhelp-skin/header/termbrowser-reponsive.xml @@ -3,7 +3,4 @@ - - - \ No newline at end of file diff --git a/xsl/terminology-stats-xml2html.xsl b/xsl/terminology-stats-xml2html.xsl index 029de34..7c572cb 100644 --- a/xsl/terminology-stats-xml2html.xsl +++ b/xsl/terminology-stats-xml2html.xsl @@ -28,7 +28,12 @@ - + + HEAD BEGINNING + + + HEAD END + From 1ff2cd3ba80896a9a7a96acaafab4627e5074546 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 27 Oct 2017 12:55:45 +0200 Subject: [PATCH 08/47] Fix framework path issues --- DOCTALES_Terminology.framework | 17 + DOCTALES_Terminology_Map.framework | 879 +++++++++++++++++++++++------ 2 files changed, 737 insertions(+), 159 deletions(-) diff --git a/DOCTALES_Terminology.framework b/DOCTALES_Terminology.framework index e3612bb..cb3567d 100644 --- a/DOCTALES_Terminology.framework +++ b/DOCTALES_Terminology.framework @@ -8007,6 +8007,23 @@ + + + doctypeRules + + + 17 + + + + + + removeIndex + + + + + doctypeRules diff --git a/DOCTALES_Terminology_Map.framework b/DOCTALES_Terminology_Map.framework index b92ab79..7bed18f 100644 --- a/DOCTALES_Terminology_Map.framework +++ b/DOCTALES_Terminology_Map.framework @@ -1,5 +1,5 @@ - + document.types @@ -34,7 +34,7 @@ 4 - ${framework}/i18n/ + ${framework}/framework/i18n/ addIndex @@ -45,19 +45,19 @@ - authorExtensionDescriptor/cssDescriptors + classpath - 15 + 5 - + ${framework}/framework/resources/ - removeIndex + addIndex - ${baseFramework}/css/actions/actionsMap.css + @@ -74,7 +74,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-map-edit-attributes-inplace.css + ${baseFramework}/css/actions/actionsMap.css @@ -91,7 +91,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-map-show-link-text.css + ${baseFramework}/css/edit/alternate-map-edit-attributes-inplace.css @@ -108,7 +108,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-table-show-colspec.css + ${baseFramework}/css/edit/alternate-map-show-link-text.css @@ -125,7 +125,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-coloured-revisions.css + ${baseFramework}/css/edit/alternate-table-show-colspec.css @@ -142,7 +142,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-map-print-preview-layout.css + ${baseFramework}/css/edit/alternate-coloured-revisions.css @@ -159,7 +159,7 @@ removeIndex - ${baseFramework}/css/edit/alternate-full-width-layout.css + ${baseFramework}/css/edit/alternate-map-print-preview-layout.css @@ -176,7 +176,7 @@ removeIndex - ${baseFramework}/css_classed/dita.css + ${baseFramework}/css/edit/alternate-full-width-layout.css @@ -325,7 +325,7 @@ - ${framework}/css/termmap.less + ${framework}/framework/css/termmap.less DOCTALES Term Map @@ -1891,19 +1891,44 @@ - scenarios + doctypeRules - 18 + 1 - + + + * + + + *termmap* + + + * + + + * + + + + + + * + + + * + + + * + + - removeIndex + addIndex - DITA Map InDesign + @@ -1920,7 +1945,7 @@ removeIndex - DITA Map Kindle + DITA Map InDesign @@ -1937,7 +1962,7 @@ removeIndex - DITA Map Eclipse Help + DITA Map Kindle @@ -1954,7 +1979,7 @@ removeIndex - DITA Map RTF + DITA Map Eclipse Help @@ -1971,7 +1996,7 @@ removeIndex - DITA Map ODF + DITA Map RTF @@ -1988,7 +2013,7 @@ removeIndex - DITA Map Metrics Report + DITA Map ODF @@ -4568,7 +4593,7 @@ 7 - ${framework}/rules/termmap.sch + ${framework}/framework/rules/termmap.sch @@ -4632,7 +4657,7 @@ -1 - 1 + 3 set @@ -4757,17 +4782,6 @@ false - - - ${framework}/css_classed/dita.css - - - <Old - Compatibility Mode> - - - false - - ${framework}/css/edit/alternate-full-width-layout.css @@ -7289,7 +7303,31 @@ self::*[contains(@class," map/reltable ")]][1] - + + + + css.processor.type + + + + + + chemistry + + + + + + 0 + + + + + + + + + -Xmx384m @@ -7428,7 +7466,7 @@ self::*[contains(@class," map/reltable ")]][1] - + @@ -7470,7 +7508,102 @@ self::*[contains(@class," map/reltable ")]][1] - + + + + args.figurelink.style + + + + + + TITLE + + + + + + 4 + + + + NUMBER + TITLE + NUMTITLE + + + + + + + + + + + + + + args.tablelink.style + + + + + + TITLE + + + + + + 4 + + + + NUMBER + TITLE + NUMTITLE + + + + + + + + + + + + + + force-unique + + + + + + true + + + false + + + 4 + + + + true + false + + + + + + + + + + + -Xmx384m @@ -7609,7 +7742,7 @@ self::*[contains(@class," map/reltable ")]][1] - + @@ -7620,7 +7753,7 @@ self::*[contains(@class," map/reltable ")]][1] true - ${configured.ditaot.dir}/plugins/com.oxygenxml.webhelp/predefined-skins/dita/oxygen/skin.css + @@ -7654,61 +7787,155 @@ self::*[contains(@class," map/reltable ")]][1] - webhelp.product.id + args.figurelink.style - Specifies an identifier of the current documentation project. This is needed when multiple WebHelp systems are deployed on the same server. For example, "mobile-phone-user-guide" or "hvac-installation-guide" + - ${ask('Please enter the documentation product ID:', string, 'oxy-webhelp')} + TITLE - 5 + 4 - + + NUMBER + TITLE + NUMTITLE + + - + + + + + - webhelp.product.version + args.tablelink.style - Specifies the documentation version number (for example, 1.0, 2.5, etc.). New user comments are bound to this version. Multiple documentation versions can be deployed on the same server. + - ${ask('Please enter the documentation version number:', string, '1.0')} + TITLE - 5 + 4 - + + NUMBER + TITLE + NUMTITLE + + + + + + + + + + + + force-unique + + + + true + + + false + + + 4 + + + + true + false + + + + + + + + + - - - - -Xmx384m - - - false - - - - + + + webhelp.product.id + + + Specifies an identifier of the current documentation project. This is needed when multiple WebHelp systems are deployed on the same server. For example, "mobile-phone-user-guide" or "hvac-installation-guide" + + + ${ask('Please enter the documentation product ID:', string, 'oxy-webhelp')} + + + + + + 5 + + + + + + + + + + + webhelp.product.version + + + Specifies the documentation version number (for example, 1.0, 2.5, etc.). New user comments are bound to this version. Multiple documentation versions can be deployed on the same server. + + + ${ask('Please enter the documentation version number:', string, '1.0')} + + + + + + 5 + + + + + + + + + + + + -Xmx384m + + + false + + + + false @@ -7837,7 +8064,7 @@ self::*[contains(@class," map/reltable ")]][1] - + @@ -7848,7 +8075,7 @@ self::*[contains(@class," map/reltable ")]][1] true - ${configured.ditaot.dir}/plugins/com.oxygenxml.webhelp/predefined-skins/dita/oxygen/skin.css + ${configured.ditaot.dir}/plugins/com.oxygenxml.webhelp.classic/predefined-skins/dita/oxygen/skin.css @@ -7867,6 +8094,70 @@ self::*[contains(@class," map/reltable ")]][1] + + + args.figurelink.style + + + + + + TITLE + + + + + + 4 + + + + NUMBER + TITLE + NUMTITLE + + + + + + + + + + + + + + args.tablelink.style + + + + + + TITLE + + + + + + 4 + + + + NUMBER + TITLE + NUMTITLE + + + + + + + + + + + args.xhtml.classattr @@ -7897,6 +8188,36 @@ self::*[contains(@class," map/reltable ")]][1] + + + force-unique + + + + + + true + + + false + + + 4 + + + + true + false + + + + + + + + + + @@ -8036,7 +8357,7 @@ self::*[contains(@class," map/reltable ")]][1] - + @@ -8047,7 +8368,7 @@ self::*[contains(@class," map/reltable ")]][1] true - ${configured.ditaot.dir}/plugins/com.oxygenxml.webhelp/predefined-skins/dita/oxygen/skin.css + ${configured.ditaot.dir}/plugins/com.oxygenxml.webhelp.classic/predefined-skins/dita/oxygen/skin.css @@ -8096,6 +8417,36 @@ self::*[contains(@class," map/reltable ")]][1] + + + force-unique + + + + + + true + + + false + + + 4 + + + + true + false + + + + + + + + + + @@ -8235,7 +8586,7 @@ self::*[contains(@class," map/reltable ")]][1] - + @@ -8246,7 +8597,7 @@ self::*[contains(@class," map/reltable ")]][1] true - ${configured.ditaot.dir}/plugins/com.oxygenxml.webhelp/predefined-skins/dita/oxygen/skin.css + ${configured.ditaot.dir}/plugins/com.oxygenxml.webhelp.classic/predefined-skins/dita/oxygen/skin.css @@ -8265,6 +8616,70 @@ self::*[contains(@class," map/reltable ")]][1] + + + args.figurelink.style + + + + + + TITLE + + + + + + 4 + + + + NUMBER + TITLE + NUMTITLE + + + + + + + + + + + + + + args.tablelink.style + + + + + + TITLE + + + + + + 4 + + + + NUMBER + TITLE + NUMTITLE + + + + + + + + + + + args.xhtml.classattr @@ -8295,6 +8710,36 @@ self::*[contains(@class," map/reltable ")]][1] + + + force-unique + + + + + + true + + + false + + + 4 + + + + true + false + + + + + + + + + + @@ -9544,98 +9989,22 @@ self::*[contains(@class," map/reltable ")]][1] + ${oxygenHome}/classes/ + ${oxygenHome}/lib/oxygen.jar + ${oxygenHome}/lib/oxygenAuthor.jar + ${oxygenHome}/lib/oxygenDeveloper.jar + ${oxygenHome}/lib/oxygenEclipse.jar + ${oxygenHome}/lib/oxygenAuthorEclipse.jar + ${oxygenHome}/lib/oxygenDeveloperEclipse.jar + ${oxygenHome}/lib/resolver.jar + ${oxygenHome}/lib/xml-apis.jar + ${oxygenHome}/lib/xercesImpl.jar + ${oxygenHome}/lib/saxon9ee.jar + ${oxygenHome}/lib/log4j.jar ${configured.ditaot.dir.url}/lib/*.jar - - - - - - DITA Map Metrics Report - - - - - - - - - pdf - - - Apache FOP - - - - - - ${framework}/report/report.xsl - - - ${currentFileURL} - - - false - - - false - - - XML - - - true - - - true - - - ${cfd}/out/metrics-report/${cfn}-report.html - - - ${cfd}/out/metrics-report/${cfn}-report.html - - - false - - - - - - false - - - false - - - false - - - false - - - false - - - true - - - - - - - ${framework}/report/report2XHTML.xsl - - - - Saxon-PE - - - - - false @@ -10575,6 +10944,198 @@ self::*[contains(@class," map/reltable ")]][1] + + + false + + + false + + + ${cfd} + + + ${cfd}/out/metrics-report + + + ${cfd}/temp/metrics-report + + + metrics-report + + + + + false + + + true + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + dita.dir + + + + + + ${frameworksDir}/dita/DITA-OT2.x + + + + + + 3 + + + + + + + + + + + + -Xmx384m + + + false + + + + + + false + + + + + + + + + true + + + + + + DITA Map Metrics Report + + + + + + + + + + + + + + + + + + + + + + + + false + + + false + + + DITAMAP + + + true + + + true + + + + + + + + + true + + + ${cfd}/out/metrics-report/report.html + + + false + + + false + + + false + + + false + + + false + + + false + + + + + + + + + DITA-OT + + + + + From b41c9c37a2219688908db3f7e259835635253b7f Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 27 Oct 2017 16:34:38 +0200 Subject: [PATCH 09/47] Fix termmap less --- framework/css/termmap.less | 54 +++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/framework/css/termmap.less b/framework/css/termmap.less index 2e54a72..16cad25 100644 --- a/framework/css/termmap.less +++ b/framework/css/termmap.less @@ -1,7 +1,25 @@ @import url("elements.less"); *[class~="termmap/termmap"] { - display: block; + display: block; + empty-cells: true; + font-family: @font; + font-size: @fontSize; + font-style: normal; + font-weight: 400; + line-height: 1.2; + margin-bottom: 24px; + margin-left: auto; + margin-right: auto; + margin-top: 24px; + min-height: 378px; + outline-width: 0; + padding-bottom: 80px; + padding-top: 32px; + text-decoration-color: rgba(0,0,0,1.0); + text-decoration-line: none; + text-decoration-style: solid; + width: @containerWidth; -oxy-display-tags: none; } @@ -27,13 +45,15 @@ *[class~="termmap/termref"] { .blockElement(); + .border(); + -oxy-show-placeholder: no; } *[class~="termmap/termref"][format] { display: none; } -*[class~="termmap/termref"]:before(12) { +*[class~="termmap/termref"]:before(20) { .header(); content: oxy_buttonGroup( @@ -48,25 +68,17 @@ ); } -*[class~="termmap/termref"]:before(11) { - .separator(); -} - -*[class~="termmap/termref"]:before(9) { - .separator(); -} - -*[class~="termmap/termref"]:before(8) { +*[class~="termmap/termref"]:before(19) { .separator(); } -*[class~="termmap/termref"]:before(7) { +*[class~="termmap/termref"]:before(18) { content: "href"; .col1(); .link(); } -*[class~="termmap/termref"]:before(6) { +*[class~="termmap/termref"]:before(17) { content: oxy_textfield( edit, '@href', @@ -75,13 +87,16 @@ .col2(); padding-left: 0.5em; } +*[class~="termmap/termref"]:before(16) { + .separator(); +} -*[class~="termmap/termref"]:before(5) { +*[class~="termmap/termref"]:before(15) { content: "keys"; .col1(); } -*[class~="termmap/termref"]:before(4) { +*[class~="termmap/termref"]:before(14) { content: oxy_textfield( edit, '@keys', @@ -90,13 +105,16 @@ .col2(); padding-left: 0.5em; } +*[class~="termmap/termref"]:before(13) { + .separator(); +} -*[class~="termmap/termref"]:before(3) { +*[class~="termmap/termref"]:before(12) { content: "termdomain"; .col1(); } -*[class~="termmap/termref"]:before(2) { +*[class~="termmap/termref"]:before(11) { content: oxy_textfield( edit, "@termdomain", @@ -106,6 +124,6 @@ padding-left: 0.5em; } -*[class~="termmap/termref"]:before(1) { +*[class~="termmap/termref"]:before(10) { .separator(); } \ No newline at end of file From 5e5af1e5af78c44c9b49de760c6c8ff6bb12d033 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 27 Oct 2017 19:49:11 +0200 Subject: [PATCH 10/47] Fix more framework paths --- DOCTALES_Terminology_Map.framework | 41 +++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/DOCTALES_Terminology_Map.framework b/DOCTALES_Terminology_Map.framework index 7bed18f..d17fbac 100644 --- a/DOCTALES_Terminology_Map.framework +++ b/DOCTALES_Terminology_Map.framework @@ -1931,6 +1931,23 @@ + + + scenarios + + + 18 + + + + + + removeIndex + + + DITA Map Metrics Report + + scenarios @@ -2344,7 +2361,7 @@ - ${frameworksDir}\framework\webhelp-skin\doctales\skin-responsive.css + ${frameworkDir}/framework/webhelp-skin/doctales/skin-responsive.css @@ -2443,7 +2460,7 @@ - ${frameworksDir}\framework\resources\ditaval\termbrowser-responsive.ditaval + ${frameworkDir}/framework/resources/ditaval/termbrowser-responsive.ditaval @@ -2489,7 +2506,7 @@ Specifies an XML fragment (or a path to a file that contains well formed XML content) that will be displayed after the logo and title in the output. - ${frameworksDir}\framework\webhelp-skin\fragments\webhelp.fragment.after.logo_and_title.xml + ${frameworkDir}/framework/webhelp-skin/fragments/webhelp.fragment.after.logo_and_title.xml @@ -2512,7 +2529,7 @@ Specify an XML fragment (or a path to a file that contains well formed XML content) that will be displayed after the top menu in the output. - ${frameworksDir}\framework\webhelp-skin\fragments\webhelp.fragment.after.top_menu.xml + ${frameworkDir}/framework/webhelp-skin/fragments/webhelp.fragment.after.top_menu.xml @@ -2535,7 +2552,7 @@ Specify an XML fragment (or a path to a file that contains well formed XML content) that will be displayed as the footer in the output. - ${frameworksDir}\framework\webhelp-skin\fragments\webhelp.fragment.footer.xml + ${frameworkDir}/framework/webhelp-skin/fragments/webhelp.fragment.footer.xml @@ -2558,7 +2575,7 @@ Specify an XML fragment (or a path to a file that contains well formed XML content) that will be displayed as the header in the output. - ${frameworksDir}\framework\webhelp-skin\header\termbrowser-reponsive.xml + ${frameworkDir}/framework/webhelp-skin/header/termbrowser-reponsive.xml @@ -2581,7 +2598,7 @@ Specify an XML fragment (or a path to a file that contains well formed XML content) that will be displayed as a welcome message (or title) in the output. - ${frameworksDir}\framework\webhelp-skin\fragments\webhelp.fragment.welcome.xml + ${frameworkDir}/framework/webhelp-skin/fragments/webhelp.fragment.welcome.xml @@ -2604,7 +2621,7 @@ To add a logo in the title area of your WebHelp output. - ${frameworksDir}\framework\webhelp-skin\logo\doctales-logo.svg + ${frameworkDir}/framework/webhelp-skin/logo/doctales-logo.svg @@ -2911,7 +2928,7 @@ - ${frameworkDir}/webhelp-skin/doctales/skin.css + ${frameworkDir}/framework/webhelp-skin/doctales/skin.css @@ -2980,7 +2997,7 @@ - ${frameworkDir}/webhelp-skin/header/termbrowser-classic.xml + ${frameworkDir}/framework/webhelp-skin/header/termbrowser-classic.xml @@ -3271,7 +3288,7 @@ - ${frameworkDir}/webhelp-skin/doctales/html5.css + ${frameworkDir}/framework/webhelp-skin/doctales/html5.css @@ -3340,7 +3357,7 @@ - ${frameworkDir}/webhelp-skin/header/termbrowser-html5.xml + ${frameworkDir}/framework/webhelp-skin/header/termbrowser-html5.xml From 5bba6ba67d1d7722cb16b959ab4b760d905d4b0e Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 27 Oct 2017 20:01:32 +0200 Subject: [PATCH 11/47] Change termstats chart line type --- xsl/terminology-stats-xml2html.xsl | 1 + 1 file changed, 1 insertion(+) diff --git a/xsl/terminology-stats-xml2html.xsl b/xsl/terminology-stats-xml2html.xsl index 7c572cb..0d69592 100644 --- a/xsl/terminology-stats-xml2html.xsl +++ b/xsl/terminology-stats-xml2html.xsl @@ -339,6 +339,7 @@ var myLineChart = new Chart(termNotationsChart, { type: 'line', data: data, + steppedLine: 'before', options: { title: { display: true, From df4dab07b3c52e60aa0dc1433470ad467d523347 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 27 Oct 2017 20:08:15 +0200 Subject: [PATCH 12/47] Upgrade to DITA-OT 2.5.4 --- travis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis.sh b/travis.sh index 8ee0fb2..495cb48 100755 --- a/travis.sh +++ b/travis.sh @@ -1,7 +1,7 @@ #!/bin/sh zip -r org.doctales.terminology.zip . -x *.zip* *.git/* *temp/* *out/* -curl -LO https://github.com/dita-ot/dita-ot/releases/download/2.5.3/dita-ot-2.5.3.zip -unzip -q dita-ot-2.5.3.zip +curl -LO https://github.com/dita-ot/dita-ot/releases/download/2.5.4/dita-ot-2.5.4.zip +unzip -q dita-ot-2.5.4.zip mv dita-ot-*/ dita-ot/ git clone https://github.com/queshaw/dita-ng-library.git cd dita-ng-library From f21494cfac0ff80aa5d9a8ee44e67426d1a26ddf Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 27 Oct 2017 21:21:50 +0200 Subject: [PATCH 13/47] Refactoring and rename termbrowser to termbrowser-classic --- DOCTALES_Terminology_Map.framework | 8 ++++---- build_dita2termbrowser_template.xml | 2 +- plugin.xml | 4 ++-- travis.sh | 15 ++++++++------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/DOCTALES_Terminology_Map.framework b/DOCTALES_Terminology_Map.framework index d17fbac..1c478de 100644 --- a/DOCTALES_Terminology_Map.framework +++ b/DOCTALES_Terminology_Map.framework @@ -2840,10 +2840,10 @@ ${cfd} - ${cfd}/out/termbrowser + ${cfd}/out/termbrowser-classic - ${cfd}/temp/termbrowser + ${cfd}/temp/termbrowser-classic xhtml @@ -3050,7 +3050,7 @@ - termbrowser + termbrowser-classic @@ -3092,7 +3092,7 @@ - Termbrowser + Termbrowser Classic diff --git a/build_dita2termbrowser_template.xml b/build_dita2termbrowser_template.xml index 116ccf2..db15ead 100644 --- a/build_dita2termbrowser_template.xml +++ b/build_dita2termbrowser_template.xml @@ -30,7 +30,7 @@ in the termbrowser-termstats and semanticnet target on some Linux OSes when using DITA-OT 2.4.3+ --> - + diff --git a/plugin.xml b/plugin.xml index 3da987d..35edd22 100644 --- a/plugin.xml +++ b/plugin.xml @@ -882,8 +882,8 @@ - - + + diff --git a/travis.sh b/travis.sh index 495cb48..1523c3b 100755 --- a/travis.sh +++ b/travis.sh @@ -7,11 +7,12 @@ git clone https://github.com/queshaw/dita-ng-library.git cd dita-ng-library ./gradlew cd .. +chmod +x dita-ot/bin/ant chmod +x dita-ot/bin/dita -dita-ot/bin/dita -install dita-ng-library/dist/org.dita-ng.library-0.1.zip -dita-ot/bin/dita -install org.doctales.terminology.zip -dita-ot/bin/dita -input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap -format termchecker-dita -verbose -Dprocessing-mode=strict -Dargs.language=en-GB -o out/termchecker-dita -dita-ot/bin/dita -input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap -format termchecker-xliff -verbose -Dprocessing-mode=strict -Dargs.language=en-GB -o out/termchecker-xliff -dita-ot/bin/dita -input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap -format tbx-basic -verbose -Dprocessing-mode=strict -o out/tbx-basic -dita-ot/bin/dita -input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap -format tbx-min -verbose -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE -o out/tbx-min -dita-ot/bin/dita -input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap -format termbrowser-html5 -verbose -Dargs.default.language=en-GB -o out/termbrowser-html5 +dita-ot/bin/dita --install dita-ng-library/dist/org.dita-ng.library-0.1.zip +dita-ot/bin/dita --install org.doctales.terminology.zip +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita --verbose -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff --verbose -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-xliff +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic --verbose -Dprocessing-mode=strict --output out/tbx-basic +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-min --verbose -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE --output out/tbx-min +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termbrowser-html5 --verbose -Dargs.default.language=en-GB --output out/termbrowser-html5 From 211ddcdccfbc1aaee57bf396431787848dfdb242 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 1 Nov 2017 10:42:35 +0100 Subject: [PATCH 14/47] Change time scale for terminology statistics --- xsl/terminology-stats-xml2html.xsl | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/xsl/terminology-stats-xml2html.xsl b/xsl/terminology-stats-xml2html.xsl index 0d69592..7c5d3e6 100644 --- a/xsl/terminology-stats-xml2html.xsl +++ b/xsl/terminology-stats-xml2html.xsl @@ -349,16 +349,10 @@ xAxes: [{ type: 'time', time: { + unit: 'month', + unitStepSize: 1, displayFormats: { - 'millisecond': 'MMM DD', - 'second': 'MMM DD', - 'minute': 'MMM DD', - 'hour': 'MMM DD', - 'day': 'MMM DD', - 'week': 'MMM DD', - 'month': 'MMM DD', - 'quarter': 'MMM DD', - 'year': 'MMM DD', + 'day': 'MMM DD' } } }] From 2f084c31a408a4fe95f65d065bfc8ac15757997c Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 1 Nov 2017 10:42:51 +0100 Subject: [PATCH 15/47] Clear terminology templates --- DOCTALES_Terminology.framework | 155 +++++++++++++++++- DOCTALES_Terminology_Map.framework | 17 ++ .../DOCTALES SemanticNet (RelaxNG).dita | 0 .../DOCTALES SemanticNet (RelaxNG).properties | 0 .../{topic => }/DOCTALES SemanticNet.dita | 0 .../DOCTALES SemanticNet.properties | 0 .../DOCTALES Termentry (RelaxNG).dita | 0 .../DOCTALES Termentry (RelaxNG).properties | 0 .../{topic => }/DOCTALES Termentry.dita | 0 .../{topic => }/DOCTALES Termentry.properties | 0 .../DOCTALES Termmap (RelaxNG).dita | 0 .../DOCTALES Termmap (RelaxNG).properties | 0 .../{termmap => }/DOCTALES Termmap.dita | 0 .../{termmap => }/DOCTALES Termmap.properties | 0 .../DOCTALES Termstats (RelaxNG).dita | 0 .../DOCTALES Termstats (RelaxNG).properties | 0 .../{topic => }/DOCTALES Termstats.dita | 0 .../{topic => }/DOCTALES Termstats.properties | 0 18 files changed, 171 insertions(+), 1 deletion(-) rename framework/templates/{topic => }/DOCTALES SemanticNet (RelaxNG).dita (100%) rename framework/templates/{topic => }/DOCTALES SemanticNet (RelaxNG).properties (100%) rename framework/templates/{topic => }/DOCTALES SemanticNet.dita (100%) rename framework/templates/{topic => }/DOCTALES SemanticNet.properties (100%) rename framework/templates/{topic => }/DOCTALES Termentry (RelaxNG).dita (100%) rename framework/templates/{topic => }/DOCTALES Termentry (RelaxNG).properties (100%) rename framework/templates/{topic => }/DOCTALES Termentry.dita (100%) rename framework/templates/{topic => }/DOCTALES Termentry.properties (100%) rename framework/templates/{termmap => }/DOCTALES Termmap (RelaxNG).dita (100%) rename framework/templates/{termmap => }/DOCTALES Termmap (RelaxNG).properties (100%) rename framework/templates/{termmap => }/DOCTALES Termmap.dita (100%) rename framework/templates/{termmap => }/DOCTALES Termmap.properties (100%) rename framework/templates/{topic => }/DOCTALES Termstats (RelaxNG).dita (100%) rename framework/templates/{topic => }/DOCTALES Termstats (RelaxNG).properties (100%) rename framework/templates/{topic => }/DOCTALES Termstats.dita (100%) rename framework/templates/{topic => }/DOCTALES Termstats.properties (100%) diff --git a/DOCTALES_Terminology.framework b/DOCTALES_Terminology.framework index cb3567d..9c15881 100644 --- a/DOCTALES_Terminology.framework +++ b/DOCTALES_Terminology.framework @@ -7944,7 +7944,160 @@ templatesLocations - 9 + 8 + + + + + + removeIndex + + + + + + + + templatesLocations + + + 7 + + + + + + removeIndex + + + + + + + + templatesLocations + + + 6 + + + + + + removeIndex + + + + + + + + templatesLocations + + + 5 + + + + + + removeIndex + + + + + + + + templatesLocations + + + 4 + + + + + + removeIndex + + + + + + + + templatesLocations + + + 3 + + + + + + removeIndex + + + + + + + + templatesLocations + + + 2 + + + + + + removeIndex + + + + + + + + templatesLocations + + + 1 + + + + + + removeIndex + + + + + + + + templatesLocations + + + 0 + + + + + + removeIndex + + + + + + + + templatesLocations + + + 0 ${frameworkDir}/framework/templates diff --git a/DOCTALES_Terminology_Map.framework b/DOCTALES_Terminology_Map.framework index 1c478de..444f5a3 100644 --- a/DOCTALES_Terminology_Map.framework +++ b/DOCTALES_Terminology_Map.framework @@ -1643,6 +1643,23 @@ insert.table + + + templatesLocations + + + 6 + + + + + + removeIndex + + + + + templatesLocations diff --git a/framework/templates/topic/DOCTALES SemanticNet (RelaxNG).dita b/framework/templates/DOCTALES SemanticNet (RelaxNG).dita similarity index 100% rename from framework/templates/topic/DOCTALES SemanticNet (RelaxNG).dita rename to framework/templates/DOCTALES SemanticNet (RelaxNG).dita diff --git a/framework/templates/topic/DOCTALES SemanticNet (RelaxNG).properties b/framework/templates/DOCTALES SemanticNet (RelaxNG).properties similarity index 100% rename from framework/templates/topic/DOCTALES SemanticNet (RelaxNG).properties rename to framework/templates/DOCTALES SemanticNet (RelaxNG).properties diff --git a/framework/templates/topic/DOCTALES SemanticNet.dita b/framework/templates/DOCTALES SemanticNet.dita similarity index 100% rename from framework/templates/topic/DOCTALES SemanticNet.dita rename to framework/templates/DOCTALES SemanticNet.dita diff --git a/framework/templates/topic/DOCTALES SemanticNet.properties b/framework/templates/DOCTALES SemanticNet.properties similarity index 100% rename from framework/templates/topic/DOCTALES SemanticNet.properties rename to framework/templates/DOCTALES SemanticNet.properties diff --git a/framework/templates/topic/DOCTALES Termentry (RelaxNG).dita b/framework/templates/DOCTALES Termentry (RelaxNG).dita similarity index 100% rename from framework/templates/topic/DOCTALES Termentry (RelaxNG).dita rename to framework/templates/DOCTALES Termentry (RelaxNG).dita diff --git a/framework/templates/topic/DOCTALES Termentry (RelaxNG).properties b/framework/templates/DOCTALES Termentry (RelaxNG).properties similarity index 100% rename from framework/templates/topic/DOCTALES Termentry (RelaxNG).properties rename to framework/templates/DOCTALES Termentry (RelaxNG).properties diff --git a/framework/templates/topic/DOCTALES Termentry.dita b/framework/templates/DOCTALES Termentry.dita similarity index 100% rename from framework/templates/topic/DOCTALES Termentry.dita rename to framework/templates/DOCTALES Termentry.dita diff --git a/framework/templates/topic/DOCTALES Termentry.properties b/framework/templates/DOCTALES Termentry.properties similarity index 100% rename from framework/templates/topic/DOCTALES Termentry.properties rename to framework/templates/DOCTALES Termentry.properties diff --git a/framework/templates/termmap/DOCTALES Termmap (RelaxNG).dita b/framework/templates/DOCTALES Termmap (RelaxNG).dita similarity index 100% rename from framework/templates/termmap/DOCTALES Termmap (RelaxNG).dita rename to framework/templates/DOCTALES Termmap (RelaxNG).dita diff --git a/framework/templates/termmap/DOCTALES Termmap (RelaxNG).properties b/framework/templates/DOCTALES Termmap (RelaxNG).properties similarity index 100% rename from framework/templates/termmap/DOCTALES Termmap (RelaxNG).properties rename to framework/templates/DOCTALES Termmap (RelaxNG).properties diff --git a/framework/templates/termmap/DOCTALES Termmap.dita b/framework/templates/DOCTALES Termmap.dita similarity index 100% rename from framework/templates/termmap/DOCTALES Termmap.dita rename to framework/templates/DOCTALES Termmap.dita diff --git a/framework/templates/termmap/DOCTALES Termmap.properties b/framework/templates/DOCTALES Termmap.properties similarity index 100% rename from framework/templates/termmap/DOCTALES Termmap.properties rename to framework/templates/DOCTALES Termmap.properties diff --git a/framework/templates/topic/DOCTALES Termstats (RelaxNG).dita b/framework/templates/DOCTALES Termstats (RelaxNG).dita similarity index 100% rename from framework/templates/topic/DOCTALES Termstats (RelaxNG).dita rename to framework/templates/DOCTALES Termstats (RelaxNG).dita diff --git a/framework/templates/topic/DOCTALES Termstats (RelaxNG).properties b/framework/templates/DOCTALES Termstats (RelaxNG).properties similarity index 100% rename from framework/templates/topic/DOCTALES Termstats (RelaxNG).properties rename to framework/templates/DOCTALES Termstats (RelaxNG).properties diff --git a/framework/templates/topic/DOCTALES Termstats.dita b/framework/templates/DOCTALES Termstats.dita similarity index 100% rename from framework/templates/topic/DOCTALES Termstats.dita rename to framework/templates/DOCTALES Termstats.dita diff --git a/framework/templates/topic/DOCTALES Termstats.properties b/framework/templates/DOCTALES Termstats.properties similarity index 100% rename from framework/templates/topic/DOCTALES Termstats.properties rename to framework/templates/DOCTALES Termstats.properties From 937991a5c718352f583201a1e57c5decd57e7e22 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 1 Nov 2017 13:38:50 +0100 Subject: [PATCH 16/47] Enhance element insertion usability --- DOCTALES_Terminology.framework | 32 ++++++++++++++++---------------- framework/i18n/translation.xml | 8 ++++++++ 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/DOCTALES_Terminology.framework b/DOCTALES_Terminology.framework index 9c15881..1fb0855 100644 --- a/DOCTALES_Terminology.framework +++ b/DOCTALES_Terminology.framework @@ -671,7 +671,7 @@ fragment - <fullForm language="en-GB" usage="preferred"> + <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </fullForm> @@ -697,7 +697,7 @@ fragment - <fullForm language="en-GB" usage="preferred"> + <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </fullForm> @@ -723,7 +723,7 @@ fragment - <fullForm language="en-GB" usage="preferred"> + <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </fullForm> @@ -749,7 +749,7 @@ fragment - <fullForm language="en-GB" usage="preferred"> + <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </fullForm> @@ -821,7 +821,7 @@ fragment - <abbreviation language="en-GB" usage="preferred"> + <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </abbreviation> @@ -847,7 +847,7 @@ fragment - <abbreviation language="en-GB" usage="preferred"> + <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </abbreviation> @@ -873,7 +873,7 @@ fragment - <abbreviation language="en-GB" usage="preferred"> + <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </abbreviation> @@ -899,7 +899,7 @@ fragment - <abbreviation language="en-GB" usage="preferred"> + <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </abbreviation> @@ -971,7 +971,7 @@ fragment - <acronym language="en-GB" usage="preferred"> + <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </acronym> @@ -997,7 +997,7 @@ fragment - <acronym language="en-GB" usage="preferred"> + <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </acronym> @@ -1023,7 +1023,7 @@ fragment - <acronym language="en-GB" usage="preferred"> + <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </acronym> @@ -1049,7 +1049,7 @@ fragment - <acronym language="en-GB" usage="preferred"> + <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </acronym> @@ -1121,7 +1121,7 @@ fragment - <verb language="en-GB" usage="preferred"> + <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </verb> @@ -1147,7 +1147,7 @@ fragment - <verb language="en-GB" usage="preferred"> + <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </verb> @@ -1173,7 +1173,7 @@ fragment - <verb language="en-GB" usage="preferred"> + <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </verb> @@ -1199,7 +1199,7 @@ fragment - <verb language="en-GB" usage="preferred"> + <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> <termVariant>${caret}</termVariant> </verb> diff --git a/framework/i18n/translation.xml b/framework/i18n/translation.xml index cf451f9..2d04208 100644 --- a/framework/i18n/translation.xml +++ b/framework/i18n/translation.xml @@ -30,6 +30,14 @@ Delete the current element. Lösche das aktuelle Element. + + Select language + Sprache wählen + + + Select usage + Verwendung wählen + From 97e0bcfd8b9f435f234c01b53731dd5e007a333c Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 1 Nov 2017 14:09:29 +0100 Subject: [PATCH 17/47] Set parameter datatype --- xsl/semanticnet.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsl/semanticnet.xsl b/xsl/semanticnet.xsl index bbaf0fd..94a0ed9 100644 --- a/xsl/semanticnet.xsl +++ b/xsl/semanticnet.xsl @@ -14,7 +14,7 @@ doctype-system="about:legacy-compat" omit-xml-declaration="yes"/> - + From c32bf92c905ff6b739fc2953ec623cd47f919dd0 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 1 Nov 2017 14:20:37 +0100 Subject: [PATCH 18/47] Change usage order --- DOCTALES_Terminology.framework | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/DOCTALES_Terminology.framework b/DOCTALES_Terminology.framework index 1fb0855..bc3a603 100644 --- a/DOCTALES_Terminology.framework +++ b/DOCTALES_Terminology.framework @@ -671,7 +671,7 @@ fragment - <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </fullForm> @@ -697,7 +697,7 @@ fragment - <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </fullForm> @@ -723,7 +723,7 @@ fragment - <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </fullForm> @@ -749,7 +749,7 @@ fragment - <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <fullForm language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </fullForm> @@ -821,7 +821,7 @@ fragment - <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </abbreviation> @@ -847,7 +847,7 @@ fragment - <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </abbreviation> @@ -873,7 +873,7 @@ fragment - <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </abbreviation> @@ -899,7 +899,7 @@ fragment - <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <abbreviation language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </abbreviation> @@ -971,7 +971,7 @@ fragment - <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </acronym> @@ -997,7 +997,7 @@ fragment - <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </acronym> @@ -1023,7 +1023,7 @@ fragment - <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </acronym> @@ -1049,7 +1049,7 @@ fragment - <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <acronym language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </acronym> @@ -1121,7 +1121,7 @@ fragment - <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </verb> @@ -1147,7 +1147,7 @@ fragment - <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </verb> @@ -1173,7 +1173,7 @@ fragment - <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </verb> @@ -1199,7 +1199,7 @@ fragment - <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';'preferred':'${i18n(doctales.usage.preferred)}';)}"> + <verb language="${ask('${i18n(doctales.language.select)}', combobox, ('af-ZA':'Afrikaans - South Africa';'sq-AL':'Albanian - Albania';'ar-DZ':'Arabic - Algeria';'ar-BH':'Arabic - Bahrain';'ar-EG':'Arabic - Egypt';'ar-IQ':'Arabic - Iraq';'ar-JO':'Arabic - Jordan';'ar-KW':'Arabic - Kuwait';'ar-LB':'Arabic - Lebanon';'ar-LY':'Arabic - Libya';'ar-MA':'Arabic - Morocco';'ar-OM':'Arabic - Oman';'ar-QA':'Arabic - Qatar';'ar-SA':'Arabic - Saudi Arabia';'ar-SY':'Arabic - Syria';'ar-TN':'Arabic - Tunisia';'ar-AE':'Arabic - United Arab Emirates';'ar-YE':'Arabic - Yemen';'hy-AM':'Armenian - Armenia';'Cy-az-AZ':'Azeri (Cyrillic) - Azerbaijan';'Lt-az-AZ':'Azeri (Latin) - Azerbaijan';'eu-ES':'Basque - Basque';'be-BY':'Belarusian - Belarus';'bg-BG':'Bulgarian - Bulgaria';'ca-ES':'Catalan - Catalan';'zh-CN':'Chinese - China';'zh-HK':'Chinese - Hong Kong SAR';'zh-MO':'Chinese - Macau SAR';'zh-SG':'Chinese - Singapore';'zh-TW':'Chinese - Taiwan';'zh-CHS':'Chinese (Simplified)';'zh-CHT':'Chinese (Traditional)';'hr-HR':'Croatian - Croatia';'cs-CZ':'Czech - Czech Republic';'da-DK':'Danish - Denmark';'div-MV':'Dhivehi - Maldives';'nl-BE':'Dutch - Belgium';'nl-NL':'Dutch - The Netherlands';'en-AU':'English - Australia';'en-BZ':'English - Belize';'en-CA':'English - Canada';'en-CB':'English - Caribbean';'en-GB':'English - Great Britain';'en-IE':'English - Ireland';'en-JM':'English - Jamaica';'en-NZ':'English - New Zealand';'en-PH':'English - Philippines';'en-ZA':'English - South Africa';'en-TT':'English - Trinidad and Tobago';'en-US':'English - United States';'en-ZW':'English - Zimbabwe';'et-EE':'Estonian - Estonia';'fo-FO':'Faroese - Faroe Islands';'fa-IR':'Farsi - Iran';'fi-FI':'Finnish - Finland';'fr-BE':'French - Belgium';'fr-CA':'French - Canada';'fr-FR':'French - France';'fr-LU':'French - Luxembourg';'fr-MC':'French - Monaco';'fr-CH':'French - Switzerland';'gl-ES':'Galician - Galician';'ka-GE':'Georgian - Georgia';'de-AT':'German - Austria';'de-DE':'German - Germany';'de-LI':'German - Liechtenstein';'de-LU':'German - Luxembourg';'de-CH':'German - Switzerland';'el-GR':'Greek - Greece';'gu-IN':'Gujarati - India';'he-IL':'Hebrew - Israel';'hi-IN':'Hindi - India';'hu-HU':'Hungarian - Hungary';'is-IS':'Icelandic - Iceland';'id-ID':'Indonesian - Indonesia';'it-IT':'Italian - Italy';'it-CH':'Italian - Switzerland';'ja-JP':'Japanese - Japan';'kn-IN':'Kannada - India';'kk-KZ':'Kazakh - Kazakhstan';'kok-IN':'Konkani - India';'ko-KR':'Korean - Korea';'ky-KZ':'Kyrgyz - Kazakhstan';'lv-LV':'Latvian - Latvia';'lt-LT':'Lithuanian - Lithuania';'mk-MK':'Macedonian (FYROM) ';'ms-BN':'Malay - Brunei';'ms-MY':'Malay - Malaysia';'mr-IN':'Marathi - India';'mn-MN':'Mongolian - Mongolia';'nb-NO':'Norwegian (Bokmål) - Norway';'nn-NO':'Norwegian (Nynorsk) - Norway';'pl-PL':'Polish - Poland';'pt-BR':'Portuguese - Brazil';'pt-PT':'Portuguese - Portugal';'pa-IN':'Punjabi - India';'ro-RO':'Romanian - Romania';'ru-RU':'Russian - Russia';'sa-IN':'Sanskrit - India';'Cy-sr-SP':'Serbian (Cyrillic) - Serbia';'Lt-sr-SP':'Serbian (Latin) - Serbia';'sk-SK':'Slovak - Slovakia';'sl-SI':'Slovenian - Slovenia';'es-AR':'Spanish - Argentina';'es-BO':'Spanish - Bolivia';'es-CL':'Spanish - Chile';'es-CO':'Spanish - Colombia';'es-CR':'Spanish - Costa Rica';'es-DO':'Spanish - Dominican Republic';'es-EC':'Spanish - Ecuador';'es-SV':'Spanish - El Salvador';'es-GT':'Spanish - Guatemala';'es-HN':'Spanish - Honduras';'es-MX':'Spanish - Mexico';'es-NI':'Spanish - Nicaragua';'es-PA':'Spanish - Panama';'es-PY':'Spanish - Paraguay';'es-PE':'Spanish - Peru';'es-PR':'Spanish - Puerto Rico';'es-ES':'Spanish - Spain';'es-UY':'Spanish - Uruguay';'es-VE':'Spanish - Venezuela';'sw-KE':'Swahili - Kenya';'sv-FI':'Swedish - Finland';'sv-SE':'Swedish - Sweden';'syr-SY':'Syriac - Syria';'ta-IN':'Tamil - India';'tt-RU':'Tatar - Russia';'te-IN':'Telugu - India';'th-TH':'Thai - Thailand';'tr-TR':'Turkish - Turkey';'uk-UA':'Ukrainian - Ukraine';'ur-PK':'Urdu - Pakistan';'Cy-uz-UZ':'Uzbek (Cyrillic) - Uzbekistan';'Lt-uz-UZ':'Uzbek (Latin) - Uzbekistan';'vi-VN':'Vietnamese - Vietnam';)}" usage="${ask('${i18n(doctales.usage.select)}', combobox, ('preferred':'${i18n(doctales.usage.preferred)}';'admitted':'${i18n(doctales.usage.admitted)}';'notRecommended':'${i18n(doctales.usage.notRecommended)}';'obsolete':'${i18n(doctales.usage.obsolete)}';)}"> <termVariant>${caret}</termVariant> </verb> From 49a66b2b2451d326f2a1e1b062a420be0a9b076b Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 1 Nov 2017 15:30:46 +0100 Subject: [PATCH 19/47] Swap instanceOf arrow in semantic net --- xsl/semanticnet.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsl/semanticnet.xsl b/xsl/semanticnet.xsl index 94a0ed9..1fa7df0 100644 --- a/xsl/semanticnet.xsl +++ b/xsl/semanticnet.xsl @@ -403,7 +403,7 @@ ', to: ' - ', arrows: 'to', label: ' + ', arrows: 'from', label: ' '}, From bec3394a0c6e4ac7e661d1510241a68ff73b7099 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Thu, 2 Nov 2017 11:51:49 +0100 Subject: [PATCH 20/47] Add error message for empty preferred termchecker elements. --- dtd/termentry.mod | 60 +++++++++++++-------------- framework/rules/termentry.sch | 12 +++++- rng/termentryMod.rng | 30 -------------- xsl/terminology-stats-xml2html.xsl | 6 +-- xsl/terminology2termchecker-dita.xsl | 3 ++ xsl/terminology2termchecker-xliff.xsl | 3 ++ 6 files changed, 50 insertions(+), 64 deletions(-) diff --git a/dtd/termentry.mod b/dtd/termentry.mod index fce7fe4..69565d2 100644 --- a/dtd/termentry.mod +++ b/dtd/termentry.mod @@ -498,10 +498,7 @@ Category: Termentry elements--> - + @@ -509,10 +506,7 @@ Category: Termentry elements--> - + @@ -520,10 +514,7 @@ Category: Termentry elements--> - + @@ -531,10 +522,7 @@ Category: Termentry elements--> - + @@ -542,10 +530,7 @@ Category: Termentry elements--> - + @@ -553,10 +538,7 @@ Category: Termentry elements--> - + @@ -741,42 +723,60 @@ Category: Termentry elements--> - + - + - + - + - + - + diff --git a/framework/rules/termentry.sch b/framework/rules/termentry.sch index 0605ebf..e036933 100644 --- a/framework/rules/termentry.sch +++ b/framework/rules/termentry.sch @@ -35,12 +35,22 @@ - Rename ID to '' + + Rename ID to '' + + + + Rename ID to '' + + + Ändere ID zu '' + + The ID of the termentry topic must be equal to its filename without file extension. diff --git a/rng/termentryMod.rng b/rng/termentryMod.rng index 2e2e6dd..f05f70e 100644 --- a/rng/termentryMod.rng +++ b/rng/termentryMod.rng @@ -879,11 +879,6 @@ - - - antonyms - - @@ -910,11 +905,6 @@ - - - hypernyms - - @@ -941,11 +931,6 @@ - - - hyponyms - - @@ -972,11 +957,6 @@ - - - instancesOf - - @@ -1003,11 +983,6 @@ - - - partsOf - - @@ -1034,11 +1009,6 @@ - - - relatedTerms - - diff --git a/xsl/terminology-stats-xml2html.xsl b/xsl/terminology-stats-xml2html.xsl index 7c5d3e6..4354c5f 100644 --- a/xsl/terminology-stats-xml2html.xsl +++ b/xsl/terminology-stats-xml2html.xsl @@ -151,9 +151,9 @@ }; var termNotationsPerLanguageCanvas = document.getElementById("termNotationsPerLanguage"); var myPieChart = new Chart(termNotationsPerLanguageCanvas,{ - type: 'pie', - data: termNotationsPerLanguageData, - options: {} + type: 'pie', + data: termNotationsPerLanguageData, + options: {} }); } diff --git a/xsl/terminology2termchecker-dita.xsl b/xsl/terminology2termchecker-dita.xsl index dd9f2ed..715cbba 100644 --- a/xsl/terminology2termchecker-dita.xsl +++ b/xsl/terminology2termchecker-dita.xsl @@ -76,6 +76,9 @@ + + ERROR: Could not create SQF for not recommended term '', because the preferred term is empty. + diff --git a/xsl/terminology2termchecker-xliff.xsl b/xsl/terminology2termchecker-xliff.xsl index e6ec2ab..3c2ec36 100644 --- a/xsl/terminology2termchecker-xliff.xsl +++ b/xsl/terminology2termchecker-xliff.xsl @@ -94,6 +94,9 @@ + + ERROR: Could not create SQF for not recommended term '', because the preferred term is empty. + From dd1fd36037f5a5c76dac4c75a8a92122b91adb1d Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Thu, 2 Nov 2017 12:35:37 +0100 Subject: [PATCH 21/47] Enhance SQF error if preferred term is empty --- xsl/terminology2termchecker-dita.xsl | 3 ++- xsl/terminology2termchecker-xliff.xsl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xsl/terminology2termchecker-dita.xsl b/xsl/terminology2termchecker-dita.xsl index 715cbba..e352e6d 100644 --- a/xsl/terminology2termchecker-dita.xsl +++ b/xsl/terminology2termchecker-dita.xsl @@ -76,7 +76,8 @@ - + Generate SQF for term notation '' + ERROR: Could not create SQF for not recommended term '', because the preferred term is empty. diff --git a/xsl/terminology2termchecker-xliff.xsl b/xsl/terminology2termchecker-xliff.xsl index 3c2ec36..6b56cd7 100644 --- a/xsl/terminology2termchecker-xliff.xsl +++ b/xsl/terminology2termchecker-xliff.xsl @@ -94,7 +94,8 @@ - + Generate SQF for term notation '' + ERROR: Could not create SQF for not recommended term '', because the preferred term is empty. From 0a0835ff6bb45b19789c415263e226d01875f616 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Thu, 2 Nov 2017 13:52:50 +0100 Subject: [PATCH 22/47] Add more language codes and explanations --- rng/termentryMod.rng | 376 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 312 insertions(+), 64 deletions(-) diff --git a/rng/termentryMod.rng b/rng/termentryMod.rng index f05f70e..f59305b 100644 --- a/rng/termentryMod.rng +++ b/rng/termentryMod.rng @@ -200,130 +200,378 @@ The language of the term - ar-AE - ar-BH - ar-DZ - ar-EG - ar-IQ - ar-JO - ar-KW - ar-LB - ar-LY - ar-MA - ar-OM - ar-QA - ar-SA - ar-SY - ar-TN - ar-YE + af-ZA + Afrikaans - South Africa + ar-AE + Arabic - United Arab Emirates + ar-BH + Arabic - Bahrain + ar-DZ + Arabic - Algeria + ar-EG + Arabic - Egypt + ar-IQ + Arabic - Iraq + ar-JO + Arabic - Jordan + ar-KW + Arabic - Kuwait + ar-LB + Arabic - Lebanon + ar-LY + Arabic - Libya + ar-MA + Arabic - Morocco + ar-OM + Arabic - Oman + ar-QA + Arabic - Qatar + ar-SA + Arabic - Saudi Arabia + ar-SY + Arabic - Syria + ar-TN + Arabic - Tunisia + ar-YE + Arabic - Yemen be + Belarusian + be-BY + Belarusian - Belarus bg + Bulgarian + bg-BG + Bulgarian - Bulgaria ca + Catalan + ca-ES + Catalan - Catalan cs - cs-CZ + Czech + cs-CZ + Czech - Czech Republic + Cy-az-AZ + Azeri (Cyrillic) - Azerbaijan + Cy-sr-SP + Serbian (Cyrillic) - Serbia + Cy-uz-UZ + Uzbek (Cyrillic) - Uzbekistan da - da-DK + Danish + da-DK + Danish - Denmark de - de-AT + German + de-AT + German - Austria de-CH + German - Switzerland de-DE German - Germany - de-LI - de-LU + de-LI + German - Liechtenstein + de-LU + German - Luxembourg + div-MV + Dhivehi - Maldives el + Greek + el-GR + Greek - Greece en - en-AU - en-BZ - en-CA + English + en-AU + English - Australia + en-BZ + English - Belize + en-CA + English - Canada + en-CB + English - Caribbean en-GB - English - Great Britain - en-IE - en-JM - en-NZ - en-TT - en-US - en-ZA + English - United Kingdom + en-IE + English - Ireland + en-JM + English - Jamaica + en-NZ + English - New Zealand + en-PH + English - Philippines + en-TT + English - Trinidad and Tobago + en-US + English - United States + en-ZA + English - South Africa + en-ZW + English - Zimbabwe es - es-AR - es-BO - es-CL - es-CO - es-CR - es-DO - es-EC - es-GT - es-HN - es-MX - es-NI - es-PA - es-PE - es-PR - es-PY - es-SV - es-UY - es-VE + Spanish + es-AR + Spanish - Argentina + es-BO + Spanish - Bolivia + es-CL + Spanish - Chile + es-CO + Spanish - Colombia + es-CR + Spanish - Costa Rica + es-DO + Spanish - Dominican Republic + es-EC + Spanish - Ecuador + es-ES + Spanish - Spain + es-GT + Spanish - Guatemala + es-HN + Spanish - Honduras + es-MX + Spanish - Mexico + es-NI + Spanish - Nicaragua + es-PA + Spanish - Panama + es-PE + Spanish - Peru + es-PR + Spanish - Puerto Rico + es-PY + Spanish - Paraguay + es-SV + Spanish - El Salvador + es-UY + Spanish - Uruguay + es-VE + Spanish - Venezuela et + Estonian + et-EE + Estonian - Estonia eu + Basque + eu-ES + Basque - Basque fa + Farsi + fa-IR + Farsi - Iran fi + Finnish + fi-FI + Finnish - Finland fo + Faroese + fo-FO + Faroese - Faroe Islands fr - fr-BE - fr-CA - fr-CH - fr-LU + French + fr-BE + French - Belgium + fr-CA + French - Canada + fr-CH + French - Switzerland + fr-FR + French - France + fr-LU + French - Luxembourg + fr-MC + French - Monaco ga gd + gl-ES + Galician - Galician + gu-IN + Gujarati - India he + Hebrew + he-IL + Hebrew - Israel hi + Hindi + hi-IN + Hindi - India hr + Croatian + hr-HR + Croatian - Croatia hu + Hungarian + hu-HU + Hungarian - Hungary + hy-AM + Armenian - Armenia id + Indonesian + id-ID + Indonesian - Indonesia is + Icelandic + is-IS + Icelandic - Iceland it - it-CH + Italian + it-IT + Italian - Italy + it-CH + Italian - Switzerland ja + Japanese + ja-JP + Japanese - Japan ji + ka-GE + Georgian - Georgia + kk-KZ + Kazakh - Kazakhstan + kn-IN + Kannada - India ko + Korean + ko-KR + Korean - Korea + kok-IN + Konkani - India + ky-KZ + Kyrgyz - Kazakhstan lt + Lithuanian + lt-LT + Lithuanian - Lithuania + Lt-az-AZ + Azeri (Latin) - Azerbaijan + Lt-sr-SP + Serbian (Latin) - Serbia + Lt-uz-UZ + Uzbek (Latin) - Uzbekistan lv + Latvian + lv-LV + Latvian - Latvia mk + mk-MK + Macedonian (FYROM) + mn-MN + Mongolian - Mongolia + mr-IN + Marathi - India ms + Malay + ms-BN + Malay - Brunei + ms-MY + Malay - Malaysia mt + nb-NO + Norwegian (Bokmål) - Norway nl - nl-BE + Dutch + nl-BE + Dutch - Belgium + nl-NL + Dutch - The Netherlands + nn-NO + Norwegian (Nynorsk) - Norway no + Norwegian + pa-IN + Punjabi - India pl - pl-PL + Polish + pl-PL + Polish - Poland pt - pt-BR + Portuguese + pt-BR + Portuguese - Brazil + pt-PT + Portuguese - Portugal rm ro - ro-MO + Romanian + ro-MO + ro-RO + Romanian - Romania ru - ru-MO + Russian + ru-MO + ru-RU + Russian - Russia + sa-IN + Sanskrit - India sb sk + Slovak + sk-SK + Slovak - Slovakia sl + Slovenian + sl-SI + Slovenian - Slovenia sq + Albanian + sq-AL + Albanian - Albania sr sv - sv-FI + Swedish + sv-SE + Swedish - Sweden + sv-FI + Swedish - Finland + sw-KE + Swahili - Kenya sx + syr-SY + Syriac - Syria sz + ta-IN + Tamil - India + te-IN + Telugu - India th + Thai + th-TH + Thai - Thailand tn tr + Turkish + tr-TR + Turkish - Turkey ts + tt-RU + Tatar - Russia uk + Ukrainian + uk-UA + Ukrainian - Ukraine ur + Urdu + ur-PK + Urdu - Pakistan ve vi + Vietnamese + vi-VN + Vietnamese - Vietnam xh - zh-CN - zh-HK - zh-SG - zh-TW + zh-CHS + Chinese (Simplified) + zh-CHT + Chinese (Traditional) + zh-CN + Chinese - China + zh-HK + Chinese - Hong Kong SAR + zh-MO + Chinese - Macau SAR + zh-SG + Chinese - Singapore + zh-TW + Chinese - Taiwan zu From 43bed19adb1d3694f8e679155b0eb12915a20bad Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Thu, 2 Nov 2017 23:02:28 +0100 Subject: [PATCH 23/47] Clean up README.md --- README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ccb0e37..7a3d8a4 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,10 @@ org.doctales.terminology [![Build Status](https://travis-ci.org/doctales/org.doctales.terminology.svg?branch=master)](https://travis-ci.org/doctales/org.doctales.terminology) [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) -[![Stories in Ready](https://badge.waffle.io/doctales/org.doctales.terminology.png?label=ready&title=Ready)](https://waffle.io/doctales/org.doctales.terminology) **org.doctales.terminology** is a plugin for the [DITA-OT](http://dita-ot.github.io) for creating a DITA-based terminology database. -- Create and change terms easily using specialized DITA topics. The new DITA `` topic represents a single term. Terms are linked together to a terminology database using the `` map. +- Create and change terms easily using specialized DITA topics (DTD/RNG). The new DITA `` topic represents a single term. Terms are linked together to a terminology database using the `` map. - Author terms easily using an <oXygen/> XML framework with author mode stylesheets, that simplify the editing of `` and `` topics. - Navigate through the terminology database with a classic or responsive terminology browser ([DEMO](https://doctales.github.io/samples/termbrowser-responsive/index.html)) based on the <oXygen/> webhelp transformation. - Check DITA or XLIFF files with a Schematron based terminology checker. @@ -23,13 +22,17 @@ org.doctales.terminology - DITA-OT 2.3 or higher - <oXygen/> XML 18 or higher (optional) +- To use the Relax NG topics and maps, you need to install the **dita-relaxng-defaults** plugin. + ```shell + dita --install https://github.com/oxygenxml/dita-relaxng-defaults/archive/master.zip + ``` **Install the plugin** -1. Install the plugin with the [`dita` command](http://www.dita-ot.org/dev/parameters/dita-command-arguments.html). - ```shell - dita -install https://github.com/doctales/org.doctales.terminology/archive/master.zip - ``` +Install the plugin with the [`dita` command](http://www.dita-ot.org/dev/parameters/dita-command-arguments.html). +```shell +dita --install https://github.com/doctales/org.doctales.terminology/archive/master.zip +``` **Install the <oXygen/> XML Framework** From d175a7dcdd9999961bac6db54c68dcefa13b3a6a Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Thu, 2 Nov 2017 23:02:50 +0100 Subject: [PATCH 24/47] Harmonize template file names --- ...{DOCTALES SemanticNet.dita => DOCTALES SemanticNet (DTD).dita} | 0 ...manticNet.properties => DOCTALES SemanticNet (DTD).properties} | 0 .../{DOCTALES Termentry.dita => DOCTALES Termentry (DTD).dita} | 0 ...y (RelaxNG).properties => DOCTALES Termentry (DTD).properties} | 0 ...ermentry (RelaxNG).dita => DOCTALES Termentry (Relax NG).dita} | 0 ...mentry.properties => DOCTALES Termentry (Relax NG).properties} | 0 .../{DOCTALES Termmap.dita => DOCTALES Termmap (DTD).dita} | 0 ...TALES Termmap.properties => DOCTALES Termmap (DTD).properties} | 0 .../{DOCTALES Termstats.dita => DOCTALES Termstats (DTD).dita} | 0 ...S Termstats.properties => DOCTALES Termstats (DTD).properties} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename framework/templates/{DOCTALES SemanticNet.dita => DOCTALES SemanticNet (DTD).dita} (100%) rename framework/templates/{DOCTALES SemanticNet.properties => DOCTALES SemanticNet (DTD).properties} (100%) rename framework/templates/{DOCTALES Termentry.dita => DOCTALES Termentry (DTD).dita} (100%) rename framework/templates/{DOCTALES Termentry (RelaxNG).properties => DOCTALES Termentry (DTD).properties} (100%) rename framework/templates/{DOCTALES Termentry (RelaxNG).dita => DOCTALES Termentry (Relax NG).dita} (100%) rename framework/templates/{DOCTALES Termentry.properties => DOCTALES Termentry (Relax NG).properties} (100%) rename framework/templates/{DOCTALES Termmap.dita => DOCTALES Termmap (DTD).dita} (100%) rename framework/templates/{DOCTALES Termmap.properties => DOCTALES Termmap (DTD).properties} (100%) rename framework/templates/{DOCTALES Termstats.dita => DOCTALES Termstats (DTD).dita} (100%) rename framework/templates/{DOCTALES Termstats.properties => DOCTALES Termstats (DTD).properties} (100%) diff --git a/framework/templates/DOCTALES SemanticNet.dita b/framework/templates/DOCTALES SemanticNet (DTD).dita similarity index 100% rename from framework/templates/DOCTALES SemanticNet.dita rename to framework/templates/DOCTALES SemanticNet (DTD).dita diff --git a/framework/templates/DOCTALES SemanticNet.properties b/framework/templates/DOCTALES SemanticNet (DTD).properties similarity index 100% rename from framework/templates/DOCTALES SemanticNet.properties rename to framework/templates/DOCTALES SemanticNet (DTD).properties diff --git a/framework/templates/DOCTALES Termentry.dita b/framework/templates/DOCTALES Termentry (DTD).dita similarity index 100% rename from framework/templates/DOCTALES Termentry.dita rename to framework/templates/DOCTALES Termentry (DTD).dita diff --git a/framework/templates/DOCTALES Termentry (RelaxNG).properties b/framework/templates/DOCTALES Termentry (DTD).properties similarity index 100% rename from framework/templates/DOCTALES Termentry (RelaxNG).properties rename to framework/templates/DOCTALES Termentry (DTD).properties diff --git a/framework/templates/DOCTALES Termentry (RelaxNG).dita b/framework/templates/DOCTALES Termentry (Relax NG).dita similarity index 100% rename from framework/templates/DOCTALES Termentry (RelaxNG).dita rename to framework/templates/DOCTALES Termentry (Relax NG).dita diff --git a/framework/templates/DOCTALES Termentry.properties b/framework/templates/DOCTALES Termentry (Relax NG).properties similarity index 100% rename from framework/templates/DOCTALES Termentry.properties rename to framework/templates/DOCTALES Termentry (Relax NG).properties diff --git a/framework/templates/DOCTALES Termmap.dita b/framework/templates/DOCTALES Termmap (DTD).dita similarity index 100% rename from framework/templates/DOCTALES Termmap.dita rename to framework/templates/DOCTALES Termmap (DTD).dita diff --git a/framework/templates/DOCTALES Termmap.properties b/framework/templates/DOCTALES Termmap (DTD).properties similarity index 100% rename from framework/templates/DOCTALES Termmap.properties rename to framework/templates/DOCTALES Termmap (DTD).properties diff --git a/framework/templates/DOCTALES Termstats.dita b/framework/templates/DOCTALES Termstats (DTD).dita similarity index 100% rename from framework/templates/DOCTALES Termstats.dita rename to framework/templates/DOCTALES Termstats (DTD).dita diff --git a/framework/templates/DOCTALES Termstats.properties b/framework/templates/DOCTALES Termstats (DTD).properties similarity index 100% rename from framework/templates/DOCTALES Termstats.properties rename to framework/templates/DOCTALES Termstats (DTD).properties From d6513c6d462f4ad0519a8fdfbd6657ed08bb2dec Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Thu, 2 Nov 2017 23:02:56 +0100 Subject: [PATCH 25/47] Clean up flags --- framework/css/flags.less | 218 +++++++++++------------------- xsl/flagicon.xsl | 281 ++++++++++++++++----------------------- 2 files changed, 191 insertions(+), 308 deletions(-) diff --git a/framework/css/flags.less b/framework/css/flags.less index aec1138..80068c2 100644 --- a/framework/css/flags.less +++ b/framework/css/flags.less @@ -19,49 +19,82 @@ background-image: url("../flag-icon-css/af.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='ar']:before(20), -*[class~="termentry/termNotation"][language='ar-AE']:before(20), -*[class~="termentry/termNotation"][language='ar-BH']:before(20), -*[class~="termentry/termNotation"][language='ar-DZ']:before(20), -*[class~="termentry/termNotation"][language='ar-EG']:before(20), -*[class~="termentry/termNotation"][language='ar-IQ']:before(20), -*[class~="termentry/termNotation"][language='ar-JO']:before(20), -*[class~="termentry/termNotation"][language='ar-KW']:before(20), -*[class~="termentry/termNotation"][language='ar-LB']:before(20), -*[class~="termentry/termNotation"][language='ar-LY']:before(20), -*[class~="termentry/termNotation"][language='ar-MA']:before(20), -*[class~="termentry/termNotation"][language='ar-OM']:before(20), -*[class~="termentry/termNotation"][language='ar-QA']:before(20), -*[class~="termentry/termNotation"][language='ar-SA']:before(20), -*[class~="termentry/termNotation"][language='ar-SY']:before(20), -*[class~="termentry/termNotation"][language='ar-TN']:before(20), -*[class~="termentry/termNotation"][language='ar-YE']:before(20) { - background-image: url("../flag-icon-css/ar.svg"); +*[class~="termentry/termNotation"][language='af-ZA']:before(20) { + background-image: url("../flag-icon-css/za.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='be']:before(20) { - background-image: url("../flag-icon-css/be.svg"); +*[class~="termentry/termNotation"][language='ar-AE']:before(20) { + background-image: url("../flag-icon-css/ae.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='bg']:before(20) { - background-image: url("../flag-icon-css/bg.svg"); +*[class~="termentry/termNotation"][language='ar-BH']:before(20) { + background-image: url("../flag-icon-css/bh.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='ca']:before(20) { - background-image: url("../flag-icon-css/ca.svg"); +*[class~="termentry/termNotation"][language='ar-DZ']:before(20) { + background-image: url("../flag-icon-css/dz.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-EG']:before(20) { + background-image: url("../flag-icon-css/eg.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-IQ']:before(20) { + background-image: url("../flag-icon-css/iq.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-JO']:before(20) { + background-image: url("../flag-icon-css/jo.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-KW']:before(20) { + background-image: url("../flag-icon-css/kw.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-LB']:before(20) { + background-image: url("../flag-icon-css/lb.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-LY']:before(20) { + background-image: url("../flag-icon-css/ly.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-MA']:before(20) { + background-image: url("../flag-icon-css/ma.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-OM']:before(20) { + background-image: url("../flag-icon-css/om.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-QA']:before(20) { + background-image: url("../flag-icon-css/qa.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-SA']:before(20) { + background-image: url("../flag-icon-css/sa.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-SY']:before(20) { + background-image: url("../flag-icon-css/sy.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-TN']:before(20) { + background-image: url("../flag-icon-css/tn.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ar-YE']:before(20) { + background-image: url("../flag-icon-css/ye.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='cs']:before(20), *[class~="termentry/termNotation"][language='cs-CZ']:before(20) { background-image: url("../flag-icon-css/cs.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='da']:before(20), *[class~="termentry/termNotation"][language='da-DK']:before(20) { background-image: url("../flag-icon-css/dk.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='de']:before(20), *[class~="termentry/termNotation"][language='de-DE']:before(20) { background-image: url("../flag-icon-css/de.svg"); .flagIcon(); @@ -82,11 +115,6 @@ background-image: url("../flag-icon-css/lu.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='el']:before(20) { - background-image: url("../flag-icon-css/el.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='en']:before(20), *[class~="termentry/termNotation"][language='en-GB']:before(20) { background-image: url("../flag-icon-css/gb.svg"); .flagIcon(); @@ -115,10 +143,6 @@ background-image: url("../flag-icon-css/za.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='es']:before(20) { - background-image: url("../flag-icon-css/es.svg"); - .flagIcon(); -} *[class~="termentry/termNotation"][language='es-AR']:before(20) { background-image: url("../flag-icon-css/ar.svg"); .flagIcon(); @@ -191,23 +215,6 @@ background-image: url("../flag-icon-css/ve.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='et']:before(20) { - background-image: url("../flag-icon-css/ee.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='fa']:before(20) { - background-image: url("../flag-icon-css/ir.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='fi']:before(20) { - background-image: url("../flag-icon-css/fi.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='fo']:before(20) { - background-image: url("../flag-icon-css/fo.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='fr']:before(20), *[class~="termentry/termNotation"][language='fr-FR']:before(20) { background-image: url("../flag-icon-css/fr.svg"); .flagIcon(); @@ -228,88 +235,39 @@ background-image: url("../flag-icon-css/lu.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='ga']:before(20), *[class~="termentry/termNotation"][language='fr-GA']:before(20) { background-image: url("../flag-icon-css/ga.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='gd']:before(20) { - background-image: url("../flag-icon-css/gd.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='he']:before(20) { - background-image: url("../flag-icon-css/il.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='hi']:before(20) { - background-image: url("../flag-icon-css/in.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='hr']:before(20) { - background-image: url("../flag-icon-css/ir.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='hu']:before(20) { - background-image: url("../flag-icon-css/hu.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='id']:before(20) { - background-image: url("../flag-icon-css/id.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='is']:before(20) { - background-image: url("../flag-icon-css/is.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='it']:before(20), -*[class~="termentry/termNotation"][language='it-CH']:before(20), *[class~="termentry/termNotation"][language='it-IT']:before(20) { background-image: url("../flag-icon-css/it.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='ja']:before(20) { - background-image: url("../flag-icon-css/ja.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='ko']:before(20) { - background-image: url("../flag-icon-css/kr.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='lt']:before(20) { - background-image: url("../flag-icon-css/lt.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='lv']:before(20) { - background-image: url("../flag-icon-css/lv.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='mk']:before(20) { - background-image: url("../flag-icon-css/mk.svg"); +*[class~="termentry/termNotation"][language='it-CH']:before(20) { + background-image: url("../flag-icon-css/ch.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='ms']:before(20) { - background-image: url("../flag-icon-css/my.svg"); +*[class~="termentry/termNotation"][language='ja-JP']:before(20) { + background-image: url("../flag-icon-css/ja.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='mt']:before(20) { - background-image: url("../flag-icon-css/mt.svg"); +*[class~="termentry/termNotation"][language='ko-KR']:before(20) { + background-image: url("../flag-icon-css/kr.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='nl']:before(20), *[class~="termentry/termNotation"][language='nl-BE']:before(20) { - background-image: url("../flag-icon-css/nl.svg"); + background-image: url("../flag-icon-css/be.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='no']:before(20) { - background-image: url("../flag-icon-css/no.svg"); +*[class~="termentry/termNotation"][language='nl-NL']:before(20) { + background-image: url("../flag-icon-css/nl.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='pl']:before(20), *[class~="termentry/termNotation"][language='pl-PL']:before(20) { background-image: url("../flag-icon-css/pl.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='pt']:before(20) { +*[class~="termentry/termNotation"][language='pt-PT']:before(20) { background-image: url("../flag-icon-css/pt.svg"); .flagIcon(); } @@ -317,48 +275,22 @@ background-image: url("../flag-icon-css/br.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='ro']:before(20) { +*[class~="termentry/termNotation"][language='ro-RO']:before(20) { background-image: url("../flag-icon-css/ro.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='ru']:before(20) { +*[class~="termentry/termNotation"][language='ru-RU']:before(20) { background-image: url("../flag-icon-css/ru.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='sk']:before(20) { - background-image: url("../flag-icon-css/sk.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='sl']:before(20) { - background-image: url("../flag-icon-css/sl.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='sq']:before(20) { - background-image: url("../flag-icon-css/al.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='sr']:before(20) { - background-image: url("../flag-icon-css/rs.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='sv']:before(20), -*[class~="termentry/termNotation"][language='sv-FI']:before(20) { +*[class~="termentry/termNotation"][language='sv-SE']:before(20) { background-image: url("../flag-icon-css/se.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='th']:before(20) { - background-image: url("../flag-icon-css/th.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='uk']:before(20) { - background-image: url("../flag-icon-css/ua.svg"); - .flagIcon(); -} -*[class~="termentry/termNotation"][language='vi']:before(20) { - background-image: url("../flag-icon-css/vn.svg"); +*[class~="termentry/termNotation"][language='sv-FI']:before(20) { + background-image: url("../flag-icon-css/fi.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='zh']:before(20), *[class~="termentry/termNotation"][language='zh-CN']:before(20) { background-image: url("../flag-icon-css/cn.svg"); .flagIcon(); diff --git a/xsl/flagicon.xsl b/xsl/flagicon.xsl index 2fd7f4e..13e46a1 100644 --- a/xsl/flagicon.xsl +++ b/xsl/flagicon.xsl @@ -2,8 +2,22 @@ + xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" + exclude-result-prefixes="xs xd doctales" + version="2.0"> + + + Return the corresponding flag + Usually this should be: ISO-639 Language Code + "-" + ISO-3166 Country Code + + Boolean + + + Language Code + + The string to be processed. + @@ -15,61 +29,107 @@ flag-icon flag-icon-af - + - flag-icon flag-icon-ar + flag-icon flag-icon-za - + - flag-icon flag-icon-be + flag-icon flag-icon-ae - + - flag-icon flag-icon-bg + flag-icon flag-icon-bh - + - flag-icon flag-icon-ca + flag-icon flag-icon-dz + + + + + flag-icon flag-icon-eg + + + + + flag-icon flag-icon-iq + + + + + flag-icon flag-icon-jo - + + + flag-icon flag-icon-kw + + + + + flag-icon flag-icon-lb + + + + + flag-icon flag-icon-ly + + + + + flag-icon flag-icon-ma + + + + + flag-icon flag-icon-om + + + + + flag-icon flag-icon-qa + + + + + flag-icon flag-icon-sa + + + + + flag-icon flag-icon-sy + + + + + flag-icon flag-icon-tn + + + + + flag-icon flag-icon-ye + + + flag-icon flag-icon-cz - + flag-icon flag-icon-dk - + flag-icon flag-icon-at - + flag-icon flag-icon-de @@ -89,13 +149,7 @@ flag-icon flag-icon-lu - - - flag-icon flag-icon-el - - - + flag-icon flag-icon-gb @@ -130,8 +184,7 @@ flag-icon flag-icon-za - + flag-icon flag-icon-es @@ -226,28 +279,7 @@ flag-icon flag-icon-ve - - - flag-icon flag-icon-ee - - - - - flag-icon flag-icon-ir - - - - - flag-icon flag-icon-fi - - - - - flag-icon flag-icon-fo - - - + flag-icon flag-icon-fr @@ -272,106 +304,62 @@ flag-icon flag-icon-lu - + flag-icon flag-icon-ga - - - flag-icon flag-icon-gd - - - - - flag-icon flag-icon-il - - - - - flag-icon flag-icon-in - - - + - flag-icon flag-icon-ir + flag-icon flag-icon-hr - + flag-icon flag-icon-hu - + - flag-icon flag-icon-id + flag-icon flag-icon-is - + - flag-icon flag-icon-is + flag-icon flag-icon-ch - + flag-icon flag-icon-it - + flag-icon flag-icon-ja - + flag-icon flag-icon-kr - - - flag-icon flag-icon-lt - - - - - flag-icon flag-icon-lv - - - - - flag-icon flag-icon-mk - - - - - flag-icon flag-icon-my - - - - - flag-icon flag-icon-mt - - - + flag-icon flag-icon-nl - + - flag-icon flag-icon-no + flag-icon flag-icon-nl - + flag-icon flag-icon-pl - + flag-icon flag-icon-pt @@ -381,59 +369,22 @@ flag-icon flag-icon-br - + flag-icon flag-icon-ro - + flag-icon flag-icon-ru - - - flag-icon flag-icon-sk - - - - - flag-icon flag-icon-sl - - - - - flag-icon flag-icon-al - - - + - flag-icon flag-icon-rs - - - - - flag-icon flag-icon-se - - - - - flag-icon flag-icon-th - - - - - flag-icon flag-icon-ua - - - - - flag-icon flag-icon-vn + flag-icon flag-icon-fi - + flag-icon flag-icon-cn From 59aa4e1a71b7fb742c8f10e87f80ea68375feed7 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 3 Nov 2017 11:07:49 +0100 Subject: [PATCH 26/47] Fix flags --- framework/css/flags.less | 272 ++++++++++++++++++++++++++++++-- rng/termentryMod.rng | 11 +- xsl/flagicon.xsl | 328 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 571 insertions(+), 40 deletions(-) diff --git a/framework/css/flags.less b/framework/css/flags.less index 80068c2..950f215 100644 --- a/framework/css/flags.less +++ b/framework/css/flags.less @@ -15,10 +15,6 @@ /********************************************* * FLAGS *********************************************/ -*[class~="termentry/termNotation"][language='af']:before(20) { - background-image: url("../flag-icon-css/af.svg"); - .flagIcon(); -} *[class~="termentry/termNotation"][language='af-ZA']:before(20) { background-image: url("../flag-icon-css/za.svg"); .flagIcon(); @@ -95,10 +91,6 @@ background-image: url("../flag-icon-css/dk.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='de-DE']:before(20) { - background-image: url("../flag-icon-css/de.svg"); - .flagIcon(); -} *[class~="termentry/termNotation"][language='de-AT']:before(20) { background-image: url("../flag-icon-css/at.svg"); .flagIcon(); @@ -107,6 +99,10 @@ background-image: url("../flag-icon-css/ch.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='de-DE']:before(20) { + background-image: url("../flag-icon-css/de.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='de-LI']:before(20) { background-image: url("../flag-icon-css/li.svg"); .flagIcon(); @@ -115,6 +111,30 @@ background-image: url("../flag-icon-css/lu.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='div-MV']:before(20) { + background-image: url("../flag-icon-css/mv.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='el-GR']:before(20) { + background-image: url("../flag-icon-css/gr.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='en-AU']:before(20) { + background-image: url("../flag-icon-css/au.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='en-BZ']:before(20) { + background-image: url("../flag-icon-css/bz.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='en-CA']:before(20) { + background-image: url("../flag-icon-css/ca.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='en-CB']:before(20) { + background-image: url("../flag-icon-css/cb.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='en-GB']:before(20) { background-image: url("../flag-icon-css/gb.svg"); .flagIcon(); @@ -131,6 +151,10 @@ background-image: url("../flag-icon-css/nz.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='en-PH']:before(20) { + background-image: url("../flag-icon-css/ph.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='en-TT']:before(20) { background-image: url("../flag-icon-css/tt.svg"); .flagIcon(); @@ -143,6 +167,10 @@ background-image: url("../flag-icon-css/za.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='en-ZW']:before(20) { + background-image: url("../flag-icon-css/zw.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='es-AR']:before(20) { background-image: url("../flag-icon-css/ar.svg"); .flagIcon(); @@ -171,6 +199,10 @@ background-image: url("../flag-icon-css/ec.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='es-ES']:before(20) { + background-image: url("../flag-icon-css/es.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='es-GT']:before(20) { background-image: url("../flag-icon-css/gt.svg"); .flagIcon(); @@ -215,6 +247,26 @@ background-image: url("../flag-icon-css/ve.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='et-EE']:before(20) { + background-image: url("../flag-icon-css/ee.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='eu-ES']:before(20) { + background-image: url("../flag-icon-css/es.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='fa-IR']:before(20) { + background-image: url("../flag-icon-css/ir.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='fi-FI']:before(20) { + background-image: url("../flag-icon-css/fi.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='fo-FO']:before(20) { + background-image: url("../flag-icon-css/fo.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='fr-FR']:before(20) { background-image: url("../flag-icon-css/fr.svg"); .flagIcon(); @@ -231,30 +283,134 @@ background-image: url("../flag-icon-css/ch.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='fr-FR']:before(20) { + background-image: url("../flag-icon-css/fr.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='fr-LU']:before(20) { background-image: url("../flag-icon-css/lu.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='fr-GA']:before(20) { - background-image: url("../flag-icon-css/ga.svg"); +*[class~="termentry/termNotation"][language='fr-MC']:before(20) { + background-image: url("../flag-icon-css/mc.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='it-IT']:before(20) { - background-image: url("../flag-icon-css/it.svg"); +*[class~="termentry/termNotation"][language='gl-ES']:before(20) { + background-image: url("../flag-icon-css/es.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='gu-IN']:before(20) { + background-image: url("../flag-icon-css/in.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='he-IL']:before(20) { + background-image: url("../flag-icon-css/il.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='hi-IN']:before(20) { + background-image: url("../flag-icon-css/in.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='hr-HR']:before(20) { + background-image: url("../flag-icon-css/hr.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='hu-HU']:before(20) { + background-image: url("../flag-icon-css/hu.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='hy-AM']:before(20) { + background-image: url("../flag-icon-css/am.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='id-ID']:before(20) { + background-image: url("../flag-icon-css/id.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='is-IS']:before(20) { + background-image: url("../flag-icon-css/is.svg"); .flagIcon(); } *[class~="termentry/termNotation"][language='it-CH']:before(20) { background-image: url("../flag-icon-css/ch.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='it-IT']:before(20) { + background-image: url("../flag-icon-css/it.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='ja-JP']:before(20) { background-image: url("../flag-icon-css/ja.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='ka-GE']:before(20) { + background-image: url("../flag-icon-css/ge.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='kk-KZ']:before(20) { + background-image: url("../flag-icon-css/kz.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='kn-IN']:before(20) { + background-image: url("../flag-icon-css/in.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='ko-KR']:before(20) { background-image: url("../flag-icon-css/kr.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='kok-IN']:before(20) { + background-image: url("../flag-icon-css/in.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ky-KZ']:before(20) { + background-image: url("../flag-icon-css/kz.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='lt-LT']:before(20) { + background-image: url("../flag-icon-css/lt.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='Lt-az-AZ']:before(20) { + background-image: url("../flag-icon-css/az.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='Lt-sr-SP']:before(20) { + background-image: url("../flag-icon-css/sp.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='Lt-uz-UZ']:before(20) { + background-image: url("../flag-icon-css/uz.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='lv-LV']:before(20) { + background-image: url("../flag-icon-css/lv.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='mk-MK']:before(20) { + background-image: url("../flag-icon-css/mk.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='mn-MN']:before(20) { + background-image: url("../flag-icon-css/mn.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='mr-IN']:before(20) { + background-image: url("../flag-icon-css/in.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ms-BN']:before(20) { + background-image: url("../flag-icon-css/bn.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ms-MY']:before(20) { + background-image: url("../flag-icon-css/my.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='nb-NO']:before(20) { + background-image: url("../flag-icon-css/no.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='nl-BE']:before(20) { background-image: url("../flag-icon-css/be.svg"); .flagIcon(); @@ -263,34 +419,114 @@ background-image: url("../flag-icon-css/nl.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='nn-NO']:before(20) { + background-image: url("../flag-icon-css/no.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='pa-IN']:before(20) { + background-image: url("../flag-icon-css/in.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='pl-PL']:before(20) { background-image: url("../flag-icon-css/pl.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='pt-BR']:before(20) { + background-image: url("../flag-icon-css/br.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='pt-PT']:before(20) { background-image: url("../flag-icon-css/pt.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='pt-BR']:before(20) { - background-image: url("../flag-icon-css/br.svg"); +*[class~="termentry/termNotation"][language='ro-MO']:before(20) { + background-image: url("../flag-icon-css/mo.svg"); .flagIcon(); } *[class~="termentry/termNotation"][language='ro-RO']:before(20) { background-image: url("../flag-icon-css/ro.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='ru-MO']:before(20) { + background-image: url("../flag-icon-css/mo.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='ru-RU']:before(20) { background-image: url("../flag-icon-css/ru.svg"); .flagIcon(); } -*[class~="termentry/termNotation"][language='sv-SE']:before(20) { - background-image: url("../flag-icon-css/se.svg"); +*[class~="termentry/termNotation"][language='sa-IN']:before(20) { + background-image: url("../flag-icon-css/in.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='sk-SK']:before(20) { + background-image: url("../flag-icon-css/sk.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='sl-SI']:before(20) { + background-image: url("../flag-icon-css/si.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='sq-AL']:before(20) { + background-image: url("../flag-icon-css/al.svg"); .flagIcon(); } *[class~="termentry/termNotation"][language='sv-FI']:before(20) { background-image: url("../flag-icon-css/fi.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='sv-SE']:before(20) { + background-image: url("../flag-icon-css/se.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='sw-KE']:before(20) { + background-image: url("../flag-icon-css/ke.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='syr-SY']:before(20) { + background-image: url("../flag-icon-css/sy.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ta-IN']:before(20) { + background-image: url("../flag-icon-css/in.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='te-IN']:before(20) { + background-image: url("../flag-icon-css/in.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='th-TH']:before(20) { + background-image: url("../flag-icon-css/th.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='tr-TR']:before(20) { + background-image: url("../flag-icon-css/tr.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='tt-RU']:before(20) { + background-image: url("../flag-icon-css/ru.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='uk-UA']:before(20) { + background-image: url("../flag-icon-css/ua.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ur-PK']:before(20) { + background-image: url("../flag-icon-css/pk.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='vi-VN']:before(20) { + background-image: url("../flag-icon-css/vn.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='zh-CHS']:before(20) { + background-image: url("../flag-icon-css/cn.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='zh-CHT']:before(20) { + background-image: url("../flag-icon-css/cn.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='zh-CN']:before(20) { background-image: url("../flag-icon-css/cn.svg"); .flagIcon(); @@ -299,6 +535,10 @@ background-image: url("../flag-icon-css/hk.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='zh-MO']:before(20) { + background-image: url("../flag-icon-css/mo.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='zh-SG']:before(20) { background-image: url("../flag-icon-css/sg.svg"); .flagIcon(); diff --git a/rng/termentryMod.rng b/rng/termentryMod.rng index f59305b..26adad2 100644 --- a/rng/termentryMod.rng +++ b/rng/termentryMod.rng @@ -23,7 +23,7 @@ SYSTEM: Darwin Information Typing Architecture (DITA) - PURPOSE: Define elements and specialization atttributes for Termentries + PURPOSE: Define elements and specialization attributes for Termentries ORIGINAL CREATION DATE: March 2017 @@ -414,10 +414,10 @@ Icelandic - Iceland it Italian - it-IT - Italian - Italy it-CH Italian - Switzerland + it-IT + Italian - Italy ja Japanese ja-JP @@ -452,6 +452,7 @@ lv-LV Latvian - Latvia mk + Macedonian mk-MK Macedonian (FYROM) mn-MN @@ -518,10 +519,10 @@ sr sv Swedish - sv-SE - Swedish - Sweden sv-FI Swedish - Finland + sv-SE + Swedish - Sweden sw-KE Swahili - Kenya sx diff --git a/xsl/flagicon.xsl b/xsl/flagicon.xsl index 13e46a1..7c00aea 100644 --- a/xsl/flagicon.xsl +++ b/xsl/flagicon.xsl @@ -6,10 +6,20 @@ exclude-result-prefixes="xs xd doctales" version="2.0"> - Return the corresponding flag - Usually this should be: ISO-639 Language Code + "-" + ISO-3166 Country Code + + Usually this should be: ISO-639-1 Language Code + "-" + ISO-3166 Country Code, + as explained in https://tools.ietf.org/html/bcp47 + + Good resources are: + + https://msdn.microsoft.com/de-de/library/ee825488(v=cs.20).aspx + https://www.andiamo.co.uk/resources/iso-language-codes + https://datahub.io/core/language-codes, section ietf-language-tags + https://docs.oracle.com/cd/E13214_01/wli/docs92/xref/xqisocodes.html + + A good resource for language names is http://id.loc.gov/vocabulary/iso639-1.html. Boolean @@ -24,11 +34,6 @@ label label-default - - - flag-icon flag-icon-af - - flag-icon flag-icon-za @@ -129,14 +134,14 @@ flag-icon flag-icon-at - + - flag-icon flag-icon-de + flag-icon flag-icon-ch - + - flag-icon flag-icon-ch + flag-icon flag-icon-de @@ -149,6 +154,36 @@ flag-icon flag-icon-lu + + + flag-icon flag-icon-mv + + + + + flag-icon flag-icon-gr + + + + + flag-icon flag-icon-au + + + + + flag-icon flag-icon-bz + + + + + flag-icon flag-icon-ca + + + + + flag-icon flag-icon-cb + + flag-icon flag-icon-gb @@ -169,6 +204,11 @@ flag-icon flag-icon-nz + + + flag-icon flag-icon-ph + + flag-icon flag-icon-tt @@ -184,9 +224,9 @@ flag-icon flag-icon-za - + - flag-icon flag-icon-es + flag-icon flag-icon-zw @@ -224,6 +264,11 @@ flag-icon flag-icon-ec + + + flag-icon flag-icon-es + + flag-icon flag-icon-gt @@ -279,9 +324,29 @@ flag-icon flag-icon-ve - + - flag-icon flag-icon-fr + flag-icon flag-icon-ee + + + + + flag-icon flag-icon-es + + + + + flag-icon flag-icon-ir + + + + + flag-icon flag-icon-fi + + + + + flag-icon flag-icon-fo @@ -299,14 +364,39 @@ flag-icon flag-icon-ch + + + flag-icon flag-icon-fr + + flag-icon flag-icon-lu - + + + flag-icon flag-icon-mc + + + - flag-icon flag-icon-ga + flag-icon flag-icon-es + + + + + flag-icon flag-icon-in + + + + + flag-icon flag-icon-il + + + + + flag-icon flag-icon-in @@ -319,6 +409,16 @@ flag-icon flag-icon-hu + + + flag-icon flag-icon-am + + + + + flag-icon flag-icon-id + + flag-icon flag-icon-is @@ -339,11 +439,91 @@ flag-icon flag-icon-ja + + + flag-icon flag-icon-ge + + + + + flag-icon flag-icon-kz + + + + + flag-icon flag-icon-in + + flag-icon flag-icon-kr + + + flag-icon flag-icon-in + + + + + flag-icon flag-icon-kz + + + + + flag-icon flag-icon-lt + + + + + flag-icon flag-icon-az + + + + + flag-icon flag-icon-sp + + + + + flag-icon flag-icon-uz + + + + + flag-icon flag-icon-lv + + + + + flag-icon flag-icon-mk + + + + + flag-icon flag-icon-mn + + + + + flag-icon flag-icon-in + + + + + flag-icon flag-icon-bn + + + + + flag-icon flag-icon-my + + + + + flag-icon flag-icon-no + + flag-icon flag-icon-nl @@ -354,19 +534,34 @@ flag-icon flag-icon-nl + + + flag-icon flag-icon-no + + + + + flag-icon flag-icon-in + + flag-icon flag-icon-pl + + + flag-icon flag-icon-br + + flag-icon flag-icon-pt - + - flag-icon flag-icon-br + flag-icon flag-icon-mo @@ -374,16 +569,106 @@ flag-icon flag-icon-ro + + + flag-icon flag-icon-mo + + flag-icon flag-icon-ru + + + flag-icon flag-icon-in + + + + + flag-icon flag-icon-sk + + + + + flag-icon flag-icon-si + + + + + flag-icon flag-icon-al + + flag-icon flag-icon-fi + + + flag-icon flag-icon-se + + + + + flag-icon flag-icon-ke + + + + + flag-icon flag-icon-sy + + + + + flag-icon flag-icon-in + + + + + flag-icon flag-icon-in + + + + + flag-icon flag-icon-th + + + + + flag-icon flag-icon-tr + + + + + flag-icon flag-icon-ru + + + + + flag-icon flag-icon-ua + + + + + flag-icon flag-icon-pk + + + + + flag-icon flag-icon-vn + + + + + flag-icon flag-icon-cn + + + + + flag-icon flag-icon-cn + + flag-icon flag-icon-cn @@ -394,6 +679,11 @@ flag-icon flag-icon-hk + + + flag-icon flag-icon-mo + + flag-icon flag-icon-sg From 14606603d8d8ec735cd9d983da60ce0e86cdaebf Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 3 Nov 2017 11:12:09 +0100 Subject: [PATCH 27/47] Fix flags --- framework/css/flags.less | 12 ++++++++++++ xsl/flagicon.xsl | 15 +++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/framework/css/flags.less b/framework/css/flags.less index 950f215..94a4b6c 100644 --- a/framework/css/flags.less +++ b/framework/css/flags.less @@ -83,6 +83,18 @@ background-image: url("../flag-icon-css/ye.svg"); .flagIcon(); } +*[class~="termentry/termNotation"][language='be-BY']:before(20) { + background-image: url("../flag-icon-css/by.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='bg-BG']:before(20) { + background-image: url("../flag-icon-css/bg.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='ca-ES']:before(20) { + background-image: url("../flag-icon-css/es.svg"); + .flagIcon(); +} *[class~="termentry/termNotation"][language='cs-CZ']:before(20) { background-image: url("../flag-icon-css/cs.svg"); .flagIcon(); diff --git a/xsl/flagicon.xsl b/xsl/flagicon.xsl index 7c00aea..591e180 100644 --- a/xsl/flagicon.xsl +++ b/xsl/flagicon.xsl @@ -119,6 +119,21 @@ flag-icon flag-icon-ye + + + flag-icon flag-icon-by + + + + + flag-icon flag-icon-bg + + + + + flag-icon flag-icon-es + + flag-icon flag-icon-cz From 8b7a6f91e50ed95cca81389502c8fd27e452d64d Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 3 Nov 2017 12:33:35 +0100 Subject: [PATCH 28/47] Fix flags --- framework/css/flags.less | 18 +++++++++++++++--- xsl/flagicon.xsl | 19 +++++++++++++++++-- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/framework/css/flags.less b/framework/css/flags.less index 94a4b6c..1a7cd0a 100644 --- a/framework/css/flags.less +++ b/framework/css/flags.less @@ -96,7 +96,19 @@ .flagIcon(); } *[class~="termentry/termNotation"][language='cs-CZ']:before(20) { - background-image: url("../flag-icon-css/cs.svg"); + background-image: url("../flag-icon-css/cz.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='Cy-az-AZ']:before(20) { + background-image: url("../flag-icon-css/az.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='Cy-sr-SP']:before(20) { + background-image: url("../flag-icon-css/sr.svg"); + .flagIcon(); +} +*[class~="termentry/termNotation"][language='Cy-uz-UZ']:before(20) { + background-image: url("../flag-icon-css/uz.svg"); .flagIcon(); } *[class~="termentry/termNotation"][language='da-DK']:before(20) { @@ -352,7 +364,7 @@ .flagIcon(); } *[class~="termentry/termNotation"][language='ja-JP']:before(20) { - background-image: url("../flag-icon-css/ja.svg"); + background-image: url("../flag-icon-css/jp.svg"); .flagIcon(); } *[class~="termentry/termNotation"][language='ka-GE']:before(20) { @@ -388,7 +400,7 @@ .flagIcon(); } *[class~="termentry/termNotation"][language='Lt-sr-SP']:before(20) { - background-image: url("../flag-icon-css/sp.svg"); + background-image: url("../flag-icon-css/sr.svg"); .flagIcon(); } *[class~="termentry/termNotation"][language='Lt-uz-UZ']:before(20) { diff --git a/xsl/flagicon.xsl b/xsl/flagicon.xsl index 591e180..5ded2bc 100644 --- a/xsl/flagicon.xsl +++ b/xsl/flagicon.xsl @@ -139,6 +139,21 @@ flag-icon flag-icon-cz + + + flag-icon flag-icon-az + + + + + flag-icon flag-icon-sr + + + + + flag-icon flag-icon-uz + + flag-icon flag-icon-dk @@ -451,7 +466,7 @@ - flag-icon flag-icon-ja + flag-icon flag-icon-jp @@ -496,7 +511,7 @@ - flag-icon flag-icon-sp + flag-icon flag-icon-sr From 9aca167bb843fc39c2e86e5e03b37ae03132ea45 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 3 Nov 2017 23:25:22 +0100 Subject: [PATCH 29/47] Update license info --- README.md | 3 +++ framework/flag-icon-css/LICENSE | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 framework/flag-icon-css/LICENSE diff --git a/README.md b/README.md index 7a3d8a4..2d2c292 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,9 @@ dita --install https://github.com/doctales/org.doctales.terminology/archive/mast Please refer to the [documentation](https://doctales.atlassian.net/wiki/display/TERM/org.doctales.terminology). +## Licenses + +**org.doctales.terminology** is available under the [Apache Public License (APL) 2](https://www.apache.org/licenses/LICENSE-2.0). The plugin contains SVG flags taken from the [flag-icon-css](https://github.com/lipis/flag-icon-css) project, which is available under the [MIT license](https://opensource.org/licenses/MIT). The plugin contains the [OOPS Consultancy XMLTask library](http://www.oopsconsultancy.com/software/xmltask), which is available under the [Apache Public License (APL)](https://www.apache.org/licenses/LICENSE-1.0). ## Contribution diff --git a/framework/flag-icon-css/LICENSE b/framework/flag-icon-css/LICENSE new file mode 100644 index 0000000..ee959dc --- /dev/null +++ b/framework/flag-icon-css/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013 Panayiotis Lipiridis + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From d51228852c78f469b0f08cb43f2c804d6bf7f750 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 3 Nov 2017 23:43:43 +0100 Subject: [PATCH 30/47] Update DITA-OT version info in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d2c292..e71cf3f 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ org.doctales.terminology **Prerequisites** -- DITA-OT 2.3 or higher +- DITA-OT 2.3 - 2.5.4 - <oXygen/> XML 18 or higher (optional) - To use the Relax NG topics and maps, you need to install the **dita-relaxng-defaults** plugin. ```shell From 8045e872c461f08f8d720454ad4404d90ec98a10 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 3 Nov 2017 23:43:58 +0100 Subject: [PATCH 31/47] Fix flags in samples --- samples/advancedDriverAssistanceSystem.dita | 4 ++-- samples/antiLockBrakingSystem.dita | 21 --------------------- samples/brakeLight.dita | 4 ++-- samples/bus.dita | 3 +++ samples/dieselEngine.dita | 6 +++--- samples/gasengine.dita | 6 +++--- samples/headlamp.dita | 2 +- samples/ladderFrame.dita | 6 +++--- samples/lighting.dita | 8 ++++---- samples/motorCycle.dita | 6 +++--- samples/rearFogLamp.dita | 4 ++-- samples/rearPositionLamp.dita | 12 ++++++------ samples/reversingLamp.dita | 2 +- samples/transmission.dita | 2 +- samples/turnSignal.dita | 4 ++-- samples/wheel.dita | 6 +++--- 16 files changed, 39 insertions(+), 57 deletions(-) diff --git a/samples/advancedDriverAssistanceSystem.dita b/samples/advancedDriverAssistanceSystem.dita index eee0e2d..cbb9c20 100644 --- a/samples/advancedDriverAssistanceSystem.dita +++ b/samples/advancedDriverAssistanceSystem.dita @@ -13,10 +13,10 @@ - + advanced driver assistance systems - + ADAS diff --git a/samples/antiLockBrakingSystem.dita b/samples/antiLockBrakingSystem.dita index fe7d71d..98556e0 100644 --- a/samples/antiLockBrakingSystem.dita +++ b/samples/antiLockBrakingSystem.dita @@ -13,27 +13,6 @@ - - An Equation - - - - - - - a - - - b - - - = - c - - - - - Bruce Wayne Peter Parker diff --git a/samples/brakeLight.dita b/samples/brakeLight.dita index 8ba6838..4317eda 100644 --- a/samples/brakeLight.dita +++ b/samples/brakeLight.dita @@ -23,13 +23,13 @@ - + brake light stop lamp - + Rücklicht diff --git a/samples/bus.dita b/samples/bus.dita index 18d9794..bcbba49 100644 --- a/samples/bus.dita +++ b/samples/bus.dita @@ -24,6 +24,9 @@ omnibus + + Bus + diff --git a/samples/dieselEngine.dita b/samples/dieselEngine.dita index 398a3b0..c4de6db 100644 --- a/samples/dieselEngine.dita +++ b/samples/dieselEngine.dita @@ -23,9 +23,9 @@ - - diesel enginge - + + diesel enginge + Dieselmotor diff --git a/samples/gasengine.dita b/samples/gasengine.dita index d896baf..660d34a 100644 --- a/samples/gasengine.dita +++ b/samples/gasengine.dita @@ -19,9 +19,9 @@ - - gas engine - + + gas engine + diff --git a/samples/headlamp.dita b/samples/headlamp.dita index a4bd358..ab0cac7 100644 --- a/samples/headlamp.dita +++ b/samples/headlamp.dita @@ -21,7 +21,7 @@ - + headlamp diff --git a/samples/ladderFrame.dita b/samples/ladderFrame.dita index 69263d4..e2bb66e 100644 --- a/samples/ladderFrame.dita +++ b/samples/ladderFrame.dita @@ -21,9 +21,9 @@ - - ladder frame - + + ladder frame + diff --git a/samples/lighting.dita b/samples/lighting.dita index fc744e8..b9b502f 100644 --- a/samples/lighting.dita +++ b/samples/lighting.dita @@ -22,13 +22,13 @@ - - lighting - + + lighting + lightning system - + Beleuchtung diff --git a/samples/motorCycle.dita b/samples/motorCycle.dita index 6daa86c..8ae1509 100644 --- a/samples/motorCycle.dita +++ b/samples/motorCycle.dita @@ -20,9 +20,9 @@ - - motorcycle - + + motorcycle + motor-bike diff --git a/samples/rearFogLamp.dita b/samples/rearFogLamp.dita index 64929aa..6a17f25 100644 --- a/samples/rearFogLamp.dita +++ b/samples/rearFogLamp.dita @@ -23,10 +23,10 @@ - + rear fog lamp - + Nebelschlussleuchte diff --git a/samples/rearPositionLamp.dita b/samples/rearPositionLamp.dita index 310feab..c31008a 100644 --- a/samples/rearPositionLamp.dita +++ b/samples/rearPositionLamp.dita @@ -22,22 +22,22 @@ - + rear position lamp - + taillight - + tail light - + taillamp - + tail lamp - + Rücklicht diff --git a/samples/reversingLamp.dita b/samples/reversingLamp.dita index dd120f8..f6904d9 100644 --- a/samples/reversingLamp.dita +++ b/samples/reversingLamp.dita @@ -25,7 +25,7 @@ - + reversing lamp diff --git a/samples/transmission.dita b/samples/transmission.dita index cce143f..addf4c7 100644 --- a/samples/transmission.dita +++ b/samples/transmission.dita @@ -21,7 +21,7 @@ - + transmission diff --git a/samples/turnSignal.dita b/samples/turnSignal.dita index e65c24b..303a4fe 100644 --- a/samples/turnSignal.dita +++ b/samples/turnSignal.dita @@ -23,10 +23,10 @@ - + turn signal - + Blinker diff --git a/samples/wheel.dita b/samples/wheel.dita index 79aa88d..75ef011 100644 --- a/samples/wheel.dita +++ b/samples/wheel.dita @@ -10,11 +10,11 @@ - - Rad - wheel + + Rad + From 20e114cea6815e0314dc746bf52bf96e7e199221 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Fri, 10 Nov 2017 10:45:41 +0100 Subject: [PATCH 32/47] Fix minor typos --- rng/termmap.rng | 3 +-- rng/termmapMod.rng | 17 ++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/rng/termmap.rng b/rng/termmap.rng index ef57aef..f8814ee 100644 --- a/rng/termmap.rng +++ b/rng/termmap.rng @@ -78,8 +78,8 @@ (map glossref-d) (map map) (map mapgroup-d) + (map termmap) (topic abbrev-d) - (topic dc_variables-d) (topic delay-d) (topic hazard-d) (topic hi-d) @@ -89,7 +89,6 @@ (topic pr-d) (topic relmgmt-d) (topic sw-d) - (map termmap) (topic ui-d) (topic ut-d) a(props deliveryTarget) diff --git a/rng/termmapMod.rng b/rng/termmapMod.rng index 466cdec..4fc36ab 100644 --- a/rng/termmapMod.rng +++ b/rng/termmapMod.rng @@ -1,8 +1,11 @@ - + - DITA Bookmap + DITA DOCTALES Term Map ======================================================================================================================== HEADER @@ -51,12 +54,12 @@ map termmap - -//OASIS//ELEMENTS DITA Termmap//EN - -//OASIS//ENTITIES DITA Termmap//EN - urn:doctales:dita:rnc:termmapGrp.xsd - urn:doctales:dita:rnc:termmapMod.xsd + -//DOCTALES//ELEMENTS DITA Termmap//EN + -//DOCTALES//ENTITIES DITA Termmap//EN + urn:doctales:dita:xsd:termmapGrp.xsd + urn:doctales:dita:xsd:termmapMod.xsd urn:doctales:dita:rnc:termmapMod.rnc - urn:doctales:dita:rnc:termmapMod.rng + urn:doctales:dita:rng:termmapMod.rng (map termmap) From 80890a69316b7f87185a72a03548b39e369123ea Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 13:50:32 +0100 Subject: [PATCH 33/47] Remove obsolete xmltask library and make it a termbrowser dependency --- README.md | 3 ++- build_dita2termbrowser_template.xml | 24 ++++++++++++++---------- lib/xmltask.jar | Bin 76166 -> 0 bytes plugin.xml | 1 - travis.sh | 9 ++++----- 5 files changed, 20 insertions(+), 17 deletions(-) delete mode 100644 lib/xmltask.jar diff --git a/README.md b/README.md index e71cf3f..8004af3 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ org.doctales.terminology **Prerequisites** - DITA-OT 2.3 - 2.5.4 +- The termbrowser needs the [OOPS Consultancy XMLTask](http://www.oopsconsultancy.com/software/xmltask/) library on classpath. If this library is missing, you can provide it by installing the DITA-OT utility plugin [org.doctales.xmltask](https://github.com/doctales/org.doctales.xmltask). - <oXygen/> XML 18 or higher (optional) - To use the Relax NG topics and maps, you need to install the **dita-relaxng-defaults** plugin. ```shell @@ -46,7 +47,7 @@ Please refer to the [documentation](https://doctales.atlassian.net/wiki/display/ ## Licenses -**org.doctales.terminology** is available under the [Apache Public License (APL) 2](https://www.apache.org/licenses/LICENSE-2.0). The plugin contains SVG flags taken from the [flag-icon-css](https://github.com/lipis/flag-icon-css) project, which is available under the [MIT license](https://opensource.org/licenses/MIT). The plugin contains the [OOPS Consultancy XMLTask library](http://www.oopsconsultancy.com/software/xmltask), which is available under the [Apache Public License (APL)](https://www.apache.org/licenses/LICENSE-1.0). +**org.doctales.terminology** is available under the [Apache Public License (APL) 2](https://www.apache.org/licenses/LICENSE-2.0). The plugin contains SVG flags taken from the [flag-icon-css](https://github.com/lipis/flag-icon-css) project, which is available under the [MIT license](https://opensource.org/licenses/MIT). ## Contribution diff --git a/build_dita2termbrowser_template.xml b/build_dita2termbrowser_template.xml index db15ead..fcb30a3 100644 --- a/build_dita2termbrowser_template.xml +++ b/build_dita2termbrowser_template.xml @@ -3,14 +3,9 @@ - - - - - - + @@ -30,20 +25,29 @@ in the termbrowser-termstats and semanticnet target on some Linux OSes when using DITA-OT 2.4.3+ --> - + - + + + + + + + xmltask.jar is not found on classpath + + + description="Generate terminology statistics." + depends="-is-xmltask-available"> @@ -173,7 +177,7 @@ - + 'args.default.language' is not set, e.g. to 'en-GB' 4_nhy(b8f_o^S+A6tomc` zik(?2R;`^oQ$ZR86dLHiuE+>>p8tOMX9ooY3M4D4B1k7GC&utK2?V6@Pg6*sh`*-y zg;!~ce@*rNHq^iEe@tZs@cgSrPF60NY3QlOT++#AAUHVchxk z;-E_31b)Jpw{ItSgMREJJB9&{Jbu}3*FT&XXj&~X1=mr1@v1Z?8;H`Y{DiNS659Xs zp!aEhk`1ISk)}PyK#oxB*(NX{==AmkU$@oSv@TQo`O0jiV&d|(Tif}U=%13sE#S>W zbvMvIFm^Lk>{VoAdyP_PT8UtDt<+nox0B9WcSdZj@0Yt!aNM)8cU>ugp=iH~jkQML`B)#q-(}-3T_ZmaI2dA9pt6aEvIB~_RbyTZdh$&E8!o7%#%hH*~Iq4N&&O9of zI%JvzYI{F12B|(TwSJYKywbdX@@=r0+Vk*wL}#ozJQfStRbX+7J{@MuqR9f=Uz-7#j0r9{QO*2;l?m6TW0SFPefL zZr&KCfIR7i&6KSONm8JWBX~n9+AH3jXJLH2j1_L`Cw{dCQr^z&w=77y8oJ<+`poFj zAvBcmcl{1>=^n-6Mz!Kk+wtm@qeg6}_wkViPb>6(#E8*82l#)oMAj0A} zqG`}7t#p*aD4dKEFjf8zy-(yfX){N76of$zG2=g4qvuCS+Ej`g5w0Hdro(~Q*SkI zJl%8OZVs29wdUPq= zh9AmplTEo#-qm8>jCO^1#aVdN#d;TN{AdHeO?uPA+SUJsF#a)sy-gwWB7RTgqcJ94 zs6mlQ&@UeHCtZO6<3bRNA8CZ*z52quv#cYs0N98a-PnL&@3y-78Y;>u<+adG!l3Ss`^&4-L$+XGp%KYZ7nKG2~ zwoI%h)Sj!YdR&VU0;#3Hw=lpK0PV9Xqcfg8rM54mpUs!^EA<|g zM9b7_B-GK^tvZWYAcGS3T1#apLtJ^3R^BHTMRShTHg&dMxuPcObWG7W($wW$QUPqK zqGfY!jit9{o^B(8douV0jAN>xF1*D=sV%%y0*I(Vspt*>!1Ho`To%>IvQin;3XIaro{r*-z-jro$zG>Fs3cE#jrt^g0pav1tg!qV2enbXa7^ zZnqENp%qH-usW>0B-cHE?r}#lZ4nU2RP6epA@dphf6oFkcW?^s z7pRZ@isn}X-~jiF+B<*k2^84(1o0ovOLqeCM{oNg9@4+(0P#;7?=#pZ;4A~=f$I%d zhYp*%VZ-5|r$DBot9lF8ylh%d8Tyy&uj9X>rTgc#vk7ovW1qB29oHCcgzRYCC`sN< zuC`8IOAxU12wFGJON1R^SBe@Zd=H8>cv_lDv`|eEu(GWB$d=sZ-k@QrskBEqp{Zw* zko45DWXc^ku1aWz^}1E$wKnF`LW3od1_c(}50&O5xiS32IyJyLj0oMS`5qHjlu>OG z)S89#)*w4Yw*gzL@y7RWxTPP|2Xu`Tt~X*H@m-kVo6Me@*q6BV}55pU2p!X$HJuL~T^#|fLUlVRz&Gtq#7V^{n> znHpv=qC!LxW`dqU^Bhau(;)7$oxn57%P=W?^^IAub5yo6zBfPpV6fUs%-G;*REy*@ zuI0Jb{(x3Fv%v6VIx`ErOhm{yyx!;FIO+Pl0Y%FqR!^edSp^^UzfCqaTbyVNb%;2X z-soAbk))|Gne4hi#XH?%IyyOfjSMo`G!3~g5;v6Y!N8%mQ9fv|wt={OgD~NF)f2&d zdH~)3F7)yQE6+gqF{}E(zh9kHhttKm+rQGY9p|98#Sc@{V+^i(ox=jz;yy#Ty^ESF z7!0uzNA9OzeoL}GOPpId3WIpl(?+G`s|i720O+-LrZem$^&~LkR^PF8OFH2iY1QbK|}1M zvX=LvbWVUFK-e^Z1L?>Ncw49vP1mC6%`NjWl~2{m)xe!G)=aD{Qxjs_H`|l!HKj%Ik6q;!7sic5v4Rtrd3*uO5@{*9cd2m151; zJUgQd9qh7Lp^dQzcZ7<==)~G!nCuU8RGfN&pKGe2vp>rN?5?Gc79D`<5cXpf^aeNA zB{6>iGmEG^VG~%vIaBGC>YSM&yCY4&l|U-iCNGM0|A0t27Q-FHQAJvz(jhXvcQCkr z?l;oS7=a$OEA~J*=QAC>kQ%*k2yQ8)sf^a*E{pilN zCt}+H>26S%!NXiXqglc*i^TmC_o(=#V|PF_^p{=eo#Ji?QFnwP|3trZ{!lvtNaZG} z?x|D-m-w|3L>o0u8xzte7~ZL7rz*GInq^{Bh4CxzTcmcuU}~(%l)pnxEK=&_RJ&f- zll>o7DLg}`vhujN*ZfqSP4vqd2 zQtIKBLQoz(UDf8zC9 zmyL#(Q7?2?!IgKD+wYDcVTB0}qATWyzJw zK~tY#i{M&&%sJ0>d`L-37 zXW{{iigE@YBc0R^Z#o7r$$qIDl6#?+jiO66xwe3n%j#(Duc?=4S`k#L(neTb zjl)j&A--Q$`1J?HW|U1UW3*o=clryCv0uis#Q9TbG2(dcyET7S-Oai&O8NI9{mBtS zJWL>`8&5J*v7dAxHj}Uhb#*SF8C|seiCzzzJp-b51wBYR#LoP)uutM`B z^nV_bCZI_VunX~kcGAY9g2@lNbzH++232_6Psy?jK8q` z11r>A{0EqC+RHy5!ZfA~93D{??qNVdp&?I>a?~e`g`bYkVYko})U@#XL;HI^a6a58 zoEA59s$dCu%phJeim)CbmYJdsCMGDD~W`aUPf@?cAW(0@K%(}U${an^+sp+wyu}V?1 zy$)1DxLXfU9Ppao+}gFWMzF2vxn1>o^loa(l5G_H{7ih=?R^pG`@Y}h{TvmJ1J)q4 zQgJaX3%Uep7Ze4vQ@OX?M(v;Zaiw&R<)b!02W_WXU{vQx9xU*(?6M{~dqEvbPefal1^9LW3V1I^PT4fiJX>V>jheb!rbIuY93FfZsGb-T_8 z9$$e82Vs(^%s^rG9Sv6jX;c_G6xc%p+J`hi{CHImO_8bqCCo}8W(?IwbpSw(F2w|M zCjyr{tn8E@Jwz=xApFBeb{2x{Z4Jaj>%osCz#jar2B;UW-yPLQT{Oz26=e@*KLe(rdJwY6@K8K827X3o-9v&+%dI_qb>ag$>M zk~DV3*E;r?T=AbY$mLdzifH5FY*#U6Yv|?X7Wd}Fx|W(xpTNo`D2WH8~r@XI!D^AVm7P3^CS21bA9|Otdc0y?=4HSNlZdc{;gu9B&p~#2@~8!)l!MMqE2R|bU$D%;-yrHOwV*sA=Bt6 zn|*%SG#4e^EL%9#v(wZfhBT~|5e>-fdw3+wOEuLv3aR-wg^1==TSt~_(&}VbLwzCg z+29Yy!AMDncKrm2iGFl9^=BJ)fSfmVj;lqKB`jjPw`O897mLmBjAI*o)3pR2gWmUQ z+93hcGLT2V9t}5H#9+OLOGNRGsF=IEX%50@aqgrlUv)=IYg7ht4+4M|i;w*rH z#o@m73{BV_<%gtSV?tSXrTxW8Y7g2xG>2~Qpchgnws51E&anOBegsw&1?uI>l6srk z&1#=;p8VWgz>|(+`GuEcC*e28!k0zV!7o1)b`Jrb6eVydkNp+hXYoq&RZ2vKW>Ml= zNCYN5w0DmX_{UMY#2{r%#ff;~s|@$6Pv$N5*3(#RF@@w#S%!-AyeY~a4XqzkHCpn_FMClZ-;>2 zNSF;NbB^SD?K>vfTUNSXhx)3N>U_9VdkMVI&m9@!+~$S~+g3@TSrzSXtL}QcSdlBy zySvD}o&Y_f5}QT8k%sM`P{BhO$wX95V_Vd@&9CuJdnyHYp%NXTwGWPFJQ+_{cEGas zmp9Lyuo)n+s*saM4jaM1D+x6`bu+&5J=HMZjc(LnhD*GNF|mMfNK%wpeXw3I_S z%lZN~ewGA|*Lga%VD}re(i^m|Xw+qrdd2kDRHkx!rKbERr<{jakyNIOMY(o0S$;(g9nN8VNElH&*m{>~lcRzLZEyt|HOb5VpMH%PP{!9Btc zh$1c(boNSU96_?Mej*ijR$MU)NUIk@EA9sfI4%n~Z>q7=i@Yg&dP1>Jin}7mA405; zn6yG9=+37meyKS@#};n3S&3_L?f|}Q940snBa)h~@s?!{!$s@#qW=70{9(Q-g0ds2 z*)nmQ=c3l8dq(P!U9mlqbO#_58VAUv*R^BqD}=W!{2n~zEY7eGm=6dC)P=512DiR9 zr=|K1XT<&WQ0i>i6dK62jt`aVeqJ$Cq*Jo!2-YW3>J=uC9!5)`m7=(Yz^=rTrtote z0rrIw&0-k?7B&g-pt~M$*@4tG#WI6Lj}%AMW8)#`GZCk8M5+Y?#<0$=$b@RAwl3+y zat|rhH~RZ^WmfTAy6L9d!3Jh0;q+<5kRWBJ^hripI5|MPa1V~WBqv`O))1x4K5USV zY&yxKgT}Ft{IMu~O}GNbo~`GO5x-zU!#dJVTn0yxKV(y92d@|6m<#(!{%v9d)}T!$ zOIepA;u!p4du=IhtUz$bj352U%KHoZ`{gH>NGKwm)=YAy)YmAXWa;G68`z~W1lAJ@ zH%<|RLm}+*b`Ps5d65hDU@k+H;?x4MhUN0Y@_D_aBh!*K4oN3o*&(u$eq>2IEL}UU zwgVYeos+MgV6Es!8(l0r_`4ok9ITT56E|g9$~~*ptg6 z_~N!iWftW5Ot1$=5&#|8nMSau26D|YU4)Q;_TV@#GKXcmbgXmiQ6Gwy5*6V(KXe;-L>7eb zuTv{gNoCK}kr&*k-*1Vr1XP(g_t0fpy}$WVaQIRRLd!gwM5>%P%{i9e9q3owU`eoC z-tVGt^^HdQq9;5`L`1_Yvel6uR3zj-%ga-2pOkA8);sIC?b-zkzD|2Nk}T7U@3U^ZUbcBo zx0^msx8HNU014thaLeT2^Fg{I>+v}z9GYOeOkaax+r}NNf!Yq-1a2VrliHX1%S?VR zHNIs4MLMP_xWlkfFY^iQ&fd41j*$$HRI@-h=VdE^7po?NA7B z_U{6r8>JDvo9y0>kuVe70iu}wC*s6IZX1B`$I?Jvp?kHWDel;?Mvu!WL@(Du{)hp| zA7n9KAw}4~-8U2LJp*_S2U!N6b+LLWhF(lx0|N=b>#@5`UK0rBCO?d^{D}PpD2C)m zPVy%1oCR{z-Y}Rym;*3|TlL@Wt)cpjMPK3kaQbiW3Iq3WUVjA&P@|Ssi}d9vQCjcW z*ft3%(yS6($dC~?e3^mSPfFP-mfItYK?vQy8ZhI=k%bjf(V*i)!6Aqo-^Qa!hs+X$ zyCsxL5F&4xP!Lz7TBr!R(x7(XoNoF`UR+{bTsEPQg4YDI_2+EF9u}yOVq3+LD)SaG z+K3jl*3=jC<(?sE{!;Tu!jl>SEEKPjTX}oxl#`Wi$j1y5SFl0zx!SuKjh4E*pCaX& zXnl%}7PIY2FG+2YFm)MQ0Yn`*52H5GDmLo<>ut zDuZ-CLCrgXN(5Lsp_-mC*5XSz!NPAw#V&=LeZ#3E$pq)+;pg)5kW(`avO{dnXqmhF>)(pvm#4k|F+_0E>1Hm$#O0E z(v0(l>mF7cf#xyhv_XK@N(9#<7t`oN2Dzv8-|f8ojpn|vN<@Qw9<|;B4dysHkQd40 zkIdrgDayOR`JJ6cVQu(zzs&<gTrS)7OfeCCM$u_0x5eYuc`2>me<>ep_x(tDx((AGftIJC5;N8 zW;gsLm?OX?WgSMmpl9jFjl5m%)@k2TA;T7xP<0bU@mLtFrn)9-v;tpTDeD8tLD@eX z=2%o9B|2jxjAvTO%r>TQT$)*Rl3~@$y{Up`G{R&RSV8UhtDsV*MWMSFe(kryS_s-N zY+AAm(>*owA^A16M<(r3tzrvFIIN{Z#OK=y`Bay!6P1%SGbQSYjE$*uRtWD7!+s%lNXsn-b((pUkK4vj z_=-n+SZy)3F_-l$U=)qB&K=I{m@YfWL%*|j1)P~wpJ`h6h7D!e_gETG$JS&!#?&

c{oy@1msIX9ft@6-Y3XC|x~rx%at=IV3YA7L(Ggl$cJFMcAHZiNcS&jb&1C|19m9gi=aEwY_vT={nRAX=kk2-OWxrm?YujMev8Y zINBI;^Pm(x(Ch@c%S(2yOYX8ve*~Z7h3^srx82d=&fzcUQzajyrk$mJ@xvwpdh0ld zKv=l%kh39i?8J^J!PL|CH=3Skk`;z9MT;p2-Rr>lXYWqJ)l>t#X( zr-2?b;4Pl(2nHCva?uB4M0psoNm*>+-l!Qsxu+Uo`QH+cY0jS4&x2S}Uoe`j;7!$&EE^Vl63Na4QocD6i$mIgr7#-pd#Z zOrmY#JR8>z+NmU_m)&um)Y;1b&KzHHRI$;D!t@YFa&bo}l<%p^2dzfyu%1+Q!r8PO z+1@J4dl5cWPz|y~^!KNR)Fnz2MgCap)|-@8nZmIY3&T7wP#vQz zZZH`9M7|b+De6s4ZMK>b6sOPXa~eim%ba2guStF^P}w?Oz(%PZmDY(V;lln+sV#ob zBAJ&`RLxpdjVg&jTcT+iSlx&k+AeGgCa)CxLuJAMI|bB9^$rMKuO1_6vT~`s;09RE zG>U6JluQRBwupJCaoLdSD0#F|@paM)uhD@am8Ux>YY;q+vjM?1@zC+noTaCCVa7$> zn0yIOmU{{2rNFPHZ4k$1GcF$jZ5MoFFAf}GmSjZ&9^#km;7AUdWiYE?aWyWVi+%k- z6UJCA0=oy7>(N~*UKv*iox8iLnBOtz;-~3YnWGRkMW=T3h$Q{FEWjk~vBYumN41$q zrusXzPpt)ZncC~5oV0NaOOI$f&G@^TxOLP^AZ@6C)N)YDl_}V}>yuvpWKX=P6O*GO zRINc|ow1R<3EnL!vHhvQ3(AOh_zuW=5XJZt>%tQ((<3d)H!sQuvGNCV>j9e0*d?Z# zUUWGSy{c+^Gyz{)m1?_C%|Ob9j7|x+W6Q-Tyy*dU3)Wg?O}pN&%DDKA2v1&99$TJ% zKh9_*rL~4?JW5+*^JFh-L`c(q@rxbo^SMK{?yz0d`NEv`dNbRayH@J8&`PlT}?4l`Bd37NhEb9agFT8kgU zF4pH zoP*azVb6}I(-0Ib`MNqg!5i%vmpicYblrA#Qx!9_Hnwh^2S^tnG98b7aIjIq;zA9u zy}u5xW7}f`5cDX3KgRcn7UB^>kLVBE+AmMJcUl+~GtG}x?6Zu&e{Fy(m3!V!TTZ8J zj85Nry-ah?B#1TrMC6NA+6kv#;`Bxh22f^pPHd!|F2Kl$T^E45oL?dQ5j# z2zo=8d}kp`zqs1TC$T)zIqD7e8+HC*=?tiXq`J%hGa)X=a`i zYgm1LwWgAKB7Uj`b++E@K12`3Lf1BV(;jRTPKS(zJH~$dV`FG?7_FVI=ZoxWo*l;n zXQG*TkW;Ly9On?bE=Am@qD`|pqGNcSa>s=zZx3Cr>5&ZYt|5cPIBL>{8dY6}3ic{S z6b@-pYgK3wy{t&9sdDWN1mMvv?&NOURmyU*Bo?K6?02$un6gJ5h9cTx4As`F*aa9ff8_>O;k7 zZA=tLg<+y(THYW>^kmxuM^rTYtP0Osfj$uz9tO13w$q_;JG7A7727^Lh=W4iXRD)y zh#qFomOEP?@dAHeM2gq-es?+_guS*q5E-1;f)Ij(F=+YO#@9+CVo2kx*gt5JNj)AL zFg9sSca=x%hZ-t}^SMhgg5>^22W77tOG$Mp-vh&|H*@40DqKgeYoD71;3zZlKS8 zbckJTbjn;@It2F&`mE=xAzn}vL7RWsr-S=h9;m;z1nz0P*1T4Qe*@jKO?kPvfY#sf zeC+lU(9!}zLl_Q&h32%V&``zrwE+v8ZjrVnUo)Nxn4PDPhGuKaw{B=S<;V{^24R6N zV%$~!&I0!q15tDI;Cjn9rXhSbmEJBLlGm#)cxT1Le0ZMK{#1RXfeG-lHp3XYMyGAY z6>n(i2m53ujW-L6A`tsEAjVx>w8YI0IN{EL4+%k@y0wK~j9-JE2F9S`wKeUKHvNF$(R(Dy>9 zE73?JjcFv%opos>(8AQ?>2LG})g38YfQ!-uTovD^*Jy6lPhOsWZ+{INbe9+|yD zl{Ru~RW|hNco)_zUx8VT%S7XA-qPYD?>*)s3a{xh~Tn2hp z-$4uyke;OUlwHYXsGg+uBrl4DvPU^1`O6%Uy%Kliw!oro0>KC6P&;f+vwf-(SX_*I zRLb11WboEqQjZ~5jC(F;3r&sp;64lahVQgn4fqU+5(O zgnf~Kpp*STcOY-tGP73)=0*+`^N6lfG%=mHzvweLKlx!T&iaJuJ~*@N2M1&}$=z$% znYB?mpb9fPQT^8NCF<5l-pvBd+q0dcD^AFvquQvw%96|xf^Wpp?1eniNZ!Y;Cwc26 zNd_ipuK6UPf#+;(_6Eb;-pHkA;JuuyH4>z%e&p(NCak7>@tTo9!j>|e3mqiA9ZyCh zc7nT~^;k1DEInnY_}Q}b8#vZ5a2kR$mMphha`QVl$s>%+38w50Uk*Uvf&M*=^#L0QLwPML3oyFu?((#dHrFMJPF4xl2asdHryBgUXabpYY@H$lV;` z>zAO}=UpFD;+cOtf&QUvB=($AZh`C$uSZI_QZhvF5JEyyxVkGFX;w9VF^?79M|JJu zn#Nx#4{@ULS?jiDHQ0>HUHP&Ogc9BSe0HymZmQXB^?IrHsYGC$w&kLeAuklN^ zrK`udIY=8uaDpI24YI6)t~G4S5>JyR&rR;zXH6|_wWo9T^dJ>4q)F>?`+x5Rt@O;w z@c{+``t^7315b{ZjhQ%&q^j(!p9;U zX;EZ1^ct9ED`)14ey~em3_=!`H1ieYLvfU4NeLxtn4PcfZPuNh<@4=w3js*lLZe=> z#Q}PAg|j%qmF&=x9|-p@3u2L%6XV~ z%=L9?yf=JYd)F;j1ft;89iwBbhfh8{1hN$!xUpME zOXttzEm(}nUL4j*X6+fLkVpf~ASWC$e&^V%Vp#NRzov9jn%!Yky&&9eaaUKaiVMi` zd9ru{Ml04j`w*i%^2VWHWXza`Vfsgw0o&8BRtmH`D95LzDt7X_3DRQq{}if9{GOox`AB{$651E6S!jr9Por$B2Y0kXR&!8$=(+A-lB2 zh(jJ_)kgwQqGUCaGgd5!>JZTs)j-!S>dR>=qfS{_XI5vono+J5Us<=yWmFce6{Cge z<_QeMBVz%S`?8Q`xW#w@%bJ?*tP3MAJdKXOPE6ZHTLu5Hf1deyqtu~jx$=DCjdm%U zNOz#5Kh=#VQNty120nG@Gn6%;>5ko;JYCGQ%$IlU{kv)_a#Qh<`wQZ-zaVD(4-V%epc{Z9dQrObfdPNimWG2P zgeOK+`{jNv$ev)JAuCs;j9*NF29zp`LZzt?nJkZ7JFI+=ToU?;Z9PTI{DfS(h!lTm zd5whF1p82=fQQCGJdv`J>j0x(M6t($-Dsnn6=LsDN_EkrhMosfdZ77Qa0g7 zmOPP{>~;$bDmI03leQc5mMFZ+hFw%g@*Gxc_4e9ZWffjV$P2{~tk|LFsK_GJobw4X zl@aLOl7>yEu?I3!y^Nt83E0EwA269>tBqahm`h)IiXp<&OJjifEcYL@ zX-z`~_SC|sn7oa8#Vg>UXF%JBixl;T=CHo`JBaiPuE{A}8fWsEyy z$(_LsahQ7Cq9>>%eTa5{EV6Fom8PdNtTBw$S=xmNGp!NYGsKh=_fnGoAXbMN@C~$-bzrNcqf$RGenq^LWU-W@c1sCzTx*xDZnmxo59Aj# zXgRXP-zrK7r@3)HGH(Fwb;brC4~zJv{hok7*d5}Fj?BIr2pa85!(sk0vJH#At3z1T zZT?V;_E_dmHaLE)xdCz60Q_ zE+eEODS&@}<#BO`0Y8`WCju+~5}CMOU`*T)#4Jg4zT}ia7@{@Qv)df86gtQjiX#I( z`Iy}UcUc8AyVSm30d6i8(Wm?dnOQJ?@10)apVXfX43%)-K=Z!d9#|eFa3^BH%y_2{ z!@?0v80SbL$eOL(weSDdBwy-dxfL;IrU(7-e;P*SdjS1JWrtEW5>nroUpCV;m#yhP z>3grUQz9>30A z7id6=5gJiInK0+CCh*yi{gJ)UJ6E5feikC3+?C_3PTsO`|FWsQu=+8suV0IN`oTS~ zsrY?0Q|^y9U?s2OAPm^AWr&maI*1JCFI|E@@_h_A9wYrP!s$^2!3q(7kD7#0zlwwV z+3e>DYm~=Zb(`%|5YY}ed%afB3&0%eKc2YqeN^3yU!M}O?(Ze9SWjN;3BMwI6heMS zd_y1f-3t(XF!)t?eNl)1uI&G&T4hk#gBe*5(7(JdyrFkQLX8S9)95~28qufy!2}Bh zULrxX9STcDFBX*^ntZmBY}7od0-d~=F9Rcm6*A!xG7Tx!;b#tRn(Ai`Q9>Nv2Q`@; zuX1>tKMgm@D|~{}_!DtEQ)Z00!9>WQl?++U%9uA%PTMljf9W|kb|%Oz z95`AlL!HW5ucpw*lp$eG95Ed$;WG~{m6AU`db{0NA&S`eLN`0GmK9x#I&C9g3eSqK zg=Tvt`^;e{B?j?cBNEyj)Z?3AL7u@)47t?^&w+mv#{n;*WJ!}UYiNfVJ>p%XQuRxk z`}Sv|RjpNAqAoL6e5_K*0B1@hz9M*r#GmKUR!~oq%p$9U!|IA+IK0Ng`&E<5y$iH) ze8GJ4`ntKl>{5cFvbiY+PQ36-&6qqRx(vtC)|ewu%CCR&f8PDM*l1#m*Zns|^_-c2DX;t5 zCY;?cUjrndk3Kcrbd{yb%E}$Gwo42lUWC#jFs3M1o&{KUrmNKo$f3V*e z(evF@Ow4H)G6-cw>lz~ItDCpN9V&lfMkUk+X~`*=S4r33#mZXunk%>xat(*gDOi_0 zRo1&AP+RcrEJA1>34wvHNZKhM;7b!m+S*f-&tzAPG+D4@VIGO+{7nH!wygnQtOH-| zu4STvi=(U&8=H4ONBAyU&%I%oQp?Hpsf8Ziz~1#}3^%?o_{J+`G$SJTlssF;79)*G ztA(w?h@|0sM&eCFmlcwR)89NpyPh`m17FfK*1Anx_SEhwsNkEw; zZqPFgU3&vQMo-hcxFP_{&&?k|^yf+w+&TF!lvYt`hDYKeu>0JX!oU(^gsCub2TL`!kp)G55avC*LPvnW1jK|=b zLswMWP?!fk?6W1v9Hx@wE#S(llibR7D%YgNk;?CF2X^2+3X)ag1dR7&yyI$ShnS(T zo?TQkjRWy9r8a{gq0Q-w)VGYLEJlxkC|JzpN+-6Z-O9!eNzGZ91AtN&i83l}6Pn*U z$?g;ErCn6Ii?)+)8v~CVre#-!>>*N7c1=BX+a#(LCd|sFBXkhVe0lj~-rC#^Kr$OO z!UOH^c9#yL$vvF5lQYd~c1W?dQ&oQ;mNF{wqY{}#$`^@iCP}NZCy&ag2L&3VpJ2@} z7qEuM&vL2~Weq0zPqMeE-@&4&_AUsx{$ExeF9k#4i^xRsst-xUFRMg;c1|qHPwvw+-_;oovWg4oeM;00x z+zc4e6eGK_v-nf1Jljf8Skf6bO!s85v-F`+h_77QJJhY#P?YGm3O2%O-5gBW8q?$h zps;Jdkec^;FF2CNB$MWBq^VP6Y-35i0A4J0X4@or2+bYn$}Q~P^=miE{%pUl*LiRD zb~`Fead7xY+{FIWu#yEy5*vMQN1jomzG z6~R4hO)?8x)AKAZ>)o7=KQgu6^cy)ZC!B`!;WsjYJ{3EEtj|A-rM9D_31G`tn!Q`lj8eaLJLGDGEQF=)b| zrDN?uZ_Zs=$@Z0htZlMJZs8kRLC3z7v8oVxo^v~4%IMIpOELNdX=7oz(^xao;8Vp1 z%zcod*za_F%FBaO&CkAOsMr7!cTn7zoJY zi+J2j@XQ@@WxCe}$eZ(e&rKxh=fQhEr#a_-9F69O=0r-UM^SNVe!7uAtmvT?|fInMDe|TPZrX1nqjyhd&*Y<|I z8K$0IoI7s->eo31I`ReOMf^U<1%En|C~FA-`eIV~S*iBoP;PhKOR1{I^PPTcIV3dW zKfZk*Qz+ysKt%;>1lW@6}j&a7_<>yxGz1GSkI(1>4 zhB5?$iL-ZEgd7GyTNbR?gT*y zf-qklo`QjPPQ6YfUkwqRPGmjIP*b|ZncO*)U3RIaZ%L!TWP2S#>I^Yek643wGJT55 z$rpu0wOpX1vObD5gc#^;p;cbP8m=hORY7&eE<|Jgw6I^U-OUzAGn~8baGt7zhAR4J z0NIFO{AR}q;B$e{08@wWf5!~ylJG>>JUgNH$;RdHC-jNeJrzFsZMgd3+fG0*aC)cs z1^I!QJ4$i2Z(|JB-0;vW{Tkkb;V(feVA+cF+qim77q%}{Zs}Hr-o=~}(BpPC+g`9G zK_?I>uVfEr1m}}h9y|wsScWMAlGh6GKuQ7s8t+#Gd0}`bvlGR#Ol2?XEX*WQH zyZCdAhn+p^@N2aC3l%#DGG--1`8BU3iGQs0#dCTr@2D}(#wn5^|1i^8)a8l*Wl#9Z zvh{73S2b9N|F$*YX?Q^l4YFx1IaU&OqYXiE!PxVfHa-b8ADrm{(dP$3rx{z!J@%;U z7)A3)7{k!1JQZ0Vo!28pU6pR4m$j-Yb5qouQKjF-3B2(Lq7X%WqLEs~Y#qA?VlfPUH}}yBn-R* z?oqGn*)E^7Q2HF4LGn5$3y(t>`^Yd@U2Xu6oW+FZl`82@tO1@l1;%ehnXbKFJ(eIG zu$(6n4F-z`Pxbey&;N(AcM8v>?Y2fcNyoNr+qRzAwr$(CZQHhO+a05$PA7lX^{>6w ze!r7efJI+;~h&2f)8#+azXo>^c{roth0+x&rTUJQYz@ajkWmi8k!FL-kvf7ss9 zt6AW!iXqGtVx6*Kdjmw>Ls|dOT;60=*PfkUm~r6q$Yt6!DE7@@y~6Q+@bG>S`TRwa z-R~;?#G}+5fPUp$!{0x9Er9T)(d{N9{8)}XoJm%kQuWG4d~}#qzrC5fr}W0uD^RUt z`r9|j&HuK{yn}bJL#+;g^ef09G-U&6cS@WUzKL@@GZw%VLRXl&Vq~B>Ygly(fH-qF z@)#GbX0xB{H{zN5LM36K(-TiOm+kZ2@tL6G$YA`9!Kd|t!iFR2(QaKNRu?O~S1dcS z^RpReWbwUh-V=rSmuykVCyS=|9US&HduT`7teA%I^o%%TRC-MgY_KC0-T*f*O)4w7 zeNq;qb@y6Yiy8JU)$Ki_d`=+OgFtLz&X~Lodm!y}c&HNvq3?z&_O|@orJF|sbK0pi z`MwSI(50dY$_9HX(XDA7@N83>wm$khtLYIDTEopC%nelUJN9rK9Au$ZWJ8+Z20dx` z6beZR%59oOyV~S^{`9c0VnCe~X%Q28+!T+u%;}Lu#b8q-0=)#RZmMQCmB9z#*Ig&e zemBb|WmE1+SDw=t#b+WG?4!jSHP}{E+FL&dw;0tL8r?o5H>ERsDvA?=CJVnZuh}f< zw3%hLI71gD=9)s@utl30F0tN;qf={W*M%ePs8jg@m?PXk#|op{9D)~ao_ zFv)TDWA2nwuG8+z+U+er(Dqm;|H8$I*^{ z`lstz&ey<;A^(LJwkp{ta=7-7&f zFyHP=vji@=Y|nePNl;mG32@y^xJLq+2PV1?5{|oPaF&OcU1@&$L2^OF5=hMHw;=;> z2BLUVpWCCL{>ujUESs%aY#}mY;Ad-PeZD>T!2;k(SZfGNQLa)tb!$$u8LOLO6SQEh z1j8+!f#Y1MR(bKMK~D9+lcg28DTC&)(`tU4(+=6L|_xUMZL|NN@k6l@ND($sDNHbAg@f|{?_Yb#s^CZ>qt?S%y zIzV75tYfR=h5O9gEaUTJ4&M)~9#&6mAv&xIVKg5HZt5UBuz=#MNQEQxh)P!E9zs^^ zp28V)NJ06?0M&xiOc}!wPl2&gA22dY0mx1qYLBdr)J8$Gj!06wPlpm06%47$#~9(_ zsnsWnMZmNRj&Vp+N6DrMay zL||hMJ%I|=?qQ&-FP(A~Q}Wc6i^HT`Yi$Ziw(Y0@g7V;O9BKx<@C5{%UT$kupYCNh z!z_mHxQ-%}Uoz1am8D~|Wdr$eSV=5hH|OFm<0{=qhY`9>(?B#kmt1R4wmyb5+n`2j zsI@IBRZM8BdM5uOZttSL&TJJ07xLJ_MJ{iPjtEi}++}&@bgiA^=KbxL^G=`2Lc>td zgi>6eJ7-o#@e-4IEcCJti^OwZ!CutDLjGIZ^( zvwt$g*BNcbT1>IsqfKYpw3>{a&rma?-BxBq!!gzZ<*>LOW~cZ7wtM1-<2~9gn*0>- zdmDo?)b7F^-R{yIA0L9c?HQmgCb!un+F8}j`2sW}lL;z1DAegyen@;Vt^cCkAE_juH#d)fEQXf@p)*`{5HzeJg(=CgsFerCW#YPCt)xM*Cm6 zSp#czWbM;UcMvi{CrIdu5G=SN4u}|?6AA4pBJ|tfsJW-95(TS#i`SM7VN;E0`@;RV ze12G;LG4OWA?^NxtAul>wgAj)NjeFMbRfH>L~{g(lP}Q`@+3<{u4;(%W-Q^}*Ry$c z9)9*DQah5eLfEA|IjbDpklKqjBH21ZZl{8_1Ha_wFgt*RT{H}`ZIX0~$~{1dA?*>n zgR<@kMpQ7DL+QqYe}MW5GB|zU<|U$BClMrK zUiW6BDXq&WfF`-sQ6Nse7iK+I;13jweTkoSEfoS+-VWosG7j94lO$&|UKg*Tr+&Z31`~k|4dMr+eQZzL9Axr7Nj|Y8XMN0zs&iHF`$5={z&4)D8&qd8p}W};rxr)-i5dg-OwCbm zqw`y3nVN&57Ll=VKRyuLJAp?;Krk)v#_Fdo4a~cct>2g}C~u43e5tM_#Ql2>;E3=2 ztn6M=^8i)hfvMRzaGFhqcv7E4;;BuyVeb^xJ-levA^ircdQKtEAGHL^d)x}dZ|#gv zP9tAzRj^MD6~ym91zHh$SQ(H%et3VUr2QK&u4rOr;%@){hAcH|Ug|h2s9!riGmS98 zG(e4!4#=pfI{HS2HH2hB5{1eHj0C~WtT{9w){R|FH?v^jWMryKSlC*B<`-49u0d>S zNNWTnEDLQ&Yo7nsx7?=rY_9p)^esPSXPh9q61=_t)@py5?s@r`?KtCnJiH{A1yT?3 zbGPSxJ}ZC&C)qw36@7Xc5nNr!evX3>x9l zjQO(ToxL5|dJo3PG4+>iW1Nz5ef-QlK3Kx@29uL~t;Uw?y61$qv>%T_MDw7*&l^MM zaR)21jb{AdfFJWnw?7IFPNKPqLdr$8C;6=`)W6lOwNVvpBvr`1U0PNcvD*TyC?zwR z98R?_TiRTlxd;xb-NnSqYZ=MmLfRvqU&&cGGL)GL5N{UYLS9M{F=pUFh`V=HmpnhX zzE|g7_}NZTSiDjyqA62c~CZ%|U8!VuB!Kes)8zM#%A^5XzaH14T_QkA_&THgZh42*cwe6K?- z!bC!ivfx?EVy71Ft|yz9v4q`*)UwLLrE?>V#5;pYF~41H#SUPRQM}nhYErpKE03J6 zCNq`Q;WASUn);JQjwYg5SyTWCVf*sycnXhZ0rM zBUMefl4T%TN*p`bMw+zx_o5gp;u+>0)sM{y;|vt@vR-!-mS_2K{zoO&2-*aJ5t122 zrinMIUeZ00ZsJ0yE2Li9J#6#TdPsP%-Q+8pE&@en%zXYOCFY)~1$KkvsHt_~Yr;LQ zx7z4SeCoZ=hyPPEoK_?=CjC(ulW(w^@dpNfLV{sw-h(Dm8+7uCqnOc-_3MaDW$jX+ zU*+?=$p;L789-B<@ocWxqfSwbnqpg&GzAW`ub15s0~p+T)1MOqCM z)yU5DghnfERvCoGm9aF8%IS|XRmuKNUR3!B%c~*;g9YP;5@m-|%6kvzW(}FAUp`Ud32?|Rb-uWRiRmq zsMBo3Rg2tx1aT2NvJ(XLmb&xXql`Q6jcTNJU4ZIuKTLs$E$x9T{t|_&G_8%S!U^G) zqTXhW*!kh7wFISPNO7o(OjJos^LQ>n`$Nd{Oz(W<^PF?16!gIAy^ctx^@Ut{MT{ni z5tpHDxZHJhPEs^8PKYUSR>T67w39|RAB{Q|AguX9Q|bhrB87xiQ-_AU#Z`T4>HMnn z?TxfpVXFQ?_J}a6gmeE1QC=LM-d_YCXZc6OgCji4>HF2T{xq9y^C+NZDxDp>DU5wV?Wl&fVoIoP!M2iOP}RFGwfPL|-k%@x?l zivtGA-gpG9h#r(f?9X-*>lFK_V4EesX3F+DWEdTQGD3LLYV-W#9gKm?Ij6g3C3!sk zyk+02!eM!aKg}J7R1hm^EF{W0L+IeF7mnfUcGZwNGFPmqFa>nzsKT-$FQi;}I{Fqv zv`O%JPLGPfy6z@z>%ix7v&pIvVvNFy zhZ*@Bh0tyUGO*Sa*&*Es({?0WV=$ogdf2s7pOMhT09CPqQD3L2|jx$s` zZ2vc>4;>$K=)>%RQ{DX$2HoYc11579`TZRV^P@Ijuq;%k!|P@GoGa24qO37nuj-< zJe=JQDQ-rgW=pE2N@nGOPKuRjkLq35K}Np?)&=SDjf8s$cZ}8P$$Kc|359s+!0jis z`4vH(tD>Q8+3I->!syJY$3* zU#M}fiwla7C6b=O-e?xx06J|91W^nW=?1x1hcJkJ*@At4i9U;D}$w=LM2xu4y#!oF8H*Jeeg;E|fbiI|B(7Xh$1d z>Bfn{!uNR6ui*d=*Qj7BcFS=*S2^(Qn(9FO9)kPWjs1TgEomxg{l)1aw)KBN!{{?W zck^9RsogCq&~UQFoHMGDQ~1kHJH}XTveFgFHG)5D7^O^)c&66N&IGk^M!AFyIGz0` z$TN)ShVuKSrK-O*UG)DVeo!>Av2!)}M>J)Of{fhYw^pVkgeXu7^<(wCBE=k;(~xEK zyyAc$G^nkGO`TR}5pCq_Sdc!`{SN%KDB2FX(42+sqIYA%W65J@t?dl`$CmmGVax`O z^0WzKoq^yGk+A6)bhmq&AmcPykSD>cPN?J-^tNZ4&uJ+6$27TETgcE~GI-t&{CG?6 z15p^%EkqmXaM|NnIY_jZ_4p|pdkE=n%d zPL_2`VOFP<8DNq>|DI6_-_)PA<659ts2h%t79xh}&KssP0{$fGIZd4jPW@_XEF$bI zIKuOoKp@s=E#`@XY35075K@Z6!6plOyB)w-{aW-5FXbnO6EBd4C`tJ<#cyF4Lq`ky zMxoEd@NIfjsbH$Sh#{{B2d0c($Si_FDYpn@h`)_ukc9|_9xg));;mGyvQfrMP`vHc zK&g>rE8o3`m%Tv#6oQ^}4~3jzu#f8J&&>DdIEx`tsB*KXGh=(SBT*%Gp-dI zFSBTYJ(Z6<*J<)q3(uAdhEPt%l!@72i0uy%PtUBB*?G@kU$4Zm_R=8IiJT*Xg5bDeylsH4{s)mp z)mow=TSmJHK`q9f=ERX2C>woZ91v`KdR$EV1Z4Bd)9L<4eWm_o%PxdAWt zKyG&X!rmnHg`Qzvk*;h-i5v1AEx`eC_mIr#EDZjF0mD0Zv;n`rz;nP^RmwUo%N{q- z)jQN@CHMWZG$g777z%9VorOH1+|Aj@|8^+olFweNiMz#GFAij{@eLUmj!j!9jEV_* zQbj$xFC5uB#c*r=L9_DUJjqRs(q;n2IzRT$C>!I1svOMdBA0n|m^;g>Rwg`S6=7HR zu<&#=h?~%4HBHbFpF(_*d60*&u0(aM`B6kewm31J!AkY(B%0ka&g^fN$-1oIX%Fv1 zaMl@J+nV|_9WLddH@&5Hds1j*p@Q6by)#+2B>!I;al$R77P3@~$`03_6c-Jfzaqm( zV`#to>`~79S~kC~St}|Yj+51D50~r8Cp1M>shz0i6`1{^wvX`m+-$s&fmXFuQYb(v z?S{!(vpBIt{P_tIJAWovenAG@azGIbv?i$QL*mbo@!3l!9G90wi$Puc(^sfyVAX@- zE<4QhV{L|1bS>x##s7ZiVQbS9HQ!4``t?(cOOc;QKm(aV5T0no7x4i4wImuYXNVpf z=km0y!kX^*1C03GaMVrlM#TN{`#`W>a)j6#^F>f-)b@%EsrRd7**B^H)cJ}qn9S!x zh~@TdY_0f^0P49Wt>OKgw3)50Biu`QbAz?c#0l}TSBE1rGj8Y7Zku9jCWKrfOo;dS zKhoYyY!SA4zQ;S8-{k$j1uH6>xc`HGha-`yxN1q_2ZeCdQhL$GG8gU6-Ic~%fNF4GfiEV}PjQ>B(rt^hp}n_kXrP8u zt=HgELCGGzT+!J;3)Q+iQ8233YpY!|w-)yp+HfldJyI{MGka^Ed5u_Jw{4-1sZ-Zz zymYH*DhIa4wso{^QJJw;liVoUT(!2Nu-byu zY1Igj>0vAvip*TTrfN5-1Q_`|oT04tQ!2w`4=VvL{T*7v6=wsOjo3M7F2cgSK}9gy3CQlp{% zKkF>^$oLrRgR~&{hr|IDN31oj)@5{@h!cEi-T(Dl)KX-yhcgM-_;L%Xe(&@D@>d+= zgou8TiE9y`sw$Ai?NbLTq8)<(Ev^o&sO85?#A4; zGmY2LUw$aT9RJ*(hVvv852UKbx(J1_P3J3ehOg|vVyFncZY{yDo}A;!E0+dYhc7pi zFE%dP%DPc*3dz32(2IAz1bzgu;5Q&cyT{?rp!}5aHnObjh;*EBDE7|ms(Td_Etf-o zA&fi(7m7c zDA2Ab32O1f2*D2#Yk{%m=q-K;X7p@ZQ3=OP?&K3+BQ^vR(x3Y(gKi zshj{GEuPpHv#5DGq(m8Bx&n!DjoJi4)08Pps4hqJIWVqkZIKM#RqGu>c=PWe(CE+9 z#`m>wGow9$xLsl8OJ-^2pZ2Maxihp)C1-KXiYA~nl!m8XZ^+@Jp8`_mX>Y?TAh#vD zN0^o*C|G|0Xav(G2UtG-2*I^;m*(QY=IJ{m1-n6z>H{ z`WsGnd|M=#{{>R3*nY2{urc|6W_bVWlCb+Pm&9mZ$l!#76bQ-}QMjlU6%NHYbPObs zNKzq*%Hh^YCtldvj;UMKiID{nS??XlYe96=SP7dsgUnLb&PK)_53`dSzn{++&^{kt zi~))hAJ25$0UDb3w%EoP(T#iiWx-*=B!eY9vXZWedaZaRD%A>GLSku>CSB1{{Z?Vf z8$xf2^Cr@wtr(la10yJ(q_JThQ?)8sWc3X*N~^LG17I1MQrATjT&V8=oKl1AlIrk+ zZ!Kc$Y&0-w{72}1NwSb#$u@>ys(t+M2`dsWQL}2ML4l$gmuqdo!A^a{n{AvGacftC z`HM2sB<~A8KiC&<8_y2kiDzDWYDDzJwmdFwM9#1ZgOAwMB;wb2#itEs$z=RjZGBkf zg#o1i>TSq5m=k;cZ%&WF2E_z~@!d@tK?U+v^*4Sty z8t!~Fh7=|VK)JmP*#cV?dbhBC!|BYS(nJko$Y||FTROKNiIQw|nSY+8t97enm_p?< zw(`a(SC>34cMw{Cq!1gi#{~2}j+o$5RI|n?+}FQP`43d<6RdEa1$(fxGcGAU!RSw& zAnWU*aLV>GPpp#c`V{2RKK*vrz(Gi{PlAstih@51p&6VmGmN&ZK~p~q7oPpGHCRYF zt3-Yis>2U>hF1ldFFLcISz?X0(42DF8rx)z$N)_5pC~7I?y>)QM95-ti;MeSMgj-_ z;|Jsazi;z@VmIBe)lffkNj;1$vPEOB%Z(K>Wm2ywEG!@#BpkBWU8t!EWsf+LQyW-P zQzV#wO;fn8Yvx0n&`WdD%1dcXBAFv$byOBm%TsV?C-L|D?c;FZ48DjZT4_mT;^6mr zJnriBzU=(D!R`6om!=D55B-VQFAD&TA92P;8lN~w_U5f2*b4=Q0X6;M3wTpVp8FGI z9zts7`U6f1h$=fllUZ>3uo{PtC@c=_p3$2pTy7tTlLup%{GPJo*}~#CAwOO!ecbqg z0;jjwfYIVFv%jy}Kd|pSEMB3Zddv5vfvgj5v+hs6bBfeZyjSAt-tJu@9w9;ZAo9`W zCTi@cUQ+|@pkJAlG&dP*nt&UQDX*j1veIdfkws@3U8ZDlSe8lxZ8^ZDI=sc&LMt2p z0taC7=HWBd1m+?lkb`QzoJ40g>GdODbJFeOvM_(oRgGuol}ZMSZE=^#9QY=`+}%A(v=2Etcw~J;a$8%}DXYo8-uE*xIQFV2X3HEf9j`sL>up zb}?l#RoNJwthf>i0#I~bUJ#Nb9{qw(%V=n+>kT55|C$SLC&_I-mX&z`q}hLVV$qN} zwI(ZA5}dn4jO)8-C@Ll82c5Y7;w!-w&STV$6^hxHBq!eYyjKm`9K)gY@l>YnjP6+Q z%8V%6=Z4BvxYOz6WyxBNO2pI}XmZxS&^#3(oa-0c87F(lOpuA@RGl4ve$j?aBPTY1 z?%Y0)9Jj8|Ks5p(j~y>ozaug+D|wSIatTPCF77{dn=SVR-BY^rF{P4=U%8wD)+*v% zEBOoZD<*@Kx(5Eln5sr2m5jR>5w*>rEfBxb9gbhI0lKZc9rafA-snRlzeo}X^+S1t z^8=9Y^>%?q&`RHaXelx>ci$cP*q(n#L`U%&5{YgvIkLl1Ylt%xof64(s@xqO8JWf~ zhf(=T>O1mU;f`5X?v7f=m`kNQhE3%gvseCFGhA=c@9-qF5W!(eVipfcUMR!aiP`{I ziWrAcxGzoq#PzK^r0o{GIVor^OwC|JSD^a=0I>z@3bDQ13)tsgiH9fz# zxrM-R9`da~HP|)~or7pA>MUluCRI{T(p%2*PtBu6n-yfA!N#hab{2-&X;DtJcI~$m zitKX9NPL#nIg;0^3T|WRXh&LLH^d!73N1KSx;J-=M{=$#RyjKthmX!+vUw+FI^5HG(87+iq`h&CF_Qg z%AT5?W}be9(~(%W06HNLoNhz=Yt0|1M4x~8a1B$h*^jx2*_}g68LCfgxs5jhF5zaz zk4qAMOE1vu7K5?fJ2{c_M`*o{iT#>gmwtO{{AiqW{7woOZJ&*dwzq~OdM47O8$f>4 z4rG4@=GkTPM%P~9#p&8VY7YUk6+*bIkCa_Cq~4uUX|eq2wE(ZN_j2H~TnOTj@!(sl z6WbTMO3sMxhgwsFUNAkx&luJ!pC7Gn2U@AW1e>~`I~u9}+Xs$XNu;5&E^uXf3rYy@ zDy6+!&Y*9*JYQJ9j()m^HM`l*BDo6OSv$ix~(v{L@8{sJ|3 z`lvBU2z-o>VqK68DLmnGOX7_|QZC^JvXN18;?Kmw(D51L_ALF!%Mm2Zz6DM{GskdU zA|V(4D9??vMi02nJmP@wBvo^L(gR5JAW5r|QGB1aGEZF4vUNe7csVbCW#|Lf30!Ra z&yk1&xfzpfnpHzWQ&&4#{INH@x7zt&oxZZ5)PMn~`1S-i3XX}yS5VAX=vm+S;UVg1 zPYKmInJjBc>;ijVPUXUAU$~?vwi(wB&n9==42kWOh&Pwib*P3{bs=Z{P`=}!(QKx z2bsEtuBLl!bajEU3+e00>*dbHm)4VIy6snA0T{4WxTj3PqKgA%B~z1^E!s045^)c< z)el1*YPLCic9ou`xyjCx><_2Drp~pKT7mNTRD<{Ra19A_W}31a?_7YHxh%=pRdy8* z(Q}>JW)0)10buZMxj`mN=EhhXu)an)O%S2CTQkTozb_ITA0@p79pHkXRxVHjXwd%l z7`n&6jX;MmuQrwZ7r1{GDt_{GZT`DZyx)cTx3x_FD3q|Z#Wz_0zvXg~9k2vuM9DT= zQMM}BAK|apg*kVSBf6GUMi{oj8tTMKGGVW}srx+-e=eRvhSwbKbLVasifP*G$Jh4* z=5Bi4*qw+)B=eV}L~v;L|P1%4O2k zW0;zz$4aes8peCS*$`T$ie2Pu5bmlD`>X`S&S@34)d;3qeCwZdJ|I?0+V9aq+y=%I za$aA@+`eOC?j1A4&2`Hq_BjIO1b`ALcY&3oO!0%&Iha3FuRbuEEWZDt{@C&U;}rc} zo~`eb4BNjT#ebAY%)sb7rQPGd;iBRWJ%}K}7wt+>tm59@o+PzH8Il}o1VqGfU~u@_ zwT6q!PD&T;yWV}EJHp&21*29;I5^uzM$X>sw4JM|o-Tggk7|87P-u{A41fW|kXW=j zMhkmt24uK#N?ac2}^nQ!-R+L%3CT?pQXX# zC`zf#w0em)dD4tRkwxfpQOQgwxRcJ5S)0=aq67mj=2cW55R;780dO0Md zdaavxUV%V5B>RQ9A4Vv$3Kui0lcJLU&&pX&k3gL4A~{nP==4*(aU@L|3-L~?`}f(l z?}j9!I!LEpa`P6>*d^&k0E_q7B=8J-z_s)QsK!l#r|3G=`k7Q5tcL{Id3OG$iutMU zKi+S|D1r9R?-MG-x5DS&(kRqz{xS5aQMFO}=Bj*cks7n=gI%QsHTCKj*&r?2SbEDw zfng&<(SZ_FZFa2D*4Z{@NU~BZ`-bOcpQQQAi5YCnJ~lD^l09c{kP;CvxQLlKUrw_B z@SNp7ZU^^$d3>V#U#>?Qp?E;%jUo=puqjzTFfuJ!n{w=vWmRC<7W8{H;XGhw&5=%z zBnaq^qVxDp+!RK8U_y86UX3C3MjBy8F{zSNLy6d_x1OAW4o)m*3K)-4W&sC@PO+h9 zt|V&ctw^J8Dn!K=sI5MAj$G<9AKGfb226<#RanL#ew8-C1X1U2~v{_xjmkVnsHL^O)boFMSRs9Lt^4#VF{a?O>_Nermj zgYNzj>Y;7T6pQdd<1rs3j4}#Qou>%BRG1F zSgG*D_<$77Ew)Q$)Sd-~3qkQR=%%PC(15Fk!0U*q!x~N)MfR#$;YWxJdH$kQw_LK~ zZ^a?B_66b25Edj>zg_zk#u{iS_njT5Sd--@-CLOFbrJ)+jGLcIdHUxmL`4HHkNq*% zWRH5M9TwegY2Av#T^?YE>?FY_M^yt$^2fRKt>A}j62dOQl-^7~sK_1MZgIvT_yKM7 z0tRtAG|IpakH~}dSLk5dGV*7H&zcaV-?BOn2%&!|2C-ij!<&L9{4!1vv66x_h2ANa zCD<)1L0o_{h!yIZ9ebpW(nkr!c7*r5$$Em!O%1^nPk-o@BoXjr$imHADHV8V8+~f{ z`r)m~_me8QusnorstbSUf~<0Kjggl;iI~DWx+Scg3wdG(prB-!Y116cq*rF?HEoscm5_rc-qQ^g+MbmCSm;xe#m_;CwC=ezq5TB5reE z;f{Xm;w*l*CPOfy2NB?;;TiDL#Y~>JC2Hw{zo1tnG4xz|{8t9K#7$S2w_9?kPPR{= zV60E5L4Z#5eCd1U?ZIs5R`R1&R$*G;Hec}^XYj4$t9cIJS0TR8;26Y$kWlQ6!%)`+ zdHeN>%Df*_k@~k~>!1BJZVncx=bKi5MErN=`}=32Xku?|VDvwWJUslq83kUsMAk+g zjrgW@m&8enqjg855H?y8SyEmh8H$zy`BXXqe>A8PN)rnW zq<#VRDF-R(4I~QgyZ|{tzrH~aJL8E|ld+G-Q`(oE>uj&Qr&aE>y&v|-pO|M18{uxm zRfOo`9O@j7_9yXiM?ff82Lo|M;Y|)VyyXT|aJWf~fT>&Z<2y-C9+Eg{2XCmn)S)3p zZ?e$ubx~)BuRM4bgGKJuka0)Qj?bc;e-x2t52hSnBSY&(?}C>fjbZeXR{Q8`_)*8$ z?`AM^V-K_#d60)ZJf5nbJ_;~;afh4~=iG`@ZrKjJUVB5&SiAENz=0FG59A<7z-BSb zVw_j)N0)|t2V6(JeinvaY}FFmANgOLF4ktf0M_m!HTLYMFP@ZRk?ojv%8DuQ6Ql!L zf!Y{y*&aeU4N830W;`v1?w5#pisgfjOljowjr1GNw>F;qztmQgsnXMfes6}?Zhp2(J#;C`&s!zvmf+8MOUrmIxmm&5Vq*!;< z*^PchX4ARWR{2w*{oI~1hgCX)z%utBu8ijDT$>1XA;obS3vFHTjgz@%J$P)#HO*?O z{m;?W*{`rqj~R*eo@)oj&zb-LEB%XstQqG}-`#`Ek?fOKUY%}Y>j0T3rkz_Y&>=Ty zXVz>7naw)Cv@s0ppf zuF(F1@6N*{os=-50X?JQe{(NBX+Zb{s4J>AJ&VJ!R+F_!M40}TD8J1BZO1!!uDWFuT+uk?i) zV^u-15nNh$L#&7P>Ro26o@Afi7&e!03_D~`?B2dFZr{kQ`e_RSgWW{WUbY^?X!f?sdAVBm2%)PIC`Q5_P@L{O_c< z6j2w_U-IFHT((2Bzy-$Sl0sE>2XkDXfqj;*S+RXb_`tYURj#9|($E1k$n*Lm?+b}^#IC(^BqGs7{obR#P!?YQ^1FNCbjO6&$)I6t#b=x}oxgrq9ocFc@85$~HM`z-qEx z41~_j)e)39)gz>=(~_ zzS!HdUqGLOu#a9omT*L*rifBKp?5w`;nRhLE4)$WmUA@CX~}_nv1;+N|3Xu3&pj8noGy2g60xk(Q_!aak-aPBtvurKg^gN(&3VTdZu{&9|BNVoeR-EFjikg zFI!ZhoAY|EeX#h0IxHOh9zP3CDcs@=;<;JqPTlJQ_8=bDpJ=cKnOX3ABD>OMb1t;g z)b$kUEJ&?s4s;ecNsgtG=e?QMca;%$x&bUqN^)|B(hPAAO%mk9JD!lVW6#CIJeouM zxhAA!iF{Vs`Z%GW+tytW0s&z-J3Yc2g^G0qhPv&ewx}UpjL&B8iXJq|M~6 zbS*Ost#itaJmcGeZ%Yt9#DrTC^PLk@AjYQf9v*?&Jfd`bfQzw=N2lp`rQj#dK+l8? zpB${u5U)G7*eHZhR3Y&6Gc}3QE=CeYlmyUfjxO-Ah)GU>l56m|_VI1DSA?c|!D_U` z(H4d`coCK?1T6WN@M^B2J=C_i!)GE?I|&Ia$$1*)60DlNlw(CO_DN;1j#_Dq_YYsim;-zb6NSHUyeH!nORdVWtP=pW<)9owj*4z_@of{;?OXI z3}O&W(W{1@qXvVaam*iboDpRS!jN!ugmsBE;2IQV?gA>h$MSy$TyGx9jXNGfl~q7+ zP1=BooTba2l`%8du{mB1OD2nctv(S+PNU4QM>jtj@0xS5#0&5Fj$R|p!{)@L`+)#SN5c(0T zIXaaKO^*4<#d8m~J*4)(t=;J?OS|4l%s{&7NHL;b96UY)E04Xg(mV@b~pqeZYxN(O_0BivuD zXo$E@Oz&;fr8PBZsk*A|FO^JcW|5IzQp+rz2lrVL-z2L@IBNe6G0ym$=ci=0__L#< zks1Pl7k9hU^OAj={g^ZMi~q~#Oy|eT5ijf?gGvfZiGFKwyj1PkNfR-;vtvUudpz{x zLu2_sYIHeKjUg_cn!&Ytpi=EX7NHKcV@HJ{(rHtMuqjM$%sKP#eX}EK$~d&_sU+A8-puw8eJk+;o9U9Y*Jysy38Z-Q8L#rMLf zb(OCP{x@1CV+=KkC!qoTyu@cQQDOy1o3aMOaDzZVq%48Zz&pgb{7MXyp&qkT!MSHY zL5EBo3nG(Qq79Gfz0c94YMI?PawT^^MR7V5Np=#yn|cCa-U) z`;w)pBqb(+Ok@{ptYW1fqiR*+VYJdbnSa){bQz^|fpIIHch61#4Z6Bf^|-eX|8+3` z5HtT+a*}VDsVWfQf?Qyr%VCjB%%{>l>KJR4l<`Dm&@o6u{)Yreb4L@wq3v)~ofj`DE1nnEjDM~s+}GK4O$Yah^*^3o4E zYN1kopOv7Vhyt@QHm$ZV*G+KFVXcsHN8M`eDAPbcR0osdzcw}`3jk_^j|%GY|cSg|7G)+$e6>2kiIlC zwZbB;-WdHoHJd}+6+_iJvL~;?#Q3A$7nw0n zj}=A5Nx2$&a%`W3|C1vYX}*Q32KsPnY=ato{8NpZouyBI4akNo0lu7Q*PXMbv;M0-?z0eL zH5=_CN%&-Wa6PZ(8#A8# zZaWUW%z&}11n=!yb{g*XA{B4IPc6^4>tH46_0-Y<&8~cqEKM9I{dSr{^TE3##nKrD zET3$u(v{>96Rh)vn=U{h;gB&E=NWUYi^V#uaRMTpTG8oE=93$*3O3z(tJ_-X=5tp# zg!OSWPL$~@t6C--CYJ|n_W3$3%lg6IGigewL za)%u{z2V(uTM~7z9hZQB-c*ILB!m1D9UidoVB8PLmb|``&G;0MEIAF%;-VbnEH9zi zJM%M)vsy<*oMFOR5bv&Nk}v<94$$yzBqSwhiQT}&qeZebW!qcY@(!Q2cwc5A>KL zg+F@a>r?ukIu`Czan8H~yK=L_ z8r=}DA$b}M<)Ut$iH9&qpHJ0WV{48u@JJI0W+N~Zv`hZ7?e4^fN6r5fOC}bXh0q?7 z-l{!-(sK^*Gu$!HWwJ!Qgr~@vba^@{Jxx%|O&pjb?g@q^Imz`##ctZ5VpCa2s4P^f zq%myj?`vrI><*{B3iN2!AvS|v_e9n>3S1J;U`Bz=smDlI7=it zV`vpeNZLJz?orzn*SE2of9B_@2fK)O$fBfoq#4u+`-4TgTo1%OMuG{F-E#Qq9TlIj z@#pR+HOEAw)O;wws(8~50$ebx8(5IG~34|`xLGIV$y@{0Q707BnnT1 z#whbGe)i0;?U#uqlb)OyP)52TGfBAzjM*J0(|3$p|Cyw~Hd;_itHep?M%)a`4CCDt zENnuhmQ+G7h=Q;;q})n9)B?9S=#X@eZkUv4*c@B^j%pAh15w4r|8D91@gpLFjr*H& z{hy2A`|evOLT_hh?_^|W>*QkXY+!5TLGNz!edAY_l{qx z{|`?Ke((AH?;fmTrG#yQ;>*@1(+VA;zpxq@A_gUCqSb<4EMx&1Sqj?0TBBm7(Hif% z5z~b&<{SA5)b}b{HW;0APdxjYmhIp@Ybp~TI%VuQ>#@gs#yQtv{J8eLN)zZ?GFo+D z6MZrtB_|Rc)lPh=82timF$suG~;efSNfV4N7b>wZ+6!ho+v3y__@eT!VY`hgKX9yA&HMh1M+NnM2sp zw7r5r&)2{R=Q1*`PnQrM8=&Cqx zY}>Yzif!9`V;dFQwpFp6if!ArU8$3`yZfBe{bl$53(qy5F~_{`fvjtf9OF#-uBNkl z@a>9K-`2vshAVDY#725%x1Y9bSqgEu_?l!7K6cp>=Hsf%zAD>V4ZlsDChLO3%+sfS zo~j?>>X-CQTILy?478U>q^T_Qz+)7&Pr?1tOgq4cEiY@Qty&cG=gNq5h{lu72X=W| zEExebx3|h5@+YC9u`n((jI}xmzNaV`pHfv?cAM8x0jlu{Tp z64amRyh^AK9F@k(P=D?-1GuO517h496vcDHe37nq6P)L2)~QomDu0ZO;_)clYKViU zI`bmM=FcxW1r#D?)c5^71{9VOch4~q^4jJV87ov~QkJ`y>|1#k?qdT0fKsg5fa)cg z<7K@SwX!^CrGqS-+NZF&KYw9M_kuV5s>qbHw=l)N*(Z@lbN*HLV10bIH^vId%A%@Q zpa*QQ8Q%JMKBw~f3^81iv6^QW+5$&9JOYVo>gQ|zt(dKNk*sWso!YCTZ%!iLHA_-~ zYr&vz2iWqD2(rf8_JG#xlz1L&=U>|Bkw6$Y?v*&koGvc*&Mh_XR4;pv^iqfzvy%vu zh>!@Eh#dJq9z;;o69~D3Rr1z8vPaK85khDmrHrNVF5sA9j6$*m7fsreK@pKqFpnT3 zw;-~dz4Rywr-SN(tHBhcEtlUtw)Co8Fs%G;^hn^ph+*tAgHPjwY4t-RP~6~gSffyu zmSKqcU~!JVo?mGCc;Mw5-k^SdT_V3=p$qvHka;Z0oTK-JR~{qWH{HD|D%flYgn}9i zZVgC!-v*0U%_jcJ0!jQWd5@;(k4cXD$VH({^4c(~sv`kPO+G);JsY=3>3}-!tL#O- zQ>-5n*_v+033~RnXe_T0l3f!NM~Xp`39L*)FKxAPj$e1|twZ7qsrnxGwFw@z1GLye zv&iwbd(V69$)>?~lor`UB+}OKV=dzo6S*C9nC{89A$V3XD|WF+UjTCi&gJl$i+g3_ zK!?|W2IOAdmUV10e-xW=6{DT0sscoI|2e;r)wS$4sb>#g|$-W z4&kuL03^|Y%kBo7!Hy7evj!gpUtb-KNSJXmU23qI zp9GALd-iQkqe!q1n>Ex6(9@ZYCslV`tdO0$LwbAX-xc5H7-DTD1z0dQ$%Rj>c#M_0 z^wu62wYAb^v(?#1$xSW=x6$JU{tC@xvRlsMgv4;}NNc)Gs8~q%Fs%TjebtxA`&VRWA|=Bm))8b3X~qSm`Y z#l!q-B3LC(P7gcJ?o@n60gx4P_K?5gEDn&DJI@hJ0dOalJB`xWTuWwam!{xqmx@th zcJt;$7qp34@fToTQ%fvfiqMr@qG>V*)2GweIc{(^9H^-Ap->N zu9zeD)~uO|r#e9-5>8Fx9R{%##n0MB|;~YC?aX)uJ;^_3l4o(dp?n^JCsZ1x{~d5>;2w=3BV> zVMBc*uW%am3xrluHN}0hF8ErfsigT3YBkNMQNoCx{xrnTx-h$Swrc-&V0V*hf7{v6 z!E4*QJ_5Ao>HGJZ_kt>(i?;y$pC~aFiqGCGSJ{77X|eaM9tNo0Ass~AhfX)6Z_?h| zITlzix~~w};96>cIzHL3mrC8X#Jugy67cgJIEq@|${(1L8Xd!+A}J#^xLw0SoF5RQ zPf^M;hg%)PUZe>ugG>mj<2r*eyS5w}3&FD=oZSjTKW!CuBmo9Vw2eD|ncRK{f*U`~ z6LES+#1R+a%wuu424vm1DO=uSo9YS{ zHH?GUe7`MCB3gm8==ZnFEmjU?5LT{Z7&vHSoy*x&4p~-q1U=q@Yy2i!5;s9Jm<-X- zdQ%@@`9*}(n`k*8A4aQujM&5?5-peUfOH+N`hycssXTCHPQ-c^epY5@QrzOT7~r1q z<2si_d>D(X(kuS+hLK?Bl<&7{ufJ;`R@XeKSMbZ5`=FmKrakC#05rA5n1UPCnc9;r7Cq_GsABf~d6z*Cvvd)ObC zf8TZ7hI{C}dzNG7%ZLt^&87tM-n_c@% zW!=I^1vCeAV#yqe=;c#=Xo)b&v$j3M7K03(w!=w%nT@rlheMhO9=Zxw#aao8zap zwwNg4k&5+jnY$M&1>SHiJNQ7mfR3l0scMF5pg^OQI-%m0RyEyKxmL+;`(ya$9|5xd zc(l`1uB4$<{5SRpu)-H;$;Whz&+K_}Qi6HfkDE{LsXR7G+m( zdQ=y$7K8Pezafu}4|wVoeC;}FpNm#>h<0RS9;+155#mNOVQFyjN74yQx3L7jevIUo z7`CRZ+gCP!7d0Dw0^L=53Gp)?vEHxS<}v&AQjj6j_1OevMq8VL zvgp^dQD&DULFh)&)L7GIQo1U4?6>wiFgX(VVC~Q=!QhVJ<-q(B{JY0=g8WPA%Z*Y0$VIAnC1J+%fJ^2*-9 zX^Chzmo(7CG%VSs7aLYHHKTzzx>9-o+pbqCxbhbJTyjK;%(%^Gz%L|4ruG)Ou2M+U z)N`TqIS!(lP}0w_^tKlXp*$lL70?|z{;4RI09aMG@Yy*h_{qki7gl^>7lvyTpz?qi zynNz0!BUf77c)06C~qD^mz;A2`hc6~c8Vbb&Qp`11Rrm=Qoi6y4aajIDsc$hXo>Y* z8uiHzP6zK073g?NAs<_?2~7=OY0sAp;GFnZL&z) ztu-vkXh?{zG&S0^>&1rFoL89_TiU_Nwe6usvML6Tv_mlSS>Ua{5?dlMs%kPQ?r$~w z&ByTx{_ohswP`BY`X$Km`Eq$u{TI)=uNskmLeE!$$btgm=ae30M+y(6o5{l7dlN2fh_600qK{hXx<(MjkrN>PH#TN!M8n; zMewWJ2a+*F2w4|XDi5WfRt&WWwP5{w44H!| zeaJVZddw=ueOaV%q(Zk#RBl^Z68zAE8C=INQkxVPjK z1{Te^w16w-{5!`8sjGNp)Gs5 z{?7e`{-iei96Hix&eMs1njP&E?CAyt&a|cH;HZ?csZ?jnJ=>Y=m=DbgnBSzjQ>fc# z3yqMKsY{s17&lh<%XBF4iXIv~4Y->lc(2OR3>{Jj`9767%rrODnTD@G(Gi$x_K>t= znQ9CK2Z?i_U|DBS{d@o9IBwXS{h$ey%>gN?)|}g#iSRdH!%?X(X|imyb~lk&X1j3t zR!1EdC%BVbqzZRDz(NCpx8S#Y6L49uDj%z2JSiQgjM`w>aj!=W# zoDv}Z7cWWTFe!K43LbJ?6b4a-jj)35LfoY~TtYxhxx{PDLA7J0~g1kUT z;NWTa_}b*Y^e()`r^xj4R#zZ?NKiQ<38kYr6m$~9EFFmYeK%MMl5+wuU7ucVz0A1Qc^^|tGRUhFM_@Z`vF;U-~#FuNekmigd&5%YM9 z7m;1Kc=yonox`HuB7PE$zvRqvDYbo2(SrW`kVcJGAZz2D%^jg>WuBF;^RKlI^!tyb z{+H^jisvs)+RN8u<9{>Q{XG*AwRHwM|LgKikhPl^Kn&S#%I0*@opVP$Yh9bybu9dcw@_^X(I~ zM;TUUVaCP4IQ0;ITsPHZdXR6U<+f)?_?z_Thl&9sU@kqk#M~o}{FPUY8G7pXbVJ&B zw@lI>Uvz@Gw{!tE81r%fct#=0tK?gqOv$H)sUmZ+C7B#3)_nP~B62wfNbEaJ1El!E z%=iOn-LkkMa(DVPxuGj1MV+hhP5cD$)VQp)Pn4toAMH*lm7=L~ehP%e4#yvAf3Bfh zL$R~5(2N)A?XeH3C%`7YFP|Bc1005H-+1W=6WFcgK zZqN!ewt%0YaS)y?7ibx}DXg_ku#Yy>?{Jg>mjGQ#);0REFhh+Ewa;B zKB*t$c?R%?Uza)dlt<9P%^mta!uA+>2`vK^c5C;6<|oEm0mgS5U;Yy#@ppId{D;*g zbJ0|GH)pSw|FmX-c`AyTQ3_BmXM_x5f0g`(HoI1NoZ+yINI+INM^GCO_iSy$$g3#p5wn?4E06N z7sVzKczV7m-!DI8<@ma}1q(pQOr7pBx|v-~xLt2tPh~Iif4&cC|MflWmsKkP%wre{ zovc_!C95mn_lT^ADXGNRp4puO!uexjcbNktuwzwkJz*4dVt1W`V5l6#*P3cMwUfdvqW75j3R@O9_+}wA4@%2rR$^^~9ML8A z>cH!Z5joviYrM;TDf6l1(|aqKdFwr(pwK+ZNsQOVMEN$+c5AFeVvS6Vf=XeZ))5K=RSI=TjX>*)xW{h%98IOr6 z-7}P6dwVIg<3tXL#C%yY+b|$qlZ78R0kC#nki$F$lGu%MrondHqi3JC(}91Eo-PFdzTr3q`CIw`xB8q_(knbz#X0lJGM@2IC zDI-55fl1&ljjfx3x(!7@oCR6A}_9a44tj zOQ{o`#i)K(t)PivWSKg?OVF9?j;F-{0Ho14m{ z_AS^ieMyhW-Dix(l7tW(R<%ytC38@{02EQyi( zTbzO=>*^bHoJOCSv>ag|E82wR#@`bAFZ~27V_krf|*+kHZB%GmYob(gox z#k{i`Q4z)Z?U#Ntr9@q?6@ehK^)%lWxS_^|T)A`fH2L7I?cJIT@~h%&zO*bg9E&s6 zNfQh2|6~KuQIu(!Dcqjl6dd&&g922f7@#r$+1sl z(Bq||xufyD`9sG=exKgAZWBQbiItGF2Ktwj@LisJJx83k8tcT8jdSrQRw#ic<{i;Ae99t{o)%uoTf z^ZICn67oX5!_hUG(C7MPw`!WRZ#l$`G%I4UI48HNu;Pz*3+#4h290&Rs>iY}1Gf1< zGiW!F%*Ze$oap9SDkCp>2QMg_0ujUPv9) zLLD(`Z|xlyvPmXCa4Sq&f?2#Q#4BB25NXub8BaBnw@`gxJ)ZiZnid?MkRaF_bBg$q zNu%S7P;lZFu6J|q6kc_E{$OQQhpefEa|c}GG->-|vEynZw>)M|FWeHDt?k>{EMOtdd+y~}jULKwp>upgwp~6^|ITjrj&C)&>agwL8RKC=0sRj4|xh=llZDV z+((H(Dv``ewy>qvkKEI38X3OxayzRZm2Lb)*Tvs9-$~5O)G}QEp6|jL0|{j`se5?* zj`*tUi0qWbJtg!>*&AeiHODZ5p?1h5ZA}w>6qjLL6JjEN%k*cq@VCf~XE3+#G19F+ z#@&%?_K5ZN?anxES+{m;_WkZCUVgp8bUKUD*B$uAJW%V*N=2aLJi37rA4ISc)ps;C zbvOtN>h$}KL<(&s2tvR^epvR|g$+J*GY>~^!F7s!DdVc#ebJ`Z0Mi-jmt-i)i{mD4 zrc<3Fo#QwM69x+8#}&qpDn?y0mFnz0*mt!;m1_0Ju<#xos7tM-Gof#P{zK3{B8~ZN z;p#^D6=p^$osZ)R(y|7z;u;>y~MALp; zffiw!1rae1aTThFPe4Us)y}J=({Li#-~Gqv3gWJv_u%XK==`P8`QJ4E|FcsxbTqX2 z=L0hFtASGStG91`J*8bo%R=#13AKnWm720FxZp=nS_CH4EG7Z`r4ss@&Ae^+_gA~5ogIEy_J1Yb&*qYEudO=1S8qlu~4>^~D(|EQr%bVnD$OvF3sMa_J-#;;9RV?q)7 zE0Ji8*W_9eG1emy+K4@j3*Iy^P5oA6P#OHYa*_*p{6_T(#%Tg$2|H<@?qnSR(hvgF&|D)=$V_U`pqgp9$}&8wh`vkFTSwF;ldL=t1u8GVZt)1_ zHW@FVMIGEFJGLv8FWsXxY*A|VP54RtVn|fpmWG*^stM1aOayDH)~--8WOYy@hS`Z? zD`%0|DxqT&xk~7!gOa^9V%bWSXh&OXvkm{)f>Cra`8oJY=IP?SD@Y|y_Cx*c+z}Y~ z5!InXa7-nkhbjD46#JQ+5HLwc}0F-9>(5v~dN zbmfDAD^!`W!WLsJGDMPAG4ZCa-enIdyL-{b|C0rBm>t3dFW7q%3{jeQ{7|2&-Ql_Q zMq#ooZzriz(XOe$c*VZKLL_bv5%`eP|3LDxv#T_EZ{Oq?&21%9O*AKiN8}aks@$lA zbyFIX?;Q_RH%$n&4zlmUB$RJRw1->n72WQUg^VkfnSv`4`_(ruhZ$#{hS<=63*tqa z$PnAn(0N%&WCWMnf99kSctxwvW0j?Wa$H*gf1biKzCD#ezBIvAnbu$MykF}m*WX_* z{33^VaQGwY&yN7T@XG?UG{`P%%MYRPzxv=kHIArpJLgGDGYffxp7W@f2?NKgjd30L zE`ayDRVtZp^YiaQ+YsPf~DK0@TZ3I90h&+={AzP6D*rc z&<+weF%k2D{$4OOUvFL_;%pY8xl00<(6afEHP>r|f1kCqq^WZ)f8mMP7oPlgKg(BW|37~g`EjWM0mRC!NpkGMju%LL z@5|nAH8gtYU_`V53GXJj_N?jg6DG6Mcckt&pihMZQzyC|`6tvr+fOH#hbewIO*lr? zWg0T{C&lSuTJ@0`dOK<%B@}lo2LXYVdXF|$9Xy&Gl^3aUqa_L1ST8kcL6G~Ep_5rU`Sh@I{>m5*tNGyY5jboai% zMBu*#lfR?t|M`7X{s&Ax<+L^0X#);RerR14gQMR@5CSlfWkrRcXNNDJ8fhE7GB!mI z5l&gedM)+}5k4vRv*tyy%aTK<($lBB?v>{l^I5h8lLrsrXnwv0H)2w zi;0QDl(1~vI%FH96J=zqry#Keex2iaTZ7`ywS7`WK25F}WT6O|O47{xr<>l*4sr*LO?G&qz<+ zfO9S!?ooBdI!Pk-rw<7?3oaW$uSucHv~oAtAwnk|A%Tm8NV!?*VMb@=Wx7G7fxX8e zraDeX)vIUkDAGS{R(5tL(j+}rQccj5nyE*?v=-16pnME!(kEMJS)9GDJbkgalgN1xy-G z{0jX=yQoF1FKJX18c!^ngof~+9;qM=4hNcnx4&dX59e}`Uc+}M+!{NH_%h<*-v+x2 z9>La_*1j9beL8%n)Pjk~g=q2%$g$uLaVR<>4Tn3 z$i~4E9ebj6$%;%vdb|TquqHTNnlfW7kM&jktI$v?)rN8{MONFiSZZBf9ty-YoujmU z#Xwbk03@R+?U*}de?nebG4ygdU|Bz5hN-!Xf9^iTHuXNS+iLBw0eQ``nT*%YSha7t zD-^ljI7E4rM{bb?cfCTh+ZIRqbr>zO^uGP_*qmkwwJAKl?CcX1nwd+#wK+(|1us>n zELp0rSW{hvZW9q%3vLr7vF}M{+grp3s3#;n$qrXa31Ah?oJwy#MUW0NuV)!xn28E{ zVwy)^wn_%yl{}bmLNK0sW#sRHz&IlqjF4!_mll$-A6>hO&AM>?E`7>cN zX*2blrB7B7Jr?RkG+XFf54A*BK8uG#%0jTSXil1sR+bWuRD%suQp!kJON&HL)AXem zz0=CHMjhC)&0a0Me=4KK0&rp?s55JJB;4)B3njtztv#=L!sG zEy$M3ElPB&UUL8#$EvXVok88%(9;x!KG=~=5z5q_tuD#(=M`nUv+PCDAEn;wP)9?3 z1&rR@zg@k=ZKmC<6mv{nGt7{mFsljk3n*WzNog-TPnwrh1Et>iHGgsN%J-Jj%W`G< zQga~GpaI2IQc>Tg&K+QCWEv?M8!3?!dU zwY$RgHedE)|KAe(f5nJGtqIvp#EwY6U{VloKwU<}t2=^@OCUO_^PMufD%t}9v69)l zXJG?XiKw_;YB$hwq7%De=_Y25fu&%Dn*-;o15(uu3I2=|+?#1+%MG64i_1Za1a(ua zX2oZknns5iwaiH8*2Ze>IW9>W!m=8xVJ`5;Ew%8oE=vtDNayY-=oEm45S)g+$4Zm| z?$sbR%)0M3xP?m7+_IG{vKn22QB1zYLA0k{W8zaK{Ka(}%0>EyKe9eD?yjhmYG&SW z>74M+sI~NG1OmDx^`2mDI(6VvOItMQ`3wE%b^~O`56#Avr)#~eci5({($7yc26-6V zwJ#t?!U^KTY77{jN3XqNrnoGrK`TzM35u3J(Qpm??7>4ZxmpAIX%%=8EpkY|ffE#3 z%I*`lD-a6O$7`fYZqTSW7pC>FZ47gcwaVGW;k-a_+|rTX;+5QhvAjUH)J17_4&ZJf z-g0d8613t#RR=4H1q|Qt@EsFF|4ta|`Y{bWK#qPE{0*baEH-!P6)1nshL!qf7mvAm zMCWbcn1;Z{`|$m|<^x~1ZR=pHiL$DO-3+hN94(wIqt=snsmWk^<=4Lx5h5!sGtDm| zBL0Q2|IJq5e`0L^#nckt?dB9vhkvE27o!fZ^gwn$8KGh>zGlqQGLe%@E2P>aTn;N; zHBZeYG|N1jr&E&B-y+<^GUs>^k)&HAB2TrI9(zxnZ}I#2{f4NGfkOkLCeGCU%qtR5 zM-o;PMKv|7gsP%$WXoSv!E~?O2@h}qm&Y=~W8pO$S(2Ynp0}5I9$A6&S?BYd%v%dx z?_S>Zbsw^CIOpbt5(^o?S#Ro>4Y824Lp;e|-h*XvSwAG`xFmmmo+#-DUu%#lHGFI4 zM2N1tS%Jrtav8V6$ytV`orY_dvuIyRzpav$x*25LoLSkmxlU4MlIrQV(X^_5@T)5T zDc<)&PaaXop4hbG@hTecNvmZ(QHGqg80qZii2>e9>R#x(E9qpluW*}4Bz(|9N>%FC zoNIq{(Lp3)v+AJWS*G=OhG3asM$8xI(N{Yq+0T1e1vei9K3L!yMl3W$1clWsq$w%g zt9QZmB-D;+d$Qa+`@T?RV>M-4M>`X+%WIdZVy8e=%SPG z5{F1uo1O6WR^fzQdVug4xd&idq>VX*QJ%{wA&$Tu4q6C>jrnb}|2NS&jfc48*>MAe3W%gR=NuWtET-YM7VV2CfOBN>v0zyAP7Me_(JB~4R>ChUzZ zMx}IKmtAMOqxqmC2ZWRQ9t84_an93O2f#>YOl+vwEG39LjXH3X6*%AN*;|p?=~-+5QG>QNHI|mh#9%B)cxJT~FOXlrvsk~s zz`I%3)qZHz?5p#s)%4<~+3@?$b#blekruBU_~|bof2ihkE;c#m zT&P=jIW9xJ)V6E&HtSV|K9_7&U6|^W#YIR|MI7^6#MluSUUD(G4RCI%_*e{Suw@aY0E>_pGteMs z5*m>mv<8d^K43IjS41*N<)>Bc+_#j0XR?7eF~un@%1?mCKQare9ks-IjUZ^L1atPZ)uJ7lFqbKDYYU|QH0 zA)sJP^1Vn0UtLW33co8ToRMh8xgeOWVUZh8S0l5?0|6YFfk3Z%AXC<#vTUSOg z|I(pC(bB>|p$_nDISCf1X;oR!s72VQP>20kbd_W`Au`!FD>SHSUh95pV(_`tHqTOY zK8y0{PybZR{+zmUgdw__3FSNP$hv=@y5!mZyua4B`zvdR0UO?+_1pVxTU@4)SWwi@ z*5Z74W9BwG6P=NuI7v9So8Y((p)24EvObWJv6v{h5uhwuf83nELBX@M%LfD^)k-+-)<0v*MBW z7Ya_{z3|;c*xPBzS(Wyh56yfigsWvSswYY(0>Gk5fxX?wraTnt>|j*5>8PZO5~bpN zNv1OVMpf~TL@28z0!D;kT3yC++M?Vn5OUvX5Fa8Lb&=I_w$6h$m8VQ$h!J#o}OaPyiij}BT;;XEVGQ)e%ubI?y ztWLOL-(s4rGVCxdx9flr8(s;1x}P*p$Ri@<3+D$R0!rhXo8NI}CJq<&X8j)8=j;6t z>G1;1xoMTtY381r&x*F!CE7;wf+j2J6p)aJj1~HP-DGc z&d0;!MEQXX=Hni#)BDbegKHnZMs(M%krh{Ak-Uy_HALgNg#+jj#tbOS>s^PJxo^sz3Myeqx4DKqNiU| zc!l2%I)zqk{wvPpmKZ+;ob(Av#cw!B6aL09bWOOB$dy|_6|9@JhXYn4*(>%Xip_N` zEYIhWm^*aosAUSGU-T5TX8fu2h0GAwiPix9ZU;u4xWQiJ%KJnITkLI+?UMU$+Y}CX zRDj_KWEJ)X`oZ+XxDhpW`?D=&^AZ@FZDgZlrQiu*4HWFtSXfa-gtS5^T&1aWT~ zv13xXUIgeC6E>2Oktjj-2mkJ>>u==N(db6aKQ7WDg8Y?GHs)@-Y(0u=tnWF+_ndX? zF~!y8_xbq-XMn<>GEtBg5aI$(2HqY47D2s7Ic^~8sd~znv=ssXjYZ{Et1UN(B${O( zq!KQ1HS=YHTRxx|%DKVwy^Aoc?$_mka`maPdEd(tbcqQKO<#t08(sakHt zI48+Sf0xgK#sl?hX(FeqD~t@+|WJhi;|&N_yU=Nm6e#1t>q zX*!sYSr-kJr&=Oj`Pq-l(`T$SPRvz;*ckFYVx@de ziK!Q(c{OnRv<~&$`u*_pq=qe1R*C&_?}1zG6m2p9T?B!O9770!k-QXbO~xY8S^mA? z8acapgc*zOxu-i6$o2NqMDQNdfgCHX$t4dQWooL4A=OlH$7nYKHWI>jK`McNRk zHea(v*?J1sb23Z%r|#8!)ADg&nFw26rvk%W=$WGt9S@I&%u-mSv3iG;9&7 zgq2Owwdll^kcN|M|1qYcR)!XG{*spMe6e({|3Y2)WnowOvfq(P+S zTSeOrMI7~$e9Oex%c&e15kP0l6mDl2jWR}-BrQV;#Je{Tq4LS7gft)bbZzROe<-~f z(Elr38c3#<6Ze9n(3C82CTgRfceWZ1gRZF{&}=p}!R0jdoIU>i<+-Edub-UR15jp4 zn1eZ}l4bz33)y%hwc!oMr((vSSmz6Ql5o&jM@B99)3jxWG($?Ara+zGe1(>cnA3JW zgEr<9ZlcsBj-x|(=w8vp@fqG_hp9MT`B?b%Irvyc+)=w1)!#IqY#ey>>t-wuHmf-d zS*A0Vw$hAIi#Al)n^O@t(>G|Lw#+WedsCWM>$7cc<)Q{ybJBC?AuyXT7(vqpw31XG z8U29*agN(!NQZBoh!nDSF%cc`6yVm8H$he|JVGI`iLXMNkLyRpn&Z}rm4DbwI5#|P zn+{dkGtSp-L~G@@^H}5LQuh*6u&|=o3mQ(xIXmLbMyevmHkRTjP`J_IvIZz%I|^Di_LqJ# z3NO2WBzFc^f7QN18m3h_P;D}hvM8HM&ub1l%|2Zw z(hOXO)y>5v9YO0C^6g6Xw5D3nKr?#ZZxVbzQ4X{pM;45$P&>h~_uk+C7(-gY4dl;w zklBW%<2JI9Xzpf};sbA!T*aGy>~C6-KVDAc)ej@dIm)3hsc4q^3b#hPr$55_o`-Nu z=_9-P;?9aj3im^_Q1G0bJ6kBg_lF|wCKyf1SPPTAuBPk^_fKa8rZ91deG2Q6dGxt> zzRUH$$hsmg$Ijt9#k~$5IXpQe-e33VNFz9Ux`WjiHpM+<@jKPpD|81(o-yBu3%7@E z5W3zEl?v9<+CmS|q9#7V4)BUFu@A8>;pd=n=f>70m?3UFUa>voDWg<{{`!zPXBfCv zm)T?58b&#Q76t!h4DV-v?`MSMx6ArD#Pw0=K7rH+h%o6$RG2mdXpX4`SkJx0k<#^T z8w2zFbw`kfH=V}_Z&4GuONMd`Lt}v1MrbE`BtG%p$ts^?L8SF~c>tBVWaq+0zskBl z|DhC(a&;eO{e$kNi3XT8HiBFSj;EcX(^$6>`XDFO`JU&Hu!ZF@|YZHns{Iyf-N=R$pz zbPdZmx+t9s%TnFrW!?nGik~Mop{XSBJ9J8}0vT5dH2iJf=H!<#mn@A7KQU_Tl!51p zp;DQaZ%Wor{mo%5?mRPtV)zKn9v2lZ&A>7vtO%U?W%=tj%ki~1rGfKr^2mbX75hud zc#aDEAqPYbn>;cch3_mK#9hUkxmAneul$nGEhIGrfOKXRN~(yCt9jMwO9d(~iX@Hp zhW&88Gi5_^%SKz#-zzBTFq*pRNddvgoVaPr$9YDG2!*e#FSd zDag&QWBG)Rpsj7mU(^06G(_RKNgrZJA5u4ZFL60?_J2|so^nh%c!xXq?*Gli{ckslf}@?ispG%&%f-qz ze^&zdHsjLq!Bg$PP*Yn3cM~oPMG>$LfUyw)qe_BaTso}Bb~mpMZ7XhSSdmzLzxuW| zQ(ugu8pOe)qXkDz?aW=xay-n;pZ1@h3I3urE)GM|aZwy#qnT_^>vy5qv{xLGt(d~7 zRS*d7J-tz3mT7iCRarxaW39{HV9>=jRsAbEjqAeuez2rdMDCL#ED|PYOfdqZ( zluNVEAK3?&U^CMt0B)9S*yOlZ#-FIp5x$nOMQpiWB``YNRYsBsw*}2ouXSUeNa4Tu z9vVY7&e&YNm*bIeqCsvJ+pDcEMQ%kTuPk}QLvg6`2^V_ih#E^dX`!A0sr5iy4%_cs zyf!Df?AJ#8K?m{)B=URSt&XdMrj-50Hn-lM3iV1^YtrSLLZ;mciC~OBWv~$#ISX=z zkM1zu4_-m*aWi`}Gr-(``NwE_=A*RLl@?t17Q^GLRZ!fNi8c!{IiggXgq=rerg-v+ zA$nNHT6)_8uO!`TJCNS)$nL4192bK_AB&Mc@M!f=XoQuH1BZ3~QaSo~r+U60J6|30 zU}r@Qq&UIG*0s+%^i-etk}Bi`l-%;sr&i17md=r_IW~Ve{T%E!1vJP@l%Y3Ko;>PP z^3;!elTrbh_#l}ArqP{Jhj>>Qzucbm$Eq$OXDvv33!Lu)pLl?p7{>#a8au3NH_X}L zE|Ky4#PI{J#8>^^wkXvYsjPm@dNg1S_r-tY0k@?dqD_3s7lOV>&Hot%mF-Q9|G9!p zn6#Z2KnPeq;U-_w1vb0k8m5f>_4LUc;z$!^$jHY@XrkXRafh7i-TYbE-BHAa--1s(EQC79 zY8Q1iTwLAlVlCE3zt5_@<APo0yPF2ij;c*tgaKJErH=`AX_m^ z+?z2bDL_3N`my=+=bi7;?CH$Vl`dX?JjvZEFKu5V#vk-Zsbib!K+b99=NxVfmBHV$ zKAuAoj>d(HDcDIvBYC1AC3C2MQ`55FnqkI9XyT{Ld>t)a1eaENZV>rTF9iQ3s+aRw zf3*Xv+>#?skVV_ur)Lb@UF#c`#g~5S#sg5Ts(>^s$PJirUOq8lH5K6U2P6gJr<;nm zL%`2Jal;Pf{KHPk)H^JXx%T+t7W--Ftpi?`b$x&&J*JAjEt|J_=xMrd>Jj3 zsiO?0ICff$RwVWgOt&o!M&fa&%q-^(vNZ}0O$)kT%K~yIc-#ELu>WAZYaLEp9ADTJ z^%WB#_wmZ_luVuMtX==be2Z1J<#E)%d`4^Tlb*dB^9n-qAt3CW(us}5 zoc`oV+WlnUQbL}(>l9{&UFYu0NDsNJ3_elRkNy&LNyMr?XTpC(|A?!)m~|o2#{{Wp z^5n3vm>*@XU+Mq(eB$|mIg!kp?cdE!G?wazBhME zx1Eq9;OIN=ZHBG7T^|kJkcAeu*^E0*fDr~;vIJI;Xe(HseK;~`Nku_ZVKzlBx!#${ zamm(TbjyV*_8Ts;vl+6TDyF`HmT%dYoCf4AYky>{$i@>tw3{W@O*-T}rK|JYU3Hx! z`y-}Kmw0HMS!S36Klws+@BPf3Bu_ROTVEMU26oA@PPWvd@&#?2%4}L%>E5<@L=kp+ zgZ(JWaZ%r)BDs?^_STWjT>G^R#N6$Q{Im;iI+bjRVpZvnxk-=iZYD@M3{Oe7n#t&6n}hg^iQ$<$eA%iKh*lNqJo>W|!nK|` z828o?4@gx_iRsb$8=BszNaF z;EKX1MgNOGX@knp42SHdTNo$b(@!+tOO&N4;_}M6fm~ZYlJ|2Sj&W9>^;AE=CqnX%gsF8oWL5#8ib4m{Z+@QMlOpfY8*rZS?qi7 z;=NdMQ*)NxoJ@lBzF}-fsdNQLr61NiTi~%g+GnE#qx5E8bciReGHEQk1c@mdG|JU6 zXnoSPHT1z*@c|GYGDTLEK@nF(_|ADGjkkoiA^i0`QMYK`3`D|97fC#$<@Uo6AsdUH ziRMBTmY$Jb!DmxRm1o40eo>{s)x5d8_ahcyOw$M6I zDUf%hQG~)ED2YRg6dY7piAh*Zf@7d(gEVKOTxKJ(P5?KhR+z#c6L2Ib2P!=-d#G=R z28bBFP?9KNpZyF)&+Rn>qZbgiA*Y`b5EqsuAT3KQT`vs-XTboD9RSS zW!tuG+qP}nuDWI0wr$(GW!tv(E4qKb|D)faJ7Y%hhS-pa#YKht)s z9(0*t#8`m9fYffV3HIcc?1v%Zh;jI-C#DYxRo1Qt*CGC75v|J`lubD*3RaaZ31LmR zJh$dnR#ygaS~kDWm5)3Ar(bV+s~Bsi@z+bD_i=YN+e7xw=P_Ha)p0V>EH~62r$b&g z?0!R9ZtWy{hItsV`X>Kv(RB8VT%$Jf14C-GgEsOLLvA#rwzRR})JO?!X;%9PEJ@}m zWuVe_gQRbU>_`l4WqXBjk>v2D&#Z9~7_?^4@WHBl2;Yk5t1$X)mYNr7rErWeIR?MhLa2vK-T3Z5@T6$YX zJ|;BxFbq`PVjoM?(wGQRtNF1Z4cbLpf4O!QTmA45%%>+N8kWqa@vbRbRX>e3HIoC? zf@=rXY#&oQdt_wemOJeGYjtw^AzOX4l{L}^%%%Mx>gC}MfG<}oe5*knd?&rJewxH3 z>n%51Rx|?JE4`)u6pRfzL;dK`73p(E+u%?(X^!1K2&u05z6hx9uBnoA`l&uLo1f&ts`yC?!Khyq)JGhO6NKZnqfIsZNJr)JC3g1zS*Wb(Dv988-{yh zc?G&1{ zci#}$)+_w=0WKWYYgl+}hXI}M+|a1>Ct|Pf8cgS%11;gyHkmt14)Yxq_oG_-hSF5^ z7wI#KAs?^JK7cQ;(XId+cZeR-?Zu~eO5{nKdrl;p^e1TShYXu9RPXdK0g@i`9SM@2 z>jBkkHsB|%@9dD;)~nBF0EKAUJ}HtO(_JWOkL`Y}G(*nlPklI_fx#OEnw|X}6O!Ld z6DwnSFa2$*?JI7N#eVJUOD&A|Z*xWPDtFI}+(~=YV(SU~^{{$7gq8|=k;g=6aqjLm$NL;5j^fB^m8==*8g<0;vT zebocvvmg9;1mYWt-F#(03vGW5iX_s;E*1nt`wMj_=(sl!3!Q!v5^LO}g{cfgGS6%r zK(GZUi8<)2XD>pI8g`{^CpOrBs00jcA zgmOW+XUm1SL6OJ*rHcW+e)p1MyFu5dz1FmMdE7ir1?-MF`(*R71mcq)(~+W141b;` z$38ibZ$5<LjSm;VEdd0dPZ;p?Rh~J_ZiKEjmEK z-ESX8P*Bb{pcAlaxv?^mI1w4V0r<#lw5Q5~Qov&97D@z7pr6!TnCUs9A+U25mutq? zMROT@b=fj|eQf~)`bmK@mpzxZMZ#~nDgM_F3hQgHro+CC>%0`=891EyXNHrI=Qz@~ zvhZ!$<{HvA@1-1Ll}~ThF`Z7d5r4pxIfMwurN=h6ccCUSc(A`rP#?0uB{LHP{0?MKy&CmF3oFm=zIgdmih=M zfxNw2BFyu%pCAG9_$^`T8Vc?4m^4tW2rxvLKm?ubrIkxD*0;?K_8!Q+tnY*X-&e{V zhS>lEWmCy#($H{X-n#XJc5b8MX=Q#6p*T`I;7F8|C@&DjwC5WNZ05y~<~BL-DO< zC?QwC(XXtmhFZ6pHFZBP27+3eKaj7OGYnr~NuaiRz-e@t=Nv8I>c?ZM7Hv){y9+FVr7=3NnqQhYRH%sd zXf;hX#QrKO#j6`sE315cRt-r45{RT+HR8j{ErtaVm0lN zAMzyr%T92GN+!+%te}c1_Y%LUS~-`MD2P0VpgrOB6su8-D&RqM&`rB-rg)C_qmpV9 z#^TEncbdm4^srL31Gj4w3K~eDl(35buoy$g zr~w_FX_Igup?0#Euq=*{(`9>uR!EsUgpa{Os4MKUYq0{qHyD>I-g$=I*g-OS@06fQ zfCp2T5&oP^9xp~qi6yskZq_DJ^2aJ05&MWAeG2tT6SpocQHm{QL9ZD$rI@f7^phD!X_P5$&~sT@-^5AX4d8($DU)R z5P2IW?2&KE7OmKT_fx_Vwj0pHk4`}E<~CAe>=p(>S`lT!&WsncmMa%Ah=?T6H;w6> zRv@6Dw6&@DBR5ISB^h7Z;&dm7J}-n2MIiN>Yn_2@As!*OL+F+(D6r1kWb)_@QZ<&h z8)B?`q~8*atxuCJG4~i-ZQ~AGPB{@a#07h$Lb9YRvA(Lacl8`Mp&(?h#KKt4wncNI zd)N+x?j{k1;(he*t36+JjCaYz)0SucWDTA$JoboLZcBNVY1etOeMSGA7!}!uNtuI&%Fd(B$S(Y=%M0?*VpsFvk`34tule!%&BGimPRClV zBm9>NI1sWXJ_`L7B8LbwV&N1>MZzx@b7P9PcyV_aQj6v%rHlt z7y>TP$6L^^U%KK&+d$B*$n4i9dYFowc{dCpGb9tUo^{iO3wv{MxEY6A75 z>WaxW$vaYt2&Ay<$r91EOe8EEK_jNh$c_xzKAby;qz+iyWp3fre-(wVcLl_?Znb9f zdJJA|gUHTX$G4K5U)0fP5KuKb@bbh9?k8mc7|x}ejZ+FssZOS+RK+)IFKRfZWZ8^! z7~-CUwb9)TN%0n?CWW+S6B^Z$oG=Q-CXOyt&{!P6r}EBx|IQ}N>~ppGFhUE2eO3(3X_( zvk~ehn1cuo$qcuttf?0f;EG}%I!cK>IcnoawTPL__lwR$O#39gK*^v+cBR;KjwQuA4bq-Pq8| zBwcEzKAW@ms#-y-KOm&lR}tz=ZJgZZPr^WPQYAEZn?A%NuygzOEMikTGk#iPxs;}~ z$;r_FYh>6i*&|VWm+>yRQINRbF|pQ9amFl_MKMEY$5uENKNIGFt6ukAX4;VRI`r#RLzbZq#yZ)I%x*d{hVGb6BA0vtvt~FBbI*K_i@m+*TFSg`J}%?f zNYXk+;()_T|0LuUiq0K&=0Ht$W;9-X@9Y>T2N&Eeiy~p`^(u|&8ax5S0F*6Tq*-IO zKf7y@H4a(injVW5{v68YizqP3&)`~$L*NkUGVd8YgPA~w80^WBtyslcQ5LoTE9?e!os?^H8~?hs6SgduCB5wT&=W6 z3Vfp6JhIY5$W@aOf42FM72~sMT|KuCrDlPHq&U(9O>0zrb~ z={_6{133dnBZbut&1=NionCHUGHVv~5>QH)oUWjI;3R@2NPfZeBd{k-ZnAB&9F|$o zKqy81-taD*fUf?K)`LPqGLpCAku;VJ#v`4?tx+Zhk9@f(mwtIj4xMZWsT~@j{>eG9 zQp{DM)PTvaWk_n@gmEH^c>b?F$A_d^-Kt)=`1Q!d&|;^zaWs1(I=BT)j<%VU?r_db zl(a^9nIfNyCe#@*4&B01Ruzo%oN3)5%caHi$BzjSjYoCYdcw;1g+#y-);&{7m%vQj zVe~yIKq4ceFbjB0|PC&AqCw$vhAfpUgZH6bNOB z`bLs7zis2;)qP_Kw#7KtYBu?JoZ%spL-T_3sw8ikniuzs?~_|X(_8xHYdtLs1{T;n z@tH^%8R}>eX4)dC^n5mPdijnEnb39pq3#=pkneV!8^*n@(6-T-7mPi2PU9KbsX)UGlp=TJIzDgsrjLu*YLdh4` z?IYLBAwVf&l?bD7Zj=6+<2oQIY&?8SY?e4US3^8UWX-H~7|Y2#D4BqhtN<9prbWKf z$M|z%!y(xIGzXKsZxyQNXYnCl`CwK-#Ka@e6~d#B1l3z34}(`W=lA%Fi`zzi%i-E- zUzb2ipB!Gk%Ln#IW_{gvm91El2nR~S(W`HzzsQdgrI8Wl?YinTHX!S3#7Io@l}1R( zAHj+|Q{|9a80bq_;e$;ADZEFKC4(%%sm;=Ww|@(mE~I=F1^EO<69r9#PCogZH<7uU zu@z(XFv4>vOOq9{GCB&7>=rIuh&mftM4j^y6HzbX%U^WRv(gF%W7jtFYSE7d;zy+% zlP6Z9(>=6Yl8)ANdw&90nE_xGK^GkRvun#GuHEFg56mt)(E*O5t9FMeV_r`0k;}5SyM+2 zwS#S4duW9X;PC;6qul#cf%$hdYB?FoTJ#UB%|I#S`U)NODxR!W*V2^Rx0`ti%w`-5 z;^GmJ6RV9_h^4wh^F*KAH=lk$E$yF8JW!NAAH0b&N*sw0~ZW+fOoaqpV|^tXrEbw1N_cb zYU$PdRm+HyKv}3jO{?@=)}ZeQtE2gde#D}fC?sR>wA^&=QBB;7gop$aKYHvXu9MzHl-pYJ1!+O#5v{%F0V@q>Nue+QbfY9Qm9C*Q>R zLdQ>qzVkE71D`24uzgOL4SXti9)mpO28r1L#Q^fKM<9jL@Pz@s1kvSsw(H5kiRNa`HE8`c@gqW z9$kea?M1cUJ1&TWii|YShOTwI3Pn&cN!8KaXuOuA2}PHz1WTO|-d1OgJY)WX@kXg>b@sQfiX$ zJv))1>4}O`^LHQqpCyTmP^4Y}RitSc;TsAHcM(jvseCuIrPn@^4}|#O&5nwU6l#emttHza?$siA(KA(8z~1aWtpIu1sVJ4K znC9d<+1bA?34tnf$8ZCfVhwRIE~p0C*~zpyH1~78fluHJs?#CphaLzS%qM27swyu6 zFp*>`ctM(o1)Q^0ylG!3X+kD=Q&)ip&k4+&J8c^0YNcdO+LY@fh_e8i{eSpq^s%Bq zv5w)rnRk!L?enN&4x|P*t+Q^r;ZWM%DRR7W2mih%U7v~?%BJ=A^(=Z z?$2A!hWpqfZVOEeDczh0z7?F|Q{$u3TBAPI1lE~D$s8W?s&|1MU$i{jSD3Icv@qAg zr9Ae}mz)pLt#J6%Rc)&r5Q@}^q_k_k>%Z~NbAI7xR4klZnLhVNygGWQ&NC*@-8S-6 zmZg=W(d3Smp9L;C>grnHb~AH(@mV{1PDxkM`jJmNEw}UX0eCo$*A%l=uu4Fx{rMNj^mhm+}G z6;N#?<&a%Ugb447TEt7W)qFN=%L+P#L>caSGi4NE3gtQDwM7x8&8z{?_0t?WR24K>f>B!1sU zDh*?4G9&BjEQmkXW)@Xvo~t1U1gkDcKPQIL)W$xusYZ0%mT1<;4PX_jVj3#f#trdw zK%N0+9`byb`TGvRj9C!8&4V{^3V>wrgfT%Bl3Hjs7tP{3^7TJ*6W6w{4oQqux2 z%askoWLC79&KX7`vvi`7Lzk%}mTe3*<*>SG$6YL2H&<{N;`%L(3FYr_1cCFSTT@TWZ>xuu3UrYgW`ydkGLr&Ij3>0b?*6bvykZGFb-zdyso z(1pT8?jlH2@YD2SS&(GmPjx}4R?(}#G(%BLVKCYI(yOF1A+&pe55iQJh&J}==Al#~ zp@s*Z^y7-L2xgH^;=3JT`Mj3NVjF=wpO2zdl2!Xx1v0BcifEfvtIPauVz99V74?{+naFphC_t>ZS6Va|Jx5IMu@{Ij-ZH z!wdO%+3yJdVx69hGJS!c3Z?i2=ht2|6Dq{T1)Kv3W{4;v_{+lt+r#>i=YUiUxu#IN z?F&``$Re{TzWWW$?#EsZvHNud9~<1^h)j@7F;1^TALg^5>$yzupr!2X)7a^z@9}pA zCjVd??3#n_Vm1B|150mGAAr(0x!fdt7Azs_ULbaR~6~CO=Xl-Fw7!6 zB5jPn;2`aw0(wUS{{j&7i~EO%3FzZx3TG+UG2xL#pF3t4(+#U?$116__Ik^lkBcvv zOCSjcD{vMwm6TGd^e!{-sfsG;#;JZ1358un3Rc;cvDtuLo)vNKOegj>vfl~(!9#em zgnYUW>|Ea_uU(W!H*>iIEl2iH8uTKH%1Gz%nW>Xr54ljkO<2|1sE@*-o=RG$%Ap<{ zb#y#TA)b4Q2XV`znaWq}k4nl9r4lxtmuf;LLSWw-=;C4M(<|N}Fb@C) zCpep8Is5E;YU9|2{;cnM8DRL_;`)nL=X#Zw?8{vL%!s+;(&qU^tS7{TIY!qbLpmTQ z?V6)U8s!0w4gg}8idW1Bl89@P*T@?xim!i5I-nqE3r1X6Mkp4~x1(y^Aqr_5g;|Lq zj<1-Q4y-zp{!%-nCkKLD$?V&B5!f$FgY_4*yx?hz()AX{06iV>wD;GRz*3+4O+NaT zl&{*m;A+e>-U!ojsLBnGk%9~d&>f9k;nI9y($v9>>}jJ0*W_bH`;obM8N4FY#vy$~ z6;v+dO$MAD0^8zmOaA@c8M=RyQ6eO9>><>>5I&E{ZoTbhlXp$_V7oWio6161a!kmhfn(_%k~ZfAlfnCykyHG z(4WU1p?j0uyxq>SW{zQL`VjxLRqOm=Rmi+-HuWJ&v5-3V^YX~#t#~BMlWA{)lek_< zKJm7DQd%axLWXk*lw)Z&32BA{>IG*@r3X!0j?{ds(va9HR_MMOcKj}O@J)xE*Qsm$ z=}*>B_VWO?r!*h%(k9zX(MFoYU5Sr<=SgD*IheAak*=S304$Nb>vwy|=g)}c z(Y;(1=IO)3iaRlf4lTM^FBwv*cGb500FLthu@ePmla;}$ktA;zA*^`_-Q6R|8B3mxcBXaE;#7|#50bL?O`a7 z+WYO(Bi@|zDWTnC2Juabf`zQIyl<=LzEj4PsS^Vkyv-djJ^B0%-cSiRa?*I9H8{A6 zbd?JW9%Awqcy^4FJ&ACd2P*b}B3A^PySlv2z!D`)kLhnW|-lJMNaBcf{yJKDVciPvkKfeee4C{=B zZr>%9H&W;H z>^C4hAVMF6yCx||bMc5nSrO{W)#x6%D5@d)a!G>O%_}KR&%h0-4{={@PD0iX_o}Z* z6Ex{pcs4J8^UuP#kCv!LeW=ajbc{cuRW$ejW?sSmdqf)1L^yWQscW+~XYn_Z>zEI%aLTcNT`BB8+D3`ggI`TQb)XR*aC$LB+{DfIDu z<`Z|q@egcPUZfxQ))xfUvu7DhuatFGF`27d<{KAXcE_DsX$4+L713^;1rJsL!N-?( zCduqns@-&efIOd$ZiwT4ig$S@2aP>j^o9w%{4{RBH%E`fwZ6t9K+i>H4L42O2b}aY z9cRDq5o>Do+&E04dgMAlK_$oT9_;*^W_H06TB`d&SlFjW^)iRj6iF;|r)G8sEcF-7 zEFdk9NI)%Ng(ve2v5txBEQx4MKquFE)^8hMJkINu9iB{j8O#f;X47NVLd#cw-DaOu zOhB8tE7-Y@EQ~_<-0IwC!w$T(BptmBRz8jJnmCiW_w0c2tpWi*V+MT1iS0`-T$qrq z_2ZSJ@~LXDqz&;QqHyx5@>fIUgyhOAc^2aG@qpV|Q!st(nQ;rwOMhxFup9V4<=!%X z7Qp$wad%1lcpd`XQUQl>{^=DJ2cVkd0=IMMdS+!hW0O9xdlB$q!noZj*8I0q%5d<0 zl3|r|pgNJT$R2Vi@mzZd*^arbFl*B!_x8&t2CPSBH+i5(e+75HRVW*z6C~n=&Af$B z{FEC2dF(>&g27tVJ;rtU8`#*aO$fp{xSVP7xIEp=>A%IuIy z-KTptLRA#ZHfhkN7Ss1(jBuSe{F+4FpL!_%nU5XImxy$W!-24qoJcZ3;aHSKIXY?K z$oVy$g5p?TMa-K`t~QCehHqt(Se3YODkVRYOyJQ4J?X(nDHoSImY7uU0UcpL)h?iS z=!}Khx35uLP0xPK(ItmeJ({6OIPr1v6=G$U*`=joeU`h#QS}!?2Sz z*)IJsJ8Y69>D=P)s;bGNADBOp-ABR0!wVBrgY+ZtJDdGj)#B@KGCfQv_y; zE&RnoL!X!#o=2kr*m$G(Z+7mia{nW}?mH#Mh14KB8RPcEtA0) z6%LiO`j$rBHliI>)lS%s>A<@ir)pB2;qMYcuabH%+Rg8h9H%OsfeDxId*Ex~fT!Fi z1=6zLLOm^h6;z}Cmqu4@-8bQP2E;|6bCndhl^SYQZ+I_Nm0y_O?^b#oD>eh29FPmW z{T;{)zWrX{@~Vo7PH@N*UP@#2h==NFVgl*p zj0|`%V(lwrNTpx9l6*CIshl*-2MYs#10d`Koy|m(e*A_6o3Mw7C*J{>fH zEYvUg97kMq-u>loP}W5ervbf)>C@kO%07C2&Oq8uw8|-r0wS!Q_@^?vHK^RRCkn{) zGj8SNQ_1O;rsEQm114B{CVI!K7Er7>d)JK{4>=HrLlY2L>U7wL7u9Mi|#9Dk-teqUI>`!Gh3=4kzU>XSAMUi}$t(b55w2tJh-ja@B}=hVhQGFyz}Pe?vlpH-`akY@j|A zK|h{YoL+2DhTsJ8EJwQbFL_r1a>DuOR~y-^8DJ%fmm?Toxu(#!!7fHYAMv1bz_lo= zcubWj7hfjLBXUnNaaS-MKn<_C78h^U)XW^-GUteuwi zj#92!k>(lmNTfczI6JmDKm5pqZe6H(42Mj~N1!leFT*ROhqyyFoap!M`B%dv(I<+4 z#3?pjjqwM(5OT1pxLKpaXt{QJ<|nVQ$gnNSx8`Kb3|S+@C*u+_Y9Gkd9rd8hVW{^0 zj91bLg!JzEo+Ek;{SIa5Vdo(F>rP^F%~v(Hc)f4aQ-h&e72gGz48*qPqxpt zbqxWv0JsOD@<2$PKEdB0d}4tDi9S;g2ynK}RAYz6&g*Ru#OC#sdDZvDiYJ9z8N6jm zLG$7FG8C;3-|vN)rtB7`uU@9?Ig8?6r|ao0k}9BsxL>P^lbnZ-o|_k*nWHT@T@RSP z=2s)|O8X{2syh%4Zv|Mrgu&FK+hqJ6Ou>KK_PyA+af2&@*tkh#c=NaR;CiD(n7AZ}d3z`@W-MKpLvTW;eRKG_ zQ2S5#+u-{$0eR`MSQ<zOiq9gA1_#7Q9^Szz+RwjBWy0Qx)kuMV#Jh0J&8Lk+<4jB~T=C>cr>a;e;ZLPY5>-?E zTV3W<0rcER1-dZ4#+x|Q(Xm*a7>w9WBqtdih?gvSz+ApoFlQC4ZVN<~@s8pv$C32t4rgM*j$8BdVWipP2 zQQJ#dNu-5TX*2RPyf>&awj&fX$W32R)54-rGu0}4GzRZM9o%5=SAMcfJfk{F+$Sd( zpfej^zuwfD;aMDowBv!wX)0qvqidkF;`1iu`;*N;KVDw8AaRUd1tg{8#(R{LFuLNW13YRK z1&)osPT26IyZ4K(OgVEW=2>F4iOXaM~se#xfKcp}nUchD&c^&SqRq6)7{~ z4sCGG>}4mQO%Y9EBc(BI#XbcaQxaSdE^_pmDY;pX9&elC@b$}`={y|MTzq_VWNM)| zp?Y0Hp1Gs(E!;U_$8&|aLJxa_WoS7&OAY!3=rQUOl%&V#?X7UmkDZc>^SK?c;Va1Zl$!+OQ27uM=2_5TrUc$(`IW! zRc?1Zt3<P17siNLg0+$87r@{N<2t z6#-L3XZVG^OZURV7H%cS(KsM}EPx5k5H=k^*DaKVyGjufgpQ;j9pVmH%68iTd7Bj0 z11Sw>5Zw%N+OX6jz2FgE2q$K9Wj2d9I_fZ5?NMLZL$J9z!jAW_!HDLNpDp9D$mbAe6fcdZo>0b|VTxsKQ|mIW*&BoM2(| zV8NukYu$Xz*p4X9_4__Qw?Ss&*>{N8302<6y#`eh(;T|>!j}}G7vE+Y`%p0!Z#R3nFKysTwmWsbmXm5uY|nym^Bs zjLIT{ut?`lpRxszbnIf9Xl!eb20zDOdtRqlNdH9&Epx^ zTu;y!x+C_S!j$gGDFntViIG0kDT$KI`abwBAquzCz{C@aud`FPl6rdEyhK-P z%NwKNSi>G8$q|~v-{#wLLvb3)vtRe}8UEmB%N`PJ)97P)V@+b;SOa{$4EHfp>EpNG z1Ao@0IX|bm!w)NKA23f`LxE_|vjzGci0@N@*fkIgrm!~*xhEzKTqgruuN7nvrh$$E z^Lc1-C}zVnA`&SjkHW+>>3gU|;~P-{u^Et6VEI>Lv$QNjKlIdTfCFgVuiQ~qr4ZE< z4lUo}7Z0kJ*V>&0fBF-Sarac}yvx zaX#A8osXYLgOhlBH0lMu4gd6@2JdG-V=CU=IKhI_ON+`&t2Y5v0n=U!nQgJD8;EAp z70^W~GV-Y4QuRt{tAeyEC{P@8#SE3LpUk%8;LF+j&!AzVW78Vzs6%lC z+D4G%@7%ubM!B43OAB01Kn~sw>@NJlT9%|z*Gna$_95c8yngv4@WL&}OQ&h|`g9k2 zBy7r(3*F$2q)UzSlN4kbdI@%5u2^(k+q;L!h|kY|Q|&4m`3KMaVotWab{JJvKLFgFLQw9 zJeL&ILvN`466ynKl}E=Wdu34lkc$?<5hW7D`Cs15x_jDZ@F3Zo#810YsndPrvCdFJ zs-Q+uu^+VmLihiv535%5c-{F;aB?L5U;iL=8R`E&B(K)+@Wx*9`RPg5xMJy0)tqb~ zrXFvhzM4Q~96?QhBbEXUpvGfNiG}adtu7v(zi#LxWEI2L$IP&APTH^tAVp<{QM-%4 zB7>I(FOtwi#3uj?YT2{YoDcEu|N7dFG8MaELFfH4+UfFm*uMGvjv?cDxg(PMqfR_? zj~`W<{n`Ttnd52%mb1494>#*+{t95{9%IJmyzc?WJyL^~^%@TrJTl4maBGC?JAmao z(dc)#t9Ms`#OHKy;yw<ofz8c?w%Ry=Kj)2`$@+4)7SYOnfjBdw{x%;OZyoM^)tD^ z*M8dr<#&8@bAJnl%e%WLgbV9M4~2Jk$%Fc8L>B{oi*GJNF0577Bx26(bSvLiD~qcw zyZ5{c&3%Q4>j_B*#|al~jHECW;xSDXAp!wcOuKiWWb&yv6PO!{L94Kb$fQ#+Ph#3G zoGhj6B^=EjpfT+lu31{<6yXUVH=E&t)ta@??r`AWH`U|r*kjzMLDjBAuF_ADdbHcK_q2)u}^Un!kv(Lll3C`_YQ`x0X*tG8s=j_i6dFkd9ddY zf}I^P6w+Wv2xZ)$a-%tkjFUtKUVd*M3!oP8G+OMOlWY`}^!Pvy6oVj*%Q5S2neUw8 zy+@!xvt8;fyFE3CgbP6;WH11r;KFLFwX`ugDVf$)Ypo>`Rh)BJIVUci$1Qr70U3%I zPw*ii(A#ioPn~1T4jltuWBe~3?`+jRBkT=n+?_o^65(K5oiZC6u93z9C?3yr%0ejL zIgF`Kov?d!etNQUS?l#@ZQ{*lzX)Ac%C`eXtf*k}j|uUxL#m7e55r$+Mq_=UseB)y zJBl&fT)UQIk@~z{doiVyXG5xPI1$$n^4>={`FNt6u^@pFEA8QgNcyiai(yBO$})bH z12TeXl9!jF(>5tX{YvfV67!uB_~1BNwzLp?Lp%t>DslN1KiO7s+MIw_b_@@fqzCc% zWFoYCTbz@C1Z|(5sT`GjH)@6oBX9(q6T{RPU^u-ITV9`lm`Q%$G%xO90WoL?LC2i) zVk5E;m#AC#qdi1omng$2isSRPq~a`=WU44)2~JT#qYy?}201hsLtY7DOqV%gzz*;T z(+Z1rR)+|X4s~)(=gVOf&YqY`V9eBN;&H24vUmu?$qOyC9CbY@0}L$4Xhn9~+8rc` zrCRO1yHj@mN@wlq0vvwPQ5I@7jT~&z;Z57PfSKuKvXnbvohHWkz}K3X(7Ui0zugrw z_g5=zxpD&x33nvhHjviyHlWt~m1O2B?fioq2asvavNpj{U+vjW@d1d< z;>g4yL!B(@6#21J!*cV5VTuBsQJyw6G@REA+LZ944s`<6^H(Wf9u?>Fg2+9cc&p}` zyVEl2&~=WJN4V1ht;gFsO|;VRg>lq^6^faE!|4TbXjZ~}COGrlDV8h4n)R}17b1N1 zhXz1?$|*`G2j<|>B;?@DA#+XM&<}-qdtG`fnDe;+2e0W5xB$M2R!de4l2vsT}Tu2d9pY&+h!~}3B44pV@iyST_-At@)tAQ z84XDflP=LI$h?e%mnY_rqCH%w@RhQf13uQqJPrtINWZ;J*Cu!vNY>;T?=e0oIM1R+ zLI^uou8oU5Gd2&J9ZD&g_we^g1lqWX3O4+8i;e1=?)Vo zqP$5D-@U@dS*BBw5{xto8fyIRcBm_G7O5o2J(IC&eLoi=o zQK;GqbG$-TR+Qugh&8~@awp-)ilv)N)VN~RfI*@shv2a z@`YS8?a}tl8+wsB^h7h>yqxETtd>*149RRODE*C=rb%ZQ*%96w`sxM8Uur=h6A7Eg z&P6jWE9FGui3j_MLGt=Xd3pones{di5zpxHmwtj^aF+HnCT-$~+G*+B z1oyj+=^CY=Rh5LwE&Rkd;x`SP{s=K8Y@YRBb>OpcXywehQbDBb+eno(5>M-qvW6%H z6U+n0am70(Ez5f86f0?WcZq;~d;o)E{TkTJaa1kqoEOca?pG*pmGh(FWM(5MrBTBK z-sEi!WSxYWynB4pEwee=T_-|AB#qY7b5fmtn>>l?(IEu_1u6(${|fH{U2q+3V>(_U(P)O5lIL$P;*)TM0Q?jNghFLJfavm#0k7mIqm>ThkuOOaJJf!7e&}hCD_pT zWJyo5pUGYs@{8!1f;>_L=lat?TDV1@_1Q!+pc+Pb#u!o<*1CBz1r+iUM)-YRwxNl} zaPzes@(lxNV&6JK}10m!KKtj;@7KJ(DDI9YCv3g|0h`H+bRX?a(*?JA%*0Nt_|O zA)K}g1dld|G$HR~n9t~hUdGLq_*g>T!ac8PpZ35<#EQ*=sk|a0i3NMY!vU_v{FX@c ztD5W1>iuH>eati_1lb?N5}_WKwa_(4IY zSARyV3Pq?|#ZXBTSj*&g)}Lh!z@`7JbineUj}40w8G~1P<-J_e6P#Sr+(gH##-z&y z(f_BiGmnRA4deLODkW6NmV`=VT4W?tlOjztq3j`zeP-;XsHUQ931uq`MzTypB=u8P_c zBjoNR_cdQ@_uVl-R!R2O#oV(9B998^D?}eQvAC*_ySH?aWt5ENQ3p@cq(&Ui>DG_C z6B8qAZr{p@x{{Ggm{DV=R#%w)LRB$Bn0UDmgY^f;b=D z|9i`qgAqznxkn0Qf)9mLknXw7*O%MB6tC-zI&k7e0%pSJ!tfFlPlt$2Vd{DHFius| z#h$UNf~&F80%6_d)Q5H}x@<>=-z+=(WBqBeZ1hB84cE{)eu04>Cj{P%9$s?zj>xLQ zh3j0Sb-yi7eol4v=kOWDlV66HZ9N-rr`XPWN69sFeXYMz3NIQHAGmd-s)&mn)mhM+}x$$ZFGm36BV!T+6 zL_S#P!wmjerRwe;H&hm(Z1%3 zJv+@3p4Q>e3pU_CPS9wpR^+y~ynp97c=bTFviu#-4jsi*J7wa==P4D)ofhw$ZCyWi zIAQyIRO6RD92AVA5jYYDt;dwNKW%N?zc>bcZh`arf$-H5#TQ)!(`6HHsqGgxCtwT| z`Nq|UGd`0oN>-}$`#Bg4>0tc?>)!8ar|KtL`H6D%%eGN=24qief0QBhq!s8$nvHK5 zFifmMj|(OkBvu6X3yfq;Y8*4RDt+A_Hk>fILh`7Ukbi%}-r&gy2V*M{&3?t@{1P=I z@p2V6wo=l^EB%^ugtEiZHe-~PQ)FguA$= zzW^zb>u1<47xP#Pb!JJ?B{W zk7WkR&b5VVQh)EJ(AIy0yz2*sPdQ>acA+E$X!qP#_r5M)Wte*VsM8^bj?k#4SEQ1R znC-c{(%fDK{nK;+OZkFLxsjx+s1y8F=iX6L0qvkmvqDb%qoJk@YE?Qf1{d^d|5)DI zthR)Ts1Fsn$%|f|DIQ1-y_1-3-@cEd zAKQ);I^u6?lr7>eDhpNIFJvt?5vFSK>CGx<#q^z|vh&27w>~cPwYnB5^*!>s)Ns5~ zca-?L*wQ`gtlWXR)rw)i!=GY5eiwWm9_o3yqvwXR%kG6@uEs6rzsbvn*MyiYq2(XV zdLfczXddz^KhiDWzR zS15ET2wS2QQ;sL%TKrlDtrNY}+w8mePkq{6No`DtDzAvXQHhMsd~syx7J=aZV+$^> zxa-of4u|SO^Gb(es%Yc-+LX?3OZbyYTU#ENE~LhOhKrq4Oxb z;BTi0VVX2gtKD@cb8ITU(gH6bUa(2}j^8pWP0b_&U!87tMOtj#etw%2ku@g#vdN*= z(IWc}s<&RS6K;v+aYgD!w(F&4>K5}F8#E~dRoqWD;kgVH4fbf-Z__v>s-mx9I=WM> zjqm_`&=AW%`AVEiMRXBz*dqs3tCLDq7`e2$X{VQ1-G*LT<*lEI_6O`>mx=z(sbi{dJo;NhtHEfdCf8L;otlyyf40E?BvxaADP~Ld0 zL2!`r*qD%uFyA;|{a>KWCkJ~%)x(xZ@bCgbBG~${5TG_Cr+uaqIKll&xB{0< zU#71A^>cT=Vz4Ji7znbS`3Q1!Q5_*PeE0lUF<$NU??D9Dcnp%a0stKx(!}*6M z5D7kbqL+u3jf)GM2|1a~8oNNe7XmYM!6C*$AvFTk3Rn}Kp6+nu|CXAx`-9|KBRp04 zib*yDmjg$hDnD)LNp$~Jx)vIj-gh+7HvoNgCDdt!Rq*J!!eQAFbS@2)%3P~4~k%uLFdBTBHyp4SI0XPkSH#4Z=#>Z%hawgXsACEc|P=j6xIaEP2X(BI4GoyZS$aGi5`wjbz-QIhCD76 zaef2>Cxt*D85Y1hh4c@KeIv79fI>uEUpKgbdW zLh1rV>fjRQr`nhe?0AAvZ&_-)MpM12*(4^hm;xd0Phsi7F&4ow7kQVCVusn4!}GDnw7OlGx6|vmaU<)!>`r8ZKcnsngGr^3pEku0oQVI#4$v3 zp#wmt?|&X40RI}a0qF752Zi*RI1dxrHnw2W@R|KG0;{AgxIz0a0^N#r0B&`g!v-EU z<-;15a+H9!V)Dqw?#28)T=o2~bm$K`I&Yyx1A zW#zsPoZCzKd_OyPB+$od8{pQ0bYSHQhOxl~v;FK`wN4!RFObH5U=ZBE5{HmTHn?8D zWTm00Fmd-o=4a4DCP0W;lPoxDZtPTfG4Mvos z34~x9@OukODDIHiB73@f!K{uKj23CU0g?6uJ%qJG*Cox3$J)5t;Ai(6s+P`hokE(R zumhgfPKP!kRA!tB7QM{|m?=6A1w%!dnP9E-xxq6fnxSN*sPd^aB>NWI{2nLfv8fOpq#|I>su201Wx&e-9$&G^p z_QTdM*CE^CpnT~5F(y9(+{1$VF!zfO*-bW+KidsQCcjLGW0u>GSPT!CjuD6*;KvAj Lc$E|elRx5r5HuDx diff --git a/plugin.xml b/plugin.xml index 35edd22..5e32cca 100644 --- a/plugin.xml +++ b/plugin.xml @@ -7,7 +7,6 @@ - diff --git a/travis.sh b/travis.sh index 1523c3b..0da9f9c 100755 --- a/travis.sh +++ b/travis.sh @@ -3,14 +3,13 @@ zip -r org.doctales.terminology.zip . -x *.zip* *.git/* *temp/* *out/* curl -LO https://github.com/dita-ot/dita-ot/releases/download/2.5.4/dita-ot-2.5.4.zip unzip -q dita-ot-2.5.4.zip mv dita-ot-*/ dita-ot/ -git clone https://github.com/queshaw/dita-ng-library.git -cd dita-ng-library -./gradlew -cd .. chmod +x dita-ot/bin/ant chmod +x dita-ot/bin/dita -dita-ot/bin/dita --install dita-ng-library/dist/org.dita-ng.library-0.1.zip + +dita-ot/bin/dita --install https://github.com/oxygenxml/dita-relaxng-defaults/archive/master.zip +dita-ot/bin/dita --install https://github.com/doctales/org.doctales.xmltask/archive/master.zip dita-ot/bin/dita --install org.doctales.terminology.zip + dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita --verbose -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff --verbose -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-xliff dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic --verbose -Dprocessing-mode=strict --output out/tbx-basic From bb7b2675f940d8f6a929efeb3068b28cb261d5f4 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 20:09:18 +0100 Subject: [PATCH 34/47] Update build script --- travis.sh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/travis.sh b/travis.sh index 1523c3b..da21cec 100755 --- a/travis.sh +++ b/travis.sh @@ -3,16 +3,13 @@ zip -r org.doctales.terminology.zip . -x *.zip* *.git/* *temp/* *out/* curl -LO https://github.com/dita-ot/dita-ot/releases/download/2.5.4/dita-ot-2.5.4.zip unzip -q dita-ot-2.5.4.zip mv dita-ot-*/ dita-ot/ -git clone https://github.com/queshaw/dita-ng-library.git -cd dita-ng-library -./gradlew -cd .. chmod +x dita-ot/bin/ant chmod +x dita-ot/bin/dita -dita-ot/bin/dita --install dita-ng-library/dist/org.dita-ng.library-0.1.zip +dita-ot/bin/dita --install https://github.com/oxygenxml/dita-relaxng-defaults/archive/master.zip +dita-ot/bin/dita --install https://github.com/doctales/org.doctales.xmltask/archive/master.zip dita-ot/bin/dita --install org.doctales.terminology.zip -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita --verbose -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff --verbose -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-xliff -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic --verbose -Dprocessing-mode=strict --output out/tbx-basic -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-min --verbose -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE --output out/tbx-min -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termbrowser-html5 --verbose -Dargs.default.language=en-GB --output out/termbrowser-html5 +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-xliff +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic -Dprocessing-mode=strict --output out/tbx-basic +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-min -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE --output out/tbx-min +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termbrowser-html5 -Dargs.default.language=en-GB --output out/termbrowser-html5 From e33b9daf508a228a82d50b499f0790504c42d400 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 20:14:13 +0100 Subject: [PATCH 35/47] Fix xmltask issues --- build_dita2termbrowser_template.xml | 1 + travis.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build_dita2termbrowser_template.xml b/build_dita2termbrowser_template.xml index fcb30a3..be67fdf 100644 --- a/build_dita2termbrowser_template.xml +++ b/build_dita2termbrowser_template.xml @@ -42,6 +42,7 @@ + terminology.path=${terminology.path} xmltask.jar is not found on classpath diff --git a/travis.sh b/travis.sh index da21cec..5c38fa5 100755 --- a/travis.sh +++ b/travis.sh @@ -9,7 +9,7 @@ dita-ot/bin/dita --install https://github.com/oxygenxml/dita-relaxng-defaults/ar dita-ot/bin/dita --install https://github.com/doctales/org.doctales.xmltask/archive/master.zip dita-ot/bin/dita --install org.doctales.terminology.zip dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-xliff +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff -Dprocessing-mode=strict -Dargs.language=en-GB -Dargs.check.elements=both --output out/termchecker-xliff dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic -Dprocessing-mode=strict --output out/tbx-basic dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-min -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE --output out/tbx-min dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termbrowser-html5 -Dargs.default.language=en-GB --output out/termbrowser-html5 From 3dfffcd89a155fd99551c3d70e10cca94b70c763 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 20:18:12 +0100 Subject: [PATCH 36/47] Fix xmltask issues --- build_dita2termbrowser_template.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/build_dita2termbrowser_template.xml b/build_dita2termbrowser_template.xml index be67fdf..b56a6cd 100644 --- a/build_dita2termbrowser_template.xml +++ b/build_dita2termbrowser_template.xml @@ -1,10 +1,6 @@ - - - - @@ -38,11 +34,11 @@ - + - + - terminology.path=${terminology.path} + dost.class.path=${dost.class.path.property} xmltask.jar is not found on classpath From 888d9a5a14fcacbf8412d331d165d88bf5458172 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 20:22:53 +0100 Subject: [PATCH 37/47] Update echos --- xsl/terminology2termchecker-dita.xsl | 2 +- xsl/terminology2termchecker-xliff.xsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xsl/terminology2termchecker-dita.xsl b/xsl/terminology2termchecker-dita.xsl index e352e6d..7bf89dd 100644 --- a/xsl/terminology2termchecker-dita.xsl +++ b/xsl/terminology2termchecker-dita.xsl @@ -76,7 +76,7 @@ - Generate SQF for term notation '' + Generate SQF for term notation '' ERROR: Could not create SQF for not recommended term '', because the preferred term is empty. diff --git a/xsl/terminology2termchecker-xliff.xsl b/xsl/terminology2termchecker-xliff.xsl index 6b56cd7..675e22b 100644 --- a/xsl/terminology2termchecker-xliff.xsl +++ b/xsl/terminology2termchecker-xliff.xsl @@ -94,7 +94,7 @@ - Generate SQF for term notation '' + Generate SQF for term notation '' ERROR: Could not create SQF for not recommended term '', because the preferred term is empty. From 9ec003a0c8ea180473033b9a6b5344ae05b4218e Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 20:23:10 +0100 Subject: [PATCH 38/47] Remove echo --- build_dita2termbrowser_template.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/build_dita2termbrowser_template.xml b/build_dita2termbrowser_template.xml index b56a6cd..53a2cdc 100644 --- a/build_dita2termbrowser_template.xml +++ b/build_dita2termbrowser_template.xml @@ -38,7 +38,6 @@ - dost.class.path=${dost.class.path.property} xmltask.jar is not found on classpath From 35643a24f05b960ef3355b95529612d21e8bfda7 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 20:30:44 +0100 Subject: [PATCH 39/47] Readd --verbose --- travis.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/travis.sh b/travis.sh index 5c38fa5..f7a1630 100755 --- a/travis.sh +++ b/travis.sh @@ -8,8 +8,8 @@ chmod +x dita-ot/bin/dita dita-ot/bin/dita --install https://github.com/oxygenxml/dita-relaxng-defaults/archive/master.zip dita-ot/bin/dita --install https://github.com/doctales/org.doctales.xmltask/archive/master.zip dita-ot/bin/dita --install org.doctales.terminology.zip -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff -Dprocessing-mode=strict -Dargs.language=en-GB -Dargs.check.elements=both --output out/termchecker-xliff -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic -Dprocessing-mode=strict --output out/tbx-basic -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-min -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE --output out/tbx-min -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termbrowser-html5 -Dargs.default.language=en-GB --output out/termbrowser-html5 +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita --verbose +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff -Dprocessing-mode=strict -Dargs.language=en-GB -Dargs.check.elements=both --output out/termchecker-xliff --verbose +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic -Dprocessing-mode=strict --output out/tbx-basic --verbose +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-min -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE --output out/tbx-min --verbose +dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termbrowser-html5 -Dargs.default.language=en-GB --output out/termbrowser-html5 --verbose From 0ce5053f33fe3507c36ae47ac6a1a2a908a81322 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 21:26:23 +0100 Subject: [PATCH 40/47] Add DITA-OT 3.0 --- travis.sh | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/travis.sh b/travis.sh index f7a1630..8727ef5 100755 --- a/travis.sh +++ b/travis.sh @@ -1,15 +1,30 @@ #!/bin/sh zip -r org.doctales.terminology.zip . -x *.zip* *.git/* *temp/* *out/* + +# DITA-OT 2.5.4 curl -LO https://github.com/dita-ot/dita-ot/releases/download/2.5.4/dita-ot-2.5.4.zip unzip -q dita-ot-2.5.4.zip -mv dita-ot-*/ dita-ot/ -chmod +x dita-ot/bin/ant -chmod +x dita-ot/bin/dita -dita-ot/bin/dita --install https://github.com/oxygenxml/dita-relaxng-defaults/archive/master.zip -dita-ot/bin/dita --install https://github.com/doctales/org.doctales.xmltask/archive/master.zip -dita-ot/bin/dita --install org.doctales.terminology.zip -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita --verbose -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff -Dprocessing-mode=strict -Dargs.language=en-GB -Dargs.check.elements=both --output out/termchecker-xliff --verbose -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic -Dprocessing-mode=strict --output out/tbx-basic --verbose -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-min -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE --output out/tbx-min --verbose -dita-ot/bin/dita --input dita-ot/plugins/org.doctales.terminology/samples/terminology.ditamap --format termbrowser-html5 -Dargs.default.language=en-GB --output out/termbrowser-html5 --verbose +chmod +x dita-ot-2.5.4/bin/ant +chmod +x dita-ot-2.5.4/bin/dita +dita-ot-2.5.4/bin/dita --install https://github.com/oxygenxml/dita-relaxng-defaults/archive/master.zip +dita-ot-2.5.4/bin/dita --install https://github.com/doctales/org.doctales.xmltask/archive/master.zip +dita-ot-2.5.4/bin/dita --install org.doctales.terminology.zip +dita-ot-2.5.4/bin/dita --input dita-ot-2.5.4/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita --verbose +dita-ot-2.5.4/bin/dita --input dita-ot-2.5.4/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff -Dprocessing-mode=strict -Dargs.language=en-GB -Dargs.check.elements=both --output out/termchecker-xliff --verbose +dita-ot-2.5.4/bin/dita --input dita-ot-2.5.4/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic -Dprocessing-mode=strict --output out/tbx-basic --verbose +dita-ot-2.5.4/bin/dita --input dita-ot-2.5.4/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-min -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE --output out/tbx-min --verbose +dita-ot-2.5.4/bin/dita --input dita-ot-2.5.4/plugins/org.doctales.terminology/samples/terminology.ditamap --format termbrowser-html5 -Dargs.default.language=en-GB --output out/termbrowser-html5 --verbose + +# DITA-OT 3.0 +curl -LO https://github.com/dita-ot/dita-ot/releases/download/3.0/dita-ot-3.0.zip +unzip -q dita-ot-3.0.zip +chmod +x dita-ot-3.0/bin/ant +chmod +x dita-ot-3.0/bin/dita +dita-ot-3.0/bin/dita --install https://github.com/oxygenxml/dita-relaxng-defaults/archive/master.zip +dita-ot-3.0/bin/dita --install https://github.com/doctales/org.doctales.xmltask/archive/master.zip +dita-ot-3.0/bin/dita --install org.doctales.terminology.zip +dita-ot-3.0/bin/dita --input dita-ot-3.0/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-dita -Dprocessing-mode=strict -Dargs.language=en-GB --output out/termchecker-dita --verbose +dita-ot-3.0/bin/dita --input dita-ot-3.0/plugins/org.doctales.terminology/samples/terminology.ditamap --format termchecker-xliff -Dprocessing-mode=strict -Dargs.language=en-GB -Dargs.check.elements=both --output out/termchecker-xliff --verbose +dita-ot-3.0/bin/dita --input dita-ot-3.0/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-basic -Dprocessing-mode=strict --output out/tbx-basic --verbose +dita-ot-3.0/bin/dita --input dita-ot-3.0/plugins/org.doctales.terminology/samples/terminology.ditamap --format tbx-min -Dprocessing-mode=strict -Dargs.source.language=en-GB -Dargs.target.language=de-DE --output out/tbx-min --verbose +dita-ot-3.0/bin/dita --input dita-ot-3.0/plugins/org.doctales.terminology/samples/terminology.ditamap --format termbrowser-html5 -Dargs.default.language=en-GB --output out/termbrowser-html5 --verbose From f66768d31b69a3d811b8bdea8459765aa0709ea7 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 21:56:54 +0100 Subject: [PATCH 41/47] Use generateId() to generate IDs --- xsl/termchecker.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsl/termchecker.xsl b/xsl/termchecker.xsl index ea6ac51..bd4d64a 100644 --- a/xsl/termchecker.xsl +++ b/xsl/termchecker.xsl @@ -226,7 +226,7 @@ Return a unique UUID. - + From 1e3a612d593bba6e24fa418a3601d75e454e07d4 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 22:04:17 +0100 Subject: [PATCH 42/47] generateId() did not work due to missing context node --- xsl/termchecker.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsl/termchecker.xsl b/xsl/termchecker.xsl index bd4d64a..1caa209 100644 --- a/xsl/termchecker.xsl +++ b/xsl/termchecker.xsl @@ -226,7 +226,7 @@ Return a unique UUID. - + From 96fdd94af86696e4de67816a35e0dd5f6037bf12 Mon Sep 17 00:00:00 2001 From: Stefan Eike Date: Wed, 15 Nov 2017 22:22:57 +0100 Subject: [PATCH 43/47] Refactor doctales:generateId() --- xsl/termchecker.xsl | 15 +++++++++++---- xsl/terminology2termchecker-dita.xsl | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xsl/termchecker.xsl b/xsl/termchecker.xsl index 1caa209..a0e69d7 100644 --- a/xsl/termchecker.xsl +++ b/xsl/termchecker.xsl @@ -147,7 +147,7 @@ - + @@ -222,12 +222,19 @@ - Generate a random UUID. The XSLT generate-id() does not generate a unique ID, when called on the same node. + + Generate a ID based on two strings. + The XSLT generate-id() does not generate a unique ID, when called on the same node. + Return a unique UUID. + First string + Second string - - + + + + \ No newline at end of file diff --git a/xsl/terminology2termchecker-dita.xsl b/xsl/terminology2termchecker-dita.xsl index 7bf89dd..83f73b9 100644 --- a/xsl/terminology2termchecker-dita.xsl +++ b/xsl/terminology2termchecker-dita.xsl @@ -29,7 +29,7 @@ - + + From 02b90f62b42f873abac3f0f965eed0e5b51bf99d Mon Sep 17 00:00:00 2001 From: "Eike, Stefan" Date: Thu, 22 Feb 2018 15:32:46 +0100 Subject: [PATCH 47/47] Fix webhelp plugin detection --- build_dita2termbrowser_template.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build_dita2termbrowser_template.xml b/build_dita2termbrowser_template.xml index 53a2cdc..d962844 100644 --- a/build_dita2termbrowser_template.xml +++ b/build_dita2termbrowser_template.xml @@ -4,13 +4,14 @@ - - - - - - - + + + + + + + +