From 538cf784734434e5478f7b3dab8af131304dd656 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 14 Jul 2020 05:53:21 +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(-) diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop index 56702e15..496eb7b4 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -11,7 +11,7 @@ Comment[bg]=Storage backend for KConfig Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড Comment[bn_IN]=KConfig-র জন্য ব্যবহৃত ব্যাক-এন্ড সংগ্রহস্থল Comment[bs]=Skladišna pozadina za K‑konfig -Comment[ca]=Dorsal d'emmagatzematge pel KConfig +Comment[ca]=Dorsal de l'emmagatzematge per al KConfig Comment[ca@valencia]=Dorsal d'emmagatzematge pel KConfig Comment[cs]=Úložiště pro KConfig Comment[csb]=Zôpisownô zbiérnica dlô KConfig -- cgit v1.2.1