From 66c8a3b8858584724bbde65077b1e2dbe9200bac Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 Mar 2022 01:59:41 +0000 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 e8dbb6f0..7150bfa8 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -12,7 +12,7 @@ Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড Comment[bn_IN]=KConfig-র জন্য ব্যবহৃত ব্যাক-এন্ড সংগ্রহস্থল Comment[bs]=Skladišna pozadina za K‑konfig Comment[ca]=Dorsal de l'emmagatzematge per al KConfig -Comment[ca@valencia]=Dorsal de l'emmagatzematge per al KConfig +Comment[ca@valencia]=Dorsal de l'emmagatzematge per a KConfig Comment[cs]=Úložiště pro KConfig Comment[csb]=Zôpisownô zbiérnica dlô KConfig Comment[da]=Lagringsmotor til KConfig -- cgit v1.2.1