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"
2022-05-13 01:44:55 +00:00
parent cef5d11130
commit 3a969189b8
2 changed files with 3 additions and 0 deletions
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -49,6 +49,7 @@ Comment[pt]=Procurar salas no NeoChat
 Comment[pt_BR]=Encontrar salas no NeoChat
 Comment[sl]=Najdi sobe v NeoChatu
 Comment[sv]=Sök efter rum i NeoChat
+Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்
 Comment[uk]=Пошук кімнат у NeoChat
 Comment[x-test]=xxFind rooms in NeoChatxx
 X-KDE-ServiceTypes=Plasma/Runner