From f0fcf1e4fdfb177c7ef7ddac5f3f6e3fdd0ef5a3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Dec 2021 01:42: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" --- kdecoration/config/breezedecorationconfig.desktop | 2 +- kstyle/config/breezestyleconfig.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index 1946d188..e7ec785e 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -107,7 +107,7 @@ X-KDE-Keywords[ca]=breeze,brisa,decoració X-KDE-Keywords[ca@valencia]=breeze,brisa,decoració X-KDE-Keywords[cs]=breeze,dekorace X-KDE-Keywords[da]=breeze,dekoration -X-KDE-Keywords[de]=Breeze-Dekoration +X-KDE-Keywords[de]=Dekoration X-KDE-Keywords[el]=breeze,διακόσμηση X-KDE-Keywords[en_GB]=breeze,decoration X-KDE-Keywords[es]=breeze,brisa,decoración diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index db19013f..ce92e71e 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -107,7 +107,7 @@ X-KDE-Keywords[ca]=breeze,brisa,giny,estil X-KDE-Keywords[ca@valencia]=breeze,brisa,giny,estil X-KDE-Keywords[cs]=breeze,widget,styl X-KDE-Keywords[da]=breeze,kontrol,style -X-KDE-Keywords[de]=Breeze,Bedienelement,Stil +X-KDE-Keywords[de]=Bedienelement,Stil X-KDE-Keywords[el]=breeze,γραφικό συστατικό,στιλ X-KDE-Keywords[en_GB]=breeze,widget,style X-KDE-Keywords[es]=breeze,brisa,elemento gráfico,widget,estilo