From f7895df40e2730df424913e169c1f1fdfe9338a7 Mon Sep 17 00:00:00 2001
From: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>
Date: Sun, 21 Jun 2015 18:35:35 +0900
Subject: [PATCH] Add --use-first option to msgcat

When msgcat command merge common-rst po files,
it uses only first msgstr so that Sphinx handles
properly the po file.

Change-Id: I0e744646bfe1fd398cffda316872128d563c893a
---
 RELEASE_NOTES.rst             | 5 +++++
 bin/doc-tools-check-languages | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index 451bd7ea..489a47a4 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -1,6 +1,11 @@
 Release notes
 =============
 
+0.29.1
+------
+
+* ``doc-tools-check-languages``: Fix building of translated RST guides.
+
 0.29.0
 ------
 
diff --git a/bin/doc-tools-check-languages b/bin/doc-tools-check-languages
index 2d4958bb..a3a8ef28 100755
--- a/bin/doc-tools-check-languages
+++ b/bin/doc-tools-check-languages
@@ -51,9 +51,9 @@ function build_rst {
     tox -evenv "sphinx-build -W -b gettext $TAG ${DOC_DIR}${book}/source/ ${DOC_DIR}${book}/source/locale/"
     # Merge the common-rst po file in
     if [[ -e ${DOC_DIR}common-rst/source/locale/${language}/LC_MESSAGES/common-rst.po ]] ; then
-        msgcat -o ${DOC_DIR}${book}/source/locale/${language}/${book}.po \
-            ${DOC_DIR}common-rst/source/locale/${language}/LC_MESSAGES/common-rst.po \
-            ${DOC_DIR}${book}/source/locale/${language}/LC_MESSAGES/${book}.po
+        msgcat --use-first -o ${DOC_DIR}${book}/source/locale/${language}/${book}.po \
+            ${DOC_DIR}${book}/source/locale/${language}/LC_MESSAGES/${book}.po \
+            ${DOC_DIR}common-rst/source/locale/${language}/LC_MESSAGES/common-rst.po
         mv -f ${DOC_DIR}${book}/source/locale/${language}/${book}.po \
             ${DOC_DIR}${book}/source/locale/${language}/LC_MESSAGES/${book}.po
     fi