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-03-31 05:20:59 +02:00
parent 961cc518fb
commit e61383a198
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/blur/blur_config.desktop
View file

@ -39,7 +39,7 @@ Name[hr]=Mrlja
Name[hsb]=Młowojty Name[hsb]=Młowojty
Name[hu]=Elmosódás Name[hu]=Elmosódás
Name[ia]=Obscura (Blur) Name[ia]=Obscura (Blur)
Name[id]=Samar Name[id]=Buram
Name[is]=Móða Name[is]=Móða
Name[it]=Sfocatura Name[it]=Sfocatura
Name[ja]=ぼかし Name[ja]=ぼかし