From 4c9e3452270e54c92b4ab4bc2e7040a1286f3e95 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 13 Jul 2018 15:35:51 +0200 Subject: [client] Fix translation on Qt5 --- i18n/client/pvsclient_ar_JO.ts | 22 ++++----- i18n/client/pvsclient_de_DE.ts | 28 ++++++------ i18n/client/pvsclient_es_MX.ts | 22 ++++----- i18n/client/pvsclient_fr_FR.ts | 22 ++++----- i18n/client/pvsclient_pl_PL.ts | 22 ++++----- i18n/server/pvsmgr_ar_JO.ts | 8 ++++ i18n/server/pvsmgr_de_DE.ts | 94 ++++++++++++++++++++++---------------- i18n/server/pvsmgr_es_MX.ts | 86 +++++++++++++++++++--------------- i18n/server/pvsmgr_fr_FR.ts | 86 +++++++++++++++++++--------------- i18n/server/pvsmgr_pl_PL.ts | 86 +++++++++++++++++++--------------- pvsclient.qrc | 37 +++------------ src/client/clientapp/clientapp.cpp | 5 +- 12 files changed, 278 insertions(+), 240 deletions(-) diff --git a/i18n/client/pvsclient_ar_JO.ts b/i18n/client/pvsclient_ar_JO.ts index 61d4969..5a5f46c 100644 --- a/i18n/client/pvsclient_ar_JO.ts +++ b/i18n/client/pvsclient_ar_JO.ts @@ -130,53 +130,53 @@ Toolbar - + &Connect... - + &Disconnect - + &Information... - + &What's this? - + &Quit - + Streaming - + Offline - + About PVS Client - + The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor's and student's PCs. It has been developed to simplify the information traffic in seminars and general eLearning. - - + + Online diff --git a/i18n/client/pvsclient_de_DE.ts b/i18n/client/pvsclient_de_DE.ts index 9695544..c337670 100644 --- a/i18n/client/pvsclient_de_DE.ts +++ b/i18n/client/pvsclient_de_DE.ts @@ -1,6 +1,6 @@ - + ConnectWindow @@ -106,7 +106,7 @@ Unknown state :-( - + Unbekannter Zustand :-( @@ -130,53 +130,53 @@ Toolbar - + &Connect... &Verbinden... - + &Disconnect &Trennen - + &Information... System&information - + &What's this? &Was ist das hier? - + &Quit &Beenden - + Streaming Übertragung - + Offline Offline - + About PVS Client Über PVS Client - + The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor's and student's PCs. It has been developed to simplify the information traffic in seminars and general eLearning. - Der PVS - Client ist Teil eines Softwaresystems für die Steuerung des virtuellen Datenverkehrs in den Poolräumen zwischen den Dozenten- und Studenten - PCs. Es wurde zur Vereinfachung des Informationsflusses und allgemeinem eLearning entwickelt. + Der PVS-Client ist Teil eines Softwaresystems für die Steuerung des virtuellen Datenverkehrs in den Poolräumen zwischen den Dozenten- und Studenten - PCs. Es wurde zur Vereinfachung des Informationsflusses und allgemeinem eLearning entwickelt. - - + + Online Online diff --git a/i18n/client/pvsclient_es_MX.ts b/i18n/client/pvsclient_es_MX.ts index 6b1e16d..1063146 100644 --- a/i18n/client/pvsclient_es_MX.ts +++ b/i18n/client/pvsclient_es_MX.ts @@ -130,53 +130,53 @@ Toolbar - + &Connect... - + &Disconnect &Desconectar - + &Information... - + &What's this? - + &Quit &Cerrar - + Streaming - + Offline - + About PVS Client - + The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor's and student's PCs. It has been developed to simplify the information traffic in seminars and general eLearning. - - + + Online diff --git a/i18n/client/pvsclient_fr_FR.ts b/i18n/client/pvsclient_fr_FR.ts index 61d4969..5a5f46c 100644 --- a/i18n/client/pvsclient_fr_FR.ts +++ b/i18n/client/pvsclient_fr_FR.ts @@ -130,53 +130,53 @@ Toolbar - + &Connect... - + &Disconnect - + &Information... - + &What's this? - + &Quit - + Streaming - + Offline - + About PVS Client - + The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor's and student's PCs. It has been developed to simplify the information traffic in seminars and general eLearning. - - + + Online diff --git a/i18n/client/pvsclient_pl_PL.ts b/i18n/client/pvsclient_pl_PL.ts index 61d4969..5a5f46c 100644 --- a/i18n/client/pvsclient_pl_PL.ts +++ b/i18n/client/pvsclient_pl_PL.ts @@ -130,53 +130,53 @@ Toolbar - + &Connect... - + &Disconnect - + &Information... - + &What's this? - + &Quit - + Streaming - + Offline - + About PVS Client - + The PVS - client is part of a software system for managing the virtual data traffic within the computer pools, between the tutor's and student's PCs. It has been developed to simplify the information traffic in seminars and general eLearning. - - + + Online diff --git a/i18n/server/pvsmgr_ar_JO.ts b/i18n/server/pvsmgr_ar_JO.ts index 1ad154e..4d7e0d7 100644 --- a/i18n/server/pvsmgr_ar_JO.ts +++ b/i18n/server/pvsmgr_ar_JO.ts @@ -203,6 +203,14 @@ Note that all clients will be deleted. Sure, You want to delete selected client? + + Lock/Unlock single client + + + + Lock or unlock the selected client + + NumericKeyboard diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts index 9c6d0ae..d832f0d 100644 --- a/i18n/server/pvsmgr_de_DE.ts +++ b/i18n/server/pvsmgr_de_DE.ts @@ -1,6 +1,6 @@ - + ConnectionFrame @@ -64,13 +64,13 @@ Set selected client to tutor. - Ausgewählten Klienten als Tutor festlegen. + Ausgewählten Client als Tutor festlegen. MainWindow - + Exit Ausgang @@ -121,158 +121,172 @@ Kein Projektionsziel verfügbar. - - - - + + + + + + Selection Auswahl - + This client is still connected. Dieser Client ist noch verbunden. - + Sure, You want to delete selected client? Sicher, dass Sie den ausgewählten Clienten löschen wollen? - + Sure, You want to change SessionName again? All Clients will be deleted afterwards. Sicher, dass Sie den Sitzungsname erneut ändern wollen? Danach werden alle Clienten gelöscht sein. - + Session Name: %1 [click to edit] Sitzungsname: %1 [anklicken editiert] - + No item selected, please select room! Keine Auswahl getroffen, bitte einen Raum auswählen! - + Are you sure you want to reload the room? Note that all clients will be deleted. Wollen Sie den Raum wirklich neu laden? Beachten Sie, dass alle Clienten gelöscht werden. - - + - + - + + Projection Projektion - - + + + No client is selected. Kein Client ausgewählt. - + + The selected client is not connected. Ausgewählter Client ist nicht verbunden. - + Lock or Unlock all Clients - Alle Klienten sperren oder entsperren + Alle Clients sperren oder entsperren - + &Exit &Abbruch - + Ctrl+Q Strg+Q - + lock lock - + Ctrl+A Strg+A - + Student's Screen to Tutor Studierendenbildschirm an Tutor - + Student's Screen to Tutor, others blanked Studierendenbildschirm an Tutor; alle anderen ausgeblendet - + Tutor's Screen to Student Tutorenbildschirm an Studierenden - + Tutor's Screen to Everyone Tutorenbildschirm an alle - + Stop Projection on every Client - Projektion an alle Clienten abbrechen + Projektion an alle Clients abbrechen - + SetAsTutor AlsTutorSetzen - + Set current Frame as Tutor Derzeitigen Rahmen als Tutor festlegen - - + + Delete Client Lösche Client - - + + Help Hilfe - - + + Reload Room Configuration Neu laden der Raumkonfiguration + + + Lock/Unlock single client + Einzelnen Client (ent)sperren + + + + Lock or unlock the selected client + Den ausgewählten Client sperren btw. entsperren + toolBar diff --git a/i18n/server/pvsmgr_es_MX.ts b/i18n/server/pvsmgr_es_MX.ts index b47934f..1343443 100644 --- a/i18n/server/pvsmgr_es_MX.ts +++ b/i18n/server/pvsmgr_es_MX.ts @@ -70,7 +70,7 @@ MainWindow - + Exit Salir @@ -121,154 +121,168 @@ - - - - + + + + + + Selection - + This client is still connected. - + Sure, You want to delete selected client? - + Sure, You want to change SessionName again? All Clients will be deleted afterwards. - + Session Name: %1 [click to edit] - + No item selected, please select room! - + Are you sure you want to reload the room? Note that all clients will be deleted. - - + - + - + + Projection - - + + + No client is selected. - + + The selected client is not connected. - + Lock or Unlock all Clients Bloquear o desbloquear todos los clientes - + &Exit &Salir - + Ctrl+Q Ctrl+Q - + Student's Screen to Tutor - + Student's Screen to Tutor, others blanked - + Tutor's Screen to Student - + Tutor's Screen to Everyone - + Stop Projection on every Client - + SetAsTutor - + Set current Frame as Tutor - - + + Delete Client - - + + Help - - + + Reload Room Configuration - + + Lock/Unlock single client + + + + + Lock or unlock the selected client + + + + lock bloquear - + Ctrl+A Ctrl+A diff --git a/i18n/server/pvsmgr_fr_FR.ts b/i18n/server/pvsmgr_fr_FR.ts index f41176d..e571973 100644 --- a/i18n/server/pvsmgr_fr_FR.ts +++ b/i18n/server/pvsmgr_fr_FR.ts @@ -70,7 +70,7 @@ MainWindow - + Exit @@ -121,157 +121,171 @@ - - - - + + + + + + Selection - + This client is still connected. - + Sure, You want to delete selected client? - + Sure, You want to change SessionName again? All Clients will be deleted afterwards. - + Session Name: %1 [click to edit] - + No item selected, please select room! - + Are you sure you want to reload the room? Note that all clients will be deleted. - - + - + - + + Projection - - + + + No client is selected. - + + The selected client is not connected. - + Lock or Unlock all Clients - + &Exit - + Ctrl+Q - + lock - + Ctrl+A - + Student's Screen to Tutor - + Student's Screen to Tutor, others blanked - + Tutor's Screen to Student - + Tutor's Screen to Everyone - + Stop Projection on every Client - + SetAsTutor - + Set current Frame as Tutor - - + + Delete Client - - + + Help - - + + Reload Room Configuration + + + Lock/Unlock single client + + + + + Lock or unlock the selected client + + toolBar diff --git a/i18n/server/pvsmgr_pl_PL.ts b/i18n/server/pvsmgr_pl_PL.ts index f41176d..e571973 100644 --- a/i18n/server/pvsmgr_pl_PL.ts +++ b/i18n/server/pvsmgr_pl_PL.ts @@ -70,7 +70,7 @@ MainWindow - + Exit @@ -121,157 +121,171 @@ - - - - + + + + + + Selection - + This client is still connected. - + Sure, You want to delete selected client? - + Sure, You want to change SessionName again? All Clients will be deleted afterwards. - + Session Name: %1 [click to edit] - + No item selected, please select room! - + Are you sure you want to reload the room? Note that all clients will be deleted. - - + - + - + + Projection - - + + + No client is selected. - + + The selected client is not connected. - + Lock or Unlock all Clients - + &Exit - + Ctrl+Q - + lock - + Ctrl+A - + Student's Screen to Tutor - + Student's Screen to Tutor, others blanked - + Tutor's Screen to Student - + Tutor's Screen to Everyone - + Stop Projection on every Client - + SetAsTutor - + Set current Frame as Tutor - - + + Delete Client - - + + Help - - + + Reload Room Configuration + + + Lock/Unlock single client + + + + + Lock or unlock the selected client + + toolBar diff --git a/pvsclient.qrc b/pvsclient.qrc index e47a275..b5fcd79 100644 --- a/pvsclient.qrc +++ b/pvsclient.qrc @@ -4,7 +4,7 @@ icons/darrow16.svg icons/ok16.svg icons/cam32.svg - icons/eye.svg + icons/eye.svg icons/chat_msg16.svg icons/keyboard_key.svg icons/space.svg @@ -12,35 +12,10 @@ icons/hand-raise.svg icons/hand-raise-red.svg AUTHORS - - - build/pvsclient_de_DE.qm - - - build/pvsclient_de_DE.qm - - - build/pvsclient_fr_FR.qm - - - build/pvsclient_fr_FR.qm - - - build/pvsclient_es_MX.qm - - - build/pvsclient_es_MX.qm - - - build/pvsclient_ar_JO.qm - - - build/pvsclient_ar_JO.qm - - - build/pvsclient_pl_PL.qm - - - build/pvsclient_pl_PL.qm + build/pvsclient_de_DE.qm + build/pvsclient_fr_FR.qm + build/pvsclient_es_MX.qm + build/pvsclient_ar_JO.qm + build/pvsclient_pl_PL.qm diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp index 251b755..2f65bd1 100644 --- a/src/client/clientapp/clientapp.cpp +++ b/src/client/clientapp/clientapp.cpp @@ -22,12 +22,11 @@ ClientApp::ClientApp(int& argc, char** argv) /* set translator */ // System strings QTranslator *qtTranslator = new QTranslator(this); - qtTranslator->load("qt_" + QLocale::system().name(), - QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + qtTranslator->load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath)); installTranslator(qtTranslator); // App specific QTranslator *translator = new QTranslator(this); - translator->load(":pvsclient"); + translator->load(QLocale::system(), ":", "l_"); installTranslator(translator); readIsManagerPc(); -- cgit v1.2.3-55-g7522