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 2020-09-05 06:17:36 +02:00
parent 7e9bec6fd7
commit b720b4237b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kwin.notifyrc
View file

@ -301,6 +301,7 @@ Name[x-test]=xxXwayland Crashxx
Comment=Xwayland has crashed
Comment[az]=Xwayland qəzaya uğradı
Comment[ca]=L'Xwayland ha fallat
Comment[cs]=Xwayland spadnul
Comment[es]=Xwayland ha fallado
Comment[nl]=Xwayland is gecrasht
Comment[pt]=O Xwayland estoirou