From 84c1e7bdd22ebe6a276022e67bfc5173730e8b86 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Wed, 11 Nov 2020 21:18:41 +1000
Subject: [PATCH] sort merged po files

---
 qt/po/gettext.bzl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qt/po/gettext.bzl b/qt/po/gettext.bzl
index 80a88c9da..e5279b05b 100644
--- a/qt/po/gettext.bzl
+++ b/qt/po/gettext.bzl
@@ -65,7 +65,7 @@ def update_po(name, po_file_in, po_file_out, pot_file, visibility):
         srcs = [po_file_in, pot_file],
         outs = [po_file_out],
         cmd = _pathfix + """\
-msgmerge -q --no-wrap $(location {po_file_in}) $(location {pot_file}) > $(location {po_file_out})
+msgmerge -q -F --no-wrap $(location {po_file_in}) $(location {pot_file}) > $(location {po_file_out})
 """.format(
             po_file_in = po_file_in,
             po_file_out = po_file_out,
@@ -81,7 +81,6 @@ def compile_po(name, po_file, mo_file):
         name = name,
         srcs = [po_file],
         outs = [mo_file],
-        # homebrew gettext is not on path by default
         cmd = _pathfix + """\
 cat $(location {po_file}) | msgfmt - --output-file=$(location {mo_file})
 """.format(