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/kcm/kcm_krdpserver.json

@@ -23,6 +23,7 @@
         "Description[nl]": "Bureaublad op afstand configureren",
         "Description[nn]": "Set opp eksternt skrivebord",
         "Description[pl]": "Ustawienia pulpitu zdalnego",
+        "Description[pt_BR]": "Configurar área de trabalho remota",
         "Description[ru]": "Настройка удалённого рабочего стола",
         "Description[sl]": "Konfiguriraj odaljeno namizje",
         "Description[sv]": "Anpassa fjärrskrivbord",
@@ -58,6 +59,7 @@
         "Name[nl]": "Bureaublad op afstand",
         "Name[nn]": "Eksternt skrivebord",
         "Name[pl]": "Pulpit zdalny",
+        "Name[pt_BR]": "Área de trabalho remota",
         "Name[ru]": "Удалённый рабочий стол",
         "Name[sk]": "Vzdialená plocha",
         "Name[sl]": "Oddaljeno namizje",
@@ -86,6 +88,7 @@
     "X-KDE-Keywords[ka]": "KRDP,remote desktop,დაშორებული სამუშაო მაგიდა",
     "X-KDE-Keywords[nn]": "KRDP,eksternt skrivebord",
     "X-KDE-Keywords[pl]": "KRDP,pulpit zdalny",
+    "X-KDE-Keywords[pt_BR]": "KRD,área de trabalho remota",
     "X-KDE-Keywords[ru]": "KRDP,удалённый рабочий стол",
     "X-KDE-Keywords[sl]": "KRDP,oddaljeno namizje",
     "X-KDE-Keywords[sv]": "KRDP,fjärrskrivbord",