From 24802d9d9a1b123d1147a2a87f2d3232499efc79 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 1 Mar 2023 23:48:05 +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/kcms/screenedges/kcm_kwintouchscreen.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kcms/screenedges/kcm_kwintouchscreen.json b/src/kcms/screenedges/kcm_kwintouchscreen.json index 7411291634..1b5d8e03a7 100644 --- a/src/kcms/screenedges/kcm_kwintouchscreen.json +++ b/src/kcms/screenedges/kcm_kwintouchscreen.json @@ -21,7 +21,7 @@ "Description[it]": "Configura gesti dello schermo a sfioramento", "Description[ja]": "タッチスクリーンでのスワイプジェスチャーを設定", "Description[ka]": "სენსორიანი ეკრანის გასმის ჟესტების მორგება", - "Description[ko]": "터치 스크린 밀기 제스처 설정", + "Description[ko]": "터치스크린 밀기 제스처 설정", "Description[nl]": "Veeggebaren voor aanraakscherm configureren", "Description[nn]": "Set opp fingerrørsler på trykkskjerm", "Description[pl]": "Ustawienia gestów na ekranie dotykowym",