From ef5550bafd0d3ff8b982a79f7187195e2ce7cad9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Apr 2022 01:41:06 +0000 Subject: [PATCH] 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" --- src/plasma-runner-neochat.desktop | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop index 1884bfe20..eb9de83f8 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -2,6 +2,37 @@ # SPDX-FileCopyrightText: 2022 Nicolas Fella [Desktop Entry] 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 X-KDE-ServiceTypes=Plasma/Runner Type=Service