From 943bdc0e644ae5dc0bf1fb14f251dd3bac7c6be9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 13 Jun 2021 01:21:07 +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 87fe7d986a..4690a44197 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop +++ b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop @@ -19,6 +19,7 @@ Name[az]=Virtual Klaviatura Name[ca]=Teclat virtual Name[cs]=Virtuální klávesnice Name[de]=Virtuelle Tastatur +Name[en_GB]=Virtual Keyboard Name[es]=Teclado virtual Name[fr]=Clavier virtuel Name[ia]=Claviero virtual @@ -39,6 +40,7 @@ Comment[az]=İstifadə edəcəyiniz klaviaturanı seçin Comment[ca]=Seleccioneu el teclat virtual a usar Comment[cs]=Zvolte, kterou virtuální klávesnici použít Comment[de]=Wählen Sie die zu verwendende virtuelle Tastatur +Comment[en_GB]=Select which virtual keyboard to use Comment[es]=Seleccionar el teclado virtual a usar Comment[fr]=Sélectionner quel clavier virtuel utiliser Comment[ia]=Selectiona qual claviero virtual usar diff --git a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop index 74d5efdb38..2b6bef22e4 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop +++ b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop @@ -8,6 +8,7 @@ Name[az]=Virtual Klaviatura Name[ca]=Teclat virtual Name[cs]=Virtuální klávesnice Name[de]=Virtuelle Tastatur +Name[en_GB]=Virtual Keyboard Name[es]=Teclado virtual Name[fr]=Clavier virtuel Name[ia]=Claviero virtual