diff options
| author | l10n daemon script <scripty@kde.org> | 2021-12-15 01:48:33 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2021-12-15 01:48:33 +0000 |
| commit | eeefdf8aeabd875829ae6beee0e301a88c7da7c8 (patch) | |
| tree | 5a5e32b97cec413d3da886c7be6646c34c450d96 /src | |
| parent | 9c81af25b184476e3945073415c0844d09a9e696 (diff) | |
| download | kconfig-eeefdf8aeabd875829ae6beee0e301a88c7da7c8.tar.gz kconfig-eeefdf8aeabd875829ae6beee0e301a88c7da7c8.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 c3533986..e8dbb6f0 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 d'emmagatzematge pel KConfig +Comment[ca@valencia]=Dorsal de l'emmagatzematge per al KConfig Comment[cs]=Úložiště pro KConfig Comment[csb]=Zôpisownô zbiérnica dlô KConfig Comment[da]=Lagringsmotor til KConfig |