From 835c00af943f2b53c657be1e3f77414ecfae443f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Nov 2023 02:32:13 +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" --- kwin/mobiletaskswitcher/mobiletaskswitcher.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kwin/mobiletaskswitcher/mobiletaskswitcher.json b/kwin/mobiletaskswitcher/mobiletaskswitcher.json index b36662c9..a23a0a7c 100644 --- a/kwin/mobiletaskswitcher/mobiletaskswitcher.json +++ b/kwin/mobiletaskswitcher/mobiletaskswitcher.json @@ -49,7 +49,7 @@ "Name[pl]": "Przenośny przełącznik zadań", "Name[sk]": "Mobilný prepínač úloh", "Name[sl]": "Preklopnik mobilnih opravil", - "Name[tr]": "Taşınabilir Görev Değiştirici", + "Name[tr]": "Taşınabilir Görev Değiştiricisi", "Name[uk]": "Мобільний перемикач завдань", "Name[x-test]": "xxMobile Task Switcherxx", "Name[zh_CN]": "移动任务切换"