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"

src/kcms/tabbox/kwinswitcher.knsrc

@@ -5,8 +5,10 @@ Name[ca]=Estils del commutador de tasques
 Name[en_GB]=Task Switcher Styles
 Name[es]=Estilos del selector de tareas
 Name[eu]=Ataza-aldarazlearen estiloak
+Name[fr]=Styles du commutateur de tâches
 Name[gl]=Estilos de selector de tarefa
 Name[he]=סגנונות מחליף משימות
+Name[ia]=Stilos de Commutator de carga
 Name[ka]=ამოცანების გადამრთველის სტილები
 Name[lt]=Užduočių perjungiklio stiliai
 Name[nl]=Stijlen van taakschakelaar
@@ -17,6 +19,8 @@ Name[ta]=பணி மாற்றி வகைகள்
 Name[tr]=Görev Değiştiricisi Biçemleri
 Name[uk]=Стилі перемикання задач
 Name[x-test]=xxTask Switcher Stylesxx
+Name[zh_CN]=任务切换器样式
+Name[zh_TW]=工作切換器風格
 
 ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
 ContentWarning=Executables