diff options
Diffstat (limited to 'i18n/pvs_fr_FR.ts')
| -rw-r--r-- | i18n/pvs_fr_FR.ts | 12 |
1 files changed, 0 insertions, 12 deletions
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> |