From 1278d9861744111c6d81fc7bd755f61e26a9a519 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Feb 2023 02:03:06 +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" --- kded/kded_plasma-mobile-start.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kded/kded_plasma-mobile-start.json b/kded/kded_plasma-mobile-start.json index 13be4f84..a3972f55 100644 --- a/kded/kded_plasma-mobile-start.json +++ b/kded/kded_plasma-mobile-start.json @@ -3,6 +3,7 @@ "Description": "Run initial tasks for Plasma Mobile during session startup", "Description[ca]": "Executa les tasques inicials del Plasma Mobile durant l'inici de sessió", "Description[es]": "Ejecutar tareas iniciales para Plasma Mobile durante el inicio de sesión", + "Description[fr]": "Lancer les tâches initiales pour la session Plasma Mobile durant le démarrage de session", "Description[ia]": "Executa cargas initial per Plasma Mobile durante initio de session", "Description[ka]": "Plasma Mobile-ის საწყისი ამოცანების შესრულება სესიის გაშვებისას", "Description[nl]": "Initiële taken voor Plasma Mobile uitvoeren tijdens opstarten van sessie", @@ -13,6 +14,7 @@ "Name": "Plasma Mobile Start", "Name[ca]": "Inici del Plasma Mobile", "Name[es]": "Inicio de Plasma Mobile", + "Name[fr]": "Démarrage de Plasma Mobile", "Name[ia]": "Initio de Plasma Mobile", "Name[ka]": "Plasma Mobile-ის გაშვება", "Name[nl]": "Begin van Plasma Mobile",