Просмотр исходного кода

Merged marius_stanciu/flatcam_beta/Beta 8.992 into Beta

Marius Stanciu 5 лет назад
Родитель
Сommit
0975d52479

+ 2 - 0
CHANGELOG.md

@@ -19,6 +19,8 @@ CHANGELOG for FlatCAM beta
 - modified the method that detects which tab was closed in the Plot Area so it will no longer depend on it's translated text but on it's objectName set on the QTab creation
 - modified the method that detects which tab was closed in the Plot Area so it will no longer depend on it's translated text but on it's objectName set on the QTab creation
 - fixed the merge methods for all FlatCAM objects
 - fixed the merge methods for all FlatCAM objects
 - fixed a SyntaxError Exception when checking for types of found old preferences
 - fixed a SyntaxError Exception when checking for types of found old preferences
+- updated the French, German and Spanish Google translations
+- updated the Romanian translation
 
 
 28.04.2020
 28.04.2020
 
 

+ 10 - 10
flatcamTools/ToolPaint.py

@@ -143,16 +143,16 @@ class ToolPaint(FlatCAMTool, Gerber):
               "is the cut width into the material."))
               "is the cut width into the material."))
 
 
         self.tools_table.horizontalHeaderItem(2).setToolTip(
         self.tools_table.horizontalHeaderItem(2).setToolTip(
-            _("The Tool Type (TT) can be:<BR>"
-              "- <B>Circular</B> with 1 ... 4 teeth -> it is informative only. Being circular, <BR>"
-              "the cut width in material is exactly the tool diameter.<BR>"
-              "- <B>Ball</B> -> informative only and make reference to the Ball type endmill.<BR>"
-              "- <B>V-Shape</B> -> it will disable Z-Cut parameter in the resulting geometry UI form "
-              "and enable two additional UI form fields in the resulting geometry: V-Tip Dia and "
-              "V-Tip Angle. Adjusting those two values will adjust the Z-Cut parameter such "
-              "as the cut width into material will be equal with the value in the Tool Diameter "
-              "column of this table.<BR>"
-              "Choosing the <B>V-Shape</B> Tool Type automatically will select the Operation Type "
+            _("The Tool Type (TT) can be:\n"
+              "- Circular -> it is informative only. Being circular,\n"
+              "the cut width in material is exactly the tool diameter.\n"
+              "- Ball -> informative only and make reference to the Ball type endmill.\n"
+              "- V-Shape -> it will disable Z-Cut parameter in the resulting geometry UI form\n"
+              "and enable two additional UI form fields in the resulting geometry: V-Tip Dia and\n"
+              "V-Tip Angle. Adjusting those two values will adjust the Z-Cut parameter such\n"
+              "as the cut width into material will be equal with the value in the Tool Diameter\n"
+              "column of this table.\n"
+              "Choosing the 'V-Shape' Tool Type automatically will select the Operation Type\n"
               "in the resulting geometry as Isolation."))
               "in the resulting geometry as Isolation."))
 
 
         self.order_label = QtWidgets.QLabel('<b>%s:</b>' % _('Tool order'))
         self.order_label = QtWidgets.QLabel('<b>%s:</b>' % _('Tool order'))

BIN
locale/de/LC_MESSAGES/strings.mo


Разница между файлами не показана из-за своего большого размера
+ 249 - 333
locale/de/LC_MESSAGES/strings.po


BIN
locale/en/LC_MESSAGES/strings.mo


Разница между файлами не показана из-за своего большого размера
+ 207 - 292
locale/en/LC_MESSAGES/strings.po


BIN
locale/es/LC_MESSAGES/strings.mo


Разница между файлами не показана из-за своего большого размера
+ 207 - 293
locale/es/LC_MESSAGES/strings.po


BIN
locale/fr/LC_MESSAGES/strings.mo


Разница между файлами не показана из-за своего большого размера
+ 207 - 292
locale/fr/LC_MESSAGES/strings.po


BIN
locale/ro/LC_MESSAGES/strings.mo


Разница между файлами не показана из-за своего большого размера
+ 207 - 294
locale/ro/LC_MESSAGES/strings.po


Некоторые файлы не были показаны из-за большого количества измененных файлов