File 0001-SVN_SILENT-made-messages-.desktop-file-alw... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch of Package plasma5-workspace (Revision cfcf0076675c1f7b8744b03b5be4bc3e)

Currently displaying revision cfcf0076675c1f7b8744b03b5be4bc3e , Show latest

From 9f57db144e052feea6a42d34305c7195226f3ede Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 18 Sep 2021 02:13:34 +0000
Subject: [PATCH 01/11] 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 ++
 lookandfeel.dark/metadata.desktop                  | 1 +
 lookandfeel.twilight/metadata.desktop              | 2 ++
 plasmacalendarintegration/holidayeventsplugin.json | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/applets/manage-inputmethod/metadata.desktop b/applets/manage-inputmethod/metadata.desktop
index 9ed34fb90..b41874124 100644
--- a/applets/manage-inputmethod/metadata.desktop
+++ b/applets/manage-inputmethod/metadata.desktop
@@ -10,6 +10,7 @@ Name[eu]=Sarrerako metodoa
 Name[fi]=Syötemenetelmä
 Name[fr]=Méthode de saisie
 Name[hi]=इनपुट विधि
+Name[ia]=Methodo de insertar
 Name[it]=Metodo di inserimento
 Name[ko]=입력기
 Name[lt]=Įvesties metodai
@@ -39,6 +40,7 @@ Comment[eu]=Kudeatu zure sarrerako metodoak
 Comment[fi]=Syötemenetelmien hallinta
 Comment[fr]=Gérer vos méthodes de saisie
 Comment[hi]=आपके इनपुट विधियों का प्रबंधन करें
+Comment[ia]=Gere tu methodos de insertar
 Comment[it]=Gestire i metodi di inserimento
 Comment[ko]=입력기 관리
 Comment[lt]=Tvarkyti įvesties metodus
diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop
index 2fdf90c28..1c939c733 100644
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@@ -9,6 +9,7 @@ Comment[es]=Brisa oscuro por KDE VDG
 Comment[eu]=Breeze iluna KDEren VDGk egina
 Comment[fr]=Breeze sombre par le groupe de conception visuelle de KDE « VDG »
 Comment[hi]=केडीई वीडीजी द्वारा ब्रीज़ गहरा
+Comment[ia]=Breeze Dark (Brisa Obscure) per le KDE VDG
 Comment[it]=Brezza scuro a cura del VDG di KDE
 Comment[nl]=Breeze Dark door de KDE VDG
 Comment[pl]=Ciemna Bryza autorstwa KDE VDG
diff --git a/lookandfeel.twilight/metadata.desktop b/lookandfeel.twilight/metadata.desktop
index 27a3cc68a..266b9b6d9 100644
--- a/lookandfeel.twilight/metadata.desktop
+++ b/lookandfeel.twilight/metadata.desktop
@@ -9,6 +9,7 @@ Comment[es]=Brisa crepúsculo por KDE VDG
 Comment[eu]=Breeze ilunabarra KDEren VDGk egina
 Comment[fr]=Breeze clair-obscur par l'équipe de conception visuelle de KDE « VDG »
 Comment[hi]=केडीई वीडीजी द्वारा ब्रीज़ गोधूली
+Comment[ia]=Brisa Crepusculo (Breeze Twilight) per KDE VDG
 Comment[it]=Brezza crepuscolo a cura del VDG di KDE
 Comment[nl]=Breeze Twilight door de KDE VDG
 Comment[pl]=Półmroczna bryza autorstwa KDE VDG
@@ -31,6 +32,7 @@ Name[es]=Brisa crepúsculo
 Name[eu]=Breeze ilunabarra
 Name[fr]=Breeze clair-obscur 
 Name[hi]=ब्रीज़ गोधूली
+Name[ia]=Brisa Crepusculo (Breeze Twilight)
 Name[it]=Brezza crepuscolo
 Name[nl]=Breeze Twilight
 Name[pl]=Półmroczna bryza
diff --git a/plasmacalendarintegration/holidayeventsplugin.json b/plasmacalendarintegration/holidayeventsplugin.json
index 84fe5c07a..4eac78bd5 100644
--- a/plasmacalendarintegration/holidayeventsplugin.json
+++ b/plasmacalendarintegration/holidayeventsplugin.json
@@ -14,6 +14,7 @@
                 "Name[fi]": "Martin Klapetek",
                 "Name[fr]": "Martin Klapetek",
                 "Name[hi]": "मार्टिन क्लैपेटेक",
+                "Name[ia]": "Martin Klapetek",
                 "Name[it]": "Martin Klapetek",
                 "Name[nl]": "Martin Klapetek",
                 "Name[pl]": "Martin Klapetek",
@@ -66,6 +67,7 @@
         "Name[fi]": "Vapaapäivät",
         "Name[fr]": "Vacances",
         "Name[hi]": "छुट्टियाँ",
+        "Name[ia]": "Dies feriate",
         "Name[it]": "Festività",
         "Name[nl]": "Vrije dagen",
         "Name[pl]": "Święta",
-- 
2.33.0

Places

File 0001-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch of Package plasma5-workspace (Revision cfcf0076675c1f7b8744b03b5be4bc3e)

Places