Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/misc/system_info.cpp

@@ -1442,6 +1442,7 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion)
 						DWORD valueType;
 						char value[512];
 						DWORD size = 512;
+						string driverName;
 						if (RegQueryValueExA(baseKey, keyName.c_str(), NULL, &valueType, (unsigned char *)value, &size) == ERROR_SUCCESS)
 						{
 							// Null ?
@@ -1459,6 +1460,15 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion)
 										{
 											if (value[0] != 0)
 											{
+												static const std::string s_systemRoot = "\\SystemRoot\\";
+
+												driverName = value;
+
+												if (driverName.substr(0, s_systemRoot.length()) == s_systemRoot)
+												{
+													driverName = driverName.substr(s_systemRoot.length());
+												}
+
 												ok = true;
 											}
 											else
@@ -1484,7 +1494,6 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion)
 									if (_VerQueryValue && _GetFileVersionInfoSize && _GetFileVersionInfo)
 									{
 										// value got the path to the driver
-										string driverName = value;
 										if (atleastNT4)
 										{
 											nlverify (GetWindowsDirectoryA(value, 512) != 0);

code/ryzom/tools/client/CMakeLists.txt

@@ -1,7 +1,7 @@
 IF(WITH_RYZOM_CLIENT)
   ADD_SUBDIRECTORY(client_patcher)
 
-  IF(WITH_QT)
+  IF(WITH_QT OR WITH_QT5)
     ADD_SUBDIRECTORY(client_config_qt)
   ENDIF()
 ENDIF()

code/ryzom/tools/client/client_config_qt/CMakeLists.txt

@@ -1,58 +1,74 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR} ${QT_INCLUDES})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR})
-INCLUDE( ${QT_USE_FILE} )
 
-FILE( GLOB SRC *.cpp *.h )
+FILE(GLOB SRC *.cpp *.h resources/*.rc)
 
-SET( CLIENT_CONFIG_HDR
+SET(CLIENT_CONFIG_HDR
-                      client_config_dialog.h
+  client_config_dialog.h
-                      display_settings_advanced_widget.h
+  display_settings_advanced_widget.h
-                      display_settings_details_widget.h
+  display_settings_details_widget.h
-                      display_settings_widget.h
+  display_settings_widget.h
-                      general_settings_widget.h
+  general_settings_widget.h
-                      sound_settings_widget.h
+  sound_settings_widget.h
-                      sys_info_d3d_widget.h
+  sys_info_d3d_widget.h
-                      sys_info_opengl_widget.h
+  sys_info_opengl_widget.h
-                      sys_info_widget.h
+  sys_info_widget.h
-                      widget_base.h
+  widget_base.h
 )
 
-SET( CLIENT_CONFIG_UIS
+SET(CLIENT_CONFIG_UIS
-                      client_config_dialog.ui
+  client_config_dialog.ui
-                      display_settings_advanced_widget.ui
+  display_settings_advanced_widget.ui
-                      display_settings_details_widget.ui
+  display_settings_details_widget.ui
-                      display_settings_widget.ui
+  display_settings_widget.ui
-                      general_settings_widget.ui
+  general_settings_widget.ui
-                      sound_settings_widget.ui
+  sound_settings_widget.ui
-                      sys_info_d3d_widget.ui
+  sys_info_d3d_widget.ui
-                      sys_info_opengl_widget.ui
+  sys_info_opengl_widget.ui
-                      sys_info_widget.ui
+  sys_info_widget.ui
 )
 
-SET( CLIENT_CONFIG_TRANS
+SET(CLIENT_CONFIG_TRANS
-                     translations/ryzom_configuration_en.ts
+  ${CMAKE_CURRENT_SOURCE_DIR}/translations/ryzom_configuration_en.ts
-                     translations/ryzom_configuration_hu.ts
+  ${CMAKE_CURRENT_SOURCE_DIR}/translations/ryzom_configuration_fr.ts
+  ${CMAKE_CURRENT_SOURCE_DIR}/translations/ryzom_configuration_hu.ts
 )
 
-CONFIGURE_FILE( translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY )
+CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY)
-SET( CLIENT_CONFIG_RCS resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc )
+SET(CLIENT_CONFIG_RCS resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc )
-QT4_ADD_TRANSLATION( CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS} )
+
-QT4_ADD_RESOURCES( CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS} )
+IF(WITH_QT)
-QT4_WRAP_CPP( CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR} )
+  INCLUDE_DIRECTORIES(${QT_INCLUDES})
-QT4_WRAP_UI( CLIENT_CONFIG_UI_HDRS ${CLIENT_CONFIG_UIS} )
+  INCLUDE(${QT_USE_FILE})
-SOURCE_GROUP( "Resources" FILES ${CLIENT_CONFIG_RCS} )
+
-SOURCE_GROUP( "Forms" FILES ${CLIENT_CONFIG_UIS} )
+  QT4_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS})
-SOURCE_GROUP( "Generated Files" FILES ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_MOC_SRC} )
+  QT4_ADD_RESOURCES(CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS})
-SOURCE_GROUP( "Translation Files" FILES ${CLIENT_CONFIG_TRANS} )
+  QT4_WRAP_CPP(CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR})
-ADD_DEFINITIONS( ${QT_DEFINITIONS} )
+  QT4_WRAP_UI(CLIENT_CONFIG_UI_HDRS ${CLIENT_CONFIG_UIS})
-ADD_EXECUTABLE( ryzom_configuration_qt WIN32 MACOSX_BUNDLE ${SRC} ${CLIENT_CONFIG_MOC_SRC} ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_RC_SRCS} ${CLIENT_CONFIG_TRANS} )
+
-NL_DEFAULT_PROPS( ryzom_configuration_qt "Ryzom, Tools: Ryzom Configuration Qt" )
+  ADD_DEFINITIONS(${QT_DEFINITIONS})
+ELSE()
+  QT5_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_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})
+  
+  SET(QT_LIBRARIES Qt5::Widgets Qt5::Core Qt5::Gui Qt5::OpenGL)
+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} )
+
+ADD_EXECUTABLE(ryzom_configuration_qt WIN32 MACOSX_BUNDLE ${SRC} ${CLIENT_CONFIG_MOC_SRC} ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_RC_SRCS} ${CLIENT_CONFIG_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 )
 TARGET_LINK_LIBRARIES( ryzom_configuration_qt nelmisc nel3d ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_configuration_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_configuration_qt RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications)
 

code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp

@@ -29,6 +29,7 @@
 #include "system.h"
 
 #include <QtGui>
+#include <QMessageBox>
 
 CClientConfigDialog::CClientConfigDialog( QWidget *parent ) :
 	QDialog( parent )
@@ -156,18 +157,16 @@ void CClientConfigDialog::onClickPlay()
 {
 	bool started = false;
 
-#ifdef WIN32
+#ifdef Q_OS_WIN32
 	started = QProcess::startDetached( "ryzom_client_r.exe" );
 	if( !started )
 		QProcess::startDetached( "ryzom_client_rd.exe" );
 	if( !started )
 		QProcess::startDetached( "ryzom_client_d.exe" );
+#elif defined(Q_OS_MAC)
+	started = QProcess::startDetached( "./Ryzom" );
 #else
-	started = QProcess::startDetached( "./ryzom_client_r" );
+	started = QProcess::startDetached( "./ryzom_client" );
-	if( !started )
-		QProcess::startDetached( "./ryzom_client_rd" );
-	if( !started )
-		QProcess::startDetached( "./ryzom_client_d" );
 #endif
 
 	onClickOK();
@@ -180,14 +179,14 @@ void CClientConfigDialog::onClickCategory( QTreeWidgetItem *item )
 
 	static const char *iconNames[] =
 	{
-		":/resources/general_icon.bmp",
+		":/resources/general_icon.png",
-		":/resources/display_icon.bmp",
+		":/resources/display_icon.png",
-		":/resources/display_properties_icon.bmp",
+		":/resources/display_properties_icon.png",
-		":/resources/display_config_icon.bmp",
+		":/resources/display_config_icon.png",
-		":/resources/sound_icon.bmp",
+		":/resources/sound_icon.png",
-		":/resources/general_icon.bmp",
+		":/resources/general_icon.png",
-		":/resources/card_icon.bmp",
+		":/resources/card_icon.png",
-		":/resources/card_icon.bmp"
+		":/resources/card_icon.png"
 	};
 
 	sint32 index = item->data( 0, Qt::UserRole ).toInt();

code/ryzom/tools/client/client_config_qt/client_config_dialog.ui

@@ -31,7 +31,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="resources.qrc">:/resources/left_bitmap_0.bmp</pixmap>
+        <pixmap resource="resources.qrc">:/resources/left_bitmap_0.png</pixmap>
        </property>
       </widget>
      </item>
@@ -60,7 +60,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="resources.qrc">:/resources/general_icon.bmp</pixmap>
+          <pixmap resource="resources.qrc">:/resources/general_icon.png</pixmap>
          </property>
         </widget>
        </item>
@@ -101,7 +101,7 @@
           </font>
          </property>
          <property name="styleSheet">
-          <string notr="true">background-image: url(:/resources/top_right.bmp);</string>
+          <string notr="true">background-image: url(:/resources/top_right.png);</string>
          </property>
          <property name="text">
           <string>General</string>

code/ryzom/tools/client/client_config_qt/main.cpp

@@ -19,14 +19,26 @@
 #include "client_config_dialog.h"
 #include "system.h"
 
+#include <QSplashScreen>
+
 int main( sint32 argc, char **argv )
 {
 	QApplication app( argc, argv );
-	QPixmap pixmap( ":/resources/splash_screen.bmp" );
+
+	QApplication::setWindowIcon(QIcon(":/resources/welcome_icon.png"));
+	QPixmap pixmap(":/resources/splash_screen.png" );
 	QSplashScreen splash( pixmap );
 
 	splash.show();
 
+	QString locale = QLocale::system().name().left(2);
+
+	QTranslator localTranslator;
+	if (localTranslator.load(QString(":/translations/ryzom_configuration_%1.qm").arg(locale)))
+	{
+		app.installTranslator(&localTranslator);
+	}
+
 	CSystem::GetInstance().config.load( "client.cfg" );
 
 	CClientConfigDialog d;

code/ryzom/tools/client/client_config_qt/resources.qrc

@@ -1,16 +1,16 @@
 <RCC>
     <qresource prefix="/">
-        <file>resources/card_icon.bmp</file>
+        <file>resources/card_icon.png</file>
-        <file>resources/display_config_icon.bmp</file>
+        <file>resources/display_config_icon.png</file>
-        <file>resources/display_icon.bmp</file>
+        <file>resources/display_icon.png</file>
-        <file>resources/display_properties_icon.bmp</file>
+        <file>resources/display_properties_icon.png</file>
-        <file>resources/general_icon.bmp</file>
+        <file>resources/general_icon.png</file>
-        <file>resources/left_bitmap_0.bmp</file>
+        <file>resources/left_bitmap_0.png</file>
-        <file>resources/network_icon.bmp</file>
+        <file>resources/network_icon.png</file>
-        <file>resources/sound_icon.bmp</file>
+        <file>resources/sound_icon.png</file>
-        <file>resources/splash_screen.bmp</file>
+        <file>resources/splash_screen.png</file>
-        <file>resources/top_right.bmp</file>
+        <file>resources/top_right.png</file>
-        <file>resources/update_icon.bmp</file>
+        <file>resources/update_icon.png</file>
-        <file>resources/welcome_icon.bmp</file>
+        <file>resources/welcome_icon.png</file>
     </qresource>
 </RCC>

code/ryzom/tools/client/client_config_qt/resources/client_config_qt.rc

@@ -0,0 +1,39 @@
+#include <windows.h>
+#include "config.h"
+
+IDI_MAIN_ICON           ICON    DISCARDABLE     "client_config.ico"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION NL_VERSION_RC
+PRODUCTVERSION NL_VERSION_RC
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Client Config Qt"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "client_config_qt_d.exe"
+#else
+            VALUE "OriginalFilename", "client_config_qt_r.exe"
+#endif			
+            VALUE "ProductName", "Ryzom Core"
+            VALUE "ProductVersion", NL_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

code/ryzom/tools/client/client_config_qt/stdpch.h

@@ -17,6 +17,12 @@
 #ifndef STDPCH_H
 #define STDPCH_H
 
+#include <qglobal.h>
+
+#ifdef Q_COMPILER_RVALUE_REFS
+#undef Q_COMPILER_RVALUE_REFS
+#endif
+
 #include <string>
 
 #include <nel/misc/types_nl.h>

code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts

@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr">
+<context>
+    <name>CClientConfigDialog</name>
+    <message>
+        <location filename="client_config_dialog.cpp" line="248"/>
+        <source>Ryzom configuration</source>
+        <translation>Configuration de Ryzom</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.cpp" line="249"/>
+        <source>Are you sure you want to quit without saving the configuration?</source>
+        <translation>Êtes-vous sûr de vouloir quitter sans enregistrer la configuration ?</translation>
+    </message>
+</context>
+<context>
+    <name>CDisplaySettingsDetailsWidget</name>
+    <message>
+        <location filename="display_settings_details_widget.cpp" line="231"/>
+        <source>Low</source>
+        <translation>Bas</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.cpp" line="234"/>
+        <source>Medium</source>
+        <translation>Moyen</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.cpp" line="237"/>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.cpp" line="240"/>
+        <source>High</source>
+        <translation>Haut</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.cpp" line="253"/>
+        <source>Low (32 MB)</source>
+        <translation>Bas (32 Mo)</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.cpp" line="257"/>
+        <source>Normal (64 MB)</source>
+        <translation>Normal (64 Mo)</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.cpp" line="261"/>
+        <source>High (128 MB)</source>
+        <translation>Haut (128 Mo)</translation>
+    </message>
+</context>
+<context>
+    <name>CSoundSettingsWidget</name>
+    <message>
+        <location filename="sound_settings_widget.cpp" line="98"/>
+        <source>%1 tracks</source>
+        <translation>%1 pistes</translation>
+    </message>
+</context>
+<context>
+    <name>client_config_dialog</name>
+    <message>
+        <location filename="client_config_dialog.ui" line="20"/>
+        <source>Ryzom Configuration</source>
+        <translation>Configuration de Ryzom</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="107"/>
+        <location filename="client_config_dialog.ui" line="135"/>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="130"/>
+        <source>Category</source>
+        <translation>Catégorie</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="146"/>
+        <source>Display</source>
+        <translation>Affichage</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="156"/>
+        <source>Display details</source>
+        <translation>Détails d&apos;affichage</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="161"/>
+        <source>Display advanced</source>
+        <translation>Affichage avancé</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="167"/>
+        <source>Sound</source>
+        <translation>Son</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="178"/>
+        <source>System information</source>
+        <translation>Informations systèmes</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="188"/>
+        <source>OpenGL information</source>
+        <translation>Informations OpenGL</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="193"/>
+        <source>Direct3D information</source>
+        <translation>Informations Direct3D</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="245"/>
+        <source>Apply</source>
+        <translation>Appliquer</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="252"/>
+        <source>Default</source>
+        <translation>Défaut</translation>
+    </message>
+    <message>
+        <location filename="client_config_dialog.ui" line="259"/>
+        <source>Play Ryzom</source>
+        <translation>Jouer à Ryzom</translation>
+    </message>
+</context>
+<context>
+    <name>display_settings_advanced_widget</name>
+    <message>
+        <location filename="display_settings_advanced_widget.ui" line="14"/>
+        <source>Display advanced</source>
+        <translation>Affichage avancé</translation>
+    </message>
+    <message>
+        <location filename="display_settings_advanced_widget.ui" line="22"/>
+        <source>Modify these settings only if you have trouble launching the game</source>
+        <translation>Modifiez ces paramètres uniquement si vous avez des problèmes pour lancer le jeu</translation>
+    </message>
+    <message>
+        <location filename="display_settings_advanced_widget.ui" line="31"/>
+        <source>Disable texture compression</source>
+        <translation>Désactiver la compression des textures</translation>
+    </message>
+    <message>
+        <location filename="display_settings_advanced_widget.ui" line="38"/>
+        <source>Disable vertex shaders</source>
+        <translation>Désactiver les vertex shaders</translation>
+    </message>
+    <message>
+        <location filename="display_settings_advanced_widget.ui" line="45"/>
+        <source>Disable AGP for vertices</source>
+        <translation>Désactiver l&apos;AGP pour les vertices</translation>
+    </message>
+    <message>
+        <location filename="display_settings_advanced_widget.ui" line="52"/>
+        <source>Disable pixel shaders</source>
+        <translation>Désactiver les pixel shaders</translation>
+    </message>
+</context>
+<context>
+    <name>display_settings_details_widget</name>
+    <message>
+        <location filename="display_settings_details_widget.ui" line="14"/>
+        <source>Display details</source>
+        <translation>Détails d&apos;affichage</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.ui" line="20"/>
+        <source>Landscape</source>
+        <translation>Paysage</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.ui" line="30"/>
+        <location filename="display_settings_details_widget.ui" line="116"/>
+        <location filename="display_settings_details_widget.ui" line="196"/>
+        <location filename="display_settings_details_widget.ui" line="276"/>
+        <source>Level of detail</source>
+        <translation>Niveau de détail</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.ui" line="94"/>
+        <location filename="display_settings_details_widget.ui" line="174"/>
+        <location filename="display_settings_details_widget.ui" line="254"/>
+        <location filename="display_settings_details_widget.ui" line="334"/>
+        <source>Low</source>
+        <translation>Bas</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.ui" line="106"/>
+        <source>Characters</source>
+        <translation>Personnages</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.ui" line="186"/>
+        <source>FX</source>
+        <translation>Effets spéciaux</translation>
+    </message>
+    <message>
+        <location filename="display_settings_details_widget.ui" line="266"/>
+        <source>Textures</source>
+        <translation>Textures</translation>
+    </message>
+</context>
+<context>
+    <name>display_settings_widget</name>
+    <message>
+        <location filename="display_settings_widget.ui" line="14"/>
+        <source>Display</source>
+        <translation>Affichage</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="20"/>
+        <source>Driver</source>
+        <translation>Pilote</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="28"/>
+        <source>Specify if Ryzom is to be run in OpenGL or Direct3D.</source>
+        <translation>Spécifier si Ryzom doit utiliser OpenGL ou Direct3D.</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="35"/>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="42"/>
+        <source>OpenGL</source>
+        <translation>OpenGL</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="49"/>
+        <source>Direct3D</source>
+        <translation>Direct3D</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="61"/>
+        <source>Parameters</source>
+        <translation>Paramètres</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="67"/>
+        <source>Specify if Ryzom is to be run in full screen or window mode:</source>
+        <translation>Spécifier si Ryzom doit être lancé en mode plein écran ou fenêtré :</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="74"/>
+        <source>Full screen</source>
+        <translation>Plein écran</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="81"/>
+        <source>Specify a video mode</source>
+        <translation>Spécifier une résolution</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="104"/>
+        <source>Windowed</source>
+        <translation>Fenêtré</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="115"/>
+        <source>Width</source>
+        <translation>Largeur</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="122"/>
+        <source>Height</source>
+        <translation>Hauteur</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="129"/>
+        <source>X position</source>
+        <translation>Position X</translation>
+    </message>
+    <message>
+        <location filename="display_settings_widget.ui" line="136"/>
+        <source>Y position</source>
+        <translation>Position Y</translation>
+    </message>
+</context>
+<context>
+    <name>general_settings_widget</name>
+    <message>
+        <location filename="general_settings_widget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <location filename="general_settings_widget.ui" line="25"/>
+        <source>Language</source>
+        <translation>Langue</translation>
+    </message>
+    <message>
+        <location filename="general_settings_widget.ui" line="33"/>
+        <source>English</source>
+        <translation>Anglais</translation>
+    </message>
+    <message>
+        <location filename="general_settings_widget.ui" line="38"/>
+        <source>French</source>
+        <translation>Français</translation>
+    </message>
+    <message>
+        <location filename="general_settings_widget.ui" line="43"/>
+        <source>German</source>
+        <translation>Allemand</translation>
+    </message>
+    <message>
+        <location filename="general_settings_widget.ui" line="48"/>
+        <source>Hungarian</source>
+        <translation>Hongrois</translation>
+    </message>
+    <message>
+        <location filename="general_settings_widget.ui" line="72"/>
+        <source>Save config file when quitting the game</source>
+        <translation>Enregistrer le fichier de configuration quand on quitte le jeu</translation>
+    </message>
+    <message>
+        <location filename="general_settings_widget.ui" line="92"/>
+        <source>Advanced</source>
+        <translation>Avancé</translation>
+    </message>
+    <message>
+        <location filename="general_settings_widget.ui" line="100"/>
+        <source>Slow down the game ( process low priority )</source>
+        <translation>Ralentir le jeu (priorité basse au processus)</translation>
+    </message>
+</context>
+<context>
+    <name>sound_settings_widget</name>
+    <message>
+        <location filename="sound_settings_widget.ui" line="14"/>
+        <source>Sound</source>
+        <translation>Son</translation>
+    </message>
+    <message>
+        <location filename="sound_settings_widget.ui" line="24"/>
+        <source>Enable sound</source>
+        <translation>Activer le son</translation>
+    </message>
+    <message>
+        <location filename="sound_settings_widget.ui" line="31"/>
+        <source>Enable EAX</source>
+        <translation>Activer EAX</translation>
+    </message>
+    <message>
+        <location filename="sound_settings_widget.ui" line="38"/>
+        <source>Enable FMod</source>
+        <translation>Activer FMod</translation>
+    </message>
+    <message>
+        <location filename="sound_settings_widget.ui" line="45"/>
+        <source>Software sound buffer ( may increase FPS )</source>
+        <translation>Tampons sonores logiciels (peut accroître la fluidité)</translation>
+    </message>
+    <message>
+        <location filename="sound_settings_widget.ui" line="68"/>
+        <source>Sound tracks</source>
+        <translation>Pistes audio</translation>
+    </message>
+    <message>
+        <location filename="sound_settings_widget.ui" line="117"/>
+        <source>8 tracks</source>
+        <translation>8 pistes</translation>
+    </message>
+</context>
+<context>
+    <name>sys_info_d3d_widget</name>
+    <message>
+        <location filename="sys_info_d3d_widget.ui" line="14"/>
+        <source>Direct3D information</source>
+        <translation>Informations Direct3D</translation>
+    </message>
+    <message>
+        <location filename="sys_info_d3d_widget.ui" line="20"/>
+        <source>Direct3D</source>
+        <translation>Direct3D</translation>
+    </message>
+    <message>
+        <location filename="sys_info_d3d_widget.ui" line="30"/>
+        <source>Description</source>
+        <translation>Description</translation>
+    </message>
+    <message>
+        <location filename="sys_info_d3d_widget.ui" line="65"/>
+        <source>Driver</source>
+        <translation>Pilote</translation>
+    </message>
+    <message>
+        <location filename="sys_info_d3d_widget.ui" line="100"/>
+        <source>Driver version</source>
+        <translation>Version du pilote</translation>
+    </message>
+</context>
+<context>
+    <name>sys_info_opengl_widget</name>
+    <message>
+        <location filename="sys_info_opengl_widget.ui" line="14"/>
+        <source>OpenGL information</source>
+        <translation>Informations OpenGL</translation>
+    </message>
+    <message>
+        <location filename="sys_info_opengl_widget.ui" line="20"/>
+        <source>OpenGL</source>
+        <translation>OpenGL</translation>
+    </message>
+    <message>
+        <location filename="sys_info_opengl_widget.ui" line="28"/>
+        <source>Vendor</source>
+        <translation>Vendeur</translation>
+    </message>
+    <message>
+        <location filename="sys_info_opengl_widget.ui" line="63"/>
+        <source>Renderer</source>
+        <translation>Moteur de rendu</translation>
+    </message>
+    <message>
+        <location filename="sys_info_opengl_widget.ui" line="98"/>
+        <source>Version</source>
+        <translation>Version</translation>
+    </message>
+    <message>
+        <location filename="sys_info_opengl_widget.ui" line="148"/>
+        <source>Extensions</source>
+        <translation>Extensions</translation>
+    </message>
+</context>
+<context>
+    <name>sys_info_widget</name>
+    <message>
+        <location filename="sys_info_widget.ui" line="14"/>
+        <location filename="sys_info_widget.ui" line="20"/>
+        <source>System information</source>
+        <translation>Informations systèmes</translation>
+    </message>
+    <message>
+        <location filename="sys_info_widget.ui" line="30"/>
+        <source>Operating system</source>
+        <translation>Système d&apos;exploitation</translation>
+    </message>
+    <message>
+        <location filename="sys_info_widget.ui" line="68"/>
+        <source>CPU</source>
+        <translation>Processeur</translation>
+    </message>
+    <message>
+        <location filename="sys_info_widget.ui" line="106"/>
+        <source>Physical memory</source>
+        <translation>Mémoire physique</translation>
+    </message>
+    <message>
+        <location filename="sys_info_widget.ui" line="135"/>
+        <source>Video device</source>
+        <translation>Carte graphique</translation>
+    </message>
+    <message>
+        <location filename="sys_info_widget.ui" line="173"/>
+        <source>Video driver version</source>
+        <translation>Version du driver de la carte graphique</translation>
+    </message>
+</context>
+</TS>

code/ryzom/tools/client/client_config_qt/translations/translations.qrc

@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/translations">
         <file>ryzom_configuration_en.qm</file>
+        <file>ryzom_configuration_fr.qm</file>
         <file>ryzom_configuration_hu.qm</file>
     </qresource>
 </RCC>