From 2d65d44bb864a61e2bc22c31f16a70e739dbfb08 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 27 Feb 2023 02:08:37 +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 a3972f55..4795541e 100644 --- a/kded/kded_plasma-mobile-start.json +++ b/kded/kded_plasma-mobile-start.json @@ -5,6 +5,7 @@ "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[it]": "Esegui le attività iniziali per Plasma Mobile durante l'avvio della sessione", "Description[ka]": "Plasma Mobile-ის საწყისი ამოცანების შესრულება სესიის გაშვებისას", "Description[nl]": "Initiële taken voor Plasma Mobile uitvoeren tijdens opstarten van sessie", "Description[sl]": "Poženi zagonske naloge za Plasma Mobile ob začetku seje", @@ -16,6 +17,7 @@ "Name[es]": "Inicio de Plasma Mobile", "Name[fr]": "Démarrage de Plasma Mobile", "Name[ia]": "Initio de Plasma Mobile", + "Name[it]": "Avvio di Plasma Mobile", "Name[ka]": "Plasma Mobile-ის გაშვება", "Name[nl]": "Begin van Plasma Mobile", "Name[sl]": "Zagon Plasma Mobile",