From d81df24e7ce7e6924743b2d12b0366babf2bb42c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Jan 2023 01:56:42 +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, 1 insertion(+), 1 deletion(-) diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop index baeee292d..a11c1d9f0 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -60,7 +60,7 @@ 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[ru]=Поиск комнаты NeoChat +Comment[ru]=Поиск комнат NeoChat Comment[sl]=Najdi sobe v NeoChatu Comment[sv]=Sök efter rum i NeoChat Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்