From 024fb1a97ad53e6a0cfba820c630cb6529a44c49 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Apr 2022 01:46:19 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop index aedb548dd..df6040ab0 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -38,7 +38,9 @@ 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[fr]=Trouver des salons dans NeoChat Comment[nl]=Rooms zoeken in NeoChat +Comment[sl]=Najdi sobe v NeoChatu Comment[sv]=Sök efter rum i NeoChat Comment[uk]=Пошук кімнат у NeoChat Comment[x-test]=xxFind rooms in NeoChatxx