From ff118fda3af85ece2e7d247d1aca283817cdfa2e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 21 Sep 2020 09:45:39 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index 5dd86a6b6..9049a7183 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -54,6 +54,7 @@ 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[nn]=Global menylinje på Plasma-skrivebordet Comment[pt]=Menu global na sua área de trabalho do Plasma Comment[pt_BR]=Barra de menu global na sua área de trabalho Plasma Comment[ro]=Bară de meniu globală în biroul Plasma