From a15475b8f3e8c79ab9877e7d52cf58ae09d0f617 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 14 Sep 2022 01:45:56 +0000 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" --- containments/homescreens/folio/package/metadata.json | 1 + 1 file changed, 1 insertion(+) diff --git a/containments/homescreens/folio/package/metadata.json b/containments/homescreens/folio/package/metadata.json index 33ce7503..c7e14d2e 100644 --- a/containments/homescreens/folio/package/metadata.json +++ b/containments/homescreens/folio/package/metadata.json @@ -51,6 +51,7 @@ "Name[ca]": "Folio", "Name[es]": "Folio", "Name[eu]": "Folio", + "Name[fr]": "Porte-feuille", "Name[nl]": "Folio", "Name[pt]": "Folio", "Name[sl]": "Folio",