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"
2023-12-03 02:06:11 +00:00
parent 44a9a491af
commit c692d7e679
1 changed files with 1 additions and 1 deletions
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -117,7 +117,7 @@ Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
 Name[ta]=புதிய செய்தி
-Name[tr]=Yeni ileti
+Name[tr]=Yeni İleti
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
 Name[zh_CN]=新消息