From b2548fe0a91356274caccceacbabebec2a9c0be0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 May 2021 01:23:43 +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 | 4 ++++ src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop index 4877747402..e5f43e8b62 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop +++ b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop @@ -25,6 +25,8 @@ Name[it]=Tastiera virtuale Name[nl]=Virtueel toetsenbord Name[pl]=Klawiatura ekranowa Name[pt]=Teclado Virtual +Name[pt_BR]=Teclado virtual +Name[sk]=Virtuálna klávesnica Name[sl]=Virtualna tipkovnica Name[sv]=Virtuellt tangentbord Name[uk]=Віртуальна клавіатура @@ -39,6 +41,8 @@ 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[pt_BR]=Selecione qual teclado virtual a ser usado +Comment[sk]=Vyberte, ktorá virtuálna klávesnica sa má použiť Comment[sl]=Izberite virtualno tipkovnico za uporabo Comment[sv]=Välj vilket virtuellt tangentbord som ska användas Comment[uk]=Вибір віртуальної клавіатури diff --git a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop index 26ba3460a2..bb48c86225 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop +++ b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop @@ -14,6 +14,8 @@ Name[it]=Tastiera virtuale Name[nl]=Virtueel toetsenbord Name[pl]=Klawiatura ekranowa Name[pt]=Teclado Virtual +Name[pt_BR]=Teclado virtual +Name[sk]=Virtuálna klávesnica Name[sl]=Virtualna tipkovnica Name[sv]=Virtuellt tangentbord Name[uk]=Віртуальна клавіатура