From f223399c2ff082f50bd3fc218e90b41289da1c3a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Mar 2018 05:24:44 +0200 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" --- plasma-mobile.desktop.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plasma-mobile.desktop.cmake b/plasma-mobile.desktop.cmake index 2cfdf3bc..c8f901ee 100644 --- a/plasma-mobile.desktop.cmake +++ b/plasma-mobile.desktop.cmake @@ -7,6 +7,7 @@ Name=Plasma Mobile Name[ast]=Plasma Mobile Name[ca]=Plasma Mòbil Name[ca@valencia]=Plasma Mòbil +Name[cs]=Plasma Mobile Name[en_GB]=Plasma Mobile Name[es]=Plasma Mobile Name[gl]=Plasma Mobile @@ -22,6 +23,7 @@ Comment=Plasma Mobile by KDE Comment[ast]=Plasma Mobile por KDE Comment[ca]=Plasma Mòbil, creat per la comunitat KDE Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE +Comment[cs]=Plasma Mobile od KDE Comment[en_GB]=Plasma Mobile by KDE Comment[es]=Plasma Mobile creado por KDE Comment[gl]=Plasma Mobile de KDE