From 93cfafed20247a1c1fcbef4f3a8c21f440df8759 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 30 May 2019 05:19:24 +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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataengines/favicons/plasma-dataengine-favicons.desktop b/dataengines/favicons/plasma-dataengine-favicons.desktop index ecd2a284a..c0901925b 100644 --- a/dataengines/favicons/plasma-dataengine-favicons.desktop +++ b/dataengines/favicons/plasma-dataengine-favicons.desktop @@ -54,7 +54,7 @@ Name[pl]=Ikony stron internetowych Name[pt]='Favicons' Name[pt_BR]=Favicons Name[ro]=Pictograme favorite -Name[ru]=Значки сайтов +Name[ru]=Значки веб-сайтов Name[si]=Favicons Name[sk]=Favikony Name[sl]=Ikone spletnih strani @@ -122,7 +122,7 @@ Comment[pl]=Silnik danych do pobierania ikon stron internetowych Comment[pt]=Um motor de dados para obter os 'favicons' das páginas Web Comment[pt_BR]=Mecanismo de dados para busca dos favicons de páginas Web Comment[ro]=Motor de date pentru preluarea pictogramelor siturilor web -Comment[ru]=Источник данных значков сайтов +Comment[ru]=Источник данных значков веб-сайтов Comment[si]=වෙබ් අඩවි වල favicon ලබාගැනීමේ දත්ත එන්ජිම Comment[sk]=Dátový nástroj na získavanie favikon z webových stránok Comment[sl]=Podatkovni vir za pridobivanje ikon spletnih strani