From 99d38a539ea3f2f188d280b6104038f9dbadec2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?=
 <romjerome@users.noreply.github.com>
Date: Wed, 25 Mar 2015 19:53:20 +0100
Subject: [PATCH] Remove --no-wrap option from merging

Consistency with most translation files
---
 po/update_po.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/update_po.py b/po/update_po.py
index 594402455..a8f05b47d 100644
--- a/po/update_po.py
+++ b/po/update_po.py
@@ -701,7 +701,7 @@ def merge(args):
         if arg == 'all':
             continue  
         print ('Merge %(lang)s with current template' % {'lang': arg})
-        os.system('''%(msgmerge)s --no-wrap %(lang)s gramps.pot -o updated_%(lang)s''' \
+        os.system('''%(msgmerge)s %(lang)s gramps.pot -o updated_%(lang)s''' \
                     % {'msgmerge': msgmergeCmd, 'lang': arg})
         print ("Updated file: 'updated_%(lang)s'." % {'lang': arg})