From 21a40e05397f15aea066cabd36b9ada9d6ba412b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 21 Sep 2020 05:53:34 +0200 Subject: 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" --- src/core/kconfigbackend.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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 存储后端 -- cgit v1.2.1