Revision control

++ <?xml version="1.0" encoding="utf-8"?>
++ <!DOCTYPE TS>
++ <TS version="2.1">
++ <context>
++ <name></name>
++ <message id="existing-id-based">
++ <location filename="main.cpp" line="19"/>
++ <source>id based source text</source>
++ <translation>translation6</translation>
++ </message>
++ <message id="test-conflictawitha-54521">
++ <location filename="main.cpp" line="24"/>
++ <source>conflict with existing id</source>
++ <translation>translation7</translation>
++ </message>
++ </context>
++ <context>
++ <name>test</name>
++ <message>
++ <location filename="main.cpp" line="6"/>
++ <location filename="main.cpp" line="16"/>
++ <source>translation</source>
++ <translation>translation1</translation>
++ </message>
++ <message>
++ <location filename="main.cpp" line="7"/>
++ <location filename="main.cpp" line="17"/>
++ <source>translation2 with comment</source>
++ <comment>comment</comment>
++ <translation>translation2</translation>
++ </message>
++ <message>
++ <location filename="main.cpp" line="9"/>
++ <location filename="main.cpp" line="10"/>
++ <source>only macro</source>
++ <translation>translation3</translation>
++ </message>
++ <message>
++ <location filename="main.cpp" line="21"/>
++ <source>conflict with existing id</source>
++ <translation>translation4</translation>
++ </message>
++ <message>
++ <location filename="main.cpp" line="26"/>
++ <source>a source text</source>
++ <comment>with ), ), ( , &quot;, and &apos; ) ) and ( as a comment</comment>
++ <translation>translation5</translation>
++ </message>
++ </context>
++ </TS>