diff options
| author | l10n daemon script <scripty@kde.org> | 2022-05-28 02:04:31 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-05-28 02:04:31 +0000 |
| commit | 5a01d0c0c14b66db121c8eeb2332f352b843f8da (patch) | |
| tree | 2444d54f32570a5dd53c923fd9803bebe961858a /src | |
| parent | aafd381fa35acbe1d9625029ba134cbfadf10590 (diff) | |
| download | kconfig-5a01d0c0c14b66db121c8eeb2332f352b843f8da.tar.gz kconfig-5a01d0c0c14b66db121c8eeb2332f352b843f8da.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"
Diffstat (limited to 'src')
| -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 7150bfa8..587fa623 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 a KConfig +Comment[ca@valencia]=Dorsal de l'almagasenada per a KConfig Comment[cs]=Úložiště pro KConfig Comment[csb]=Zôpisownô zbiérnica dlô KConfig Comment[da]=Lagringsmotor til KConfig |