From 64217456abef322351356b38d514fbc6ea0cb67c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 24 May 2023 01:40:12 +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/mprisremote/kdeconnect_mprisremote.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json index 3a58df908..509a65ad1 100644 --- a/plugins/mprisremote/kdeconnect_mprisremote.json +++ b/plugins/mprisremote/kdeconnect_mprisremote.json @@ -89,7 +89,7 @@ "Description[sr@latin]": "Kontrola MPRIS servisa", "Description[sr]": "Контрола МПРИС сервиса", "Description[sv]": "Styr MPRIS-tjänster", - "Description[tr]": "MPRIS servislerini denetle", + "Description[tr]": "MPRIS hizmetlerini denetle", "Description[uk]": "Керування службами MPRIS", "Description[x-test]": "xxControl MPRIS servicesxx", "Description[zh_CN]": "控制 MPRIS 服务",