From ecf373e317d3e6539e301a1c2577f8a4ee4a1197 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 15 Jun 2022 01:45:58 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop index a7ce7476e..4322e2be3 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -44,6 +44,7 @@ Comment[es]=Buscar salas en NeoChat Comment[fi]=Etsi huoneita NeoChatissä Comment[fr]=Trouver des salons dans NeoChat Comment[ia]=Trova salas in NeoChat +Comment[id]=Cari ruangan di NeoChat Comment[it]=Trova stanze in NeoChat Comment[ko]=NeoChat에서 대화방 찾기 Comment[nl]=Rooms zoeken in NeoChat