From 70ecf7bfef46bf8f35a2c1d49215a37f0383617c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Mar 2017 05:15:43 +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" --- kcmkwin/kwincompositing/kwineffect.knsrc | 1 + kcmkwin/kwinscripts/kwinscripts.knsrc | 1 + kcmkwin/kwintabbox/kwinswitcher.knsrc | 1 + packageplugins/scripts/kwin-packagestructure-scripts.desktop | 1 + .../windowswitcher/kwin-packagestructure-windowswitcher.desktop | 1 + plugins/kdecorations/aurorae/src/aurorae.knsrc | 1 + 6 files changed, 6 insertions(+) diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index 143a3cfbb8..9f54d86339 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -3,6 +3,7 @@ Name=Window Manager Effects Name[de]=Fensterverwaltungs-Effekte Name[pt]=Efeitos do Gestor de Janelas Name[sv]=Fönsterhanteringseffekter +Name[uk]=Ефекти засобу керування вікнами Name[x-test]=xxWindow Manager Effectsxx ProvidersUrl=http://download.kde.org/ocs/providers.xml diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index 9bf257cc2c..f6cd004836 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -3,6 +3,7 @@ Name=Window Manager Scripts Name[de]=Fensterverwaltungs-Skripte Name[pt]=Programas do Gestor de Janelas Name[sv]=Fönsterhanteringsskript +Name[uk]=Скрипти засобу керування вікнами Name[x-test]=xxWindow Manager Scriptsxx ProvidersUrl=http://download.kde.org/ocs/providers.xml diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index b4f3f7438d..2ac4da4f51 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -3,6 +3,7 @@ Name=Window Manager Switching Layouts Name[de]=Wechsel-Layout für Fensterverwaltung Name[pt]=Disposições de Mudança do Gestor de Janelas Name[sv]=Fönsterbyteslayouter +Name[uk]=Компонування засобу перемикання вікон Name[x-test]=xxWindow Manager Switching Layoutsxx ProvidersUrl=http://download.kde.org/ocs/providers.xml diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index 1539b21d2f..11631373e3 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -3,6 +3,7 @@ Name=KWin Script Name[de]=KWin-Skript Name[pt]=Programa do KWin Name[sv]=Kwin-skript +Name[uk]=Скрипт KWin Name[x-test]=xxKWin Scriptxx Type=Service X-KDE-ServiceTypes=KPackage/PackageStructure diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index 16fcc3e755..a05a2add41 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -3,6 +3,7 @@ Name=KWin Window Switcher Name[de]=KWin-Fensterwechsler Name[pt]=Mudança de Janelas do KWin Name[sv]=Kwin-fönsterbyte +Name[uk]=Перемикач вікон KWin Name[x-test]=xxKWin Window Switcherxx Type=Service X-KDE-ServiceTypes=KPackage/PackageStructure diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index 04657ad98f..8217d8c588 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -3,6 +3,7 @@ Name=Aurorae Window Decorations Name[de]=Aurorae-Fensterdekoration Name[pt]=Decorações das Janelas do Aurorae Name[sv]=Aurora-fönsterdekorationer +Name[uk]=Обрамлення вікон Aurorae Name[x-test]=xxAurorae Window Decorationsxx ProvidersUrl=http://download.kde.org/ocs/providers.xml