From 75bfdb616d728ce42f159e21a9840128e7b78fb8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 27 May 2022 01:43:32 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop index 6ade2a6e..44fc1b5e 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -28,7 +28,7 @@ Comment=Mobile Podcast Application Comment[ca]=Aplicació mòbil per a podcast Comment[ca@valencia]=Aplicació mòbil per a podcast Comment[cs]=Mobilní aplikace pro přehrávání podcastů -Comment[de]= Podcast-Anwendung für Mobilgeräte +Comment[de]=Podcast-Anwendung für Mobilgeräte Comment[en_GB]=Mobile Podcast Application Comment[es]=Aplicación de pódcast para móviles Comment[fi]=Podcast-mobiilisovellus