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/effects/blendchanges/metadata.json

@@ -12,6 +12,7 @@
         "Description[it]": "Anima le modifiche allo stile del sistema",
         "Description[ko]": "시스템 스타일 변경 애니메이션",
         "Description[nl]": "Systeemstijl wijzigingen animeren",
+        "Description[pl]": "Animuje zmiany wyglądu systemu",
         "Description[pt]": "Anima as mudanças de estilo do sistema",
         "Description[pt_BR]": "Animar alterações de estilo do sistema",
         "Description[sl]": "Animiraj spremembe sloga sistema",
@@ -35,6 +36,7 @@
         "Name[it]": "Miscela modifiche",
         "Name[ko]": "변경 섞기",
         "Name[nl]": "Wijzigingen mengen",
+        "Name[pl]": "Przenikanie zmian",
         "Name[pt]": "Misturar as Alterações",
         "Name[pt_BR]": "Misturar alterações",
         "Name[sl]": "Zmešaj spremembe",

src/effects/windowview/metadata.json

@@ -11,6 +11,7 @@
         "Description[it]": "Effetto di assistenza per il gestore delle applicazioni",
         "Description[ko]": "작업 관리자용 도우미 효과",
         "Description[nl]": "Effect van hulp voor de takenbeheerder",
+        "Description[pl]": "Efekt pomocniczy dla zarządzania zadaniami",
         "Description[pt]": "Efeito auxiliar para o gestor de tarefas",
         "Description[sl]": "Učinki pomočnika za upravljalnika nalog",
         "Description[sv]": "Hjälpeffekt för aktivitetshanteraren",
@@ -32,6 +33,7 @@
         "Name[it]": "Vista della finestra",
         "Name[ko]": "창 보기",
         "Name[nl]": "Weergave met vensters",
+        "Name[pl]": "Widok okna",
         "Name[pt]": "Vista da Janela",
         "Name[sl]": "Pogled okna",
         "Name[sv]": "Fönstervy",

src/kcmkwin/kwinscripts/kwinscripts.json

@@ -1,8 +1,20 @@
 {
     "KPlugin": {
         "Description": "Manage KWin scripts",
+        "Description[ca]": "Gestiona els scripts del KWin",
+        "Description[es]": "Gestión de guiones de KWin",
+        "Description[nl]": "KWin-scripts beheren",
+        "Description[pl]": "Zarządzanie skryptami KWin",
+        "Description[uk]": "Керування скриптами KWin",
+        "Description[x-test]": "xxManage KWin scriptsxx",
         "Icon": "preferences-system-windows-actions",
         "Name": "KWin Scripts",
+        "Name[ca]": "Scripts del KWin",
+        "Name[es]": "Guiones de KWin",
+        "Name[nl]": "KWin-scripts",
+        "Name[pl]": "Skrypty KWin",
+        "Name[uk]": "Скрипти KWin",
+        "Name[x-test]": "xxKWin Scriptsxx",
         "ServiceTypes": [
             "KCModule"
         ]