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-01-05 05:03:50 +01:00
parent 01d6878dc2
commit 301f7199fb
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/slide/slide_config.desktop
View file

@ -21,6 +21,7 @@ Name[es]=Deslizar
Name[et]=Liuglemine
Name[eu]=Irristatu
Name[fi]=Liu’utus
Name[fr]=Glisser
Name[fy]=Glydzje
Name[ga]=Sleamhnaigh
Name[gl]=Deslizar