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"
This commit is contained in:
l10n daemon script
2026-05-02 01:38:00 +00:00
parent 6b68494264
commit dc6f413417

View File

@@ -379,7 +379,7 @@ Name[ka]=კავშირი დაიხურა
Name[kk]=Қосылымдан жабылды
Name[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
Name[ko]=연결이 닫힘
Name[lt]=Ryšys baigtas
Name[lt]=Ryšys nutrauktas
Name[lv]=Savienojums ir slēgts
Name[mai]=संबंधन बन्न भ' गेल
Name[ml]=ബന്ധം അടച്ചു
@@ -447,7 +447,7 @@ Comment[ka]=კავშირი დახურულია
Comment[kk]=Қосылым жабылды
Comment[km]=បាន​បិទ​ការ​ត​ភ្ជាប់
Comment[ko]=연결이 닫힘
Comment[lt]=Ryšys baigtas
Comment[lt]=Ryšys nutrauktas
Comment[lv]=Savienojums ir slēgts
Comment[mk]=Поврзувањето е затворено
Comment[ml]=ബന്ധം അടച്ചു