diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh
index 1306be1..a986483 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh
@@ -83,9 +83,6 @@ function locale_updateMessageMetadata {
     # first level on. Don't show the variable part of the path.
     sed -i -r "s,${TCAR_WORKDIR}/,,g" ${FILE}
 
-    # Expand translation markers inside file.
-    cli_expandTMarkers ${FILE}
-
     # Unset array variables to avoid undesired concatenations.
     unset SRC
     unset DST
diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbookWithEntities.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbookWithEntities.sh
index 9556e6b..e5f6cf1 100755
--- a/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbookWithEntities.sh
+++ b/Scripts/Bash/Functions/Locale/locale_updateMessageXmlDocbookWithEntities.sh
@@ -64,6 +64,9 @@ function locale_updateMessageXmlDocbookWithEntities {
         | msgcat --output=${MESSAGES}.pot \
                  --width=70 --no-location -
 
+    # Expand translation markers inside file.
+    cli_expandTMarkers ${INSTANCE}
+
     # Verify, initialize or merge portable objects from portable
     # object templates.
     locale_updateMessagePObjects "${MESSAGES}"