v0.5.5

lektor_i18n.py

@@ -140,7 +140,7 @@ def merge_pot(from_filenames, to_filename):
         msgcat = locate_executable("msgcat")
         if msgcat is None:
             msgcat = "/usr/bin/msgcat"
-        cmdline = [msgcat, "--use-first"]
+        cmdline = [msgcat, "--use-first", "-F"]
         cmdline.extend(from_filenames)
         cmdline.extend(("-o", to_filename))
         reporter.report_debug_info("msgcat cmd line", cmdline)
@@ -183,6 +183,7 @@ def _msg_init(self):
             "-o",
             self.FILENAME_PATTERN.format(self.language),
             "--no-translator",
+            "-F",
         ]
         reporter.report_debug_info("msginit cmd line", cmdline)
         portable_popen(cmdline, cwd=self.i18npath).wait()