From f14540485ff2c78129fc67ba6123d624a2dca0b4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 29 Jul 2017 04:45:55 +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/fadedesktop/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/fadedesktop/package/metadata.desktop b/effects/fadedesktop/package/metadata.desktop index 3ed3a22259..3618a58b0b 100644 --- a/effects/fadedesktop/package/metadata.desktop +++ b/effects/fadedesktop/package/metadata.desktop @@ -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