yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2021-02-10 08:21:09 +01:00
parent 0ea9969cee
commit fb7f507d8e
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/krunner-integration/kwin-runner-windows.desktop
View file

@ -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