From 97ce81daca5d9a500589b1003d2be4cbd4dec307 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 16 May 2022 01:45:56 +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 f90c167f4..ace31a94c 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -46,6 +46,7 @@ Comment[fr]=Trouver des salons dans NeoChat Comment[it]=Trova stanze in NeoChat Comment[ko]=NeoChat에서 대화방 찾기 Comment[nl]=Rooms zoeken in NeoChat +Comment[pl]=Znajdź pokoje w NeoChat Comment[pt]=Procurar salas no NeoChat Comment[pt_BR]=Encontrar salas no NeoChat Comment[sl]=Najdi sobe v NeoChatu