From 9162ea745f77dca04860473dc48679ba73eb7614 Mon Sep 17 00:00:00 2001 From: jspijker Date: Fri, 3 Mar 2023 13:16:42 +0100 Subject: [PATCH] No wrap and sort by file Contributes to CURA-10208 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index bfa3b95b3b..14350a76df 100644 --- a/conanfile.py +++ b/conanfile.py @@ -338,7 +338,7 @@ class CuraConan(ConanFile): pot_file = self.source_path.joinpath("resources", "i18n", po_file.with_suffix('.pot').name) mkdir(self, str(unix_path(self, pot_file.parent))) self.run( - f"{cpp_info.bindirs[0]}/msgmerge --no-wrap --no-fuzzy-matching -width=140 -o {po_file} {po_file} {pot_file}", + f"{cpp_info.bindirs[0]}/msgmerge --no-wrap --sort-by-file -o {po_file} {po_file} {pot_file}", env="conanbuild", ignore_errors=True) def build(self):