Resolved conflicts in 'ChangeLog'

2025-10-14 22:51:13 +02:00 · 2020-06-11 14:18:24 -04:00
parent 7ff0b9626f 6536e466e6
commit ddede82b47
40 changed files with 442 additions and 91 deletions
--- a/lib/librd_es.ts
+++ b/lib/librd_es.ts
@@ -801,6 +801,10 @@
        <source>Inline Traffic, </source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Results Report</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>RDAddCart</name>