Update id attributes modified by merge.

test/create-xliff1-embedded/expected.xlf

@@ -22,7 +22,7 @@
  <source xml:lang="en">Prism does its best to encourage good authoring practices. Therefore,it only works with
  <x ctype="x-dita-codeph" id="" translate="no">&lt;code&gt;</x>elements, since marking upcode without a
  <x ctype="x-dita-codeph" id="" translate="no">&lt;code&gt;</x>element is semantically invalid.
- <x ctype="x-dita-xref" dita:format="html" dita:href="https://www.w3.org/TR/html52/textlevel-semantics.html#the-code-element" dita:scope="external" id="d3e25" xmlns:dita="dita-ot.org">According to the HTML5 spec</x>, the recommended way to define a code language is a
+ <x ctype="x-dita-xref" dita:format="html" dita:href="https://www.w3.org/TR/html52/textlevel-semantics.html#the-code-element" dita:scope="external" id="d4e25" xmlns:dita="dita-ot.org">According to the HTML5 spec</x>, the recommended way to define a code language is a
  <x ctype="x-dita-codeph" id="" translate="no">language-xxxx</x>class, which is what Prism uses. Alternatively, Prism also supports a shorter version:
  <x ctype="x-dita-codeph" id="" translate="no">lang-xxxx</x>.</source>
  <target xml:lang="de"></target>
@@ -44,7 +44,7 @@
  </trans-unit>
  <trans-unit approved="no" id="25020" xml:space="preserve">
  <source xml:lang="en">The
- <x ctype="x-dita-xref" dita:format="html" dita:href="https://www.w3.org/TR/html5/grouping-content.html#the-pre-element" dita:scope="external" id="d3e59" xmlns:dita="dita-ot.org">recommended way to mark up a code block</x>(both for semantics and for Prism) is a
+ <x ctype="x-dita-xref" dita:format="html" dita:href="https://www.w3.org/TR/html5/grouping-content.html#the-pre-element" dita:scope="external" id="d4e59" xmlns:dita="dita-ot.org">recommended way to mark up a code block</x>(both for semantics and for Prism) is a
  <x ctype="x-dita-codeph" id="" translate="no">&lt;pre&gt;</x>element with a
  <x ctype="x-dita-codeph" id="" translate="no">&lt;code&gt;</x>element inside, like so:</source>
  <target xml:lang="de"></target>
@@ -59,7 +59,7 @@
  <source xml:lang="en">If you want to prevent any elements from being automatically highlighted, you can use the attribute
  <x ctype="x-dita-codeph" id="" translate="no">data-manual</x>on the
  <x ctype="x-dita-codeph" id="" translate="no">&lt;script&gt;</x>element you used for prism and use the
- <x ctype="x-dita-xref" dita:format="html" dita:href="https://prismjs.com/extending.html#api" dita:scope="external" id="d3e84" xmlns:dita="dita-ot.org">API</x>. Example:</source>
+ <x ctype="x-dita-xref" dita:format="html" dita:href="https://prismjs.com/extending.html#api" dita:scope="external" id="d4e84" xmlns:dita="dita-ot.org">API</x>. Example:</source>
  <target xml:lang="de"></target>
  </trans-unit>
  <trans-unit approved="no" id="33578" xml:space="preserve">
@@ -78,7 +78,7 @@
  </trans-unit>
  <trans-unit approved="no" id="10929" xml:space="preserve">
  <source xml:lang="en">To make it easy to configure your Prism instance with only thelanguages and plugins you need, use the babel plugin,
- <x ctype="x-dita-xref" dita:format="html" dita:href="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/mAAdhaTTah/babel-plugin-prismjs" dita:scope="external" id="d3e115" xmlns:dita="dita-ot.org">babel-plugin-prismjs</x>. This will allow you to load the minimum number of languages and plugins to satisfy your needs. See that plugin's documentation for configuration details</source>
+ <x ctype="x-dita-xref" dita:format="html" dita:href="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/mAAdhaTTah/babel-plugin-prismjs" dita:scope="external" id="d4e115" xmlns:dita="dita-ot.org">babel-plugin-prismjs</x>. This will allow you to load the minimum number of languages and plugins to satisfy your needs. See that plugin's documentation for configuration details</source>
  <target xml:lang="de"></target>
  </trans-unit>
  </body>

test/create-xliff1-glossentry/expected.xlf

@@ -14,7 +14,7 @@
  </trans-unit>
  <trans-unit approved="no" id="29470" xml:space="preserve">
  <source xml:lang="en">
- <x ctype="x-dita-term" id="d3e7" translate="no">Mnemonics</x>are keywords by which each of the instrument's subsystems is referred to.</source>
+ <x ctype="x-dita-term" id="d4e7" translate="no">Mnemonics</x>are keywords by which each of the instrument's subsystems is referred to.</source>
  <target xml:lang="de"></target>
  </trans-unit>
  </body>

test/create-xliff1-translate-no/expected.xlf

@@ -35,7 +35,7 @@
  </trans-unit>
  <trans-unit approved="no" id="10044" xml:space="preserve">
  <source xml:lang="en">The following lines are the origin of
- <x ctype="x-dita-term" id="d5e11" translate="no">Lorem Ipsum</x>:</source>
+ <x ctype="x-dita-term" id="d6e11" translate="no">Lorem Ipsum</x>:</source>
  <target xml:lang="de"></target>
  </trans-unit>
  </body>
@@ -53,18 +53,18 @@
  </trans-unit>
  <trans-unit approved="no" id="10044" xml:space="preserve">
  <source xml:lang="en">The following lines are the origin of
- <x ctype="x-dita-term" id="d7e11" translate="no" xml:lang="la">Lorem Ipsum</x>:</source>
+ <x ctype="x-dita-term" id="d8e11" translate="no" xml:lang="la">Lorem Ipsum</x>:</source>
  <target xml:lang="de"></target>
  </trans-unit>
  <trans-unit approved="no" id="54947" xml:space="preserve">
  <source xml:lang="en">Loves or pursues or desires to obtain
- <x ctype="x-dita-codeph" id="d7e20" translate="no">pain of itself</x>, because it is pain, but occasionally circumstances occur in which toil and pain can procure him some great pleasure.</source>
+ <x ctype="x-dita-codeph" id="d8e20" translate="no">pain of itself</x>, because it is pain, but occasionally circumstances occur in which toil and pain can procure him some great pleasure.</source>
  <target xml:lang="de"></target>
  </trans-unit>
  <trans-unit approved="no" id="2885" xml:space="preserve">
  <source xml:lang="en">
- <x ctype="x-dita-p" id="d7e26">To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it?</x>
- <x ctype="x-dita-p" id="d7e28">But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?</x>
+ <x ctype="x-dita-p" id="d8e26">To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it?</x>
+ <x ctype="x-dita-p" id="d8e28">But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?</x>
  </source>
  <target xml:lang="de"></target>
  </trans-unit>

test/create-xliff1-translate-yes/expected.xlf

@@ -14,12 +14,12 @@
  </trans-unit>
  <trans-unit approved="no" id="10044" xml:space="preserve">
  <source xml:lang="en">The following lines are the origin of
- <x ctype="x-dita-term" id="d3e11" translate="yes" xml:lang="la">Lorem Ipsum</x>:</source>
+ <x ctype="x-dita-term" id="d4e11" translate="yes" xml:lang="la">Lorem Ipsum</x>:</source>
  <target xml:lang="de"></target>
  </trans-unit>
  <trans-unit approved="no" id="54947" xml:space="preserve">
  <source xml:lang="en">Loves or pursues or desires to obtain
- <x ctype="x-dita-codeph" id="d3e18" translate="yes">pain of itself</x>, because it is pain, but occasionally circumstances occur in which toil and pain can procure him some great pleasure.</source>
+ <x ctype="x-dita-codeph" id="d4e18" translate="yes">pain of itself</x>, because it is pain, but occasionally circumstances occur in which toil and pain can procure him some great pleasure.</source>
  <target xml:lang="de"></target>
  </trans-unit>
  </body>

test/create-xliff2-glossentry/expected.xlf

@@ -11,13 +11,13 @@
  </unit>
  <unit id="29470">
  <originalData>
- <data id="sd4e7">&lt;term&gt;</data>
- <data id="ed4e7">&lt;/term&gt;</data>
+ <data id="sd5e7">&lt;term&gt;</data>
+ <data id="ed5e7">&lt;/term&gt;</data>
  </originalData>
  <segment state="initial">
  <source xml:lang="en" xml:space="preserve">
- <pc dataRefEnd="ed4e7" dataRefStart="sd4e7" fs:fs="code" id="d4e7" xmlns:fs="urn:oasis:names:tc:xliff:fs:2.0">
- <mrk id="md4e7" translate="no" type="term">Mnemonics</mrk>
+ <pc dataRefEnd="ed5e7" dataRefStart="sd5e7" fs:fs="code" id="d5e7" xmlns:fs="urn:oasis:names:tc:xliff:fs:2.0">
+ <mrk id="md5e7" translate="no" type="term">Mnemonics</mrk>
  </pc>are keywords by which each of the instrument's subsystems is referred to.</source>
  <target xml:lang="de"></target>
  </segment>