From dae0a5df5eb72bd4a64a41df4677ec0c17464434 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 May 2022 01:46:46 +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" --- dataengines/systemmonitor/plasma-dataengine-systemmonitor.json | 2 +- systemmonitor/org.kde.systemmonitor.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dataengines/systemmonitor/plasma-dataengine-systemmonitor.json b/dataengines/systemmonitor/plasma-dataengine-systemmonitor.json index 8a8c9a2b9..db2cc0a18 100644 --- a/dataengines/systemmonitor/plasma-dataengine-systemmonitor.json +++ b/dataengines/systemmonitor/plasma-dataengine-systemmonitor.json @@ -123,7 +123,7 @@ "Name[te]": "సిస్టమ్ మానిటర్", "Name[tg]": "Назорати низом", "Name[th]": "ติดตามการทำงานของระบบ", - "Name[tr]": "Sistem İzleyici", + "Name[tr]": "Sistem Monitörü", "Name[ug]": "سىستېما كۆزەتكۈچ", "Name[uk]": "Монітор системи", "Name[vi]": "Trình giám sát hệ thống", diff --git a/systemmonitor/org.kde.systemmonitor.desktop b/systemmonitor/org.kde.systemmonitor.desktop index 795556f30..17c0001c0 100644 --- a/systemmonitor/org.kde.systemmonitor.desktop +++ b/systemmonitor/org.kde.systemmonitor.desktop @@ -80,7 +80,7 @@ Name[ta]=கணினி நோட்டம் Name[te]=సిస్టమ్ మానిటర్ Name[tg]=Назорати низом Name[th]=ติดตามการทำงานของระบบ -Name[tr]=Sistem İzleyici +Name[tr]=Sistem Monitörü Name[ug]=سىستېما كۆزەتكۈچ Name[uk]=Монітор системи Name[vi]=Trình giám sát hệ thống