Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta

2019-06-26 01:31:58 +04:00
parent 775c4a23f0 7e100145e2
commit 851c227064
8 changed files with 4007 additions and 2469 deletions
--- a/locale/de/LC_MESSAGES/strings.mo
+++ b/locale/de/LC_MESSAGES/strings.mo
--- a/locale/de/LC_MESSAGES/strings.po
+++ b/locale/de/LC_MESSAGES/strings.po
--- a/locale/en/LC_MESSAGES/strings.mo
+++ b/locale/en/LC_MESSAGES/strings.mo
--- a/locale/en/LC_MESSAGES/strings.po
+++ b/locale/en/LC_MESSAGES/strings.po
--- a/locale/ro/LC_MESSAGES/strings.mo
+++ b/locale/ro/LC_MESSAGES/strings.mo
--- a/locale/ro/LC_MESSAGES/strings.po
+++ b/locale/ro/LC_MESSAGES/strings.po
--- a/locale/ru/LC_MESSAGES/strings.po
+++ b/locale/ru/LC_MESSAGES/strings.po
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,6 @@
 # Python pacakges that cannot be installed with pip (e.g. PyQt5, GDAL) are not included.
 # Usage: pip install -r requirements.txt
 numpy>=1.8
-simplejson
 dill
 rtree
 pyopengl