cmds: allow --no-ff command-line argument during merge

Add a checkbox to the Merge dialog to support no-fast-forward during
merge
Add simplified chinese translation of hotkey page

based on the traditional chinese version
Update pt_BR.po
Add Indonesian Translation by Samsul Ma'arif
Python 3 getcwd is equivalent to getcwdu

This prevented starting git-cola when installed with Python 3
Update simplified chinese translation
Merge pull request #318 from dirtycold/master

Update zh-CN translation

Signed-off-by: David Aguilar <davvid@gmail.com>
Merge pull request #314 from lobocode/patch-1

Update pt_BR.po

Signed-off-by: David Aguilar <davvid@gmail.com>
Merge pull request #315 from samsulmaarif/master

Add Indonesian Translation by Samsul Ma'arif

Signed-off-by: David Aguilar <davvid@gmail.com>
Merge pull request #311 from forfolias/master

cmds: allow --no-ff command-line argument during merge

Signed-off-by: David Aguilar <davvid@gmail.com>
Merge pull request #316 from takluyver/takluyver/py3-getcwd

Use getcwd on Python 3

Signed-off-by: David Aguilar <davvid@gmail.com>
.mailmap: fix permissions

Signed-off-by: David Aguilar <davvid@gmail.com>
doc: update v2.0.5 release notes draft

Signed-off-by: David Aguilar <davvid@gmail.com>
hotkeys: use uppercase key names consistently

Signed-off-by: David Aguilar <davvid@gmail.com>
main: change cherry-pick hotkey to avoid ambiguous shortcuts

We were binding two actions to the same Ctrl+P hotkey.

Ctrl+P is a better mnemonic for "push", so make "cherry-pick" use
Shift+Ctrl+C.

Closes #317

Reported-by: Thomas Kluyver <takowl@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>