From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Sep 2016 14:19:57 +0000 (-0700)
Subject: Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18n
X-Git-Tag: v2.11.0-rc0~90^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0219a0572187f04cf6ff04323b81b0669776d21a;p=git

Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18n

* 'va/i18n' of ../git-gui:
  git-gui: l10n: add Portuguese translation
  git-gui i18n: mark strings for translation
---

0219a0572187f04cf6ff04323b81b0669776d21a
diff --cc git-gui/po/glossary/pt_pt.po
index 0000000000,adc3b542a6..adc3b542a6
mode 000000,100644..100644
--- a/git-gui/po/glossary/pt_pt.po
+++ b/git-gui/po/glossary/pt_pt.po
diff --cc git-gui/po/pt_pt.po
index 0000000000,0ef3c7927d..0ef3c7927d
mode 000000,100644..100644
--- a/git-gui/po/pt_pt.po
+++ b/git-gui/po/pt_pt.po