From 438ec77eec15a9d2dcd3675020084b6782c47400 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 Dec 2019 09:24:21 +0100 Subject: [PATCH 1/2] 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" --- runners/activities/plasma-runner-activityrunner.desktop | 2 +- runners/kill/plasma-runner-kill.desktop | 2 +- runners/powerdevil/plasma-runner-powerdevil.desktop | 2 +- runners/windows/plasma-runner-windows.desktop | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runners/activities/plasma-runner-activityrunner.desktop b/runners/activities/plasma-runner-activityrunner.desktop index 24b394299..f67537cfe 100644 --- a/runners/activities/plasma-runner-activityrunner.desktop +++ b/runners/activities/plasma-runner-activityrunner.desktop @@ -61,7 +61,7 @@ Comment=List and switch between desktop activities Comment[ar]=اسرد أنشطة سطح المكتب وبدّل بينها Comment[bg]=Списък и превключване между дейностите Comment[bs]=Prikaz i prebacivanje između aktivnosti radne površine -Comment[ca]=Llista i commuta entre activitats d'escriptori +Comment[ca]=Llista i commuta entre les activitats d'escriptori Comment[ca@valencia]=Llista i commuta entre activitats d'escriptori Comment[cs]=Zobrazení a přepínač aktivit pracovní plochy Comment[da]=Vis og skift mellem skrivebordsaktiviteter diff --git a/runners/kill/plasma-runner-kill.desktop b/runners/kill/plasma-runner-kill.desktop index d5a98519d..4d635de7a 100644 --- a/runners/kill/plasma-runner-kill.desktop +++ b/runners/kill/plasma-runner-kill.desktop @@ -71,7 +71,7 @@ Comment=Stop applications that are currently running Comment[ar]=أوقف التطبيقات التي تعمل حاليًا Comment[bg]=Спиране на работещи в момента програми Comment[bs]=Zaustavlja programe trenutno u pogonu -Comment[ca]=Atura aplicacions que estan actualment en execució +Comment[ca]=Atura les aplicacions que estan en execució Comment[ca@valencia]=Para aplicacions que estan actualment en execució Comment[cs]=Ukončit aktuálně spuštěné aplikace Comment[csb]=Zamëkô prawie robiącé aplikacëje diff --git a/runners/powerdevil/plasma-runner-powerdevil.desktop b/runners/powerdevil/plasma-runner-powerdevil.desktop index 4753ba65f..b769cf133 100644 --- a/runners/powerdevil/plasma-runner-powerdevil.desktop +++ b/runners/powerdevil/plasma-runner-powerdevil.desktop @@ -4,7 +4,7 @@ Comment[ar]=عمليات إدارة الطاقة الأساسية Comment[be@latin]=Prostyja aperacyi dla kiravańnia enerhijaj Comment[bg]=Основни операции по захранването Comment[bs]=Osnovni postupci upravljanja napajanjem -Comment[ca]=Operacions bàsiques de gestió d'energia +Comment[ca]=Operacions bàsiques en la gestió d'energia Comment[ca@valencia]=Operacions bàsiques de gestió d'energia Comment[cs]=Základní úkony týkající se správy napájení Comment[csb]=Spòdlowé òperacejë sprôwiania mòcą diff --git a/runners/windows/plasma-runner-windows.desktop b/runners/windows/plasma-runner-windows.desktop index 9bd1114db..91a59c8cf 100644 --- a/runners/windows/plasma-runner-windows.desktop +++ b/runners/windows/plasma-runner-windows.desktop @@ -72,7 +72,7 @@ Comment=List windows and desktops and switch them Comment[ar]=اسرد النوافذ وأسطح المكتب وبدّل بينها Comment[bg]=Показване и превключване на прозорци и работни плотове Comment[bs]=Nabrajanje i prebacivanje između prozora i površî -Comment[ca]=Llista finestres i escriptoris i canvia entre ells +Comment[ca]=Llista finestres i escriptoris, i canvia entre ells Comment[ca@valencia]=Llista finestres i escriptoris i canvia entre ells Comment[cs]=Seznam oken a ploch k přepínání Comment[da]=Oplist vinduer og skriveborde og skift mellem dem From 469a7c1e33f83d6b73610997811fb131b5af80ca Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Sat, 28 Dec 2019 13:55:41 -0700 Subject: [PATCH 2/2] Revert "Add Meta+Space as a default shortcut to activate KRunner" This reverts commit 4000bd5db5f42fa5504e0889494f261fcb92856d. Meta+space was already used for Change Keyboard Layout, which was not known by me or the patch's reviewers. However users have started to complain about this. Reverting to un-break people. Sorry everyone! --- krunner/krunner.desktop.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krunner/krunner.desktop.cmake b/krunner/krunner.desktop.cmake index 1ae7e2680..e356bc5fa 100644 --- a/krunner/krunner.desktop.cmake +++ b/krunner/krunner.desktop.cmake @@ -49,7 +49,7 @@ Type=Application X-DBUS-StartupType=Unique X-DBUS-ServiceName=org.kde.krunner X-KDE-StartupNotify=false -X-KDE-Shortcuts=Alt+Space,Alt+F2,Meta+Space,Search +X-KDE-Shortcuts=Alt+Space,Alt+F2,Search Actions=RunClipboard X-KDE-Wayland-Interfaces=org_kde_plasma_window_management