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-11-12 08:21:59 +01:00
parent 4e10c99084
commit 51bf12e629
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/zoom/zoom_config.desktop
View file

@ -40,7 +40,7 @@ Name[hne]=जूम
Name[hr]=Povećanje Name[hr]=Povećanje
Name[hu]=Kinagyítás Name[hu]=Kinagyítás
Name[ia]=Zoom Name[ia]=Zoom
Name[id]=Zoom Name[id]=Zum
Name[is]=Aðdráttur Name[is]=Aðdráttur
Name[it]=Ingrandimento Name[it]=Ingrandimento
Name[ja]=ズーム Name[ja]=ズーム