Update Tortoise.pot

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
If reflected name is specified, use it for editorconfig

Based on TortoiseSVN revision 25638

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Pass reflected names to TortoiseGitMerge when diffing local files and repository files

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'editorconfig'