From 7fb7e4bb42a6f92da9342013dd9f7cafdea24d6a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Aug 2021 01:21:28 +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" --- applets/manage-inputmethod/metadata.desktop | 2 ++ plasmacalendarintegration/holidayeventsplugin.json | 3 +++ 2 files changed, 5 insertions(+) diff --git a/applets/manage-inputmethod/metadata.desktop b/applets/manage-inputmethod/metadata.desktop index 8def0a80c..9ed34fb90 100644 --- a/applets/manage-inputmethod/metadata.desktop +++ b/applets/manage-inputmethod/metadata.desktop @@ -7,6 +7,7 @@ Name[cs]=Metoda vstupu Name[en_GB]=Input Method Name[es]=Método de entrada Name[eu]=Sarrerako metodoa +Name[fi]=Syötemenetelmä Name[fr]=Méthode de saisie Name[hi]=इनपुट विधि Name[it]=Metodo di inserimento @@ -35,6 +36,7 @@ Comment[cs]=Spravujte svoje metody vstupu Comment[en_GB]=Manage your Input Methods Comment[es]=Gestión de métodos de entrada Comment[eu]=Kudeatu zure sarrerako metodoak +Comment[fi]=Syötemenetelmien hallinta Comment[fr]=Gérer vos méthodes de saisie Comment[hi]=आपके इनपुट विधियों का प्रबंधन करें Comment[it]=Gestire i metodi di inserimento diff --git a/plasmacalendarintegration/holidayeventsplugin.json b/plasmacalendarintegration/holidayeventsplugin.json index e9236f139..5a23a8331 100644 --- a/plasmacalendarintegration/holidayeventsplugin.json +++ b/plasmacalendarintegration/holidayeventsplugin.json @@ -11,6 +11,7 @@ "Name[en_GB]": "Martin Klapetek", "Name[es]": "Martin Klapetek", "Name[eu]": "Martin Klapetek", + "Name[fi]": "Martin Klapetek", "Name[fr]": "Martin Klapetek", "Name[hi]": "मार्टिन क्लैपेटेक", "Name[it]": "Martin Klapetek", @@ -35,6 +36,7 @@ "Description[en_GB]": "Calendar plugin for displaying public holidays", "Description[es]": "Complemento del calendario para mostrar días festivos nacionales", "Description[eu]": "Jaiegunak erakusteko egutegiko plugina", + "Description[fi]": "Julkiset vapaapäivät näyttävä kalenteriliitännäinen", "Description[fr]": "Module externe d'agenda pour l'affichage des jours fériés", "Description[hi]": "सार्वजनिक छुट्टियों को प्रदर्शित करने के लिए कैलेन्डर प्लगइन", "Description[it]": "Estensione calendario per visualizzare le festività pubbliche", @@ -58,6 +60,7 @@ "Name[en_GB]": "Holidays", "Name[es]": "Días festivos", "Name[eu]": "Jaiegunak", + "Name[fi]": "Vapaapäivät", "Name[fr]": "Vacances", "Name[hi]": "छुट्टियाँ", "Name[it]": "Festività",