From 6fd1d0184e669ea20dc4c758f75bcc299f7bdc9d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 31 Dec 2019 05:45:46 +0100 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" --- bin/plasma-mobile.desktop.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake index 63f46d4c..ef28740b 100644 --- a/bin/plasma-mobile.desktop.cmake +++ b/bin/plasma-mobile.desktop.cmake @@ -16,7 +16,7 @@ Name[fr]=Plasma Mobile Name[gl]=Plasma Mobile Name[hu]=Plasma Mobile Name[ia]=Plasma Mobile -Name[id]=Seluler Plasma +Name[id]=Plasma Mobile Name[it]=Plasma Mobile Name[ko]=Plasma 모바일 Name[lt]=Plasma mobilioji sąsaja @@ -44,7 +44,7 @@ Comment[fr]=Plasma Mobile par KDE Comment[gl]=Plasma Mobile de KDE Comment[hu]=Plasma Mobile a KDE-től Comment[ia]=Plasma Mobile per KDE -Comment[id]=Seluler Plasma oleh KDE +Comment[id]=Plasma Mobile oleh KDE Comment[it]=Plasma Mobile creato da KDE Comment[ko]=KDE의 Plasma 모바일 Comment[lt]=Plasma mobilioji sąsaja pagal KDE