From 86db5013336e97d043aa144e1af5f95081903237 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Apr 2022 01:57:53 +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" --- components/shellprivate/widgetexplorer/plasmoids.knsrc | 2 +- runners/windowedwidgets/plasma-runner-windowedwidgets.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc index ff256666d..7768d7499 100644 --- a/components/shellprivate/widgetexplorer/plasmoids.knsrc +++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc @@ -43,7 +43,7 @@ Name[sr@latin]=plasma vidžeti Name[sv]=Plasma grafiska komponenter Name[ta]=பிளாஸ்மா பிளாஸ்மாய்டுகள் Name[tg]=Виҷетҳои Плазма -Name[tr]=Plasma Gereçleri +Name[tr]=Plasma Araç Takımları Name[uk]=Віджети Плазми Name[vi]=Phụ kiện Plasma Name[x-test]=xxPlasma Widgetsxx diff --git a/runners/windowedwidgets/plasma-runner-windowedwidgets.json b/runners/windowedwidgets/plasma-runner-windowedwidgets.json index 7c9664281..60316555b 100644 --- a/runners/windowedwidgets/plasma-runner-windowedwidgets.json +++ b/runners/windowedwidgets/plasma-runner-windowedwidgets.json @@ -134,7 +134,7 @@ "Name[sv]": "Fönsterbaserade grafiska komponenter", "Name[ta]": "சாளர பிளாஸ்மாய்டுகள்", "Name[th]": "วิดเจ็ตที่เป็นหน้าต่าง", - "Name[tr]": "Pencerelendirilmiş gereçler", + "Name[tr]": "Pencerelendirilmiş araç takımları", "Name[ug]": "كۆزنەكلىك ۋىجېتلار", "Name[uk]": "Віджети-вікна", "Name[vi]": "Phụ kiện được cửa sổ hoá",