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"

Modules/samba/smbstatus.desktop

@@ -166,7 +166,7 @@ Comment[pa]=ਸਾਂਬਾ ਹਾਲਤ ਨਿਗਰਾਨ
 Comment[pl]=Monitor stanu Samby
 Comment[pt]=Monitor do estado do Samba
 Comment[pt_BR]=Monitor de estado do Samba
-Comment[ro]=Monitorizează starea serverului Samba
+Comment[ro]=Monitor de stare Samba
 Comment[ru]=Состояние сервера Samba
 Comment[se]=Gozit Samba stáhtusa
 Comment[si]=සම්බා තත්ත්ව නිරික්‍ෂකය