diff options
| author | l10n daemon script <scripty@kde.org> | 2022-07-01 01:42:24 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-07-01 01:42:24 +0000 |
| commit | a0ee952c73f573df37556c68081e4ef1860eef51 (patch) | |
| tree | dc5f233631ae4c68fae1c433611d9d43e7c7c723 /src | |
| parent | 5ce3f9eb1fd2c83754d94f568ba00335e3d184f3 (diff) | |
| download | kconfig-a0ee952c73f573df37556c68081e4ef1860eef51.tar.gz kconfig-a0ee952c73f573df37556c68081e4ef1860eef51.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..62e857e7 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -7,7 +7,7 @@ Comment[ar]=سند «ضبطك» للتخزين Comment[as]=KConfig ৰ বাবে ভঁৰালৰ বেকএন্ড Comment[az]=KConfig Ayarlarını Saxlama Modulu Comment[be@latin]=Słužba schovišča dla systemy „KConfig” -Comment[bg]=Storage backend for KConfig +Comment[bg]=Съхраняващи операции на KConfig Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড Comment[bn_IN]=KConfig-র জন্য ব্যবহৃত ব্যাক-এন্ড সংগ্রহস্থল Comment[bs]=Skladišna pozadina za K‑konfig |