Add translation support for short names of Emoji and other symbols

Cherry picked from 4a91d5ee
(Add translation support for short names of Emoji and other symbols)

and 851b3afb.
(l10ntools: support x-comments in ulf format).

See also https://wiki.documentfoundation.org/Emoji

Change-Id: I3d7ec13d381160d63d535ccbdcd0b3209799d3d5
Reviewed-on: https://gerrit.libreoffice.org/16014Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

l10ntools/source/lngmerge.cxx

@@ -114,6 +114,7 @@ bool LngParser::CreatePO( const OString &rPOFile )
         else {
             WritePO( aPOStream , Text , sSource , sID );
         }
+        Text.erase("x-comment");
     }
     aPOStream.close();
     return true;
@@ -129,7 +130,7 @@ void LngParser::WritePO(PoOfstream &aPOStream,
     {
         common::writePoEntry(
             "Ulfex", aPOStream, rActFileName, "LngText",
-            rID, OString(), OString(), rText_inout["en-US"]);
+            rID, OString(), rText_inout.count("x-comment") ? rText_inout["x-comment"] : OString(), rText_inout["en-US"]);
    }
 }