From 58aeeeb1726d0a18752598db3da71d63be64d403 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 24 Jul 2023 08:30:48 +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, 2 insertions(+), 2 deletions(-) diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop index 4a05a181..349029fc 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -41,7 +41,7 @@ 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]=모바일 팟캐스트 프로그램 +Comment[ko]=모바일 팟캐스트 앱 Comment[nl]=Podcastprogramma voor mobiel Comment[pa]=ਮੋਬਾਈਲ ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ Comment[pl]=Przenośna aplikacja do podkastów @@ -67,7 +67,7 @@ GenericName[fr]=Application pour podcasts GenericName[gl]=Aplicación de podcasts GenericName[it]=Applicazione podcast GenericName[ka]=პოდკასტის აპლიკაცია -GenericName[ko]=팟캐스트 프로그램 +GenericName[ko]=팟캐스트 앱 GenericName[nl]=Podcastprogramma GenericName[pa]=ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ GenericName[pl]=Aplikacja do podkastów