From 257d8f32cf60d2cdbf59aff8c80785e9ca9cabfe Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 28 Apr 2021 01:22:29 +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/kwinoptions/kwinfocus.desktop        |  1 +
 .../kcm_virtualkeyboard.desktop                  | 16 ++++++++++++++++
 .../kwinvirtualkeyboard/package/metadata.desktop |  8 ++++++++
 3 files changed, 25 insertions(+)

diff --git a/src/kcmkwin/kwinoptions/kwinfocus.desktop b/src/kcmkwin/kwinoptions/kwinfocus.desktop
index 2f93584136..94cd33b429 100644
--- a/src/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/src/kcmkwin/kwinoptions/kwinfocus.desktop
@@ -12,6 +12,7 @@ Name[az]=Pəncərə fokuslama davranışları
 Name[ca]=Comportament del focus de les finestres
 Name[cs]=Chování při zaměření na okno
 Name[da]=Opførsel af vinduesfokus
+Name[de]=Fenster-Fokusverhalten
 Name[en_GB]=Window Focus Behaviour
 Name[es]=Comportamiento del foco de las ventanas
 Name[et]=Akende fookuse käitumine
diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop
index c6927b9a1c..22ef3b606b 100644
--- a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop
+++ b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop
@@ -14,6 +14,22 @@ X-KDE-OnlyShowOnQtPlatforms=wayland;
 X-DocPath=kcontrol/kwinvirtualkeyboard/index.html
 
 Name=Virtual Keyboard
+Name[az]=Virtual Klaviatura
+Name[ca]=Teclat virtual
+Name[de]=Virtuelle Tastatur
+Name[es]=Teclado virtual
+Name[nl]=Virtueel toetsenbord
+Name[sv]=Virtuellt tangentbord
+Name[uk]=Віртуальна клавіатура
+Name[x-test]=xxVirtual Keyboardxx
 Comment=Select which virtual keyboard to use
+Comment[az]=İstifadə edəcəyiniz klaviaturanı seçin
+Comment[ca]=Seleccioneu el teclat virtual a usar
+Comment[de]=Wählen Sie die zu verwendende virtuelle Tastatur
+Comment[es]=Seleccionar el teclado virtual a usar
+Comment[nl]=Het te gebruiken virtuele toetsenbord selecteren
+Comment[sv]=Välj vilket virtuellt tangentbord som ska användas
+Comment[uk]=Вибір віртуальної клавіатури
+Comment[x-test]=xxSelect which virtual keyboard to usexx
 
 Categories=Qt;KDE;
diff --git a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop
index 93fafe35b6..0afffdabdd 100644
--- a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop
+++ b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop
@@ -3,6 +3,14 @@
 
 [Desktop Entry]
 Name=Virtual Keyboard
+Name[az]=Virtual Klaviatura
+Name[ca]=Teclat virtual
+Name[de]=Virtuelle Tastatur
+Name[es]=Teclado virtual
+Name[nl]=Virtueel toetsenbord
+Name[sv]=Virtuellt tangentbord
+Name[uk]=Віртуальна клавіатура
+Name[x-test]=xxVirtual Keyboardxx
 
 Icon=input-keyboard-virtual
 Type=Service