From 8312483659dd3cf5441bc714ac27a18fcaf1211c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 Mar 2024 01:13:30 +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" --- src/purpose/purposeplugin.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index 416603368..106fbfd5d 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -6,6 +6,7 @@ "Name[ca@valencia]": "Tobias Fella", "Name[ca]": "Tobias Fella", "Name[es]": "Tobias Fella", + "Name[fr]": "Tobias Fella", "Name[hu]": "Tobias Fella", "Name[ia]": "Tobias Fella", "Name[nl]": "Tobias Fella", @@ -20,6 +21,7 @@ "Description[ca@valencia]": "Compartix a través de NeoChat", "Description[ca]": "Comparteix a través del NeoChat", "Description[es]": "Compartir mediante NeoChat", + "Description[fr]": "Partager grâce à NeoChat", "Description[hu]": "Megosztás NeoChatben", "Description[ia]": "Comparti via NeoChat", "Description[nl]": "Delen via NeoChat", @@ -33,6 +35,7 @@ "Name[ca@valencia]": "NeoChat", "Name[ca]": "NeoChat", "Name[es]": "NeoChat", + "Name[fr]": "NeoChat", "Name[hu]": "NeoChat", "Name[ia]": "Neochat", "Name[nl]": "NeoChat",