Fix 2to3, Use Translations, Add ToolTip text with Help
Fix from_import_dialog, Use Translations, Add Insert At Line
Fix from_import_dialog, Use Translations, Add Insert At Line
Dummy Commit ReSync
Dummy Commit ReSync
Dummy Commit ReSync
Dummy Commit ReSync
Add Items count on titles of Symbols Explorer
Merge branch 'master' of https://github.com/ninja-ide/ninja-ide into feature/item_count
Use ToolTip instead of Item Text
Merge pull request #1779 from juancarlospaco/feature/item_count

Add Items count on titles of Symbols Explorer
Merge branch 'master' of https://github.com/ninja-ide/ninja-ide into fix/from_import_dialog

Conflicts:
	ninja_ide/translations.py
ReSync
Merge branch 'master' of https://github.com/ninja-ide/ninja-ide into fix/2to3

Conflicts:
	ninja_ide/translations.py
Merge pull request #1708 from juancarlospaco/fix/from_import_dialog

[from_import_dialog] Fix for #1705, Use Translations
Merge branch 'master' of https://github.com/ninja-ide/ninja-ide into fix/2to3

Conflicts:
	ninja_ide/translations.py
Merge pull request #1707 from juancarlospaco/fix/2to3

[2to3] Fix #1701, Use Translations
fix ask to save file on closing if modified
Merge pull request #1797 from diegosarmentero/master

fix ask to save file on closing if modified
Allow highlighting variable names with length of 2 or more characters