From 5c51b1c6198eafe5b6733ab009f5228070fc3053 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 21 Mar 2020 09:55:15 +0100 Subject: [PATCH 1/3] 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" --- kcmkwin/kwincompositing/kwincompositing.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 2 +- kcmkwin/kwinoptions/kwinadvanced.desktop | 2 +- kcmkwin/kwinoptions/kwinoptions.desktop | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 31b8609182..811b4b069e 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -120,6 +120,7 @@ X-KDE-Keywords[nn]=kwin,vindauge,vindaugshandsamar,samansetjing,effekt,3D-effekt X-KDE-Keywords[pt]=kwin,janela,gestor,composição,efeito,efeitos 3D,efeitos 2D,OpenGL,XRender,configuração do vídeo,efeitos gráficos,efeitos do ecrã X-KDE-Keywords[pt_BR]=kwin,janela,gerenciador,composição,efeito,efeitos 3D,efeitos 2D,OpenGL,XRender,configurações de vídeo,efeitos gráficos,efeitos da área de trabalho X-KDE-Keywords[ru]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,композитинг,композитный диспетчер окон,эффекты рабочего стола,графические эффекты,рендеринг,параметры видео,настройка видео +X-KDE-Keywords[sk]=kwin,okno,správca,kompozícia,efekt,3D efekty,2D efekty,OpenGL,XRender,nastavenia videa,grafické efekty,efekty plochy X-KDE-Keywords[sv]=kwin,fönster,hantering,sammansättning,effekt,3D effekter,2D effekter,OpenGL,XRender,videoinställningar,grafiska effekter,skrivbordseffekter X-KDE-Keywords[uk]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,вікно,керування,композитне,композиція,ефект,просторовий,ефекти,плоскі,параметри відео,графічні ефекти,ефекти стільниці X-KDE-Keywords[x-test]=xxkwinxx,xxwindowxx,xxmanagerxx,xxcompositingxx,xxeffectxx,xx3D effectsxx,xx2D effectsxx,xxOpenGLxx,xxXRenderxx,xxvideo settingsxx,xxgraphical effectsxx,xxdesktop effectsxx diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 3ac1eaa624..163a54c207 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -32,7 +32,7 @@ Name[pl]=Zachowanie okien Name[pt]=Acções das Janelas Name[pt_BR]=Ações da janela Name[ru]=Действия с окнами -Name[sk]=Akcie ok&na +Name[sk]=Akcie okna Name[sv]=Fönsteråtgärder Name[uk]=Дії з вікнами Name[x-test]=xxWindow Actionsxx diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index 8cac4f583e..a9d4d730ad 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -61,7 +61,7 @@ Comment[pl]=Zaawansowane ustawienia zarządzania oknami Comment[pt]=Configurar as funcionalidades de gestão de janelas avançadas Comment[pt_BR]=Configure as opções avançadas de gerenciamento de janelas Comment[ru]=Настройка дополнительных возможностей управления окнами -Comment[sk]=Nastaviť pokročilé možnosti správy okien +Comment[sk]=Nastavuje pokročilé možnosti správy okien Comment[sv]=Anpassa avancerade fönsterhanteringsalternativ Comment[uk]=Налаштовування додаткових параметрів керування вікнами Comment[x-test]=xxConfigure advanced window management optionsxx diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index 69668445ce..01af173aa3 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -122,7 +122,7 @@ Comment[pl]=Ustawienia działań i zachowań okien Comment[pt]=Configurar as acções e comportamento das janelas Comment[pt_BR]=Configure as ações e comportamento das janelas Comment[ru]=Настройка поведения окон -Comment[sk]=Nastaviť akcie a správanie okien +Comment[sk]=Nastavuje akcie a správanie okien Comment[sv]=Anpassa fönsteråtgärder och beteende Comment[uk]=Налаштовування реакції та поведінки вікон Comment[x-test]=xxConfigure window actions and behaviorxx From f18109d9c4aaee0081acf822dccb12c8cf68bb3c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 26 Mar 2020 10:48:29 +0100 Subject: [PATCH 2/3] 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" --- kcmkwin/kwincompositing/kwincompositing.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 811b4b069e..ce5528db2f 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -124,4 +124,5 @@ X-KDE-Keywords[sk]=kwin,okno,správca,kompozícia,efekt,3D efekty,2D efekty,Open X-KDE-Keywords[sv]=kwin,fönster,hantering,sammansättning,effekt,3D effekter,2D effekter,OpenGL,XRender,videoinställningar,grafiska effekter,skrivbordseffekter X-KDE-Keywords[uk]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,вікно,керування,композитне,композиція,ефект,просторовий,ефекти,плоскі,параметри відео,графічні ефекти,ефекти стільниці X-KDE-Keywords[x-test]=xxkwinxx,xxwindowxx,xxmanagerxx,xxcompositingxx,xxeffectxx,xx3D effectsxx,xx2D effectsxx,xxOpenGLxx,xxXRenderxx,xxvideo settingsxx,xxgraphical effectsxx,xxdesktop effectsxx +X-KDE-Keywords[zh_CN]=kwin,窗口,管理器,混成,特效,3D 特效,2D 特效,OpenGL,XRender,视频设置,图形特效,桌面特效 X-KDE-Keywords[zh_TW]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,桌面特效,圖形特效,視訊設定,特效,3D,2D,合成,視窗,管理器 From ae022e92c9f516877fa59d5104a84c981895cddf Mon Sep 17 00:00:00 2001 From: Eugene Popov Date: Sun, 29 Mar 2020 18:13:55 -0600 Subject: [PATCH 3/3] [kcmkwin/kwindesktop] Fix inability to create more than one row on the "Virtual Desktops" settings page Summary: When a spinbox with the number of rows loses focus, the value of this spinbox (i.e., the count of rows) is always reset to 1. Thus, it's impossible to create more then one row. To fix this bug, we need to implement `valueFromText` function. BUG: 419141 FIXED-IN: 5.18.4 Reviewers: ngraham, zzag, davidedmundson Reviewed By: ngraham, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D28378 --- kcmkwin/kwindesktop/package/contents/ui/main.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwindesktop/package/contents/ui/main.qml b/kcmkwin/kwindesktop/package/contents/ui/main.qml index 5e0f39b267..770bc22d68 100644 --- a/kcmkwin/kwindesktop/package/contents/ui/main.qml +++ b/kcmkwin/kwindesktop/package/contents/ui/main.qml @@ -159,6 +159,7 @@ ScrollViewKCM { editable: true textFromValue: function(value, locale) { return i18np("1 Row", "%1 Rows", value)} + valueFromText: function(text, locale) { return parseInt(text, 10); } onValueModified: kcm.desktopsModel.rows = value }