diff options
| author | l10n daemon script <scripty@kde.org> | 2022-06-13 02:13:18 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-06-13 02:13:18 +0000 |
| commit | a83e1f5068b6558c25a1366386fd4d4554efef63 (patch) | |
| tree | d2faa575657f7c1f028fc5ab62d53fa0efe4941c | |
| parent | 41121e72d5662dc8005fc86261026406267947a2 (diff) | |
| download | kconfig-a83e1f5068b6558c25a1366386fd4d4554efef63.tar.gz kconfig-a83e1f5068b6558c25a1366386fd4d4554efef63.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop index 587fa623..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'almagasenada per a 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 |