From 45074ca2e8049158bddaba9b44b3ae8409229458 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Apr 2020 06:20:00 +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.mobile.alligator.desktop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.kde.mobile.alligator.desktop b/org.kde.mobile.alligator.desktop index dc34a2e4..7123559d 100755 --- a/org.kde.mobile.alligator.desktop +++ b/org.kde.mobile.alligator.desktop @@ -3,18 +3,21 @@ Name=Alligator Name[ca]=Alligator Name[et]=Alligator Name[nl]=Alligator +Name[pt]=Alligator Name[uk]=Alligator Name[x-test]=xxAlligatorxx Comment=Mobile Feed Reader Comment[ca]=Lector de fonts per a mòbil Comment[et]=Mobiili uudistelugeja Comment[nl]=Mobiele feedlezer +Comment[pt]=Leitor Móvel de Fontes Comment[uk]=Програма для читання подач на мобільному Comment[x-test]=xxMobile Feed Readerxx GenericName=Feed Reader GenericName[ca]=Lector de fonts GenericName[et]=Uudistelugeja GenericName[nl]=Feedlezer +GenericName[pt]=Leitor de Fontes GenericName[uk]=Читання подач GenericName[x-test]=xxFeed Readerxx Encoding=UTF-8