Fix for #1582, Added Translations, Add Missing DocStrings
Renamed icon to ninja_icon.png and fixed desktop icon path
Fixed .qrc resource file to point at updated icon name
Revert "Fixed .qrc resource file to point at updated icon name"

This reverts commit 8446d388d80d97c6e20ad78cb8fe75ab5d395a22.
Updated icon names in .qrc resource file
Update README.md
Update README.md
Changed English grammar in one of the checker classes
Merge pull request #1601 from ThreeToes/master

Changed English grammar in the migration_2to3 checker class
Fix for #1609
Merge pull request #1597 from juancarlospaco/fix/translations

Fix for #1582, Added Translations, Add Missing DocStrings
Merge pull request #1612 from juancarlospaco/fix/toolbar

Fix for #1609
Fix for #1605
Merge pull request #1613 from juancarlospaco/fix/console

Fix for #1605
Fix for #1567
Fix merge conflicts
Fix merge conflicts
Merge pull request #1616 from juancarlospaco/fix/preferences_editor

Fix for #1567
opaque split resize false, reload files
Merge remote-tracking branch 'upstream/master'