From 213c98213a6e61933b0b5bb84e97d0f82d86ff78 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 9 May 2021 01:20: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/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop index 3fe1c12183..6ccab0de3d 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop +++ b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop @@ -35,6 +35,7 @@ Comment[es]=Seleccionar el teclado virtual a usar Comment[it]=Seleziona quale tastiera virtuale utilizzare Comment[nl]=Het te gebruiken virtuele toetsenbord selecteren Comment[pl]=Wybierz której klawiatury ekranowej użyć +Comment[pt]=Seleccionar qual o teclado virtual a usar Comment[sl]=Izberite virtualno tipkovnico za uporabo Comment[sv]=Välj vilket virtuellt tangentbord som ska användas Comment[uk]=Вибір віртуальної клавіатури