From c6eb9d7a2b581a623591b84ebdc40c607d932513 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 19 Jun 2023 03:29:59 +0000 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.kasts.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop index 590291df..9b86ccb9 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -10,6 +10,7 @@ Name[en_GB]=Kasts Name[es]=Kasts Name[fi]=Kasts Name[fr]=Kasts +Name[gl]=Kasts Name[it]=Kasts Name[ka]=Kasts Name[ko]=Kasts @@ -35,6 +36,7 @@ Comment[en_GB]=Mobile Podcast Application Comment[es]=Aplicación de pódcast para móviles Comment[fi]=Podcast-mobiilisovellus Comment[fr]=Application mobile pour podcasts +Comment[gl]=Aplicación de podcasts para móbiles. Comment[it]=Applicazione mobile per podcast Comment[ka]=მობილური პოდკასტის აპლიკაცია Comment[ko]=모바일 팟캐스트 프로그램 @@ -60,6 +62,7 @@ GenericName[en_GB]=Podcast Application GenericName[es]=Aplicación de pódcast GenericName[fi]=Podcast-sovellus GenericName[fr]=Application pour podcasts +GenericName[gl]=Aplicación de podcasts GenericName[it]=Applicazione podcast GenericName[ka]=პოდკასტის აპლიკაცია GenericName[ko]=팟캐스트 프로그램 @@ -85,6 +88,7 @@ Keywords[en_GB]=podcast Keywords[es]=pódcast Keywords[fi]=podcast Keywords[fr]=podcast +Keywords[gl]=podcast Keywords[it]=podcast Keywords[ka]=პოდკასტი Keywords[ko]=팟캐스트