commit 29c9a547640c8f9b2eebdcbd2d4e159a50a78df5
Author: Ahmed Siam <aahs.coder@gmail.com>
Date:   Fri Aug 18 16:41:40 2023 +0300

    Solve conflicts

diff --git a/apertium/adapt_docx.cc b/apertium/adapt_docx.cc
index 811c894..783d18e 100644
--- a/apertium/adapt_docx.cc
+++ b/apertium/adapt_docx.cc
@@ -412,7 +412,7 @@ void process(string fileName, bool outputsName, bool pretty)
 	int sizeBuffer;
 	xmlDocDumpFormatMemory(document, &buffer, &sizeBuffer, pretty ? 1: 0);
 	if (outputsName)
-		cout << "<file name=\"" << fileName << "\"/> ";
+		cout << "<" << I18n(APER_I18N_DATA, "apertium").format("file_name") << "=\"" << fileName << "\"/> ";
 	const unsigned char *p = buffer;
 	p = printNl2spc(p);
 	if (pretty)
diff --git a/apertium/gen-header.sh b/apertium/gen-header.sh
index 156e28d..b9a4092 100644
--- a/apertium/gen-header.sh
+++ b/apertium/gen-header.sh
@@ -14,14 +14,14 @@ FILE2=$2;
 
 if [ $# = 2 ]
 then if [ ! -e "$1" ]
-     then icuformat "$APERTIUM_DATADIR"/apertium.dat "apertium" "APER1000" "file_name" "$1";
+     then echo "ERROR: '$1' file not found";
           exit 1;
      fi
 fi
 
 if [ $# = 3 ]
 then if [ ! -e "$2" ]
-     then icuformat "$APERTIUM_DATADIR"/apertium.dat "apertium" "APER1000" "file_name" "$2";
+     then echo "ERROR: '$2' file not found";
           exit 1;
      fi
      FLEXOPTS="-Cfer";
diff --git a/apertium/trx_reader.cc b/apertium/trx_reader.cc
index 583b310..7af3fbe 100644
--- a/apertium/trx_reader.cc
+++ b/apertium/trx_reader.cc
@@ -24,6 +24,7 @@
 #include <apertium/apertium_re.h>
 #include <i18n.h>
 #include <lttoolbox/string_utils.h>
+#include <i18n.h>
 
 UString const TRXReader::ANY_TAG         = "<ANY_TAG>"_u;
 UString const TRXReader::ANY_CHAR        = "<ANY_CHAR>"_u;