From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Jan 2014 21:16:17 +0000 (-0800)
Subject: Merge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui
X-Git-Tag: v1.9-rc1~30
X-Git-Url: https://repo.or.cz/w/alt-git.git/commitdiff_plain/d9bb4be53bc5185244b4be9860562a012803bacb

Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui

git-gui 0.19.0

* tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui:
  git-gui 0.19
  git-gui: chmod +x po2msg, windows/git-gui.sh
  git-gui: fallback right pane to packed widgets with Tk 8.4
  git-gui i18n: Added Bulgarian translation
  git-gui l10n: Add 29 more terms to glossary
  git-gui i18n: Initial glossary in Bulgarian
---

d9bb4be53bc5185244b4be9860562a012803bacb
diff --cc git-gui/po/bg.po
index 0000000000,89b3a4e53d..89b3a4e53d
mode 000000,100644..100644
--- a/git-gui/po/bg.po
+++ b/git-gui/po/bg.po
diff --cc git-gui/po/glossary/bg.po
index 0000000000,8b71fad9a5..8b71fad9a5
mode 000000,100644..100644
--- a/git-gui/po/glossary/bg.po
+++ b/git-gui/po/glossary/bg.po
diff --cc git-gui/po/po2msg.sh
index 1e9f992528,1e9f992528..1e9f992528
mode 100644,100755..100755
--- a/git-gui/po/po2msg.sh
+++ b/git-gui/po/po2msg.sh
diff --cc git-gui/windows/git-gui.sh
index b1845c5055,b1845c5055..b1845c5055
mode 100644,100755..100755
--- a/git-gui/windows/git-gui.sh
+++ b/git-gui/windows/git-gui.sh