From d565fa752e26acc16f0b5cc5d2c044b490f41d58 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 8 Sep 2020 06:47:34 +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 bf30964ef..e7af588e2 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -48,6 +48,7 @@ Name[zh_TW]=全域選單 Comment=Global menubar in your Plasma Desktop Comment[ca]=Barra de menús global a l'escriptori Plasma Comment[es]=Barra de menú global para el escritorio Plasma +Comment[nl]=Globale menubalk in uw Plasma-bureaublad Comment[pt]=Menu global na sua área de trabalho do Plasma Comment[sv]=Global menyrad på Plasmaskrivbordet Comment[uk]=Загальна панель меню у вашій стільниці Плазми