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"
10 years ago · fb63b9a286
parent 1754d9d4b5
commit fb63b9a286
2 changed files with 2 additions and 2 deletions
--- 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
--- 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