From ecebbc9094c238e517befb116f761c102a00ed3a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 Sep 2024 01:21:21 +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/kcms/tabbox/kwinswitcher.knsrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/kcms/tabbox/kwinswitcher.knsrc b/src/kcms/tabbox/kwinswitcher.knsrc index 7632c9674b..31db0a4987 100644 --- a/src/kcms/tabbox/kwinswitcher.knsrc +++ b/src/kcms/tabbox/kwinswitcher.knsrc @@ -11,9 +11,11 @@ Name[ka]=ამოცანების გადამრთველის ს Name[lt]=Užduočių perjungiklio stiliai Name[nl]=Stijlen van taakschakelaar Name[pl]=Wyglądy przełącznika zadań +Name[sl]=Slogi preklopa med opravili Name[sv]=Stilar för aktivitetsbyte Name[ta]=பணி மாற்றி வகைகள் Name[tr]=Görev Değiştiricisi Biçemleri +Name[uk]=Стилі перемикання задач Name[x-test]=xxTask Switcher Stylesxx ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml