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

Browse Source

# 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:

Marius

2020-05-03 16:36:23 +03:00

parent 451b4ce507 25bb145dd6

commit 83a515eeee

11 changed files with 38040 additions and 387 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

5730

locale/ru/LC_MESSAGES/strings.po

File diff suppressed because it is too large Load Diff