diff options
| author | Fabian Schillinger | 2010-07-10 02:14:20 +0200 |
|---|---|---|
| committer | Fabian Schillinger | 2010-07-10 02:14:20 +0200 |
| commit | 99021fc683c36f57fdad8dc812e2267fca4cbcf7 (patch) | |
| tree | 5fd77585e4e5dbd171427186e4c31ad09ca18e68 /i18n/pvs_de_DE.ts | |
| parent | Inserted some Buttons in GUI and TouchGUI and modified handling of commands i... (diff) | |
| parent | Configuration by pvs via D-Bus. Old .allow ist now deprecated, config file: .... (diff) | |
| download | pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.tar.gz pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.tar.xz pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.zip | |
Merge branch 'master' of openslx.org:pvs
Conflicts:
i18n/pvs_ar_JO.ts
i18n/pvs_de_DE.ts
i18n/pvs_es_MX.ts
i18n/pvs_fr_FR.ts
i18n/pvs_pl_PL.ts
Diffstat (limited to 'i18n/pvs_de_DE.ts')
| -rw-r--r-- | i18n/pvs_de_DE.ts | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/i18n/pvs_de_DE.ts b/i18n/pvs_de_DE.ts index f5b5dc5..e9a460f 100644 --- a/i18n/pvs_de_DE.ts +++ b/i18n/pvs_de_DE.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> |