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 2018-10-17 06:38:09 +02:00
parent d014f2ab74
commit ea0f2e2d7c
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packageplugins/effect/kwin-packagestructure-effect.desktop
View file

@ -4,6 +4,7 @@ Name[ca]=Efecte del KWin
Name[ca@valencia]=Efecte del KWin
Name[de]=KWin-Effekt
Name[es]=Efecto de KWin
Name[fr]=Effet KWin
Name[id]=KWin Effect
Name[it]=Effetto di KWin
Name[nl]=KWin-effect