From 911c5c0da5fc506ac47a1a4e5f1f91c7acc74566 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 3 Sep 2022 01:45:52 +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" --- quicksettings/record/metadata.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/quicksettings/record/metadata.json b/quicksettings/record/metadata.json index d04b70a3..5c36a053 100644 --- a/quicksettings/record/metadata.json +++ b/quicksettings/record/metadata.json @@ -29,8 +29,10 @@ } ], "Description": "Screen recording quick setting", + "Description[ca@valencia]": "Configuració ràpida de la gravació de pantalla", "Description[ca]": "Configuració ràpida de l'enregistrament de pantalla", "Description[eu]": "Pantaila grabatzeko ezarpen azkarra", + "Description[fr]": "Configuration rapide de l'enregistrement d'écran", "Description[nl]": "Snelle instelling van scherm opnemen", "Description[pt]": "Configuração rápida da gravação do ecrã", "Description[tr]": "Ekran kaydetme hızlı ayarı", @@ -40,8 +42,10 @@ "Id": "org.kde.plasma.quicksetting.record", "License": "GPL-2.0+", "Name": "Record Screen", + "Name[ca@valencia]": "Grava la pantalla", "Name[ca]": "Enregistra la pantalla", "Name[eu]": "Grabatu pantaila", + "Name[fr]": "Enregistrer l'écran", "Name[nl]": "Scherm opnemen", "Name[pt]": "Gravar o Ecrã", "Name[tr]": "Ekranı Kaydet",