From fb63b9a28698fb7e37fd20d9b4ba8bbd13773d55 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 4 Mar 2016 09:16:02 +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" --- plasma.desktop.cmake | 2 +- plasmawayland.desktop.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plasma.desktop.cmake b/plasma.desktop.cmake index 8a8e8e743..71910eea6 100644 --- a/plasma.desktop.cmake +++ b/plasma.desktop.cmake @@ -60,7 +60,7 @@ Comment[el]=Plasma από το KDE Comment[en_GB]=Plasma by KDE Comment[es]=Plasma, por KDE Comment[et]=KDE Plasma -Comment[fi]=KDE:n Plasma +Comment[fi]=Plasma KDE:ltä Comment[fr]=Plasma, par KDE Comment[gl]=Plasma por KDE Comment[hu]=Plasma a KDE-től diff --git a/plasmawayland.desktop.cmake b/plasmawayland.desktop.cmake index fdcf9d527..84a714fbd 100644 --- a/plasmawayland.desktop.cmake +++ b/plasmawayland.desktop.cmake @@ -59,7 +59,7 @@ Comment[el]=Plasma από το KDE Comment[en_GB]=Plasma by KDE Comment[es]=Plasma, por KDE Comment[et]=KDE Plasma -Comment[fi]=KDE:n Plasma +Comment[fi]=Plasma KDE:ltä Comment[fr]=Plasma, par KDE Comment[gl]=Plasma por KDE Comment[hu]=Plasma a KDE-től