From cfb18072fc0e00cdd2aff190ba9f77e0be0a32f9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Apr 2020 06:16:07 +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 5577a220..f2361bd4 100755 --- a/org.kde.mobile.alligator.desktop +++ b/org.kde.mobile.alligator.desktop @@ -5,6 +5,7 @@ Name[et]=Alligator Name[ko]=Alligator Name[nl]=Alligator Name[pt]=Alligator +Name[sv]=Alligator Name[uk]=Alligator Name[x-test]=xxAlligatorxx Comment=Mobile Feed Reader @@ -13,6 +14,7 @@ Comment[et]=Mobiili uudistelugeja Comment[ko]=모바일 피드 리더 Comment[nl]=Mobiele feedlezer Comment[pt]=Leitor Móvel de Fontes +Comment[sv]=Mobil kanalläsare Comment[uk]=Програма для читання подач на мобільному Comment[x-test]=xxMobile Feed Readerxx GenericName=Feed Reader @@ -21,6 +23,7 @@ GenericName[et]=Uudistelugeja GenericName[ko]=피드 리더 GenericName[nl]=Feedlezer GenericName[pt]=Leitor de Fontes +GenericName[sv]=Kanalläsare GenericName[uk]=Читання подач GenericName[x-test]=xxFeed Readerxx Encoding=UTF-8