From 538ed7dd026378da601b2b2c54b5952a2ff7f850 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 21 Apr 2022 01:42:02 +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 bcffb9e5b..93e5aec17 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -42,6 +42,7 @@ Comment[en_GB]=Find rooms in NeoChat Comment[es]=Buscar salas en NeoChat Comment[fi]=Etsi huoneita NeoChatissä Comment[fr]=Trouver des salons dans NeoChat +Comment[it]=Trova stanze in NeoChat Comment[ko]=NeoChat에서 대화방 찾기 Comment[nl]=Rooms zoeken in NeoChat Comment[pt_BR]=Encontrar salas no NeoChat