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-07-29 04:45:55 +02:00
parent 8527ac30dc
commit f14540485f
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/fadedesktop/package/metadata.desktop
View file

@ -86,7 +86,7 @@ Comment[fi]=Häivytys virtuaalityöpöytien välillä niitä vaihdettaessa
Comment[fr]=Effectue un fondu entre les bureaux virtuels lors des changements de bureau
Comment[fy]=By it wikseljen tusken firuele buroblêden in ferfaging dwaan
Comment[ga]=Céimnigh idir deasca fíorúla agus ag malairt eatarthu
Comment[gl]=Emprega un efecto de esvaemento ao trocar de escritorio
Comment[gl]=Emprega un efecto de esvaemento ao cambiar de escritorio
Comment[he]=חשיפה והיעלמות בין שולחנות עבודה וירטואליים במעבר ביניהם
Comment[hr]=Efekt preklapanja radnih površina prilikom promjene među njima
Comment[hu]=Asztalváltáskor a régi asztal elhalványul, az új felerősödik