GitUI/Hotkey/KeysExtensions.ToFormattedString is now able to produce culture specific strings
GitUI/Hotkey/KeysExtensions.ToFormattedString extract method and note that "None" is not translated yet.
Commands --> Commit: show shortcut key from settings
Merge pull request #1863 from feinstaub/feature_gotocurrentrevision_in_menu

Menu ShortcutKey improvements
Merge pull request #1850 from feinstaub/feature_diff_goto_filetree

FormBrowse: Diff Tab: new context menu item: "Show in File tree"
Merge branch 'pr/n1854_feinstaub'

Conflicts:
	GitExtensionsTest
Merge branch 'master' into feature/DistSettings

Conflicts:
	GitExtensionsTest
Merge branch 'master' into jb/RevisionLinks#1582

Conflicts:
	GitUI/CommitInfo/CommitInfo.cs
Revert "ConfigFilesCache"

This reverts commit c523a28ad67505c54e7cfff31fc8e372e4909518.
Merge branch 'feature/DistSettings' into jb/RevisionLinks#1582

Conflicts:
	GitUI/CommandsDialogs/FormSettings.cs
	GitUI/GitUI.csproj
Merge remote-tracking branch 'gitextensions/master' into BuildServerIntegration
Merge branch 'feature_diff_goto_filetree_fix' into fix_formgotocommit_dropdown
Merge branch 'feature_diff_goto_filetree_fix' into fix_add_icon_warning_use_for_FileEditor_and_DeleteBranch_instead_of_star
use TranslationString
Merge pull request #1864 from feinstaub/feature_diff_goto_filetree_fix

use TranslationString
Merge branch 'pr/n1848_pmiossec'
FormGoToCommit: call revparse as late as possible
FormGoToCommit: SetCommitExpressionFromClipboard: don't call revparse
Hotkeys: change default setting: GoToParent (Alt+P, instead of Ctrl+C), GoToChild (Alt+C, instead of Ctrl+C)

This makes the key settings more consistent to the Next/PrevQuickSearch which also use Alt as modifier. And it makes Ctrl+C free for more intuitive operation: copy to clipboard.
default key setting for ToggleHighlightSelectedBranch: Ctrl+Shift+B