Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Add Brazilian Portuguese (pt-BR) translation
  gitk: Make text selectable on Mac
  gitk: Prevent the text pane from becoming editable
  gitk: Add the equivalent of diff --color-words
  gitk: Update Swedish translation (290t)
  gitk: Show notes by default (like git log does)

diff --cc gitk-git/gitk
index 1b0e09a561e01c51bdc6dbced052e0c753924618,e82c6bfedea5fb9a3d768c0fa1759346c6e5e603..e82c6bfedea5fb9a3d768c0fa1759346c6e5e603
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk

diff --cc gitk-git/po/pt_br.po
index 0000000000000000000000000000000000000000,1486e3205a8d47705f96c199a745f78dc616e39d..1486e3205a8d47705f96c199a745f78dc616e39d
mode 000000,100644..100644
--- /dev/null
--- 2/po/pt_br.po
+++ b/gitk-git/po/pt_br.po

diff --cc gitk-git/po/sv.po
Simple merge