From 59b1dee55aef7e0a310df28819962ed4937bbae5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 17 Jan 2021 06:42:32 +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" --- kcmkwin/kwintabbox/kwintabbox.desktop | 2 +- plugins/krunner-integration/kwin-runner-windows.desktop | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index 6b3324bbb7..33e316d3b6 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -49,7 +49,7 @@ Name[nds]=Twischen Opgaven wesseln Name[nl]=Taakschakelaar Name[nn]=Oppgåvevekslar Name[pa]=ਟਾਸਕ ਸਵਿੱਚਰ -Name[pl]=Przełączanie zadań +Name[pl]=Przełącznik zadań Name[pt]=Mudança de Tarefas Name[pt_BR]=Mudança de tarefas Name[ro]=Comutator de sarcini diff --git a/plugins/krunner-integration/kwin-runner-windows.desktop b/plugins/krunner-integration/kwin-runner-windows.desktop index 92c43ffe53..9361c21969 100644 --- a/plugins/krunner-integration/kwin-runner-windows.desktop +++ b/plugins/krunner-integration/kwin-runner-windows.desktop @@ -13,6 +13,7 @@ Name[it]=Finestre Name[lt]=Langai Name[nl]=Vensters Name[nn]=Vindauge +Name[pl]=Okna Name[pt]=Janelas Name[pt_BR]=Janelas Name[ru]=Окна @@ -35,6 +36,7 @@ Comment[it]=Elenca e scambia le finestre ed i desktop Comment[lt]=Išvardyti langus ir darbalaukius bei perjungti į juos Comment[nl]=Toon vensters en bureaubladen en schakel ze om 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[sk]=Zobraziť okná a plochy a prepnúť ich