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 2022-06-25 01:59:17 +00:00
parent 66a54d38d4
commit 6ff6dcac26
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kwin.notifyrc
View file

@ -72,7 +72,7 @@ Name[az]=Effektlər dayandırıldı
Name[bg]=Ефектите са временно спрени Name[bg]=Ефектите са временно спрени
Name[bs]=Slaganje je suspendovano Name[bs]=Slaganje je suspendovano
Name[ca]=S'ha suspès la composició Name[ca]=S'ha suspès la composició
Name[ca@valencia]=S'ha suspès la composició Name[ca@valencia]=S'ha suspés la composició
Name[cs]=Kompozice byla pozastavena Name[cs]=Kompozice byla pozastavena
Name[da]=Compositing er blevet suspenderet Name[da]=Compositing er blevet suspenderet
Name[de]=Compositing ist ausgesetzt worden Name[de]=Compositing ist ausgesetzt worden