From b70e821ad217a16e521b55969023d68267571f3c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Oct 2020 06:12:10 +0100 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" --- lookandfeel.twilight/metadata.desktop | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lookandfeel.twilight/metadata.desktop b/lookandfeel.twilight/metadata.desktop index c157b51c..7ff151f5 100644 --- a/lookandfeel.twilight/metadata.desktop +++ b/lookandfeel.twilight/metadata.desktop @@ -1,6 +1,20 @@ [Desktop Entry] Comment=Breeze Twilight by the KDE VDG +Comment[ca]=Brisa crepuscular, creat pel VDG del KDE +Comment[et]=Breeze videvik KDE VDG-lt +Comment[nl]=Breeze Twilight door de KDE VDG +Comment[pt]=Brisa da Madrugada da VDG do KDE +Comment[sv]=Breeze skymning av KDE:s visuella designgrupp +Comment[uk]=Сутінкова Breeze, автори — KDE VDG +Comment[x-test]=xxBreeze Twilight by the KDE VDGxx Name=Breeze Twilight +Name[ca]=Brisa crepuscular +Name[et]=Breeze videvik +Name[nl]=Breeze Twilight +Name[pt]=Brisa da Madrugada +Name[sv]=Breeze skymning +Name[uk]=Сутінкова Breeze +Name[x-test]=xxBreeze Twilightxx Type=Service X-KDE-ServiceTypes=Plasma/LookAndFeel