From 9c8785b130b13573229f3791f8165200f9e2c037 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Apr 2018 05:23:56 +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 081f1da0..e3bb6e9e 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -39,7 +39,7 @@ Comment[hy]=Բահեստի հետևի մասը KConfig-ի համար Comment[ia]=Retro-administration de immagazinage (storage) pro Kconfig Comment[id]=Backend penyimpanan untuk KConfig Comment[is]=Geymslubakendi fyrir KConfig -Comment[it]=Backend di archiviazione per KConfig +Comment[it]=Motore di archiviazione per KConfig Comment[ja]=KConfig のストレージバックエンド Comment[kk]=KConfig үшін сақтау тетігі Comment[km]=កម្មវិធី​ខាងក្រោយ​ការ​ផ្ទុក​សម្រាប់ KConfig -- cgit v1.2.1