Update Tortoise.pot

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fix crash when applying patch in TortoiseGitMerge

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Check valid regular expression in Regex Filter Dialog

Based on TortoiseSVN revision 25329

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Catch regex exception

Based on TortoiseSVN revision 25330

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