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-11-12 01:26:03 +00:00
parent 0568c2a93d
commit dc3db3aec4
2 changed files with 3 additions and 0 deletions
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -92,6 +92,7 @@ Comment[ca]=Xat a Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en
 Comment[gl]=Charle en Matrix
+Comment[ia]=Conversation en ditecto sur Matrix
 Comment[ka]=ჩატი Matrix-ზე
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie