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/lattedock.notifyrc

@@ -106,7 +106,9 @@ Action=Popup
 [Event/remove-done]
 Name=Removed successfully
 Name[ca]=S'ha eliminat amb èxit
+Name[ca@valencia]=S'ha eliminat amb èxit
 Name[nl]=Met succes verwijderd
+Name[pt]=Removido com sucesso
 Name[uk]=Успішно вилучено
 Name[x-test]=xxRemoved successfullyxx
 Action=Popup
@@ -114,7 +116,9 @@ Action=Popup
 [Event/remove-fail]
 Name=Failed to remove
 Name[ca]=Ha fallat en eliminar
+Name[ca@valencia]=Ha fallat en eliminar
 Name[nl]=Verwijderen is mislukt
+Name[pt]=Não foi possível remover
 Name[uk]=Не вдалося вилучити
 Name[x-test]=xxFailed to removexx
 Action=Popup