-

2 months ago · 101861d71e
12 changed files with 4620 additions and 5236 deletions
--- a/apps/client/src/locales/messages.ca.xlf
+++ b/apps/client/src/locales/messages.ca.xlf
@ -523,7 +523,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">278</context>
+          <context context-type="linenumber">279</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6555318547274416232" datatype="html">
@ -559,11 +559,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">259</context>
+          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
+          <context context-type="linenumber">296</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -603,7 +603,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">440</context>
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -639,7 +639,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">467</context>
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -4012,7 +4012,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">212</context>
+          <context context-type="linenumber">213</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1817902710689724227" datatype="html">
@ -4028,7 +4028,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">377</context>
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="72640258012696878" datatype="html">
@ -4044,7 +4044,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">389</context>
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="848497846891931418" datatype="html">
@ -5265,7 +5265,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">402</context>
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -5277,7 +5277,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">415</context>
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7641420101493176397" datatype="html">
@ -5301,7 +5301,7 @@
        <target state="translated">Clonar</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">446</context>
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -5309,7 +5309,7 @@
        <target state="translated">Exporta l’esborrany com a ICS</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">456</context>
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4239552960465242484" datatype="html">
@ -5609,7 +5609,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">310</context>
+          <context context-type="linenumber">311</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -5913,7 +5913,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">236</context>
+          <context context-type="linenumber">237</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.de.xlf
+++ b/apps/client/src/locales/messages.de.xlf
@ -198,19 +198,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -250,11 +242,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -290,11 +278,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -1398,11 +1382,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4029903570030679337" datatype="html">
@ -1950,11 +1930,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4388879716045736175" datatype="html">
@ -2226,11 +2202,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5388209493122807655" datatype="html">
@ -2242,11 +2214,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -2258,11 +2226,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5834780181397311898" datatype="html">
@ -2270,11 +2234,7 @@
        <target state="translated">Kopieren</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -2282,11 +2242,7 @@
        <target state="translated">Geplante Aktivität als ICS exportieren</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="670983159637074283" datatype="html">
@ -2730,11 +2686,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -3258,11 +3210,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1488866007739765367" datatype="html">
@ -5376,11 +5324,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.es.xlf
+++ b/apps/client/src/locales/messages.es.xlf
@ -199,19 +199,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -251,11 +243,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -291,11 +279,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -1383,11 +1367,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4029903570030679337" datatype="html">
@ -1935,11 +1915,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4388879716045736175" datatype="html">
@ -2211,11 +2187,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5388209493122807655" datatype="html">
@ -2227,11 +2199,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -2243,11 +2211,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5834780181397311898" datatype="html">
@ -2255,11 +2219,7 @@
        <target state="translated">Clonar</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -2267,11 +2227,7 @@
        <target state="translated">Exportar borrador como ICS</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="670983159637074283" datatype="html">
@ -2715,11 +2671,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -3243,11 +3195,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1488866007739765367" datatype="html">
@ -5353,11 +5301,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.fr.xlf
+++ b/apps/client/src/locales/messages.fr.xlf
@ -202,11 +202,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4029903570030679337" datatype="html">
@ -258,19 +254,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -310,11 +298,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -350,11 +334,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -2094,11 +2074,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="848497846891931418" datatype="html">
@ -2686,11 +2662,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5388209493122807655" datatype="html">
@ -2702,11 +2674,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -2718,11 +2686,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5834780181397311898" datatype="html">
@ -2730,11 +2694,7 @@
        <target state="translated">Dupliquer</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -2742,11 +2702,7 @@
        <target state="translated">Exporter Brouillon sous ICS</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="670983159637074283" datatype="html">
@ -2862,11 +2818,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -3242,11 +3194,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1488866007739765367" datatype="html">
@ -5352,11 +5300,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.it.xlf
+++ b/apps/client/src/locales/messages.it.xlf
@ -199,19 +199,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -251,11 +243,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -291,11 +279,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -1383,11 +1367,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4029903570030679337" datatype="html">
@ -1935,11 +1915,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4388879716045736175" datatype="html">
@ -2211,11 +2187,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5388209493122807655" datatype="html">
@ -2227,11 +2199,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -2243,11 +2211,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5834780181397311898" datatype="html">
@ -2255,11 +2219,7 @@
        <target state="translated">Clona</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -2267,11 +2227,7 @@
        <target state="translated">Esporta la bozza come ICS</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="670983159637074283" datatype="html">
@ -2715,11 +2671,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -3243,11 +3195,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1488866007739765367" datatype="html">
@ -5353,11 +5301,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.nl.xlf
+++ b/apps/client/src/locales/messages.nl.xlf
@ -198,19 +198,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -250,11 +242,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -290,11 +278,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -1382,11 +1366,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4029903570030679337" datatype="html">
@ -1934,11 +1914,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4388879716045736175" datatype="html">
@ -2210,11 +2186,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5388209493122807655" datatype="html">
@ -2226,11 +2198,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -2242,11 +2210,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5834780181397311898" datatype="html">
@ -2254,11 +2218,7 @@
        <target state="translated">Kloon</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -2266,11 +2226,7 @@
        <target state="translated">Concept exporteren als ICS</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="670983159637074283" datatype="html">
@ -2714,11 +2670,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -3242,11 +3194,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1488866007739765367" datatype="html">
@ -5352,11 +5300,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.pl.xlf
+++ b/apps/client/src/locales/messages.pl.xlf
@ -439,11 +439,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="6555318547274416232" datatype="html">
@ -479,19 +475,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -531,11 +519,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -571,11 +555,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -3659,11 +3639,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="1817902710689724227" datatype="html">
@ -3679,11 +3655,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="72640258012696878" datatype="html">
@ -3699,11 +3671,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="848497846891931418" datatype="html">
@ -4832,11 +4800,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -4848,11 +4812,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4808589666930368915" datatype="html">
@ -4868,11 +4828,7 @@
        <target state="translated">Sklonuj</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -4880,11 +4836,7 @@
        <target state="translated">Eksportuj Wersję Roboczą jako ICS</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="670983159637074283" datatype="html">
@ -5048,11 +5000,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -5348,11 +5296,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.pt.xlf
+++ b/apps/client/src/locales/messages.pt.xlf
@ -202,11 +202,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4029903570030679337" datatype="html">
@ -258,19 +254,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -310,11 +298,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -350,11 +334,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -2070,11 +2050,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="4388879716045736175" datatype="html">
@ -2586,11 +2562,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5388209493122807655" datatype="html">
@ -2602,11 +2574,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -2618,11 +2586,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5834780181397311898" datatype="html">
@ -2630,11 +2594,7 @@
        <target state="translated">Clonar</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -2642,11 +2602,7 @@
        <target state="translated">Exportar Rascunho como ICS</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="670983159637074283" datatype="html">
@ -2734,11 +2690,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -3242,11 +3194,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1488866007739765367" datatype="html">
@ -5352,11 +5300,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.tr.xlf
+++ b/apps/client/src/locales/messages.tr.xlf
@ -399,11 +399,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="6555318547274416232" datatype="html">
@ -439,19 +435,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -491,11 +479,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -531,11 +515,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -3139,11 +3119,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="1817902710689724227" datatype="html">
@ -3159,11 +3135,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="72640258012696878" datatype="html">
@ -3179,11 +3151,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="848497846891931418" datatype="html">
@ -4552,11 +4520,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -4568,11 +4532,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4808589666930368915" datatype="html">
@ -4588,11 +4548,7 @@
        <target state="translated">Klonla</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -4600,11 +4556,7 @@
        <target state="translated">Taslakları ICS Olarak Dışa Aktar</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="670983159637074283" datatype="html">
@ -4744,11 +4696,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -5360,11 +5308,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.uk.xlf
+++ b/apps/client/src/locales/messages.uk.xlf
@ -547,11 +547,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="6555318547274416232" datatype="html">
@ -587,19 +583,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -639,11 +627,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -679,11 +663,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -4344,11 +4324,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="1817902710689724227" datatype="html">
@ -4364,11 +4340,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="72640258012696878" datatype="html">
@ -4384,11 +4356,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="848497846891931418" datatype="html">
@ -6027,11 +5995,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -6043,11 +6007,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7641420101493176397" datatype="html">
@ -6071,11 +6031,7 @@
        <target state="translated">Клонувати</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -6083,11 +6039,7 @@
        <target state="translated">Експортувати чернетку як ICS</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4239552960465242484" datatype="html">
@ -6403,11 +6355,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -6819,11 +6767,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>
--- a/apps/client/src/locales/messages.xlf
+++ b/apps/client/src/locales/messages.xlf
--- a/apps/client/src/locales/messages.zh.xlf
+++ b/apps/client/src/locales/messages.zh.xlf
@ -448,11 +448,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">279</context>
-=======
-          <context context-type="linenumber">278</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="6555318547274416232" datatype="html">
@ -488,19 +484,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">260</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
          <context context-type="linenumber">296</context>
-=======
-          <context context-type="linenumber">259</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-          <context context-type="linenumber">295</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/holdings-table/holdings-table.component.html</context>
@ -540,11 +528,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">433</context>
-=======
-          <context context-type="linenumber">440</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">441</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7022070615528435141" datatype="html">
@ -580,11 +564,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">460</context>
-=======
-          <context context-type="linenumber">467</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">468</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/benchmark/benchmark.component.html</context>
@ -3668,11 +3648,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">213</context>
-=======
-          <context context-type="linenumber">212</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
      </trans-unit>
      <trans-unit id="1817902710689724227" datatype="html">
@ -3688,11 +3664,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">374</context>
-=======
-          <context context-type="linenumber">377</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">378</context>
        </context-group>
      </trans-unit>
      <trans-unit id="72640258012696878" datatype="html">
@ -3708,11 +3680,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">386</context>
-=======
-          <context context-type="linenumber">389</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">390</context>
        </context-group>
      </trans-unit>
      <trans-unit id="848497846891931418" datatype="html">
@ -4861,11 +4829,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">399</context>
-=======
-          <context context-type="linenumber">402</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7023389552907218716" datatype="html">
@ -4877,11 +4841,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">412</context>
-=======
-          <context context-type="linenumber">415</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4808589666930368915" datatype="html">
@ -4897,11 +4857,7 @@
        <target state="translated">克隆</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">439</context>
-=======
-          <context context-type="linenumber">446</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">447</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4631493229601603593" datatype="html">
@ -4909,11 +4865,7 @@
        <target state="translated">将汇票导出为 ICS</target>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
-          <context context-type="linenumber">449</context>
-=======
-          <context context-type="linenumber">456</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
+          <context context-type="linenumber">457</context>
        </context-group>
      </trans-unit>
      <trans-unit id="670983159637074283" datatype="html">
@ -5093,11 +5045,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">311</context>
-=======
-          <context context-type="linenumber">310</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/assistant/assistant.html</context>
@ -5393,11 +5341,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/activities-table/activities-table.component.html</context>
-<<<<<<< HEAD
          <context context-type="linenumber">237</context>
-=======
-          <context context-type="linenumber">236</context>
->>>>>>> 5bfcceb959b8f2d84747a204c9e67279f8e9475a
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">libs/ui/src/lib/i18n.ts</context>