From 864a7736455dc8b164c6c8272799545155ab4dd1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 5 May 2023 02:38:44 +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/nightcolor/package/metadata.json | 1 + quicksettings/record/plasma_mobile_quicksetting_record.notifyrc | 1 + .../screenshot/plasma_mobile_quicksetting_screenshot.notifyrc | 1 + 3 files changed, 3 insertions(+) diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index acdbc9b2..4100efdb 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -5,6 +5,7 @@ { "Email": "aleixpol@kde.org", "Name": "Aleix Pol", + "Name[ast]": "Aleix Pol", "Name[az]": "Aleix Pol", "Name[ca@valencia]": "Aleix Pol", "Name[ca]": "Aleix Pol", diff --git a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc index cecb6a4f..5867d121 100644 --- a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc +++ b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc @@ -4,6 +4,7 @@ [Global] IconName=preferences-system-windows-effect-screenshot Name=Plasma +Name[ast]=Plasma Name[az]=Plasma Name[ca]=Plasma Name[ca@valencia]=Plasma diff --git a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc index cecb6a4f..5867d121 100644 --- a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc +++ b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc @@ -4,6 +4,7 @@ [Global] IconName=preferences-system-windows-effect-screenshot Name=Plasma +Name[ast]=Plasma Name[az]=Plasma Name[ca]=Plasma Name[ca@valencia]=Plasma