Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta
# Conflicts: # CHANGELOG.md # FlatCAMApp.py # locale/de/LC_MESSAGES/strings.mo # locale/de/LC_MESSAGES/strings.po # locale/en/LC_MESSAGES/strings.mo # locale/en/LC_MESSAGES/strings.po # locale/es/LC_MESSAGES/strings.mo # locale/es/LC_MESSAGES/strings.po # locale/fr/LC_MESSAGES/strings.mo # locale/fr/LC_MESSAGES/strings.po # locale/hu/LC_MESSAGES/strings.mo # locale/hu/LC_MESSAGES/strings.po # locale/it/LC_MESSAGES/strings.mo # locale/it/LC_MESSAGES/strings.po # locale/pt_BR/LC_MESSAGES/strings.mo # locale/pt_BR/LC_MESSAGES/strings.po # locale/ro/LC_MESSAGES/strings.mo # locale/ro/LC_MESSAGES/strings.po # locale/ru/LC_MESSAGES/strings.po
This commit is contained in:
commit
83a515eeee
|
@ -29,7 +29,7 @@ CHANGELOG for FlatCAM beta
|
|||
- modified the Cutout Tool to generate multi-geo objects therefore the set geometry parameters will populate the Geometry Object UI
|
||||
- modified the Panelize Tool to optimize the output from Cutout Tool such that there are no longer overlapping cuts
|
||||
- some string corrections
|
||||
- updated the Italian translation done by user @pcb-hobbyst (Golfetto Massimiliano)
|
||||
- updated the Italian translation done by user @pcb-hobbyst
|
||||
- RELEASE 8.992
|
||||
|
||||
01.05.2020
|
||||
|
|
|
@ -162,6 +162,7 @@ class App(QtCore.QObject):
|
|||
# ###############################################################################################################
|
||||
# ################################### Version and VERSION DATE ##################################################
|
||||
# ###############################################################################################################
|
||||
|
||||
version = 8.993
|
||||
version_date = "2020/08/01"
|
||||
beta = True
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -6,7 +6,11 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: 2020-05-02 23:49+0300\n"
|
||||
<<<<<<< HEAD
|
||||
"PO-Revision-Date: 2020-05-03 12:06+0200\n"
|
||||
=======
|
||||
"PO-Revision-Date: 2020-05-02 23:50+0300\n"
|
||||
>>>>>>> remotes/jpcgt/flatcam/Beta
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: it\n"
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue