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 2017-02-10 07:31:10 +01:00
parent 8edd0336e6
commit c2bc7d4d04
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/morphingpopups/package/metadata.desktop
View file

@ -37,6 +37,7 @@ Name=Morphing popups
Name[ca]=Missatges emergents en metamorfosi
Name[ca@valencia]=Missatges emergents en metamorfosi
Name[da]=Sammensmeltende pop-op'er
Name[el]=Αναδυόμενα morphing
Name[en_GB]=Morphing popups
Name[es]=Transformación de ventanas emergentes
Name[et]=Moonduvad hüpikdialoogid