[education/rkward/releases/0.7.3] rkward: SVN_SILENT made messages (.desktop file) - always resolve ours (silent)

[Thomas Friedrichsmeier]

Git commit c41bd46b7d682162cb5c2eca3398075b83ae31c1 by Thomas Friedrichsmeier, on behalf of l10n daemon script.
Committed on 15/04/2022 at 21:35.
Pushed by tfry into branch 'releases/0.7.3'.

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"

M  +1    -1    rkward/rkward.protocol

https://invent.kde.org/education/rkward/commit/c41bd46b7d682162cb5c2eca3398075b83ae31c1

diff --git a/rkward/rkward.protocol b/rkward/rkward.protocol
index 8d8ed3b5..17cb5637 100644
--- a/rkward/rkward.protocol
+++ b/rkward/rkward.protocol
@@ -4,7 +4,7 @@ protocol=rkward
 Description=A protocol for RKWard's run again links
 Description[bs]=Protokol za RKWard's pokreće ponovo veze
 Description[ca]=Un protocol per als enllaços «torna a executar» del RKWard
-Description[ca at valencia]=Un protocol per als enllaços «torna a executar» del RKWard
+Description[ca at valencia]=Un protocol per als enllaços «torna a executar» de RKWard
 Description[en_GB]=A protocol for RKWard's run again links
 Description[es]=Un protocolo para los enlaces «Ejecutar de nuevo» de RKWard
 Description[et]=Protokoll, mida RKWard kasutab linkide korral