From 5575f2e784dee1b4ea28fcf4f388d4ac4ae33937 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 17 Sep 2020 06:22:35 +0200 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" --- applets/appmenu/package/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index 5b44a68dd..5dd86a6b6 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -51,6 +51,8 @@ Comment[ca]=Barra de menús global a l'escriptori Plasma Comment[de]=Globale Menüleiste auf der Plasma-Arbeitsfläche Comment[es]=Barra de menú global para el escritorio Plasma Comment[fr]=Barre globale de menu de votre bureau Plasma +Comment[it]=Barra dei menu globale nel tuo desktop Plasma +Comment[ko]=Plasma 데스크톱에 전역 메뉴 표시줄 표시 Comment[nl]=Globale menubalk in uw Plasma-bureaublad Comment[pt]=Menu global na sua área de trabalho do Plasma Comment[pt_BR]=Barra de menu global na sua área de trabalho Plasma