From c3c7d5748578d268ae2b8cc076bc5a87479fc768 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 5 Dec 2017 11:29:26 +0100 Subject: Fix translations on Qt5 --- CMakeLists.txt | 83 ++++++------ gui/server_normal/mainwindow.ui | 24 +++- gui/server_normal/numerickeyboard.ui | 20 +-- i18n/client/pvsclient_ar_JO.ts | 52 +++---- i18n/client/pvsclient_de_DE.ts | 52 +++---- i18n/client/pvsclient_es_MX.ts | 52 +++---- i18n/client/pvsclient_fr_FR.ts | 52 +++---- i18n/client/pvsclient_pl_PL.ts | 52 +++---- i18n/server/pvsmgr_ar_JO.ts | 231 +++++++------------------------- i18n/server/pvsmgr_de_DE.ts | 219 ++++++++++++------------------ i18n/server/pvsmgr_es_MX.ts | 219 ++++++++++++------------------ i18n/server/pvsmgr_fr_FR.ts | 219 ++++++++++++------------------ i18n/server/pvsmgr_pl_PL.ts | 219 ++++++++++++------------------ pvsmgr.qrc | 19 +-- sample_configuration/switchToManager.sh | 2 +- src/server/serverapp/serverapp.cpp | 6 +- 16 files changed, 588 insertions(+), 933 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97116b0..a3a0b2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,15 +3,15 @@ ################################################################################ PROJECT(pvs2) -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR) # set compiler optimizations for debug and release -SET(CMAKE_BUILD_TYPE Debug) SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall -Wunused -Wunreachable-code -pedantic") SET(CMAKE_C_FLAGS_RELEASE "-O2") SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall -Wextra -Wpedantic -std=c++0x -Wcast-align -Wcast-qual -Wchar-subscripts -Wcomment -Wconversion -Wdisabled-optimization -Wfloat-equal -Wformat -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Winline -Winvalid-pch -Wunsafe-loop-optimizations -Wlong-long -Wmissing-braces -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wpacked -Wparentheses -Wpointer-arith -Wredundant-decls -Wreturn-type -Wsequence-point -Wsign-compare -Wstack-protector -Wstrict-aliasing -Wstrict-aliasing=2 -Wswitch -Wswitch-default -Wswitch-enum -Wtrigraphs -Wuninitialized -Wunknown-pragmas -Wunreachable-code -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wvariadic-macros -Wvolatile-register-var -Wwrite-strings") # -Wshadow spams too much :/ -SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -std=c++0x" ) +SET(CMAKE_CXX_STANDARD 11) +SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -std=c++11) # local cmake modules SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -21,15 +21,14 @@ FIND_PACKAGE(Qt5 COMPONENTS Widgets Network X11Extras LinguistTools Svg REQUIRED FIND_PACKAGE(X11 REQUIRED) FIND_PACKAGE(VNC REQUIRED) +SET(CMAKE_INCLUDE_CURRENT_DIR ON) SET(CMAKE_AUTOMOC ON) # some includes INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ${X11_INCLUDE_DIR} -# ${X11_XTest_INCLUDE_PATH} -# ${X11_Xinput_INCLUDE_PATH} ) IF(X11_Xscreensaver_FOUND) @@ -91,17 +90,6 @@ FILE(GLOB PVSCLIENT_RC_SRCS pvsclient.qrc ) -# includes all header files that should be treated with moc -#FILE(GLOB PVSMGR_MOC_HDRS -# src/server/*/*.h -#) - -#FILE(GLOB PVSCLIENT_MOC_HDRS -# src/client/*.h -# src/client/*/*.h -# src/client/*/*/*.h -#) - # i18n FILE(GLOB PVSMGR_TSS i18n/server/*.ts @@ -112,21 +100,6 @@ FILE(GLOB PVSCLIENT_TSS ) -# include Qt modules -#SET(QT_USE_QTDBUS TRUE) -#SET(QT_USE_QTNETWORK TRUE) -#SET(QT_USE_QTSVG TRUE) -#SET(QT_USE_QTWEBKIT TRUE) - -# add some useful macros and variables -# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains -# a path to CMake script) -#INCLUDE(${QT_USE_FILE}) - -# this will run rcc on .qrc files -QT5_ADD_RESOURCES(PVSMGR_RCS ${PVSMGR_RC_SRCS}) -QT5_ADD_RESOURCES(PVSCLIENT_RCS ${PVSCLIENT_RC_SRCS}) - # this will run uic on .ui files QT5_WRAP_UI(PVSMGR_UI_HDRS ${PVSMGR_UIS}) QT5_WRAP_UI(PVSCLIENT_UI_HDRS ${PVSCLIENT_UIS}) @@ -135,24 +108,54 @@ QT5_WRAP_UI(PVSCLIENT_UI_HDRS ${PVSCLIENT_UIS}) #QT4_WRAP_CPP(PVSMGR_MOC_SRCS ${PVSMGR_MOC_HDRS}) #QT4_WRAP_CPP(PVSCLIENT_MOC_SRCS ${PVSCLIENT_MOC_HDRS}) -option(UPDATE_TRANSLATIONS "Update .ts files (WARNING: make clean will delete the .ts files!)") +option(UPDATE_TRANSLATIONS "Update .ts files (WARNING: make clean will delete the .ts files!)" OFF) + if(PVSMGR_TSS) + if (UPDATE_TRANSLATIONS) - QT5_CREATE_TRANSLATION(PVSMGR_QMS ${PVSMGR_SRCS} ${PVSMGR_UI_HDRS} ${PVSMGR_TSS} OPTIONS -noobsolete) + set(FILES_TO_TRANSLATE ${PVSMGR_SRCS} ${PVSMGR_UIS}) + QT5_CREATE_TRANSLATION(PVSMGR_QMS ${FILES_TO_TRANSLATE} ${PVSMGR_TSS} OPTIONS -noobsolete) message(STATUS ".tr files have been updated") else (UPDATE_TRANSLATIONS) QT5_ADD_TRANSLATION(PVSMGR_QMS ${PVSMGR_TSS}) endif (UPDATE_TRANSLATIONS) + # # write a resource file for qm files + # set(resource_file_content "\n \n") + # foreach(file ${PVSMGR_QMS}) + # get_filename_component(filename ${file} NAME) + # set(resource_file_content "${resource_file_content} ${filename}\n") + # endforeach(file) + # set(resource_file_content "${resource_file_content} \n\n") + # file(WRITE "${CMAKE_BINARY_DIR}/ts_pvsmgr.qrc" "${resource_file_content}") + # set(PVSMGR_RESOURCES ${PVSMGR_RESOURCES} "${CMAKE_BINARY_DIR}/ts_pvsmgr.qrc") + endif(PVSMGR_TSS) + if(PVSCLIENT_TSS) + if (UPDATE_TRANSLATIONS) - QT5_CREATE_TRANSLATION(PVSCLIENT_QMS ${PVSCLIENT_SRCS} ${PVSCLIENT_UI_HDRS} ${PVSCLIENT_TSS} OPTIONS -noobsolete) + set(FILES_TO_TRANSLATE ${PVSCLIENT_SRCS} ${PVSCLIENT_UIS}) + QT5_CREATE_TRANSLATION(PVSCLIENT_QMS ${FILES_TO_TRANSLATE} ${PVSCLIENT_TSS} OPTIONS -noobsolete) message(STATUS ".tr files have been updated") else (UPDATE_TRANSLATIONS) QT5_ADD_TRANSLATION(PVSCLIENT_QMS ${PVSCLIENT_TSS}) endif (UPDATE_TRANSLATIONS) + # # write a resource file for qm files + # set(resource_file_content "\n \n") + # foreach(file ${PVSCLIENT_QMS}) + # get_filename_component(filename ${file} NAME) + # set(resource_file_content "${resource_file_content} ${filename}\n") + # endforeach(file) + # set(resource_file_content "${resource_file_content} \n\n") + # file(WRITE "${CMAKE_BINARY_DIR}/ts_pvsclient.qrc" "${resource_file_content}") + # set(PVSCLIENT_RESOURCES ${PVSCLIENT_RESOURCES} "${CMAKE_BINARY_DIR}/ts_pvsclient.qrc") + endif(PVSCLIENT_TSS) +# this will run rcc on .qrc files +QT5_ADD_RESOURCES(PVSMGR_RCS ${PVSMGR_RC_SRCS}) +QT5_ADD_RESOURCES(PVSCLIENT_RCS ${PVSCLIENT_RC_SRCS}) + ################################################################################ # Build ################################################################################ @@ -162,8 +165,8 @@ ADD_EXECUTABLE(pvsmgr ${PVSMGR_RCS} # ${PVSMGR_MOC_SRCS} ${PVSMGR_UI_HDRS} -# ${PVSMGR_RC_SRCS} -# ${PVSMGR_QMS} + ${PVSMGR_RC_SRCS} + ${PVSMGR_QMS} ) ADD_EXECUTABLE(pvsclient @@ -171,8 +174,8 @@ ADD_EXECUTABLE(pvsclient ${PVSCLIENT_RCS} # ${PVSCLIENT_MOC_SRCS} ${PVSCLIENT_UI_HDRS} -# ${PVSCLIENT_RC_SRCS} -# ${PVSCLIENT_QMS} + ${PVSCLIENT_RC_SRCS} + ${PVSCLIENT_QMS} ) # link diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui index 18685b7..cb6888a 100644 --- a/gui/server_normal/mainwindow.ui +++ b/gui/server_normal/mainwindow.ui @@ -11,7 +11,7 @@ - PVS2 Manager + PVS2 Manager QToolButton { @@ -48,7 +48,16 @@ QLabel#examModeLabel { 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -71,7 +80,16 @@ QLabel#examModeLabel { 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/gui/server_normal/numerickeyboard.ui b/gui/server_normal/numerickeyboard.ui index 4e3a8dc..2f83a2b 100644 --- a/gui/server_normal/numerickeyboard.ui +++ b/gui/server_normal/numerickeyboard.ui @@ -32,7 +32,7 @@ - 0 + 0 @@ -58,7 +58,7 @@ - 1 + 1 @@ -71,7 +71,7 @@ - 8 + 8 @@ -84,7 +84,7 @@ - 4 + 4 @@ -97,7 +97,7 @@ - 2 + 2 @@ -110,7 +110,7 @@ - 5 + 5 @@ -123,7 +123,7 @@ - 7 + 7 @@ -136,7 +136,7 @@ - 3 + 3 @@ -149,7 +149,7 @@ - 6 + 6 @@ -162,7 +162,7 @@ - 9 + 9 diff --git a/i18n/client/pvsclient_ar_JO.ts b/i18n/client/pvsclient_ar_JO.ts index 9edff17..61d4969 100644 --- a/i18n/client/pvsclient_ar_JO.ts +++ b/i18n/client/pvsclient_ar_JO.ts @@ -1,6 +1,6 @@ - + ConnectWindow @@ -79,37 +79,37 @@ - + Connect to PVS session - + Connection - + Connect to - + Manual Connection - + Session Name - + Cancel - + Connect @@ -130,79 +130,79 @@ 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 - + Form - - + + Menu - + <html><head/><body><p>Lock this workstation</p></body></html> - + Lock - + Switch @@ -210,7 +210,7 @@ VncWindow - + Connecting... diff --git a/i18n/client/pvsclient_de_DE.ts b/i18n/client/pvsclient_de_DE.ts index 781a84e..9695544 100644 --- a/i18n/client/pvsclient_de_DE.ts +++ b/i18n/client/pvsclient_de_DE.ts @@ -1,40 +1,40 @@ - + ConnectWindow - + Connect to PVS session Verbinde zu PVS Sitzung - + Connection Verbinden - + Connect to Verbinden zu - + Manual Connection Manuelle Verbindung - + Session Name Sitzungsname - + Cancel Abbrechen - + Connect Verbinden @@ -130,79 +130,79 @@ 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. - - + + Online Online - + Form Form - - + + Menu Menü - + <html><head/><body><p>Lock this workstation</p></body></html> <html><head/><body><p>Diesen Rechner sperren</p></body></html> - + Lock Sperren - + Switch Wechseln @@ -210,7 +210,7 @@ VncWindow - + Connecting... Verbinden... diff --git a/i18n/client/pvsclient_es_MX.ts b/i18n/client/pvsclient_es_MX.ts index a0e8bcc..6b1e16d 100644 --- a/i18n/client/pvsclient_es_MX.ts +++ b/i18n/client/pvsclient_es_MX.ts @@ -1,40 +1,40 @@ - + ConnectWindow - + Connect to PVS session - + Connection - + Connect to - + Manual Connection - + Session Name - + Cancel - + Connect Conectar @@ -130,79 +130,79 @@ 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 - + Form de - - + + Menu Menu - + <html><head/><body><p>Lock this workstation</p></body></html> - + Lock - + Switch @@ -210,7 +210,7 @@ VncWindow - + Connecting... diff --git a/i18n/client/pvsclient_fr_FR.ts b/i18n/client/pvsclient_fr_FR.ts index 9edff17..61d4969 100644 --- a/i18n/client/pvsclient_fr_FR.ts +++ b/i18n/client/pvsclient_fr_FR.ts @@ -1,6 +1,6 @@ - + ConnectWindow @@ -79,37 +79,37 @@ - + Connect to PVS session - + Connection - + Connect to - + Manual Connection - + Session Name - + Cancel - + Connect @@ -130,79 +130,79 @@ 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 - + Form - - + + Menu - + <html><head/><body><p>Lock this workstation</p></body></html> - + Lock - + Switch @@ -210,7 +210,7 @@ VncWindow - + Connecting... diff --git a/i18n/client/pvsclient_pl_PL.ts b/i18n/client/pvsclient_pl_PL.ts index 9edff17..61d4969 100644 --- a/i18n/client/pvsclient_pl_PL.ts +++ b/i18n/client/pvsclient_pl_PL.ts @@ -1,6 +1,6 @@ - + ConnectWindow @@ -79,37 +79,37 @@ - + Connect to PVS session - + Connection - + Connect to - + Manual Connection - + Session Name - + Cancel - + Connect @@ -130,79 +130,79 @@ 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 - + Form - - + + Menu - + <html><head/><body><p>Lock this workstation</p></body></html> - + Lock - + Switch @@ -210,7 +210,7 @@ VncWindow - + Connecting... diff --git a/i18n/server/pvsmgr_ar_JO.ts b/i18n/server/pvsmgr_ar_JO.ts index a776887..1ad154e 100644 --- a/i18n/server/pvsmgr_ar_JO.ts +++ b/i18n/server/pvsmgr_ar_JO.ts @@ -1,10 +1,9 @@ - + ConnectionFrame - EXAM-MODE @@ -12,57 +11,46 @@ Help - Form - + Refresh classroom configuration after choosing the room. + + + Lock all connected students screens. - Start projection from tutor to all connected students. - Start projection from tutor to selected student. - Start projection from selected student to tutor. - Start projection from selected student to tutor and blank all others. - - Delete selected client - - - - - Stop running projections. + Set selected client to tutor. - - Set selected client to tutor. + Delete selected client - - Refresh classroom configuration after choosing the room. + Stop running projections. - Cancel @@ -70,297 +58,175 @@ MainWindow - - - Exit - - - - - No tutor defined. + toolBar - - Tutor is offline. + &Exit - - Please select a projection source. + Exit - - The projection source is offline. + Ctrl+Q - - Please select a projection destination. + lock - - The projection destination is offline. + Lock or Unlock all Clients - - Selected projection target is tutor. + Ctrl+A - - Selected client is currently online. + Student's Screen to Tutor - - No projection destination available. + Student's Screen to Tutor, others blanked - - - - - Selection + Tutor's Screen to Student - - This client is still connected. + Tutor's Screen to Everyone - - Sure, You want to delete selected client? + Stop Projection on every Client - - Sure, You want to change SessionName again? -All Clients will be deleted afterwards. + SetAsTutor - - Session Name: %1 [click to edit] + Set current Frame as Tutor - - No item selected, please select room! + Delete Client - - Are you sure you want to reload the room? -Note that all clients will be deleted. + Help - - - - - - - - - - - - - - - - - - - Projection + Reload Room Configuration - - - No client is selected. + No tutor defined. - - The selected client is not connected. + Tutor is offline. - - - Lock or Unlock all Clients + Please select a projection source. - - PVS2 Manager + The projection source is offline. - - &Exit + Please select a projection destination. - - Ctrl+Q + The projection destination is offline. - - lock + Selected projection target is tutor. - - Ctrl+A + Selected client is currently online. - - Student's Screen to Tutor + No projection destination available. - - Student's Screen to Tutor, others blanked + Sure, You want to change SessionName again? +All Clients will be deleted afterwards. - - Tutor's Screen to Student + Session Name: %1 [click to edit] - - Tutor's Screen to Everyone + No item selected, please select room! - - Stop Projection on every Client + Are you sure you want to reload the room? +Note that all clients will be deleted. - - SetAsTutor + Projection - - Set current Frame as Tutor + Selection - - - Delete Client + No client is selected. - - - Help + The selected client is not connected. - - - Reload Room Configuration + This client is still connected. - - toolBar + Sure, You want to delete selected client? NumericKeyboard - GroupBox - Keyboard - - 0 - - - - Del - - - 1 - - - - - 8 - - - - - 4 - - - - - 2 - - - - - 5 - - - - - 7 - - - - - 3 - - - - - 6 - - - - - 9 - - QCoreApplication - OpenSSL error CertManager - Could not generate certificates for secure connections. PVS will not work. @@ -372,12 +238,10 @@ Press OK to quit. ReloadRoom - Reload Room - Choose room configuration to reload: @@ -385,17 +249,14 @@ Press OK to quit. SessionName - Set session name - New session name - Random name diff --git a/i18n/server/pvsmgr_de_DE.ts b/i18n/server/pvsmgr_de_DE.ts index 4a3d7c3..9c6d0ae 100644 --- a/i18n/server/pvsmgr_de_DE.ts +++ b/i18n/server/pvsmgr_de_DE.ts @@ -1,6 +1,6 @@ - + ConnectionFrame @@ -12,57 +12,57 @@ Help - + Form Form - + Refresh classroom configuration after choosing the room. Lade nach Raumauswahl entsprechende Raumkonfiguration neu. - + Delete selected client Lösche ausgewählten Client - + Cancel Abbruch - + Stop running projections. Alle Projektionen abbrechen. - + Start projection from selected student to tutor and blank all others. Projektion des ausgewählten Studierendens an Tutor; alle anderen ausblenden. - + Start projection from selected student to tutor. Startet Projektion von ausgewähltem Studierenden an Tutor. - + Start projection from tutor to selected student. Startet Projektion von Tutor an ausgewählten Studierenden. - + Start projection from tutor to all connected students. Startet Projektion von Tutor an alle verbundenen Studierenden. - + Lock all connected students screens. Alle verbundenen Studierendenbildschirme sperren. - + Set selected client to tutor. Ausgewählten Klienten als Tutor festlegen. @@ -70,216 +70,211 @@ MainWindow - - + + Exit Ausgang - + No tutor defined. Kein Tutor definiert. - + Tutor is offline. Tutor ist offline. - + Please select a projection source. Bitte eine Projektionsquelle auswählen. - + The projection source is offline. Die Projektionsquelle ist offline. - + Please select a projection destination. Bitte ein Projektionsziel auswählen. - + The projection destination is offline. Das Projektionsziel ist offline. - + Selected projection target is tutor. Das ausgwählte Projektionsziel ist Tutor. - + Selected client is currently online. Der ausgewählte Client ist derzeit online. - + No projection destination available. 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 - - PVS2 Manager - PVS2-Manager - - - + &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 - + 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 - + toolBar toolBar @@ -287,70 +282,20 @@ Note that all clients will be deleted. NumericKeyboard - + GroupBox GroupBox - + Keyboard Tastatur - - 0 - 0 - - - + Del C - - - 1 - 1 - - - - 8 - 8 - - - - 4 - 4 - - - - 2 - 2 - - - - 5 - 5 - - - - 7 - 7 - - - - 3 - 3 - - - - 6 - 6 - - - - 9 - 9 - QCoreApplication @@ -376,12 +321,12 @@ OK beendet den PVS-Manager ReloadRoom - + Reload Room Raum neu laden - + Choose room configuration to reload: Wählen Sie den neuzuladenden Raum: @@ -389,17 +334,17 @@ OK beendet den PVS-Manager SessionName - + Set session name Sitzungsname eingeben - + New session name Neuer Sitzungsname - + Random name Zufälliger Sitzungsname diff --git a/i18n/server/pvsmgr_es_MX.ts b/i18n/server/pvsmgr_es_MX.ts index 829da4e..b47934f 100644 --- a/i18n/server/pvsmgr_es_MX.ts +++ b/i18n/server/pvsmgr_es_MX.ts @@ -1,6 +1,6 @@ - + ConnectionFrame @@ -12,57 +12,57 @@ Help - + Form - + Lock all connected students screens. - + Start projection from tutor to all connected students. - + Start projection from tutor to selected student. - + Start projection from selected student to tutor. - + Start projection from selected student to tutor and blank all others. - + Delete selected client - + Stop running projections. - + Set selected client to tutor. - + Refresh classroom configuration after choosing the room. - + Cancel Cancelar @@ -70,215 +70,210 @@ MainWindow - - + + Exit Salir - + No tutor defined. - + Tutor is offline. - + Please select a projection source. - + The projection source is offline. - + Please select a projection destination. - + The projection destination is offline. - + Selected projection target is tutor. - + Selected client is currently online. - + No projection destination available. - - - - + + + + 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 - - PVS2 Manager - - - - + &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 bloquear - + Ctrl+A Ctrl+A - + toolBar Barra de herramientas @@ -286,70 +281,20 @@ Note that all clients will be deleted. NumericKeyboard - + GroupBox - + Keyboard - - 0 - - - - + Del - - - 1 - - - - - 8 - - - - - 4 - - - - - 2 - - - - - 5 - - - - - 7 - - - - - 3 - - - - - 6 - - - - - 9 - - QCoreApplication @@ -372,12 +317,12 @@ Press OK to quit. ReloadRoom - + Reload Room - + Choose room configuration to reload: @@ -385,17 +330,17 @@ Press OK to quit. SessionName - + Set session name - + New session name - + Random name diff --git a/i18n/server/pvsmgr_fr_FR.ts b/i18n/server/pvsmgr_fr_FR.ts index a776887..f41176d 100644 --- a/i18n/server/pvsmgr_fr_FR.ts +++ b/i18n/server/pvsmgr_fr_FR.ts @@ -1,6 +1,6 @@ - + ConnectionFrame @@ -12,57 +12,57 @@ Help - + Form - + Lock all connected students screens. - + Start projection from tutor to all connected students. - + Start projection from tutor to selected student. - + Start projection from selected student to tutor. - + Start projection from selected student to tutor and blank all others. - + Delete selected client - + Stop running projections. - + Set selected client to tutor. - + Refresh classroom configuration after choosing the room. - + Cancel @@ -70,215 +70,210 @@ MainWindow - - + + Exit - + No tutor defined. - + Tutor is offline. - + Please select a projection source. - + The projection source is offline. - + Please select a projection destination. - + The projection destination is offline. - + Selected projection target is tutor. - + Selected client is currently online. - + No projection destination available. - - - - + + + + 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 - - PVS2 Manager - - - - + &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 - + toolBar @@ -286,70 +281,20 @@ Note that all clients will be deleted. NumericKeyboard - + GroupBox - + Keyboard - - 0 - - - - + Del - - - 1 - - - - - 8 - - - - - 4 - - - - - 2 - - - - - 5 - - - - - 7 - - - - - 3 - - - - - 6 - - - - - 9 - - QCoreApplication @@ -372,12 +317,12 @@ Press OK to quit. ReloadRoom - + Reload Room - + Choose room configuration to reload: @@ -385,17 +330,17 @@ Press OK to quit. SessionName - + Set session name - + New session name - + Random name diff --git a/i18n/server/pvsmgr_pl_PL.ts b/i18n/server/pvsmgr_pl_PL.ts index a776887..f41176d 100644 --- a/i18n/server/pvsmgr_pl_PL.ts +++ b/i18n/server/pvsmgr_pl_PL.ts @@ -1,6 +1,6 @@ - + ConnectionFrame @@ -12,57 +12,57 @@ Help - + Form - + Lock all connected students screens. - + Start projection from tutor to all connected students. - + Start projection from tutor to selected student. - + Start projection from selected student to tutor. - + Start projection from selected student to tutor and blank all others. - + Delete selected client - + Stop running projections. - + Set selected client to tutor. - + Refresh classroom configuration after choosing the room. - + Cancel @@ -70,215 +70,210 @@ MainWindow - - + + Exit - + No tutor defined. - + Tutor is offline. - + Please select a projection source. - + The projection source is offline. - + Please select a projection destination. - + The projection destination is offline. - + Selected projection target is tutor. - + Selected client is currently online. - + No projection destination available. - - - - + + + + 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 - - PVS2 Manager - - - - + &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 - + toolBar @@ -286,70 +281,20 @@ Note that all clients will be deleted. NumericKeyboard - + GroupBox - + Keyboard - - 0 - - - - + Del - - - 1 - - - - - 8 - - - - - 4 - - - - - 2 - - - - - 5 - - - - - 7 - - - - - 3 - - - - - 6 - - - - - 9 - - QCoreApplication @@ -372,12 +317,12 @@ Press OK to quit. ReloadRoom - + Reload Room - + Choose room configuration to reload: @@ -385,17 +330,17 @@ Press OK to quit. SessionName - + Set session name - + New session name - + Random name diff --git a/pvsmgr.qrc b/pvsmgr.qrc index 272b9ff..f117322 100644 --- a/pvsmgr.qrc +++ b/pvsmgr.qrc @@ -1,5 +1,5 @@ - + icons/exit.svg icons/terminal.svg icons/photo.svg @@ -15,21 +15,16 @@ icons/keyboard_key.svg icons/student2tutor_extension.svg icons/help.svg - icons/trash.svg + icons/trash.svg icons/reloadClassroom.svg AUTHORS - build/pvsmgr_de_DE.qm - build/pvsmgr_de_DE.qm - build/pvsmgr_fr_FR.qm - build/pvsmgr_fr_FR.qm - build/pvsmgr_es_MX.qm - build/pvsmgr_es_MX.qm - build/pvsmgr_ar_JO.qm - build/pvsmgr_ar_JO.qm - build/pvsmgr_pl_PL.qm - build/pvsmgr_pl_PL.qm icons/cf_icon_cam.svg icons/cf_icon_eye.svg icons/cf_icon_lock.svg + build/pvsmgr_de_DE.qm + build/pvsmgr_fr_FR.qm + build/pvsmgr_es_MX.qm + build/pvsmgr_ar_JO.qm + build/pvsmgr_pl_PL.qm diff --git a/sample_configuration/switchToManager.sh b/sample_configuration/switchToManager.sh index 84f3c37..40d863c 100755 --- a/sample_configuration/switchToManager.sh +++ b/sample_configuration/switchToManager.sh @@ -7,7 +7,7 @@ for window in $WINDOWS; do done # move PVS-Manager to workspace 1 and focus it -wt="PVS2-Manager" +wt="PVS2 Manager" wmctrl -r "$wt" -t 1 wmctrl -s 1 wmctrl -a "$wt" diff --git a/src/server/serverapp/serverapp.cpp b/src/server/serverapp/serverapp.cpp index 3df996c..7ee06e0 100644 --- a/src/server/serverapp/serverapp.cpp +++ b/src/server/serverapp/serverapp.cpp @@ -28,19 +28,17 @@ ServerApp::ServerApp(int& argc, char** argv) // 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(":pvsmgr"); + translator->load(QLocale::system(), ":", "l_"); installTranslator(translator); /* Set the global path of the settings */ QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/"); QSharedPointer sys = getSettings(); qDebug() << "System settings are in:" << sys->fileName(); - QFileInfo sysfi(sys->fileName()); _mainWindow = new MainWindow(); } -- cgit v1.2.3-55-g7522