From 2f8e2ef689ede2a7134f622c1477bec3da68a9cb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 Jan 2023 02:00:23 +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/effects/tileseditor/metadata.json | 2 ++ src/kcms/screenedges/kcm_kwintouchscreen.json | 1 + src/kcms/xwayland/kcm_kwinxwayland.json | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/effects/tileseditor/metadata.json b/src/effects/tileseditor/metadata.json index c967603eb9..c1171c18b1 100644 --- a/src/effects/tileseditor/metadata.json +++ b/src/effects/tileseditor/metadata.json @@ -18,6 +18,7 @@ "Description[sl]": "Urejevalnik za področja s sličicami", "Description[tr]": "Döşeme alanları için düzenleyici", "Description[uk]": "Редактор для мозаїчних областей", + "Description[vi]": "Trình biên tập các vùng lát", "Description[x-test]": "xxEditor for the tiling areasxx", "EnabledByDefault": true, "Id": "tileseditor", @@ -40,6 +41,7 @@ "Name[sl]": "Urejevalnik sličic", "Name[tr]": "Döşeme Düzenleyici", "Name[uk]": "Редактор мозаїк", + "Name[vi]": "Trình biên tập lát", "Name[x-test]": "xxTiling Editorxx" }, "X-KDE-ConfigModule": "kwin_tileseditor_config" diff --git a/src/kcms/screenedges/kcm_kwintouchscreen.json b/src/kcms/screenedges/kcm_kwintouchscreen.json index 47ba334b51..7c75d2f2a0 100644 --- a/src/kcms/screenedges/kcm_kwintouchscreen.json +++ b/src/kcms/screenedges/kcm_kwintouchscreen.json @@ -58,6 +58,7 @@ "Name[ta]": "தொடுதிரைக்கான சைகைகள்", "Name[tr]": "Dokunmatik Ekran Hareketleri", "Name[uk]": "Жести на сенсорній панелі", + "Name[vi]": "Các động tác của màn hình cảm ứng", "Name[x-test]": "xxTouchscreen Gesturesxx", "Name[zh_TW]": "觸控螢幕手勢" }, diff --git a/src/kcms/xwayland/kcm_kwinxwayland.json b/src/kcms/xwayland/kcm_kwinxwayland.json index 8c55db6015..17187eb268 100644 --- a/src/kcms/xwayland/kcm_kwinxwayland.json +++ b/src/kcms/xwayland/kcm_kwinxwayland.json @@ -20,6 +20,7 @@ "Description[ta]": "பழைய X11 செயலிகள் எவ்விசைகளை எப்போது வேண்டுமானாலும் கண்டறிய முடியுமென்பதை அமையுங்கள்", "Description[tr]": "Eski X11 uygulamalarına hangi düğmelerin global olarak kullanılabilir olacağını seç", "Description[uk]": "Вибір клавіш, які будуть доступні на загальному рівні програмам X11", + "Description[vi]": "Chọn các phím khả dụng toàn cục cho các ứng dụng X11 đời cũ", "Description[x-test]": "xxSelect which keys will be globally available to legacy X11 appsxx", "Icon": "xorg", "Name": "Legacy X11 App Support", @@ -41,6 +42,7 @@ "Name[ta]": "பழைய X11 செயலிகளுக்கான ஆதரவு", "Name[tr]": "Eski X11 Uygulamaları Desteği", "Name[uk]": "Підтримка застарілих програм X11", + "Name[vi]": "Hỗ trợ ứng dụng X11 đời cũ", "Name[x-test]": "xxLegacy X11 App Supportxx" }, "X-KDE-Keywords": "xwayland,global,keys,forward",