From c0461f6b4844bc2dabae52fcbaf268001f7c7ffa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 2 Dec 2022 02:02:52 +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/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json | 2 ++ .../kdecorations/aurorae/themes/plastik/package/metadata.json | 1 + 2 files changed, 3 insertions(+) diff --git a/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json b/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json index 8216ae54ed..98b2dd1180 100644 --- a/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json +++ b/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json @@ -38,6 +38,7 @@ "Icon": "preferences-desktop-gestures-touch", "Name": "Touchscreen Gestures", "Name[ar]": "إيماءات شاشة اللمس", + "Name[bg]": "Жестове за сензорен екран", "Name[ca@valencia]": "Gestos de pantalla tàctil", "Name[ca]": "Gestos de pantalla tàctil", "Name[es]": "Gestos de la pantalla táctil", @@ -47,6 +48,7 @@ "Name[nl]": "Veeggebaren voor aanraakscherm", "Name[pt]": "Gestos do Ecrã Táctil", "Name[sl]": "Geste po zaslonu z dotikom", + "Name[ta]": "தொடுதிரைக்கான சைகைகள்", "Name[tr]": "Dokunmatik Ekran Hareketleri", "Name[uk]": "Жести на сенсорній панелі", "Name[x-test]": "xxTouchscreen Gesturesxx" diff --git a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json index 9deedc0706..8378e1a299 100644 --- a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json +++ b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json @@ -39,6 +39,7 @@ "Description[nl]": "Het klassieke thema bekend van KDE 3", "Description[pt]": "O tema clássico e conhecido do KDE 3", "Description[sl]": "Klasična tema znana iz KDE 3", + "Description[ta]": "கே.டீ.யீ. 3-இலிருந்தான காலங்கடந்த தோற்றத்திட்டம்", "Description[tr]": "KDE 3 zamanından klasik tema", "Description[uk]": "Класична тема, відома з часів KDE 3", "Description[vi]": "Chủ đề cổ điển được biết đến từ KDE 3",