From e5791970dad567487cde403d3a2d2968ac0667d5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 7 Apr 2022 01:43:10 +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 df6040ab0..d3b14359c 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -38,6 +38,7 @@ 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[fi]=Etsi huoneita NeoChatissä Comment[fr]=Trouver des salons dans NeoChat Comment[nl]=Rooms zoeken in NeoChat Comment[sl]=Najdi sobe v NeoChatu