diff options
| author | Fabian Schillinger | 2010-07-10 11:22:02 +0200 |
|---|---|---|
| committer | Fabian Schillinger | 2010-07-10 11:22:02 +0200 |
| commit | ecf9cc47e7e50902858d4df420eaa6f2eb484d67 (patch) | |
| tree | 5289ee80e2461293b0107d0e0e503b4abb0a5d87 /i18n | |
| parent | Added missing icons file (diff) | |
| download | pvs-ecf9cc47e7e50902858d4df420eaa6f2eb484d67.tar.gz pvs-ecf9cc47e7e50902858d4df420eaa6f2eb484d67.tar.xz pvs-ecf9cc47e7e50902858d4df420eaa6f2eb484d67.zip | |
Deleted incorrect parts
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/pvs_ar_JO.ts | 12 | ||||
| -rw-r--r-- | i18n/pvs_de_DE.ts | 12 | ||||
| -rw-r--r-- | i18n/pvs_es_MX.ts | 12 | ||||
| -rw-r--r-- | i18n/pvs_fr_FR.ts | 12 | ||||
| -rw-r--r-- | i18n/pvs_pl_PL.ts | 9 |
5 files changed, 0 insertions, 57 deletions
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> |