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-08-10 04:56:42 +02:00
parent 5118d9470c
commit bbad15f661
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/translucency/package/metadata.desktop
View file

@ -102,7 +102,7 @@ Comment[fi]=Tee ikkunoista läpikuultavia eri ehtojen alaisina
Comment[fr]=Affiche des fenêtres translucides en fonction de diverses conditions
Comment[fy]=Meitsje finsters trochsichtich ûnder oare kondysjes
Comment[ga]=Déan fuinneoga tréshoilseach uaireanta difriúla
Comment[gl]=Fai translúcidas as xanelas en diferentes casos
Comment[gl]=Fai translúcidas as xanelas en distintos casos
Comment[gu]=જુદી જુદી સ્થિતિઓમાં વિન્ડોસને પારદર્શક બનાવે છે
Comment[he]=הפיכת חלונות לשקופים חלקית תחת תנאים שונים
Comment[hi]=विभिन्न परिस्थितियों में विंडो को अल्पपारदर्शी करें