From 0367928d58c68d46fcac5da433a3cb8583f450a2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Dec 2023 02:07:19 +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" --- src/plugins/shakecursor/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/shakecursor/metadata.json b/src/plugins/shakecursor/metadata.json index dfe66c71b4..34961471a2 100644 --- a/src/plugins/shakecursor/metadata.json +++ b/src/plugins/shakecursor/metadata.json @@ -20,7 +20,7 @@ "Description[sk]": "Zväčší kurzor pri rýchlom pohybe ukazovateľa tam a späť", "Description[sl]": "Poveča kazalec, kadar se kazalec hitro premika naprej in nazaj", "Description[ta]": "சுட்டியை வேகமாக ஆட்டும்போது சுட்டிக்குறியைப் பெரிதாக்கும்", - "Description[tr]": "İşaretçi hızla ileri geri hareket ettirildiğinde imleci büyütür", + "Description[tr]": "İşaretçi tez ileri geri hareket ettirildiğinde imleci büyütür", "Description[uk]": "Робити курсор більшим, коли вказівник швидко рухається туди-сюди", "Description[x-test]": "xxMakes the cursor larger when the pointer is quickly moved back and forthxx", "Description[zh_CN]": "快速往返移动指针后加大显示光标",