From 5f7a2806f053472e02cccee0f2e99f96c6ab5ce2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Mar 2021 07:52:05 +0100 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/kwinoptions/kwinfocus.desktop | 1 + src/plugins/krunner-integration/kwin-runner-windows.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/src/kcmkwin/kwinoptions/kwinfocus.desktop b/src/kcmkwin/kwinoptions/kwinfocus.desktop index 45793850e2..2f93584136 100644 --- a/src/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/src/kcmkwin/kwinoptions/kwinfocus.desktop @@ -45,6 +45,7 @@ Comment[az]=Pəncərə aktivliyi qaydalarını tənzimləmək Comment[ca]=Configura la política d'activació de les finestres Comment[cs]=Nastavení pravidel aktivování oken Comment[da]=Indstil vinduers aktiveringspolitik +Comment[de]=Regeln zur Fensteraktivierung einrichten Comment[en_GB]=Configure window activation policy Comment[es]=Configurar la política de activación de ventanas Comment[et]=Akende aktiveerimise reeglite seadistamine diff --git a/src/plugins/krunner-integration/kwin-runner-windows.desktop b/src/plugins/krunner-integration/kwin-runner-windows.desktop index 6a8f6f4871..f9f988f402 100644 --- a/src/plugins/krunner-integration/kwin-runner-windows.desktop +++ b/src/plugins/krunner-integration/kwin-runner-windows.desktop @@ -29,6 +29,7 @@ Comment=List windows and desktops and switch them Comment[az]=Pəncərələrin, İş Masalarının siyahısı və onlar arası keçid Comment[ca]=Llista finestres i escriptoris, i canvia entre ells Comment[cs]=Seznam oken a ploch k přepínání +Comment[de]=Listet Fenster und Arbeitsflächen auf und wechselt zwischen ihnen. Comment[en_GB]=List windows and desktops and switch them Comment[es]=Listar ventanas y escritorios y cambiar entre ellos Comment[eu]=Leihoak eta mahaigainak zerrendatzea eta haien artean aldatzea