From 3a969189b8583f2c4ecfc8f58b4aeed41095f2d0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 13 May 2022 01:44:55 +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/neochat.notifyrc | 2 ++ src/plasma-runner-neochat.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index acb51e616..74a34a268 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -155,6 +155,7 @@ Name[pt]=Novo Convite Name[pt_BR]=Novo convite Name[sl]=Novo povabilo Name[sv]=Ny inbjudan +Name[ta]=புதிய அழைப்பிதழ் Name[uk]=Нове запрошення Name[x-test]=xxNew Invitationxx Comment=There is a new invitation to a room @@ -179,6 +180,7 @@ Comment[pt]=Existe um novo convite para uma sala Comment[pt_BR]=Existe um novo convite para uma sala Comment[sl]=Tam je novo povabilo v sobo Comment[sv]=Det finns en ny inbjudan till ett rum +Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது Comment[uk]=У кімнаті нове запрошення Comment[x-test]=xxThere is a new invitation to a roomxx Action=Popup diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop index cecbf2d1b..5206a5402 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -49,6 +49,7 @@ Comment[pt]=Procurar salas no NeoChat Comment[pt_BR]=Encontrar salas no NeoChat Comment[sl]=Najdi sobe v NeoChatu Comment[sv]=Sök efter rum i NeoChat +Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும் Comment[uk]=Пошук кімнат у NeoChat Comment[x-test]=xxFind rooms in NeoChatxx X-KDE-ServiceTypes=Plasma/Runner