diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 48f49e32c..0026f6358 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -97,8 +97,6 @@ NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS() NL_SETUP_PREFIX_PATHS() RYZOM_SETUP_PREFIX_PATHS() -NL_CONFIGURE_CHECKS() - NL_SETUP_BUILD() NL_SETUP_BUILD_FLAGS() @@ -122,6 +120,16 @@ FIND_PACKAGE(OpenSSL REQUIRED) FIND_PACKAGE(GIF) FIND_PACKAGE(Jpeg) +IF(WITH_LIBOVR) + FIND_PACKAGE(LibOVR) +ENDIF() + +IF(WITH_LIBVR) + FIND_PACKAGE(LibVR) +ENDIF() + +NL_CONFIGURE_CHECKS() + IF(WITH_STATIC_LIBXML2) SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC) ENDIF() diff --git a/code/CMakeModules/FindLibOVR.cmake b/code/CMakeModules/FindLibOVR.cmake index 330835edf..081fa0bca 100644 --- a/code/CMakeModules/FindLibOVR.cmake +++ b/code/CMakeModules/FindLibOVR.cmake @@ -10,7 +10,8 @@ IF(LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIR) ENDIF() FIND_PATH(LIBOVR_INCLUDE_DIR - OVR.h + NAMES + OVR.h OVR_CAPI.h PATHS $ENV{LIBOVR_DIR}/Include /usr/local/include diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt index 167737833..0f1d11579 100644 --- a/code/nel/CMakeLists.txt +++ b/code/nel/CMakeLists.txt @@ -37,14 +37,6 @@ IF(WITH_GTK) FIND_PACKAGE(GTK2) ENDIF() -IF(WITH_LIBOVR) - FIND_PACKAGE(LibOVR) -ENDIF() - -IF(WITH_LIBVR) - FIND_PACKAGE(LibVR) -ENDIF() - IF(WITH_INSTALL_LIBRARIES) IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index af73613d1..2b2a227d6 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -897,10 +897,10 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool contentPrefix += "set SHARDID=%7\n"; #else contentPrefix += "#!/bin/sh\n"; - contentPrefix += "export RYZOM_CLIENT=$1\n"; - contentPrefix += "export UNPACKPATH=$2\n"; - contentPrefix += "export ROOTPATH=$3\n"; - contentPrefix += "export STARTUPPATH=$4\n"; + contentPrefix += "export RYZOM_CLIENT=\"$1\"\n"; + contentPrefix += "export UNPACKPATH=\"$2\"\n"; + contentPrefix += "export ROOTPATH=\"$3\"\n"; + contentPrefix += "export STARTUPPATH=\"$4\"\n"; contentPrefix += toString("export UPGRADE_FILE=$ROOTPATH/%s\n", UpgradeBatchFilename.c_str()); contentPrefix += "\n"; contentPrefix += "LOGIN=$5\n"; diff --git a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt index a94eda413..c81bfcbae 100644 --- a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt +++ b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt @@ -4,7 +4,8 @@ FILE(GLOB SRC src/*.cpp src/*.h resources/*.rc) FILE(GLOB CLIENT_CONFIG_HDR src/*.h) FILE(GLOB CLIENT_CONFIG_UIS ui/*.ui) -FILE(GLOB CLIENT_CONFIG_TRANS translations/*.ts) +FILE(GLOB CLIENT_CONFIG_BASE_TRANS translations/qtbase_*.ts) +FILE(GLOB CLIENT_CONFIG_TRANS translations/ryzom_configuration_*.ts) CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) SET(CLIENT_CONFIG_RCS resources/resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc ) @@ -22,7 +23,7 @@ IF(WITH_QT) ELSE() # uncomment this line if you want to update original translations # QT5_CREATE_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_UIS} ${SRC} ${CLIENT_CONFIG_TRANS} OPTIONS -I ${CMAKE_CURRENT_SOURCE_DIR}) - QT5_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS}) + QT5_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS} ${CLIENT_CONFIG_BASE_TRANS}) QT5_ADD_RESOURCES(CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS}) QT5_WRAP_CPP(CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR}) QT5_WRAP_UI(CLIENT_CONFIG_UI_HDRS ${CLIENT_CONFIG_UIS}) @@ -35,9 +36,9 @@ ENDIF() SOURCE_GROUP("Resources" FILES ${CLIENT_CONFIG_RCS}) SOURCE_GROUP("Forms" FILES ${CLIENT_CONFIG_UIS}) SOURCE_GROUP("Generated Files" FILES ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_MOC_SRC}) -SOURCE_GROUP("Translation Files" FILES ${CLIENT_CONFIG_TRANS} ) +SOURCE_GROUP("Translation Files" FILES ${CLIENT_CONFIG_TRANS} ${CLIENT_CONFIG_BASE_TRANS}) -ADD_EXECUTABLE(ryzom_configuration_qt WIN32 ${SRC} ${CLIENT_CONFIG_MOC_SRC} ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_RC_SRCS} ${CLIENT_CONFIG_TRANS} ${CLIENT_CONFIG_QM}) +ADD_EXECUTABLE(ryzom_configuration_qt WIN32 ${SRC} ${CLIENT_CONFIG_MOC_SRC} ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_RC_SRCS} ${CLIENT_CONFIG_TRANS} ${CLIENT_CONFIG_BASE_TRANS} ${CLIENT_CONFIG_QM}) NL_DEFAULT_PROPS(ryzom_configuration_qt "Ryzom, Tools: Ryzom Configuration Qt" ) NL_ADD_RUNTIME_FLAGS( ryzom_configuration_qt ) NL_ADD_LIB_SUFFIX( ryzom_configuration_qt ) diff --git a/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp index 780e6a87c..fa79a9b8c 100644 --- a/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp +++ b/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp @@ -108,7 +108,7 @@ void CDisplaySettingsDetailsWidget::onLandscapeSliderChange( int value ) if( ( value < 0 ) || ( value > 3 ) ) return; - landscapeLabel->setText( getQualityString( value ) ); + landscapeValLabel->setText( getQualityString( value ) ); emit changed(); } @@ -117,7 +117,7 @@ void CDisplaySettingsDetailsWidget::onCharactersSliderChange( int value ) if( ( value < 0 ) || ( value > 3 ) ) return; - characterLabel->setText( getQualityString( value ) ); + characterValLabel->setText( getQualityString( value ) ); emit changed(); } @@ -126,7 +126,7 @@ void CDisplaySettingsDetailsWidget::onFXSliderChange( int value ) if( ( value < 0 ) || ( value > 3 ) ) return; - fxLabel->setText( getQualityString( value ) ); + fxValLabel->setText( getQualityString( value ) ); emit changed(); } @@ -135,7 +135,7 @@ void CDisplaySettingsDetailsWidget::onTexturesSliderChange( int value ) if( ( value < 0 ) || ( value > 3 ) ) return; - textureLabel->setText( getTextureQualityString( value ) ); + texturesValLabel->setText( getTextureQualityString( value ) ); emit changed(); } diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_de.ts b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_de.ts index 2efd55ed3..579d169ec 100644 --- a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_de.ts +++ b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_de.ts @@ -4,12 +4,12 @@ CClientConfigDialog - + Ryzom configuration Ryzom Konfiguration - + Are you sure you want to quit without saving the configuration? Bist du sicher, dass du abbrechen willst, ohne die Konfiguration zu sichern? @@ -17,45 +17,49 @@ CDisplaySettingsDetailsWidget - + Low Niedrig - + Medium Mittel - + Normal Normal - + High Hoch - + Low (32 MB) Niedrig (32 MB) - + Normal (64 MB) Normal (64 MB) - + + High (more than 128 MB) + + + High (128 MB) - Hoch (128 MB) + Hoch (128 MB) CDisplaySettingsWidget - + Auto if too long, Auto is sufficient (just ugly, as in German the short form also means "car") Automatisch @@ -64,7 +68,7 @@ CSoundSettingsWidget - + %1 tracks audio-channels? %1 Tonspuren @@ -73,7 +77,7 @@ CSysInfoWidget - + %1 MiB %1 MiB @@ -81,68 +85,68 @@ client_config_dialog - + Ryzom Configuration Ryzom-Konfiguration - - + + General Allgemein - + Category Kategorie - + Display Anzeige - + Display details Anzeigedetails - + Display advanced Anzeige erweitert - + Sound Sound - + System information System-Information - + OpenGL information OpenGL-Information - + Direct3D information Direct3D-Information - + Apply Anwenden - + Default Standard - + Play Ryzom Ryzom spielen @@ -150,32 +154,32 @@ display_settings_advanced_widget - + Display advanced Anzeige erweitert - + Modify these settings only if you have trouble launching the game Modifiziere diese Einstellungen nur dann, wenn du Probleme mit dem Starten des Spiels hast - + Force texture compression Erzwinge Textur-Kompression - + Disable vertex shaders Deaktiviere Vertex-Shader - + Disable AGP for vertices Deaktiviere AGP für Vertexeckpunkte - + Disable pixel shaders Deaktiviere Pixel-Shader @@ -183,43 +187,43 @@ display_settings_details_widget - + Display details Anzeigedetails - + Landscape Landschaft - - - - + + + + Level of detail Detailstufe - - - - + + + + Low Niedrig - + Characters Charaktere - + FX FX Effekte - + Textures Texturen @@ -227,12 +231,12 @@ display_settings_widget - + Display Anzeige - + Driver Treiber @@ -242,42 +246,42 @@ Wähle, ob Ryzom in OpenGL oder Direct3D laufen soll: - + Specify if Ryzom is to be run in OpenGL or Direct3D: Wähle, ob Ryzom in OpenGL oder Direct3D laufen soll: - + Auto Automatisch - + OpenGL OpenGL - + Direct3D Direct3D - + Parameters Parameter - + Specify if Ryzom is to be run in full screen or window mode: Wähle, ob Ryzom im Vollbildmodus oder Fenstermodus laufen soll: - + Full screen Vollbild - + Specify a video mode: Wähle eine Bildschirmauflösung: @@ -286,27 +290,27 @@ Wähle eine Bildschirmauflösung - + Windowed Im Fenster - + Width Breite - + Height Höhe - + X position X-Position - + Y position Y-Position @@ -314,49 +318,48 @@ general_settings_widget - + Form Formblatt - + Language Sprache - + English Englisch - + French Französisch - + German Deutsch - Hungarian - Ungarisch + Ungarisch - + Save config file when quitting the game Do we need the "file" mentioned? Speichere Konfigurationsdatei beim Beenden des Spiels - + Advanced is it "extended" or rather "progressed" like "further/better developed"? Erweitert - + Slow down the game (process low priority) Verlangsame Spiel (niedrige Prozesspriorität) @@ -368,27 +371,61 @@ sound_settings_widget - + Sound Sound - + + Driver + Treiber + + + + Auto + Automatisch + + + + OpenAL + + + + + FMod + + + + + XAudio2 + + + + + DirectSound + + + + + Parameters + Parameter + + + Enable sound Aktiviere Sound - + Enable EAX Aktiviere EAX Klangverarbeitung - Enable FMod - Aktiviere FMod Audiotool + Aktiviere FMod Audiotool - + Software sound buffer (may increase FPS) Software Sound Buffer (kann FPS erhöhen) @@ -397,13 +434,13 @@ Software Sound Buffer (kann FPS erhöhen) - + Sound tracks is this really about audio channels? Tonspuren - + 8 tracks 8-track as in 8 audio channels, right? Or does it mean something else? 8 Spuren @@ -412,27 +449,27 @@ sys_info_d3d_widget - + Direct3D information Direct3D-Information - + Direct3D Direct3D - + Description Beschreibung - + Driver Treiber - + Driver version Treiber-Version @@ -440,32 +477,32 @@ sys_info_opengl_widget - + OpenGL information OpenGL-Information - + OpenGL OpenGL - + Vendor Hersteller - + Renderer Renderer - + Version Version - + Extensions Erweiterungen @@ -473,34 +510,34 @@ sys_info_widget - - + + System information System-Information - + Operating system Betriebssystem - + CPU Prozessor - + Physical memory Physikalischer Speicher - + Video device seems to refer to the video card. Or is it something else? Grafikkarte - + Video driver version Grafiktreiber-Version diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts index 97dba7b82..c38ddd51b 100644 --- a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts +++ b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts @@ -4,12 +4,12 @@ CClientConfigDialog - + Ryzom configuration Confirguración de Ryzom - + Are you sure you want to quit without saving the configuration? ¿Desea salir del juego sin guardar la configuración? @@ -17,45 +17,49 @@ CDisplaySettingsDetailsWidget - + Low Bajo - + Medium Medio - + Normal Normal - + High Alto - + Low (32 MB) Bajo (32 MB) - + Normal (64 MB) Normal (64 MB) - + + High (more than 128 MB) + + + High (128 MB) - Alto (128 MB) + Alto (128 MB) CDisplaySettingsWidget - + Auto Automático @@ -63,7 +67,7 @@ CSoundSettingsWidget - + %1 tracks %1 pistas @@ -71,7 +75,7 @@ CSysInfoWidget - + %1 MiB %1 MiB @@ -79,68 +83,68 @@ client_config_dialog - + Ryzom Configuration Configuración de Ryzom - - + + General General - + Category Categoría - + Display Monitor - + Display details Detalles de monitor - + Display advanced Monitor avanzado - + Sound Sonido - + System information Información del sistema - + OpenGL information Información OpenGL - + Direct3D information Información Direct3D - + Apply Aplicar - + Default Por defecto - + Play Ryzom Jugar Ryzom @@ -148,32 +152,32 @@ display_settings_advanced_widget - + Display advanced Monitor avanzado - + Modify these settings only if you have trouble launching the game Modifique estos ajustes sólo si tiene problemas para iniciar el juego - + Force texture compression Forzar compresión de texturas - + Disable vertex shaders Desactivar vertex shader - + Disable AGP for vertices Desactivar AGP para vértices - + Disable pixel shaders Desactivar sombreador de píxel @@ -181,43 +185,43 @@ display_settings_details_widget - + Display details Mostrar detalles - + Landscape Paisaje - - - - + + + + Level of detail Nivel de detalle - - - - + + + + Low Bajo - + Characters Personajes - + FX FX - + Textures Texturas @@ -225,12 +229,12 @@ display_settings_widget - + Display Monitor - + Driver Driver @@ -239,42 +243,42 @@ Especificar si Ryzom debe ser ejecutado con OpenGL o Direct3D. - + Specify if Ryzom is to be run in OpenGL or Direct3D: Especificar si Ryzom debe ser ejecutado con OpenGL o Direct3D: - + Auto Automático - + OpenGL OpenGL - + Direct3D Direct3D - + Parameters Parámetros - + Specify if Ryzom is to be run in full screen or window mode: Especificar si Ryzom debe ser ejecutado en modo pantalla completa o en modo ventana: - + Full screen Pantalla completa - + Specify a video mode: Especificar un modo de video: @@ -283,27 +287,27 @@ Especificar un modo de video - + Windowed Ventana - + Width Anchura - + Height Altura - + X position Posición X - + Y position Posición Y @@ -311,47 +315,46 @@ general_settings_widget - + Form Forma - + Language Idioma - + English Inglés - + French Francés - + German Alemán - Hungarian - Húngaro + Húngaro - + Save config file when quitting the game Guardar archivo config al abandonar el juego - + Advanced Avanzado - + Slow down the game (process low priority) Realentizar el juego (prioridad de procesamiento bajo) @@ -363,27 +366,61 @@ sound_settings_widget - + Sound Sonido - + + Driver + Driver + + + + Auto + Automático + + + + OpenAL + + + + + FMod + + + + + XAudio2 + + + + + DirectSound + + + + + Parameters + Parámetros + + + Enable sound Activar sonido - + Enable EAX Activar EAX - Enable FMod - Activar FMod + Activar FMod - + Software sound buffer (may increase FPS) Buffer de sonido software (puede aumentar los FPS) @@ -392,12 +429,12 @@ Buffer de sonido software (puede aumentar los FPS ) - + Sound tracks Pistas de sonido - + 8 tracks 8 pistas @@ -405,27 +442,27 @@ sys_info_d3d_widget - + Direct3D information Información Direct3D - + Direct3D Direct3D - + Description Descripcción - + Driver Driver - + Driver version Versión del driver @@ -433,32 +470,32 @@ sys_info_opengl_widget - + OpenGL information Información OpenGL - + OpenGL OpenGL - + Vendor Distribuidor - + Renderer Renderizador - + Version Version - + Extensions Extensión @@ -466,33 +503,33 @@ sys_info_widget - - + + System information Información del sistema - + Operating system Sistema operativo - + CPU CPU - + Physical memory Memoria física - + Video device Dispositivo de video - + Video driver version Versión del driver de video diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts index c60460881..d2f7bc47e 100644 --- a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts +++ b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts @@ -4,12 +4,12 @@ CClientConfigDialog - + Ryzom configuration Configuration de Ryzom - + Are you sure you want to quit without saving the configuration? Êtes-vous sûr de vouloir quitter sans enregistrer la configuration ? @@ -17,45 +17,49 @@ CDisplaySettingsDetailsWidget - + Low Faible - + Medium Moyen - + Normal Normal - + High Elevé - + Low (32 MB) Faible (32 Mo) - + Normal (64 MB) Normal (64 Mo) - + + High (more than 128 MB) + Elevé (plus de 128 Mo) + + High (128 MB) - Elevé (128 Mo) + Elevé (128 Mo) CDisplaySettingsWidget - + Auto Auto @@ -63,7 +67,7 @@ CSoundSettingsWidget - + %1 tracks %1 pistes @@ -71,7 +75,7 @@ CSysInfoWidget - + %1 MiB %1 Mio @@ -79,68 +83,68 @@ client_config_dialog - + Ryzom Configuration Configuration de Ryzom - - + + General Général - + Category Catégorie - + Display Affichage - + Display details Détails d'affichage - + Display advanced Affichage avancé - + Sound Son - + System information Informations systèmes - + OpenGL information Informations OpenGL - + Direct3D information Informations Direct3D - + Apply Appliquer - + Default Défaut - + Play Ryzom Jouer à Ryzom @@ -148,12 +152,12 @@ display_settings_advanced_widget - + Display advanced Affichage avancé - + Modify these settings only if you have trouble launching the game Modifiez ces paramètres uniquement si vous avez des problèmes pour lancer le jeu @@ -162,22 +166,22 @@ Désactiver la compression des textures - + Force texture compression Forcer la compression des textures - + Disable vertex shaders Désactiver les vertex shaders - + Disable AGP for vertices Désactiver l'AGP pour les vertices - + Disable pixel shaders Désactiver les pixel shaders @@ -185,43 +189,43 @@ display_settings_details_widget - + Display details Détails d'affichage - + Landscape Paysage - - - - + + + + Level of detail Niveau de détail - - - - + + + + Low Faible - + Characters Personnages - + FX Effets spéciaux - + Textures Textures @@ -229,12 +233,12 @@ display_settings_widget - + Display Affichage - + Driver Pilote @@ -243,42 +247,42 @@ Spécifier si Ryzom doit utiliser OpenGL ou Direct3D. - + Specify if Ryzom is to be run in OpenGL or Direct3D: Spécifier si Ryzom doit utiliser OpenGL ou Direct3D : - + Auto Auto - + OpenGL OpenGL - + Direct3D Direct3D - + Parameters Paramètres - + Specify if Ryzom is to be run in full screen or window mode: Spécifier si Ryzom doit être lancé en mode plein écran ou fenêtré : - + Full screen Plein écran - + Specify a video mode: Spécifier une résolution : @@ -287,27 +291,27 @@ Spécifier une résolution - + Windowed Fenêtré - + Width Largeur - + Height Hauteur - + X position Position X - + Y position Position Y @@ -315,47 +319,46 @@ general_settings_widget - + Form Formulaire - + Language Langue - + English Anglais - + French Français - + German Allemand - Hungarian - Hongrois + Hongrois - + Save config file when quitting the game Enregistrer le fichier de configuration quand on quitte le jeu - + Advanced Avancé - + Slow down the game (process low priority) Ralentir le jeu (priorité basse du processus) @@ -367,27 +370,61 @@ sound_settings_widget - + Sound Son - + + Driver + Pilote + + + + Auto + Auto + + + + OpenAL + OpenAL + + + + FMod + FMod + + + + XAudio2 + XAudio2 + + + + DirectSound + DirectSound + + + + Parameters + Paramètres + + + Enable sound Activer le son - + Enable EAX Activer EAX - Enable FMod - Activer FMod + Activer FMod - + Software sound buffer (may increase FPS) Tampons sonores logiciels (peut accroître la fluidité) @@ -396,12 +433,12 @@ Tampons sonores logiciels (peut accroître la fluidité) - + Sound tracks Pistes audio - + 8 tracks 8 pistes @@ -409,27 +446,27 @@ sys_info_d3d_widget - + Direct3D information Informations Direct3D - + Direct3D Direct3D - + Description Description - + Driver Pilote - + Driver version Version du pilote @@ -437,32 +474,32 @@ sys_info_opengl_widget - + OpenGL information Informations OpenGL - + OpenGL OpenGL - + Vendor Vendeur - + Renderer Moteur de rendu - + Version Version - + Extensions Extensions @@ -470,33 +507,33 @@ sys_info_widget - - + + System information Informations systèmes - + Operating system Système d'exploitation - + CPU Processeur - + Physical memory Mémoire physique - + Video device Carte graphique - + Video driver version Version du driver de la carte graphique diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts index 6f31fb7b2..4172f68f5 100644 --- a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts +++ b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts @@ -4,12 +4,12 @@ CClientConfigDialog - + Ryzom configuration Ryom beállító - + Are you sure you want to quit without saving the configuration? Biztosan ki akar lépni mentés nélkül? @@ -17,45 +17,49 @@ CDisplaySettingsDetailsWidget - + Low Alacsony - + Medium Közepes - + Normal Normális - + High Magas - + Low (32 MB) Alacsony (32 MB) - + Normal (64 MB) Normális (64 MB) - + + High (more than 128 MB) + + + High (128 MB) - Magas (128 MB) + Magas (128 MB) CDisplaySettingsWidget - + Auto Automatikus @@ -63,7 +67,7 @@ CSoundSettingsWidget - + %1 tracks %1 sáv @@ -71,7 +75,7 @@ CSysInfoWidget - + %1 MiB @@ -445,68 +449,68 @@ client_config_dialog - + Ryzom Configuration Ryzom beállító - - + + General Általános - + Category Kategória - + Display Megjelenítés - + Display details Megjelenítés részletek - + Display advanced Megjelenítés haladóknak - + Sound Hang - + System information Rendszer információk - + OpenGL information OpenGL információk - + Direct3D information Direct3D információk - + Apply Alkalmaz - + Default Alapbeállítások - + Play Ryzom Ryom indítása @@ -514,12 +518,12 @@ display_settings_advanced_widget - + Display advanced Megjelenítés haladóknak - + Modify these settings only if you have trouble launching the game Csak akkor változtasson ezeken a beállításokon ha nem tudja elindítani a játékot @@ -528,22 +532,22 @@ Textúratömörítés kikapcsolása - + Force texture compression - + Disable vertex shaders Csúcsárnyalók kikapcsolása - + Disable AGP for vertices AGP kikapcsolása a csúcsok számára - + Disable pixel shaders Képpont árnyalók kikapcsolása @@ -551,43 +555,43 @@ display_settings_details_widget - + Display details Megjelenítés részletek - + Landscape Terep - - - - + + + + Level of detail Részletesség - - - - + + + + Low Alacsony - + Characters Karakterek - + FX FX - + Textures Textúrák @@ -595,12 +599,12 @@ display_settings_widget - + Display Megjelenítés - + Driver Meghajtó @@ -609,42 +613,42 @@ Határozza meg, hogy a Ryzom OpenGL-t vagy Direct3D-t használjon. - + Specify if Ryzom is to be run in OpenGL or Direct3D: - + Auto Automatikus - + OpenGL - + Direct3D - + Parameters Paraméterek - + Specify if Ryzom is to be run in full screen or window mode: Határozza meg, hogy a Ryzom teljes képernyős vagy ablakos üzemmódban fusson: - + Full screen Teljes képernyő - + Specify a video mode: @@ -653,27 +657,27 @@ Határozza meg a megjelenítési módot - + Windowed Ablakos - + Width Szélesség - + Height Magasság - + X position X helyzet - + Y position Y Helyzet @@ -681,47 +685,46 @@ general_settings_widget - + Form - + Language Nyelv - + English Angol - + French Francia - + German Német - Hungarian - Magyar + Magyar - + Save config file when quitting the game Mentsük a beállításokat kilépéskor - + Advanced Haladó - + Slow down the game (process low priority) @@ -733,27 +736,61 @@ sound_settings_widget - + Sound Hang - + + Driver + Meghajtó + + + + Auto + Automatikus + + + + OpenAL + + + + + FMod + + + + + XAudio2 + + + + + DirectSound + + + + + Parameters + Paraméterek + + + Enable sound Hang bekapcsolása - + Enable EAX EAX bekapcsolása - Enable FMod - FMod bekapcsolása + FMod bekapcsolása - + Software sound buffer (may increase FPS) @@ -762,12 +799,12 @@ Software-es hang tárolás ( növelheti az FPS-t ) - + Sound tracks Hangsávok - + 8 tracks 8 sáv @@ -775,27 +812,27 @@ sys_info_d3d_widget - + Direct3D information Direct3D információk - + Direct3D - + Description Leírás - + Driver Meghajtó - + Driver version Meghajtó verziószám @@ -803,32 +840,32 @@ sys_info_opengl_widget - + OpenGL information OpenGL információk - + OpenGL - + Vendor Szállító - + Renderer Megjelenítő - + Version Verziószám - + Extensions Kiegészítések @@ -836,33 +873,33 @@ sys_info_widget - - + + System information Rendszer információk - + Operating system Alaprendszer - + CPU - + Physical memory Fizikai memória - + Video device Megjelenítő eszköz - + Video driver version Megjelenítő meghajtó verziószám diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_ru.ts b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_ru.ts index 2873880a5..a61aad20e 100644 --- a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_ru.ts +++ b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_ru.ts @@ -4,12 +4,12 @@ CClientConfigDialog - + Ryzom configuration - + Are you sure you want to quit without saving the configuration? @@ -17,45 +17,45 @@ CDisplaySettingsDetailsWidget - + Low - + Medium - + Normal - + High - + Low (32 MB) - + Normal (64 MB) - - High (128 MB) + + High (more than 128 MB) CDisplaySettingsWidget - + Auto @@ -63,7 +63,7 @@ CSoundSettingsWidget - + %1 tracks @@ -71,7 +71,7 @@ CSysInfoWidget - + %1 MiB @@ -79,68 +79,68 @@ client_config_dialog - + Ryzom Configuration - - + + General - + Category - + Display - + Display details - + Display advanced - + Sound - + System information - + OpenGL information - + Direct3D information - + Apply - + Default - + Play Ryzom @@ -148,32 +148,32 @@ display_settings_advanced_widget - + Display advanced - + Modify these settings only if you have trouble launching the game - + Force texture compression - + Disable vertex shaders - + Disable AGP for vertices - + Disable pixel shaders @@ -181,43 +181,43 @@ display_settings_details_widget - + Display details - + Landscape - - - - + + + + Level of detail - - - - + + + + Low - + Characters - + FX - + Textures @@ -225,77 +225,77 @@ display_settings_widget - + Display - + Driver - + Specify if Ryzom is to be run in OpenGL or Direct3D: - + Auto - + OpenGL - + Direct3D - + Parameters - + Specify if Ryzom is to be run in full screen or window mode: - + Full screen - + Specify a video mode: - + Windowed - + Width - + Height - + X position - + Y position @@ -303,47 +303,42 @@ general_settings_widget - + Form - + Language - + English - + French - + German - - Hungarian - - - - + Save config file when quitting the game - + Advanced - + Slow down the game (process low priority) @@ -351,37 +346,67 @@ sound_settings_widget - + Sound - + + Driver + + + + + Auto + + + + + OpenAL + + + + + FMod + + + + + XAudio2 + + + + + DirectSound + + + + + Parameters + + + + Enable sound - + Enable EAX - - Enable FMod - - - - + Software sound buffer (may increase FPS) - + Sound tracks - + 8 tracks @@ -389,27 +414,27 @@ sys_info_d3d_widget - + Direct3D information - + Direct3D - + Description - + Driver - + Driver version @@ -417,32 +442,32 @@ sys_info_opengl_widget - + OpenGL information - + OpenGL - + Vendor - + Renderer - + Version - + Extensions @@ -450,33 +475,33 @@ sys_info_widget - - + + System information - + Operating system - + CPU - + Physical memory - + Video device - + Video driver version diff --git a/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui b/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui index 03f4234a6..177c9a143 100644 --- a/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui +++ b/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui @@ -7,7 +7,7 @@ 0 0 941 - 567 + 558 @@ -31,7 +31,7 @@ - :/resources/left_bitmap_0.png + :/resources/left_bitmap_0.png @@ -51,7 +51,7 @@ - + @@ -60,7 +60,7 @@ - :/resources/general_icon.png + :/resources/general_icon.png @@ -269,6 +269,7 @@ + diff --git a/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui index 9a3e3052f..99babbebc 100644 --- a/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui +++ b/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui @@ -6,46 +6,29 @@ 0 0 - 391 - 429 + 530 + 573 Display details - + - + Landscape - + - - - - - - - Level of detail - - - - - - - Qt::Horizontal - - - - 98 - 20 - - - - - - + + + Level of detail + + + + + @@ -65,25 +48,8 @@ - - - - - - - Qt::Horizontal - - - - 78 - 20 - - - - - - + 0 @@ -101,37 +67,20 @@ - + Characters - + - - - - - - - Level of detail - - - - - - - Qt::Horizontal - - - - 98 - 20 - - - - - - + + + Level of detail + + + + + @@ -151,25 +100,8 @@ - - - - - - - Qt::Horizontal - - - - 78 - 20 - - - - - - + Low @@ -181,37 +113,20 @@ - + FX - + - - - - - - - Level of detail - - - - - - - Qt::Horizontal - - - - 98 - 20 - - - - - - + + + Level of detail + + + + + @@ -231,25 +146,8 @@ - - - - - - - Qt::Horizontal - - - - 78 - 20 - - - - - - + Low @@ -261,37 +159,20 @@ - + Textures - + - - - - - - - Level of detail - - - - - - - Qt::Horizontal - - - - 98 - 20 - - - - - - + + + Level of detail + + + + + @@ -311,25 +192,8 @@ - - - - - - - Qt::Horizontal - - - - 78 - 20 - - - - - - + Low @@ -340,6 +204,19 @@ + + + + Qt::Vertical + + + + 20 + 224 + + + + diff --git a/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui index f5b5c2e48..a17beac88 100644 --- a/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui +++ b/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui @@ -7,7 +7,7 @@ 0 0 391 - 388 + 467 @@ -135,6 +135,19 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui index 37a9b0b92..35ec96b89 100644 --- a/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui +++ b/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui @@ -7,7 +7,7 @@ 0 0 294 - 317 + 415 @@ -125,22 +125,22 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui index b533772cc..cbef5ee0b 100644 --- a/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui +++ b/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui @@ -7,7 +7,7 @@ 0 0 391 - 429 + 463 @@ -129,19 +129,6 @@ - - - - Qt::Vertical - - - - 20 - 99 - - - -