From 8d628a4b08671ead8c3a80a6b9dd3fb73b2e5c0c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Feb 2019 05:38:54 +0100 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/weather/ions/bbcukmet/ion-bbcukmet.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop b/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop index 8e93ea9d0..f3985b757 100644 --- a/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop +++ b/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop @@ -4,6 +4,7 @@ Name[ca]=BBC Weather Name[gl]=BBC Weather Name[nl]=BBC Weather Name[pt]=Meteorologia da BBC +Name[pt_BR]=BBC Weather Name[sv]=BBC Weather Name[uk]=Погода BBC Name[x-test]=xxBBC Weatherxx @@ -12,6 +13,7 @@ Comment[ca]=Dades XML de la British Broadcasting Corporation Comment[gl]=Datos XML da British Broadcasting Corporation Comment[nl]=XML-gegevens van de British Broadcasting Corporation Comment[pt]=Dados em XML da BBC (British Broadcasting Corporation) +Comment[pt_BR]=Dados em XML da BBC (British Broadcasting Corporation) Comment[sv]=XML-data från British Broadcasting Corporation Comment[uk]=Дані XML від BBC Comment[x-test]=xxXML Data from the British Broadcasting Corporationxx