From ea0ed96731d3c47e7d14623d832ef61c79449977 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Jul 2022 02:48:40 +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" --- plugins/bigscreen/kdeconnect_bigscreen.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index b00842cdf..cca971aa0 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -115,7 +115,7 @@ "Name[sk]": "Veľká obrazovka", "Name[sl]": "Veliki zaslon", "Name[sv]": "Storskärm", - "Name[tr]": "Bigscreen", + "Name[tr]": "Büyük Ekran", "Name[uk]": "Великий екран", "Name[x-test]": "xxBigscreenxx", "Name[zh_CN]": "大屏幕",