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"

app/packageplugins/indicator/latte-indicator.desktop

@@ -25,6 +25,7 @@ Comment[pl]=Wskaźnik Latte
 Comment[pt]=Indicador do Latte
 Comment[pt_BR]=Indicador do Latte
 Comment[ru]=Индикатор Latte
+Comment[sk]=Latte indicator
 Comment[sl]=Kazalnik Latte
 Comment[sv]=Latte indikator
 Comment[uk]=Індикатор Латте

indicators/org.kde.latte.plasmatabstyle/metadata.desktop

@@ -19,6 +19,7 @@ Name[nn]=Faner i Plasma-stil
 Name[pl]=Wygląd karty Plazmy
 Name[pt]=Estilo de Páginas do Plasma
 Name[pt_BR]=Estilo de abas do Plasma
+Name[sk]=Plasma štýl kariet
 Name[sl]=Slog Plasma zavihkov
 Name[sv]=Plasma flikstil
 Name[uk]=Стиль вкладок Плазми

shell/metadata.desktop.cmake

@@ -25,6 +25,7 @@ Name[pl]=Powłoka Latte
 Name[pt]=Consola do Latte
 Name[pt_BR]=Latte Shell
 Name[ru]=Оболочка Latte
+Name[sk]=Latte Shell
 Name[sl]=Shell Latte
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте

shell/package/metadata.desktop

@@ -25,6 +25,7 @@ Name[pl]=Powłoka Latte
 Name[pt]=Consola do Latte
 Name[pt_BR]=Latte Shell
 Name[ru]=Оболочка Latte
+Name[sk]=Latte Shell
 Name[sl]=Shell Latte
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте