From 26a50957925f12ee4d9a08fe4693efdcea30d79d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 16 Dec 2024 01:36:44 +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 93beb873..3c08deb9 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -17,6 +17,7 @@ Name[fi]=Kasts Name[fr]=Kasts Name[gl]=Kasts Name[he]=Kasts +Name[hi]=डिब्बा Name[ia]=Kasts Name[it]=Kasts Name[ka]=Kasts @@ -51,6 +52,7 @@ Comment[fi]=Podcast-mobiilisovellus Comment[fr]=Application mobile pour podcasts Comment[gl]=Aplicación de podcasts para móbiles. Comment[he]=יישומון הסכתים לניידים +Comment[hi]=मोबाइल पॉडकास्ट एप्लीकेशन Comment[ia]=Application de Podcast Mobile Comment[it]=Applicazione mobile per podcast Comment[ka]=მობილური პოდკასტის აპლიკაცია @@ -85,6 +87,7 @@ GenericName[fi]=Podcast-sovellus GenericName[fr]=Application pour podcasts GenericName[gl]=Aplicación de podcasts GenericName[he]=יישום הסכתים +GenericName[hi]=पॉडकास्ट एप्लीकेशन GenericName[ia]=Application de Podcast GenericName[it]=Applicazione podcast GenericName[ka]=პოდკასტის აპლიკაცია @@ -119,6 +122,7 @@ Keywords[fi]=podcast Keywords[fr]=podcast Keywords[gl]=podcast Keywords[he]=הסכת;פודקאסט +Keywords[hi]=पॉडकास्ट Keywords[ia]=podcast Keywords[it]=podcast Keywords[ka]=პოდკასტი