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:
@@ -2,6 +2,37 @@
|
|||||||
# SPDX-FileCopyrightText: 2022 Nicolas Fella <nicolas.fella@gmx.de>
|
# SPDX-FileCopyrightText: 2022 Nicolas Fella <nicolas.fella@gmx.de>
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=NeoChat
|
Name=NeoChat
|
||||||
|
Name[ar]=نيوتشات
|
||||||
|
Name[az]=NeoChat
|
||||||
|
Name[ca]=NeoChat
|
||||||
|
Name[ca@valencia]=NeoChat
|
||||||
|
Name[cs]=NeoChat
|
||||||
|
Name[de]=NeoChat
|
||||||
|
Name[en_GB]=NeoChat
|
||||||
|
Name[es]=NeoChat
|
||||||
|
Name[eu]=NeoChat
|
||||||
|
Name[fi]=NeoChat
|
||||||
|
Name[fr]=NeoChat
|
||||||
|
Name[hu]=NeoChat
|
||||||
|
Name[ia]=Neochat
|
||||||
|
Name[id]=NeoChat
|
||||||
|
Name[it]=NeoChat
|
||||||
|
Name[ko]=NeoChat
|
||||||
|
Name[lt]=NeoChat
|
||||||
|
Name[nl]=NeoChat
|
||||||
|
Name[nn]=NeoChat
|
||||||
|
Name[pa]=ਨਿਓ-ਚੈਟ
|
||||||
|
Name[pl]=NeoChat
|
||||||
|
Name[pt]=NeoChat
|
||||||
|
Name[pt_BR]=NeoChat
|
||||||
|
Name[ro]=NeoChat
|
||||||
|
Name[sk]=NeoChat
|
||||||
|
Name[sl]=NeoChat
|
||||||
|
Name[sv]=NeoChat
|
||||||
|
Name[ta]=நியோச்சாட்
|
||||||
|
Name[uk]=NeoChat
|
||||||
|
Name[x-test]=xxNeoChatxx
|
||||||
|
Name[zh_CN]=NeoChat
|
||||||
Comment=Find rooms in NeoChat
|
Comment=Find rooms in NeoChat
|
||||||
X-KDE-ServiceTypes=Plasma/Runner
|
X-KDE-ServiceTypes=Plasma/Runner
|
||||||
Type=Service
|
Type=Service
|
||||||
|
|||||||
Reference in New Issue
Block a user