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
2022-04-03 01:54:27 +00:00
parent 863508b629
commit e4c8b6b676

View File

@@ -34,6 +34,14 @@ Name[uk]=NeoChat
Name[x-test]=xxNeoChatxx
Name[zh_CN]=NeoChat
Comment=Find rooms in NeoChat
Comment[ca]=Cerca sales en el NeoChat
Comment[ca@valencia]=Busca sales en NeoChat
Comment[en_GB]=Find rooms in NeoChat
Comment[es]=Buscar salas en NeoChat
Comment[nl]=Rooms zoeken in NeoChat
Comment[sv]=Sök efter rum i NeoChat
Comment[uk]=Пошук кімнат у NeoChat
Comment[x-test]=xxFind rooms in NeoChatxx
X-KDE-ServiceTypes=Plasma/Runner
Type=Service
Icon=org.kde.neochat