From dcef4e4ac3a3f2e3c516b7e34dc1bc23d1f0583c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 7 Oct 2026 01:44:26 +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" --- templates/kirigami6/kirigami.kdevtemplate | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/templates/kirigami6/kirigami.kdevtemplate b/templates/kirigami6/kirigami.kdevtemplate index 7322b0f8..3eb6a295 100644 --- a/templates/kirigami6/kirigami.kdevtemplate +++ b/templates/kirigami6/kirigami.kdevtemplate @@ -33,6 +33,10 @@ Name[ru]=Приложение Kirigami (Qt6) Name[sa]=किरिगामी अनुप्रयोग (Qt6) 1.1. Name[sk]=Aplikácia Kirigami Name[sl]=Aplikacija Kirigami (Qt6) +Name[sr]=Програм над Киригамијем (КуТ6) +Name[sr@ijekavian]=Програм над Киригамијем (КуТ6) +Name[sr@ijekavianlatin]=Program nad Kirigamijem (Qt6) +Name[sr@latin]=Program nad Kirigamijem (Qt6) Name[sv]=Kirigami-program (Qt6) Name[tr]=Kirigami Uygulaması (Qt6) Name[ug]=Kirigami پىروگراممىسى (Qt6) @@ -74,6 +78,10 @@ Comment[ru]=Конвергентное приложение, использую Comment[sa]=Qt Quick Controls 2 तथा Kirigami इत्यस्य उपयोगेन अभिसरणीयः अनुप्रयोगः Comment[sk]=Convergent application using Qt Quick Controls 2 and Kirigami Comment[sl]=Konvergentna aplikacija, ki uporablja kontrole Qt Quick in Kirigami +Comment[sr]=Конвергентни програм над Qt Quick Controls 2 и Киригамијем +Comment[sr@ijekavian]=Конвергентни програм над Qt Quick Controls 2 и Киригамијем +Comment[sr@ijekavianlatin]=Konvergentni program nad Qt Quick Controls 2 i Kirigamijem +Comment[sr@latin]=Konvergentni program nad Qt Quick Controls 2 i Kirigamijem Comment[sv]=Konvergent program som använder Qt Quick Controls 2 och Kirigami Comment[tr]=Qt Quick Controls 2 ve Kirigami kullanan yakınsak uygulama Comment[uk]=Зручна програма з використанням засобів керування Qt Quick 2 та Kirigami