From 236794aad9d726991fe2d6cec5ee2c447349d095 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Jan 2024 02:08:46 +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 +- src/plugins/synchronizeskipswitcher/package/metadata.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kcms/tabbox/kwinswitcher.knsrc b/src/kcms/tabbox/kwinswitcher.knsrc index 4474f837c4..6f08c99855 100644 --- a/src/kcms/tabbox/kwinswitcher.knsrc +++ b/src/kcms/tabbox/kwinswitcher.knsrc @@ -43,7 +43,7 @@ Name[sr@ijekavianlatin]=Rasporedi prebacivanja menadžera prozora Name[sr@latin]=Rasporedi prebacivanja menadžera prozora Name[sv]=Fönsterbyteslayouter Name[ta]=சாளர மாற்றியின் தளவமைப்பு -Name[tr]=Pencere Yöneticisi Geçiş Düzenleri +Name[tr]=Pencere Yöneticisi Geçiş Yerleşimleri Name[uk]=Компонування засобу перемикання вікон Name[vi]=Bố cục chuyển đổi của trình quản lí cửa sổ Name[x-test]=xxWindow Manager Switching Layoutsxx diff --git a/src/plugins/synchronizeskipswitcher/package/metadata.json b/src/plugins/synchronizeskipswitcher/package/metadata.json index 4a55041d33..d5744e3e08 100644 --- a/src/plugins/synchronizeskipswitcher/package/metadata.json +++ b/src/plugins/synchronizeskipswitcher/package/metadata.json @@ -92,7 +92,7 @@ "Name[cs]": "Synchronizovat přepínač přeskakování s pruhem úloh", "Name[de]": "Fensterwechsler mit Fensterleiste abgleichen", "Name[en_GB]": "Synchronise Skip Switcher with Taskbar", - "Name[eo]": "Sinkronigi Skip Switcher kun Taskbaro", + "Name[eo]": "Sinkronigi Skip Switcher kun Taskbreto", "Name[es]": "Sincronizar «Omitir selector» con la barra de tareas", "Name[et]": "Vahelejätmise lülitaja sünkroonimine tegumiribaga", "Name[eu]": "Ataza-barrarekin kommutadorea saihestu sinkronizatzea",