From d6e65e4fab77b5d2416767d90aca40327913b558 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 18 Jul 2020 05:48:08 +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" --- org.kde.alligator.desktop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.kde.alligator.desktop b/org.kde.alligator.desktop index 8e0a0e73..64e5a969 100755 --- a/org.kde.alligator.desktop +++ b/org.kde.alligator.desktop @@ -11,6 +11,7 @@ Name[ko]=Alligator Name[nl]=Alligator Name[nn]=Alligator Name[pt]=Alligator +Name[pt_BR]=Alligator Name[ru]=Alligator Name[sk]=Alligator Name[sl]=Alligator @@ -28,6 +29,7 @@ Comment[ko]=모바일 피드 리더 Comment[nl]=Mobiele feedlezer Comment[nn]=Mobil kjeldelesar Comment[pt]=Leitor Móvel de Fontes +Comment[pt_BR]=Leitor de fonte de notícias móvel Comment[ru]=Чтение лент новостей для мобильных устройств Comment[sl]=Mobilni bralnik novic Comment[sv]=Mobil kanalläsare @@ -44,6 +46,7 @@ GenericName[ko]=피드 리더 GenericName[nl]=Feedlezer GenericName[nn]=Kjeldelesar GenericName[pt]=Leitor de Fontes +GenericName[pt_BR]=Leitor de fontes de notícias GenericName[ru]=Чтение лент новостей GenericName[sk]=Čítačka RSS kanálov GenericName[sl]=Bralnik novic