From 0664e644d6aed666a2465ecb5f3eb852d6fdc6b8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 7 Jul 2017 04:33:03 +0200 Subject: 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" --- src/core/kconfigbackend.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop index 37e1b961..081f1da0 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -24,7 +24,7 @@ Comment[et]=KConfigi salvestamise taustaprogramm Comment[eu]=KConfig-en biltegiratze euskarria Comment[fa]=پشتیبان دخیره‌گاه برای KConfig Comment[fi]=Asetusvaraston taustaosa -Comment[fr]=Module de stockage pour KConfig +Comment[fr]=Moteur de stockage pour KConfig Comment[fy]=Opslach efterein foar KConfig Comment[ga]=Inneall stórais KConfig Comment[gd]=Backend stòrais airson KConfig -- cgit v1.2.1