diff options
| author | l10n daemon script <scripty@kde.org> | 2021-02-04 06:41:42 +0100 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2021-02-04 06:41:42 +0100 |
| commit | 68f8622dc9d40f9a8df7fa49680a109f7f924ddb (patch) | |
| tree | c19550e7b1ab0bee6b18a591c9c2ac9aec1611e3 | |
| parent | 7766259eb5287d11d2ef60b50da9255b1307df3c (diff) | |
| download | kconfig-68f8622dc9d40f9a8df7fa49680a109f7f924ddb.tar.gz kconfig-68f8622dc9d40f9a8df7fa49680a109f7f924ddb.tar.bz2 | |
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"
| -rw-r--r-- | src/core/kconfigbackend.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
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 |