From 0a0e26d31643a184da4c8f0d176429eb7c2b83ee Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 7 Oct 2020 06:32:18 +0200
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"
---
 menu/desktop/kf5-utilities-xutils.directory | 2 ++
 menu/desktop/kf5-utilities.directory        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/menu/desktop/kf5-utilities-xutils.directory b/menu/desktop/kf5-utilities-xutils.directory
index c83386a1a..cca7b8f1e 100644
--- a/menu/desktop/kf5-utilities-xutils.directory
+++ b/menu/desktop/kf5-utilities-xutils.directory
@@ -46,6 +46,7 @@ Name[sr@ijekavian]=Икс‑алатке
 Name[sr@ijekavianlatin]=X-alatke
 Name[sr@latin]=X-alatke
 Name[sv]=X-verktyg
+Name[tg]=Барномаҳои муфиди X
 Name[tr]=X Yardımcı Araçları
 Name[uk]=Утиліти X Window
 Name[vi]=Tiện ích X
@@ -131,6 +132,7 @@ Comment[sr@latin]=Alatke za X‑prozore
 Comment[sv]=X-window-verktyg
 Comment[ta]=X-சாளர கருவிகள்
 Comment[te]=ఎక్స్ విండొ సౌలభ్యాలు
+Comment[tg]=Барномаҳои муфиди X Window
 Comment[th]=โปรแกรมอรรถประโยชน์ต่าง ๆ ของระบบ X Window
 Comment[tr]=X Yardımcı Programları
 Comment[ug]=X كۆزنەك قوراللىرى
diff --git a/menu/desktop/kf5-utilities.directory b/menu/desktop/kf5-utilities.directory
index af1ec1b32..5f8c53924 100644
--- a/menu/desktop/kf5-utilities.directory
+++ b/menu/desktop/kf5-utilities.directory
@@ -48,6 +48,7 @@ Name[sr@ijekavian]=Алатке
 Name[sr@ijekavianlatin]=Alatke
 Name[sr@latin]=Alatke
 Name[sv]=Verktyg
+Name[tg]=Барномаҳои муфид
 Name[tr]=Yardımcı Araçlar
 Name[uk]=Утиліти
 Name[vi]=Tiện ích
@@ -101,6 +102,7 @@ Comment[sr@ijekavian]=Алатке
 Comment[sr@ijekavianlatin]=Alatke
 Comment[sr@latin]=Alatke
 Comment[sv]=Verktyg
+Comment[tg]=Барномаҳои муфид
 Comment[tr]=Yardımcı Araçlar
 Comment[uk]=Утиліти
 Comment[vi]=Tiện ích