Updated Tortoise.pot

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Moved MAPI settings to settings dialog

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Drop unused parameter

Signed-off-by: Sven Strickroth <email@cs-ware.de>
TortoiseGitMerge: Slow check at the end is only needed if the fast part didn't find any non-ANSI chars

Based on TortoiseSVN revision 24553

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Handle utf-16 files that don't have a BOM

Also update TortoiseGitBlame which relies on the enum defined in TortoiseGitMerge

Based on TortoiseSVN revision 24555

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Allow to configure and use mail relay server

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Some further cleanup

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Allow to send mails over encrypted connections

Based on http://www.coastrd.com/c-schannel-smtp, got permission to use it in GPL licensed application (Message-ID: <000801ce8282$b6f768f0$24e63ad0$@coastrd.com>)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
MIME part did not end with expected boundary

Signed-off-by: Sven Strickroth <email@cs-ware.de>
When adding second and more remotes, prompt user to disable tag fetching to avoid fetching wrong tags

For example, you do not expect to fetch any tags when pulling from a contributor's personal repository

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Convert HwSMTP.h to UTF-8 BOM

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Upgraded to scintilla 3.3.4

Signed-off-by: Sven Strickroth <email@cs-ware.de>
applied backgroundcolors.patch

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Merge branch 'scintilla-3.3.4'
Fixed issue #1833: Fast-Forward rebase does not preserve SHA-1 of commits

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #1845: Add "pull" button on "git switch" window

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Add some sanity checks

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Correctly handle multi-line subjects in patches

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Prevent possible crash if debug is enabled

A git cmd might contain "%s" (e.g. reference browser).

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Correctly free buffer array

Signed-off-by: Sven Strickroth <email@cs-ware.de>