bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

4
locale/it/LC_MESSAGES/strings.po
View File

@@ -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"