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"
2024-05-09 03:09:38 +00:00
parent f8d7a969ac
commit f477ae0d5e
1 changed files with 1 additions and 1 deletions
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -254,7 +254,7 @@ Action=Popup
 [Event/Share]
 Name=Share
 Name[ca]=Compartició
-Name[ca@valencia]=Compartició
+Name[ca@valencia]=Compartiu
 Name[cs]=Sdílet
 Name[eo]=Kundividi
 Name[es]=Compartir