diff options
| author | l10n daemon script <scripty@kde.org> | 2022-03-29 01:59:41 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-03-29 01:59:41 +0000 |
| commit | 66c8a3b8858584724bbde65077b1e2dbe9200bac (patch) | |
| tree | 8609769d46fb4ac33e1df2ab1a09f4bf9ad037a6 | |
| parent | 718459dd6bed63b1460a061aefa5c8cc6c4efb3a (diff) | |
| download | kconfig-66c8a3b8858584724bbde65077b1e2dbe9200bac.tar.gz kconfig-66c8a3b8858584724bbde65077b1e2dbe9200bac.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 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 |