Merge pull request #1 from KoffeinFlummi/master

update my fork
Update stringtable.xml
Update stringtable.xml
Merge pull request #598 from ACCtomeek/master

New stringtable keys updated
More work on #417
Merge remote-tracking branch 'upstream/master'