From 0d032078be0298ad3bd2a6c779a976280a41836f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 17 Oct 2020 09:38:21 +0200 Subject: [PATCH] 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" --- dataengines/favicons/plasma-dataengine-favicons.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataengines/favicons/plasma-dataengine-favicons.desktop b/dataengines/favicons/plasma-dataengine-favicons.desktop index 6acb34881..2e9c335b1 100644 --- a/dataengines/favicons/plasma-dataengine-favicons.desktop +++ b/dataengines/favicons/plasma-dataengine-favicons.desktop @@ -137,7 +137,7 @@ Comment[th]=กลไกข้อมูลสำหรับรับค่า Comment[tr]=Ağ sitelerinden site simgelerini almak için bir Veri Motoru Comment[ug]=تور بېكەت سىنبەلگىسىگە ئېرىشىدىغان سانلىق-مەلۇمات ماتورى Comment[uk]=Рушій даних для отримання піктограм для вебсайтів -Comment[vi]=Dụng cụ dữ liệu để lấy các biểu tượng trang web +Comment[vi]=Dụng cụ dữ liệu để lấy các biểu tượng địa điểm web Comment[wa]=Moteur di dnêyes pos cweri des favicons des waibes Comment[x-test]=xxData Engine for getting favicons of web sitesxx Comment[zh_CN]=用于获取网站图标的数据引擎