From 011db0b933066824492744dd99a6348cc63c5aee Mon Sep 17 00:00:00 2001
From: JosephK <josephk@framasoft.org>
Date: Tue, 25 Sep 2018 13:35:45 +0200
Subject: [PATCH] Update yml2po.sh

---
 zanata/scripts/yml2po.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zanata/scripts/yml2po.sh b/zanata/scripts/yml2po.sh
index 7455426..8e590bf 100755
--- a/zanata/scripts/yml2po.sh
+++ b/zanata/scripts/yml2po.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 cp app/locales/*.yml zanata/yml/
-yaml2po -P --progress=none -i zanata/yml/en.yml -o zanata/po/${PWD##*/}.pot
+yaml2po -P --progress=none -i zanata/yml/en.yml -o zanata/po/${PWD##*/}.pot --duplicates merge
 for i in app/locales/*.yml
 do
   j=$(echo $i | cut -d '.' -f 1   | cut -d '/' -f 3)