From 68f8622dc9d40f9a8df7fa49680a109f7f924ddb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Feb 2021 06:41:42 +0100 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 | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop index 44f67b0d..39e35cd5 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -31,6 +31,7 @@ Comment[gd]=Backend stòrais airson KConfig Comment[gl]=Infraestrutura de almacenaxe para KConfig Comment[gu]=KConfig માટે સંગ્રહ પાશ્ર્વભાગ Comment[he]=מנוע שמירה עבור KConfig +Comment[hi]=के-कोन्फिग के लिए संचयन बैकएंड Comment[hne]=के-कानफिग बर भंडार बैकएण्ड Comment[hr]=Skladišna pozadina za KConfig Comment[hsb]=składowanski backend za KConfig -- cgit v1.2.1