diff options
| author | l10n daemon script <scripty@kde.org> | 2020-09-21 05:53:34 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2020-09-21 05:53:34 +0200 |
| commit | 21a40e05397f15aea066cabd36b9ada9d6ba412b (patch) | |
| tree | bd1a35830b1fe272c02f7d1a51f655d8afdd38ba /src | |
| parent | f9079c8413e52071bacced70bf0394dd65f14ce3 (diff) | |
| download | kconfig-21a40e05397f15aea066cabd36b9ada9d6ba412b.tar.gz kconfig-21a40e05397f15aea066cabd36b9ada9d6ba412b.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 496eb7b4..44f67b0d 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -80,7 +80,7 @@ Comment[tr]=KConfig için Depolama Arka Ucu Comment[tt]=KConfig өчен саклау бэкенды Comment[ug]=KConfig نىڭ ساقلاش ئارقا ئۇچى Comment[uk]=Модуль зберігання даних для KConfig -Comment[vi]=Hậu trường lưu trữ cho KConfig +Comment[vi]=Hậu phương lưu trữ cho KConfig Comment[wa]=Bouye di fond di stocaedje po KConfig Comment[x-test]=xxStorage backend for KConfigxx Comment[zh_CN]=KConfig 存储后端 |