From 2e246b6fec6e881bdb4c6b0097c328ba27ef2792 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 2 Mar 2020 15:03:32 -0500 Subject: [PATCH] po: Fix replacement of %m in sed programs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When running make dist, I hit this error: rm -f en@arabic.gmo && /usr/bin/gmsgfmt -c --statistics --verbose -o en@arabic.gmo en@arabic.po en@arabic.po:5312: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The character that terminates the directive number 3 is not a valid conversion specifier. /usr/bin/gmsgfmt: found 1 fatal error This was caused by "%m" being replaced with foreign Unicode characters. For example: msgid "cannot rename the file %s to %s: %m" msgstr "ﺹﺎﻨﻧﻮﺗ ﺮﻌﻧﺎﻤﻋ ﺖﻬﻋ ﻒִﻴﻠﻋ %s ﺕﻭ %s: %ﻡ" Mimic the workaround used for "%s" by reversing the replacement of "%m" at the end of the sed programs. Signed-off-by: Mike Gilbert Reviewed-by: Daniel Kiper --- po/arabic.sed | 1 + po/cyrillic.sed | 1 + po/greek.sed | 1 + po/hebrew.sed | 1 + 4 files changed, 4 insertions(+) diff --git a/po/arabic.sed b/po/arabic.sed index b5b5db661..21dc8b6db 100644 --- a/po/arabic.sed +++ b/po/arabic.sed @@ -73,6 +73,7 @@ s,%\([0-9]*\)لد,%\1ld,g s,%\([0-9]*\)للد,%\1lld,g s,%\([0-9\.\*]*\)س,%\1s,g +s,%\([0-9\.\*]*\)م,%\1m,g s,%\([0-9]*\)لو,%\1lu,g s,%\([0-9]*\)و,%\1u,g s,%\([0-9]*\)للو,%\1llu,g diff --git a/po/cyrillic.sed b/po/cyrillic.sed index ffad0ed8c..2e3e6655d 100644 --- a/po/cyrillic.sed +++ b/po/cyrillic.sed @@ -96,6 +96,7 @@ s,%\([0-9]*\)лд,%\1ld,g s,%\([0-9]*\)ллд,%\1lld,g s,%\([0-9\.\*]*\)с,%\1s,g +s,%\([0-9\.\*]*\)м,%\1m,g s,%\([0-9]*\)лу,%\1lu,g s,%\([0-9]*\)у,%\1u,g s,%\([0-9]*\)ллу,%\1llu,g diff --git a/po/greek.sed b/po/greek.sed index 93556c386..3543f6aac 100644 --- a/po/greek.sed +++ b/po/greek.sed @@ -98,6 +98,7 @@ s,%\([0-9]*\)λδ,%\1ld,g s,%\([0-9]*\)λλδ,%\1lld,g s,%\([0-9\.\*]*\)σ,%\1s,g +s,%\([0-9\.\*]*\)μ,%\1m,g s,%\([0-9]*\)λυ,%\1lu,g s,%\([0-9]*\)υ,%\1u,g s,%\([0-9]*\)λλυ,%\1llu,g diff --git a/po/hebrew.sed b/po/hebrew.sed index a47bc6a28..9210014bc 100644 --- a/po/hebrew.sed +++ b/po/hebrew.sed @@ -81,6 +81,7 @@ s,%\([0-9]*\)לד,%\1ld,g s,%\([0-9]*\)ללד,%\1lld,g s,%\([0-9\.\*]*\)ש,%\1s,g +s,%\([0-9\.\*]*\)מ,%\1m,g s,%\([0-9]*\)לוּ,%\1lu,g s,%\([0-9]*\)וּ,%\1u,g s,%\([0-9]*\)ללוּ,%\1llu,g