diff options
| author | l10n daemon script <scripty@kde.org> | 2019-08-14 05:06:10 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2019-08-14 05:06:10 +0200 |
| commit | 2de9e4fc165bcadd54f81b7d17904c45632705f5 (patch) | |
| tree | 9d476796a3f4dd530900086eb1ee2f56ec3d57eb | |
| parent | 1c977c11cdde06c08d25e9846018a2312b91694c (diff) | |
| download | kconfig-2de9e4fc165bcadd54f81b7d17904c45632705f5.tar.gz kconfig-2de9e4fc165bcadd54f81b7d17904c45632705f5.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 c0bebe09..0a7793fd 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -73,7 +73,7 @@ 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[tg]=Пуштибонии захирагоҳ барои KConfig +Comment[tg]=Коркардкунандаи захирагоҳ барои KConfig Comment[th]=โปรแกรมเบื้องหลังพื้นที่จัดเก็บข้อมูลสำหรับ KConfig Comment[tr]=KConfig için Depolama Arka Ucu Comment[tt]=KConfig өчен саклау бэкенды |