Commit bbad15f6 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent 5118d947
......@@ -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]=विभिन्न परिस्थितियों में विंडो को अल्पपारदर्शी करें
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment