diff options
| author | l10n daemon script <scripty@kde.org> | 2021-10-01 01:21:46 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2021-10-01 01:21:46 +0000 |
| commit | 1e42d79728f57197a8c70618ef48cc38b8c27ac7 (patch) | |
| tree | d38045731baf9fe8af270fdb4a312905f1a389c9 | |
| parent | 0c61fb56725a2cc042a03c21c7bee63a16a5e7fe (diff) | |
| download | kconfig-1e42d79728f57197a8c70618ef48cc38b8c27ac7.tar.gz kconfig-1e42d79728f57197a8c70618ef48cc38b8c27ac7.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 39e35cd5..c3533986 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -74,7 +74,7 @@ Comment[sr@ijekavian]=Складишна позадина за К‑конфиг Comment[sr@ijekavianlatin]=Skladišna pozadina za KConfig Comment[sr@latin]=Skladišna pozadina za KConfig Comment[sv]=Lagringsgränssnitt för KConfig -Comment[ta]=கேவடிவமைப்பிற்கான பின்னணி சேமிப்பகம் +Comment[ta]=KConfig-க்கான சேமிப்பக பின்நிலை Comment[tg]=Коркардкунандаи захирагоҳ барои KConfig Comment[th]=โปรแกรมเบื้องหลังพื้นที่จัดเก็บข้อมูลสำหรับ KConfig Comment[tr]=KConfig için Depolama Arka Ucu |