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-01-12 06:49:28 +01:00
parent 8d84fe4b6a
commit e938a569bc
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

@ -15,6 +15,7 @@ Name[nl]=Vensters
Name[nn]=Vindauge
Name[pt]=Janelas
Name[pt_BR]=Janelas
Name[ru]=Окна
Name[sk]=Okná
Name[sl]=Okna
Name[sv]=Fönster