Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: update french translation
  git-gui: update Japanese translation
  git-gui: fix shortcut for menu "Commit/Revert Changes"
  git-gui: Quote git path when starting another gui in a submodule
  git-gui: update Italian translation
  git-gui: Update Swedish translation (520t0f0u)
  git-gui: use themed tk widgets with Tk 8.5
  git-gui: Update German translation (12 new or changed strings).
  git-gui: Update translation template
  git-gui: Remove unused icon file_parttick
  git-gui: use different icon for new and modified files in the index
  git-gui: set GIT_DIR and GIT_WORK_TREE after setup
  git-gui: update shortcut tools to use _gitworktree
  git-gui: handle bare repos correctly
  git-gui: handle non-standard worktree locations
  git-gui: Support applying a range of changes at once
  git-gui: Add a special diff popup menu for submodules
  git-gui: Use git diff --submodule when available

diff --cc git-gui/git-gui.sh
Simple merge

diff --cc git-gui/lib/about.tcl
Simple merge

diff --cc git-gui/lib/blame.tcl
Simple merge

diff --cc git-gui/lib/branch_checkout.tcl
Simple merge

diff --cc git-gui/lib/branch_create.tcl
Simple merge

diff --cc git-gui/lib/branch_delete.tcl
Simple merge

diff --cc git-gui/lib/branch_rename.tcl
Simple merge

diff --cc git-gui/lib/browser.tcl
Simple merge

diff --cc git-gui/lib/choose_font.tcl
Simple merge

diff --cc git-gui/lib/choose_repository.tcl
Simple merge

diff --cc git-gui/lib/choose_rev.tcl
Simple merge

diff --cc git-gui/lib/class.tcl
Simple merge

diff --cc git-gui/lib/console.tcl
Simple merge

diff --cc git-gui/lib/database.tcl
Simple merge

diff --cc git-gui/lib/diff.tcl
Simple merge

diff --cc git-gui/lib/error.tcl
Simple merge

diff --cc git-gui/lib/index.tcl
Simple merge

diff --cc git-gui/lib/merge.tcl
Simple merge

diff --cc git-gui/lib/option.tcl
Simple merge

diff --cc git-gui/lib/remote_add.tcl
Simple merge

diff --cc git-gui/lib/remote_branch_delete.tcl
Simple merge

diff --cc git-gui/lib/search.tcl
Simple merge

diff --cc git-gui/lib/shortcut.tcl
Simple merge

diff --cc git-gui/lib/sshkey.tcl
Simple merge

diff --cc git-gui/lib/status_bar.tcl
Simple merge

diff --cc git-gui/lib/themed.tcl
index 0000000000000000000000000000000000000000,1da458673b557fe84ac8e430e97b7ad53c69a07a..1da458673b557fe84ac8e430e97b7ad53c69a07a
mode 000000,100644..100644
--- /dev/null
--- 2/lib/themed.tcl
+++ b/git-gui/lib/themed.tcl

diff --cc git-gui/lib/tools_dlg.tcl
Simple merge

diff --cc git-gui/lib/transport.tcl
Simple merge

diff --cc git-gui/po/de.po
Simple merge

diff --cc git-gui/po/fr.po
Simple merge

diff --cc git-gui/po/git-gui.pot
Simple merge

diff --cc git-gui/po/it.po
Simple merge

diff --cc git-gui/po/ja.po
Simple merge

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