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-07 06:05:30 +02:00
parent 72ab500ece
commit c7d903754f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kwin.notifyrc
View file

@ -293,6 +293,7 @@ Name=Xwayland Crash
Name[az]=Xwayland Qəzası
Name[ca]=Fallada de l'Xwayland
Name[es]=Fallo de Xwayland
Name[fr]=Plantage « Xwayland »
Name[ko]=Xwayland 충돌
Name[nl]=Xwayland-crash
Name[pt]=Estoiro do Xwayland
@ -304,6 +305,7 @@ Comment[az]=Xwayland qəzaya uğradı
Comment[ca]=L'Xwayland ha fallat
Comment[cs]=Xwayland spadnul
Comment[es]=Xwayland ha fallado
Comment[fr]=Plantage de « Xwayland »
Comment[ko]=Xwayland가 충돌함
Comment[nl]=Xwayland is gecrasht
Comment[pt]=O Xwayland estoirou