French translation update.

Denvi · Nov 4, 2015 · b4679b7 · b4679b7
1 parent 5420017
commit b4679b7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/bin/grblControl.exe b/bin/grblControl.exe
diff --git a/grbl_control.pro b/grbl_control.pro
@@ -103,7 +103,6 @@ FORMS    += frmmain.ui \
 DEFINES += _USE_MATH_DEFINES
 
 RESOURCES += \
-    fonts.qrc \
     shaders.qrc \
     images.qrc
 

diff --git a/main.cpp b/main.cpp
@@ -28,8 +28,8 @@ int main(int argc, char *argv[])
 
     QApplication a(argc, argv);
 
-    QFontDatabase::addApplicationFont(":/fonts/segoeui.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/tahoma.ttf");
+//    QFontDatabase::addApplicationFont(":/fonts/segoeui.ttf");
+//    QFontDatabase::addApplicationFont(":/fonts/tahoma.ttf");
 
 #ifdef GLES
     QFontDatabase::addApplicationFont(":/fonts/Ubuntu-R.ttf");

diff --git a/translations/grblControl_fr.qm b/translations/grblControl_fr.qm
diff --git a/translations/grblControl_fr.ts b/translations/grblControl_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>GCodeTableModel</name>
     <message>
@@ -692,7 +692,7 @@ Temps écoulé: %1</translation>
     </message>
     <message>
         <source>Sended</source>
-        <translation>Envoyé</translation>
+        <translation type="vanished">Envoyé</translation>
     </message>
     <message>
         <location filename="../frmmain.cpp" line="1630"/>