From 475af42e37a64b1e41f8ea8089ad7a73e9cddd52 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 27 Sep 2017 09:13:10 +0200 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" --- .../windowswitcher/kwin-packagestructure-windowswitcher.desktop | 2 +- scripting/kwinscript.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index c40b8de269..69e7232234 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -11,7 +11,7 @@ Name[es]=Cambiador de ventanas de KWin Name[eu]=KWin leiho-aldatzailea Name[fi]=KWin-ikkunanvalitsin Name[fr]=Sélecteur de fenêtres de KWin -Name[gl]=Selector de xanela do KWin +Name[gl]=Selector de xanela de KWin Name[hu]=KWin ablakváltó Name[ia]=Commutator de fenestra de KWin Name[it]=Scambiafinestre di KWin diff --git a/scripting/kwinscript.desktop b/scripting/kwinscript.desktop index e0c0738b9b..49551c485c 100644 --- a/scripting/kwinscript.desktop +++ b/scripting/kwinscript.desktop @@ -17,7 +17,7 @@ Comment[eu]=KWin scripta Comment[fi]=KWin-skripti Comment[fr]=Script KWin Comment[ga]=Script KWin -Comment[gl]=Script do KWin +Comment[gl]=Script de KWin Comment[he]=תוספים של KWin Comment[hu]=KWin parancsfájl Comment[ia]=Script de kwin