From ecf9cc47e7e50902858d4df420eaa6f2eb484d67 Mon Sep 17 00:00:00 2001
From: Fabian Schillinger
Date: Sat, 10 Jul 2010 11:22:02 +0200
Subject: Deleted incorrect parts

---
 i18n/pvs_ar_JO.ts | 12 ------------
 i18n/pvs_de_DE.ts | 12 ------------
 i18n/pvs_es_MX.ts | 12 ------------
 i18n/pvs_fr_FR.ts | 12 ------------
 i18n/pvs_pl_PL.ts |  9 ---------
 5 files changed, 57 deletions(-)

(limited to 'i18n')

diff --git a/i18n/pvs_ar_JO.ts b/i18n/pvs_ar_JO.ts
index e9a460f..5cb6fc0 100644
--- a/i18n/pvs_ar_JO.ts
+++ b/i18n/pvs_ar_JO.ts
@@ -9,29 +9,17 @@
         <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>
diff --git a/i18n/pvs_de_DE.ts b/i18n/pvs_de_DE.ts
index e9a460f..5cb6fc0 100644
--- a/i18n/pvs_de_DE.ts
+++ b/i18n/pvs_de_DE.ts
@@ -9,29 +9,17 @@
         <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>
diff --git a/i18n/pvs_es_MX.ts b/i18n/pvs_es_MX.ts
index e9a460f..5cb6fc0 100644
--- a/i18n/pvs_es_MX.ts
+++ b/i18n/pvs_es_MX.ts
@@ -9,29 +9,17 @@
         <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>
diff --git a/i18n/pvs_fr_FR.ts b/i18n/pvs_fr_FR.ts
index e9a460f..5cb6fc0 100644
--- a/i18n/pvs_fr_FR.ts
+++ b/i18n/pvs_fr_FR.ts
@@ -9,29 +9,17 @@
         <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>
diff --git a/i18n/pvs_pl_PL.ts b/i18n/pvs_pl_PL.ts
index e9a460f..e9a8251 100644
--- a/i18n/pvs_pl_PL.ts
+++ b/i18n/pvs_pl_PL.ts
@@ -9,29 +9,20 @@
         <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>
-- 
cgit v1.2.3-55-g7522