Re: [PATCH] merge-ort: split "distinct types" message into two translatable messages

On 10/05/21 04.52, Alex Henrie wrote:

The word "renamed" has two possible translations in many European
languages depending on whether one thing was renamed or two things were
renamed. Give translators freedom to alter any part of the message to
make it sound right in their language.

What are the examples? In French, Spanish, German, Portuguese (pt-PT),
or even Slavic (like Russian) or even Hungarian, and etc?

-			path_msg(opt, path, 0,
-				 _("CONFLICT (distinct types): %s had different "
-				   "types on each side; renamed %s of them so "
-				   "each can be recorded somewhere."),
-				 path,
-				 (rename_a && rename_b) ? _("both") : _("one"));
+			if (rename_a && rename_b) {
+				path_msg(opt, path, 0,
+					 _("CONFLICT (distinct types): %s had "
+					   "different types on each side; "
+					   "renamed both of them so each can "
+					   "be recorded somewhere."),
+					 path);
+			} else {
+				path_msg(opt, path, 0,
+					 _("CONFLICT (distinct types): %s had "
+					   "different types on each side; "
+					   "renamed one of them so each can be "
+					   "recorded somewhere."),
+					 path);
+			}

Seems OK.

For example, in Indonesian, the first case (both sides are renamed) would be
something like:

%s punya tipe yang berbeda pada setiap sisi, kedua-duanya dinamai ulang...

The second case (only one side) would be something like:

%s punya tipe yang berbeda pada setiap sisi, salah satunya dinamai ulang...

But the status quo (before this patch) would be translated as:

%s punya tipe yang berbeda pada setiap sisi, (kedua-duanya | satu) dari mereka
dinamai ulang...

On the both sides case of status quo, the personal pronoun `mereka` (they)
refers to the conflicted sides, where as on this patch, such conflicted sides
are instead be referred as `-nya` suffix on the translation.

I personally avoid using `mereka` atau `ia` as personal pronoun that refer
to things, and instead using `itu`.

-- 
An old man doll... just what I always wanted! - Clara