From 0f8ec3fcd24dbbc96a9fc4663bf400ce3ba233b9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 17 Oct 2022 01:50:44 +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.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.json b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.json index 959678c71a..30d0796d56 100644 --- a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.json +++ b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.json @@ -6,7 +6,7 @@ "Description[ar]": "اختر أيا من لوحات المفاتيح الافتراضية لإستعمالها", "Description[az]": "İstifadə edəcəyiniz virtual klaviaturanı seçin", "Description[bg]": "Избиране на виртуална клавиатура, която да се използва", - "Description[ca@valencia]": "Seleccioneu el teclat virtual que s'utilitzarà", + "Description[ca@valencia]": "Seleccioneu el teclat virtual que s'ha d'utilitzar", "Description[ca]": "Seleccioneu el teclat virtual a usar", "Description[de]": "Wählen Sie die zu verwendende virtuelle Tastatur", "Description[en_GB]": "Select which virtual keyboard to use",