From 4221d5fa9dc6b949a50a4d142ae620de933888e2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 5 Jun 2021 01:17:37 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop index e5b8458b..93b14628 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -12,6 +12,7 @@ Name[ko]=Kasts Name[nl]=Kasts Name[pl]=Kasts Name[pt]=Kasts +Name[pt_BR]=Kasts Name[sk]=Kasts Name[sl]=Kasts Name[sv]=Kasts @@ -27,6 +28,7 @@ Comment[ko]=모바일 팟캐스트 프로그램 Comment[nl]=Podcastprogramma voor mobiel Comment[pl]=Przenośna aplikacja do podkastów Comment[pt]=Aplicação Móvel de 'Podcasts' +Comment[pt_BR]=Aplicativo de podcast móvel Comment[sk]=Mobilná aplikácia na podcasty Comment[sl]=Aplikacija mobilnih podcastov Comment[sv]=Mobilt poddradioprogram @@ -42,6 +44,7 @@ GenericName[ko]=팟캐스트 프로그램 GenericName[nl]=Podcastprogramma GenericName[pl]=Aplikacja do podkastów GenericName[pt]=Aplicação de 'Podcasts' +GenericName[pt_BR]=Aplicativo de podcast GenericName[sk]=Aplikácia na podcasty GenericName[sl]=Aplikacija podcastov GenericName[sv]=Poddradioprogram