Serious (and bizarre) merge bug. I guess it doesn't like XML that much.

This commit is contained in:
Ken Sternberg 2024-01-08 14:57:20 -08:00
parent b8f0b46bb5
commit fdca6427b3
9 changed files with 9 additions and 0 deletions

View file

@ -6263,6 +6263,7 @@ Bindings to groups/users are checked against the user of the event.</source>
</trans-unit> </trans-unit>
<trans-unit id="s56b3d54118c34b2f"> <trans-unit id="s56b3d54118c34b2f">
<source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source> <source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source>
</trans-unit>
<trans-unit id="scc7f34824150bfb8"> <trans-unit id="scc7f34824150bfb8">
<source>Provider require enterprise.</source> <source>Provider require enterprise.</source>
</trans-unit> </trans-unit>

View file

@ -6539,6 +6539,7 @@ Bindings to groups/users are checked against the user of the event.</source>
</trans-unit> </trans-unit>
<trans-unit id="s56b3d54118c34b2f"> <trans-unit id="s56b3d54118c34b2f">
<source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source> <source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source>
</trans-unit>
<trans-unit id="scc7f34824150bfb8"> <trans-unit id="scc7f34824150bfb8">
<source>Provider require enterprise.</source> <source>Provider require enterprise.</source>
</trans-unit> </trans-unit>

View file

@ -6179,6 +6179,7 @@ Bindings to groups/users are checked against the user of the event.</source>
</trans-unit> </trans-unit>
<trans-unit id="s56b3d54118c34b2f"> <trans-unit id="s56b3d54118c34b2f">
<source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source> <source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source>
</trans-unit>
<trans-unit id="scc7f34824150bfb8"> <trans-unit id="scc7f34824150bfb8">
<source>Provider require enterprise.</source> <source>Provider require enterprise.</source>
</trans-unit> </trans-unit>

View file

@ -8226,6 +8226,7 @@ Les liaisons avec les groupes/utilisateurs sont vérifiées par rapport à l'uti
</trans-unit> </trans-unit>
<trans-unit id="s56b3d54118c34b2f"> <trans-unit id="s56b3d54118c34b2f">
<source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source> <source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source>
</trans-unit>
<trans-unit id="scc7f34824150bfb8"> <trans-unit id="scc7f34824150bfb8">
<source>Provider require enterprise.</source> <source>Provider require enterprise.</source>
</trans-unit> </trans-unit>

View file

@ -6387,6 +6387,7 @@ Bindings to groups/users are checked against the user of the event.</source>
</trans-unit> </trans-unit>
<trans-unit id="s56b3d54118c34b2f"> <trans-unit id="s56b3d54118c34b2f">
<source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source> <source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source>
</trans-unit>
<trans-unit id="scc7f34824150bfb8"> <trans-unit id="scc7f34824150bfb8">
<source>Provider require enterprise.</source> <source>Provider require enterprise.</source>
</trans-unit> </trans-unit>

View file

@ -6172,6 +6172,7 @@ Bindings to groups/users are checked against the user of the event.</source>
</trans-unit> </trans-unit>
<trans-unit id="s56b3d54118c34b2f"> <trans-unit id="s56b3d54118c34b2f">
<source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source> <source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source>
</trans-unit>
<trans-unit id="scc7f34824150bfb8"> <trans-unit id="scc7f34824150bfb8">
<source>Provider require enterprise.</source> <source>Provider require enterprise.</source>
</trans-unit> </trans-unit>

View file

@ -8228,6 +8228,7 @@ Bindings to groups/users are checked against the user of the event.</source>
</trans-unit> </trans-unit>
<trans-unit id="s56b3d54118c34b2f"> <trans-unit id="s56b3d54118c34b2f">
<source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source> <source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source>
</trans-unit>
<trans-unit id="scc7f34824150bfb8"> <trans-unit id="scc7f34824150bfb8">
<source>Provider require enterprise.</source> <source>Provider require enterprise.</source>
<target>提供程序需要企业版。</target> <target>提供程序需要企业版。</target>

View file

@ -6220,6 +6220,7 @@ Bindings to groups/users are checked against the user of the event.</source>
</trans-unit> </trans-unit>
<trans-unit id="s56b3d54118c34b2f"> <trans-unit id="s56b3d54118c34b2f">
<source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source> <source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source>
</trans-unit>
<trans-unit id="scc7f34824150bfb8"> <trans-unit id="scc7f34824150bfb8">
<source>Provider require enterprise.</source> <source>Provider require enterprise.</source>
</trans-unit> </trans-unit>

View file

@ -8108,6 +8108,7 @@ Bindings to groups/users are checked against the user of the event.</source>
</trans-unit> </trans-unit>
<trans-unit id="s56b3d54118c34b2f"> <trans-unit id="s56b3d54118c34b2f">
<source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source> <source><x id="0" equiv-text="${selectedCount}"/> item(s) marked to remove.</source>
</trans-unit>
<trans-unit id="scc7f34824150bfb8"> <trans-unit id="scc7f34824150bfb8">
<source>Provider require enterprise.</source> <source>Provider require enterprise.</source>
</trans-unit> </trans-unit>