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
Merge branch 'master' of https://github.com/ninja-ide/ninja-ide into fix/from_import_dialog

Conflicts:
	ninja_ide/translations.py
ReSync
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