From bbad15f6611371ed2a39cbc6ebfbc956510424f8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 Aug 2017 04:56:42 +0200 Subject: [PATCH] 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" --- effects/translucency/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/translucency/package/metadata.desktop b/effects/translucency/package/metadata.desktop index c6455ef7b3..86ed9b2caf 100644 --- a/effects/translucency/package/metadata.desktop +++ b/effects/translucency/package/metadata.desktop @@ -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]=विभिन्न परिस्थितियों में विंडो को अल्पपारदर्शी करें