From fb7f507d8ead99eabc76030ee0ea6e9588e0882e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 10 Feb 2021 08:21:09 +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" --- plugins/krunner-integration/kwin-runner-windows.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/krunner-integration/kwin-runner-windows.desktop b/plugins/krunner-integration/kwin-runner-windows.desktop index bc6b568c22..69601d7580 100644 --- a/plugins/krunner-integration/kwin-runner-windows.desktop +++ b/plugins/krunner-integration/kwin-runner-windows.desktop @@ -41,6 +41,7 @@ Comment[nn]=Vis vindauge og skrivebord, og byt mellom dei Comment[pl]=Wypisuje okna i pulpity oraz przełącza pomiędzy nimi Comment[pt]=Listar as janelas e ecrãs e mudar entre elas Comment[pt_BR]=Lista as janelas e áreas de trabalho e alterna entre elas +Comment[ru]=Просмотр списка и переключение между окнами и рабочими столами Comment[sk]=Zobraziť okná a plochy a prepnúť ich Comment[sl]=Prikaži seznam oken in namizij in preklopi med njimi Comment[sv]=Lista fönster och skrivbord, och byt mellan dem