summaryrefslogtreecommitdiffstats
path: root/i18n/pvs_ar_JO.ts
diff options
context:
space:
mode:
Diffstat (limited to 'i18n/pvs_ar_JO.ts')
-rw-r--r--i18n/pvs_ar_JO.ts12
1 files changed, 12 insertions, 0 deletions
diff --git a/i18n/pvs_ar_JO.ts b/i18n/pvs_ar_JO.ts
index f5b5dc5..e9a460f 100644
--- a/i18n/pvs_ar_JO.ts
+++ b/i18n/pvs_ar_JO.ts
@@ -9,17 +9,29 @@
<translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< HEAD
<location filename="../src/pvs.cpp" line="363"/>
+=======
+ <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
<source>VNC connection</source>
<translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< HEAD
<location filename="../src/pvs.cpp" line="363"/>
+=======
+ <location filename="../src/pvs.cpp" line="337"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
<source>The host </source>
<translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< HEAD
<location filename="../src/pvs.cpp" line="365"/>
+=======
+ <location filename="../src/pvs.cpp" line="339"/>
+>>>>>>> 25305a6ef01120bf3b0d929bae0ba7693f41c46b
<source> requested your screen!</source>
<translation type="unfinished"></translation>
</message>