From 1aba27d1ec77f7f99c052b51f50aee2eac7b945f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 Aug 2021 01:16:21 +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" --- kcms/desktoptheme/plasma-themes.knsrc | 1 + plasmacalendarintegration/holidayeventsplugin.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc index 145c918a9..0fd8b4045 100644 --- a/kcms/desktoptheme/plasma-themes.knsrc +++ b/kcms/desktoptheme/plasma-themes.knsrc @@ -22,6 +22,7 @@ Name[lt]=Plasma stiliai Name[nl]=Plasma-stijlen Name[pa]=ਪਲਾਜ਼ਮਾ ਸਟਾਈਲ Name[pl]=Wyglądy Plazmy +Name[pt]=Estilos do Plasma Name[pt_BR]=Estilos do Plasma Name[ro]=Stiluri Plasma Name[ru]=Оформления рабочего стола diff --git a/plasmacalendarintegration/holidayeventsplugin.json b/plasmacalendarintegration/holidayeventsplugin.json index 002ed66a6..e9236f139 100644 --- a/plasmacalendarintegration/holidayeventsplugin.json +++ b/plasmacalendarintegration/holidayeventsplugin.json @@ -39,10 +39,12 @@ "Description[hi]": "सार्वजनिक छुट्टियों को प्रदर्शित करने के लिए कैलेन्डर प्लगइन", "Description[it]": "Estensione calendario per visualizzare le festività pubbliche", "Description[nl]": "Plug-in voor agenda voor tonen van publieke vrije dagen", + "Description[pt]": "'Plugin' do calendário para mostrar os feriados públicos", "Description[pt_BR]": "Plugin de calendário para mostrar feriados públicos", "Description[ru]": "Модуль календаря для отображения национальных праздничных дней", "Description[sl]": "Koledarjev vtičnik za prikaz praznikov", "Description[sv]": "Kalenderinsticksprogram för att visa allmänna helgdagar", + "Description[ta]": "நாள்காட்டிகளுக்கான பொது விடுமுறைகளை காட்டும் செருகுநிரல்", "Description[uk]": "Додаток календаря для показу офіційних свят", "Description[vi]": "Phần cài cắm lịch để hiển thị các ngày lễ quốc gia", "Description[x-test]": "xxCalendar plugin for displaying public holidaysxx", @@ -60,11 +62,13 @@ "Name[hi]": "छुट्टियाँ", "Name[it]": "Festività", "Name[nl]": "Vrije dagen", + "Name[pt]": "Feriados", "Name[pt_BR]": "Feriados", "Name[ru]": "Праздничные дни", "Name[sk]": "Prázdniny", "Name[sl]": "Prazniki", "Name[sv]": "Helgdagar", + "Name[ta]": "விடுமுறைகள்", "Name[uk]": "Свята", "Name[vi]": "Ngày lễ", "Name[x-test]": "xxHolidaysxx",