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"

lookandfeel.twilight/metadata.desktop

@@ -11,7 +11,7 @@ Comment[en_GB]=Breeze Twilight by the KDE VDG
 Comment[es]=Brisa crepúsculo por KDE VDG
 Comment[et]=Breeze videvik KDE VDG-lt
 Comment[eu]=Breeze ilunabarra, KDE VDGk egina
-Comment[fi]=Hämärän Breeze KDE VDG:ltä
+Comment[fi]=Hämärä Breeze KDE VDG:ltä
 Comment[fr]=Breeze gris par l'équipe de conception visuelle de KDE « VDG »
 Comment[hu]=Breeze Twilight a KDE VDG-től
 Comment[ia]=Brisa Crepusculo (Breeze Twilight) per KDE VDG
@@ -44,7 +44,7 @@ Name[en_GB]=Breeze Twilight
 Name[es]=Brisa crepúsculo
 Name[et]=Breeze videvik
 Name[eu]=Breeze ilunabarra
-Name[fi]=Hämärän Breeze
+Name[fi]=Hämärä Breeze
 Name[fr]=Breeze gris
 Name[hu]=Breeze Twilight
 Name[ia]=Brisa Crepusculo (Breeze Twilight)

wallpapers/Next/metadata.desktop

@@ -9,6 +9,7 @@ Name[el]=Altai
 Name[en_GB]=Altai
 Name[es]=Altai
 Name[eu]=Altai
+Name[fi]=Altai
 Name[fr]=Altai
 Name[ia]=Altai
 Name[it]=Altai