From 2dee622d82bd7c3cc7780eaedb9e29aee82a7d0c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 Nov 2020 06:36:15 +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" --- runners/kwin-runner-windows.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runners/kwin-runner-windows.desktop b/runners/kwin-runner-windows.desktop index c3bf0b9ed0..5646e3d403 100644 --- a/runners/kwin-runner-windows.desktop +++ b/runners/kwin-runner-windows.desktop @@ -8,6 +8,7 @@ Name[it]=Finestre Name[nl]=Vensters Name[nn]=Vindauge Name[pt]=Janelas +Name[pt_BR]=Janelas Name[sl]=Okna Name[sv]=Fönster Name[uk]=Вікна @@ -20,6 +21,7 @@ Comment[it]=Elenca e scambia le finestre ed i desktop Comment[nl]=Toon vensters en bureaubladen en schakel ze om Comment[nn]=Vis vindauge og skrivebord, og byt mellom dei 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[sl]=Prikaži seznam oken in namizij in preklopi med njimi Comment[sv]=Lista fönster och skrivbord, och byt mellan dem Comment[uk]=Показує список вікон і стільниць і перемикає їх