From dd621979cd9fa0b6127f1123ea0ccf4d4f8167e3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 24 Jan 2021 06:51:51 +0100 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- generators/fictionbook/libokularGenerator_fb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json index a44f72597..d0fc9a929 100644 --- a/generators/fictionbook/libokularGenerator_fb.json +++ b/generators/fictionbook/libokularGenerator_fb.json @@ -136,7 +136,7 @@ "Name[et]": "Fiction Booki taustaprogramm", "Name[eu]": "Fiction Book-en bizkarraldekoa", "Name[fi]": "FictionBook-taustaosa", - "Name[fr]": "Moteur pour FictionBook", + "Name[fr]": "Moteur pour « FictionBook »", "Name[gl]": "Infraestrutura para libros FictionBook", "Name[ia]": "Retro adminisration de Fiction Book", "Name[it]": "Backend Fiction Book",