From 1c6be7e32c6672b3551d1e5c6c08557b500761d9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 29 Apr 2021 01:20:31 +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/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop | 2 ++ src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop index 22ef3b606b..cc1c37f5a2 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop +++ b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop @@ -19,6 +19,7 @@ Name[ca]=Teclat virtual Name[de]=Virtuelle Tastatur Name[es]=Teclado virtual Name[nl]=Virtueel toetsenbord +Name[sl]=Virtualna tipkovnica Name[sv]=Virtuellt tangentbord Name[uk]=Віртуальна клавіатура Name[x-test]=xxVirtual Keyboardxx @@ -28,6 +29,7 @@ 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[sl]=Izberite virtualno tipkovnico za uporabo Comment[sv]=Välj vilket virtuellt tangentbord som ska användas Comment[uk]=Вибір віртуальної клавіатури Comment[x-test]=xxSelect which virtual keyboard to usexx diff --git a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop index 0afffdabdd..708f1f5af4 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop +++ b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop @@ -8,6 +8,7 @@ Name[ca]=Teclat virtual Name[de]=Virtuelle Tastatur Name[es]=Teclado virtual Name[nl]=Virtueel toetsenbord +Name[sl]=Virtualna tipkovnica Name[sv]=Virtuellt tangentbord Name[uk]=Віртуальна клавіатура Name[x-test]=xxVirtual Keyboardxx