From 4b5cd32849890194e85a2e66d38d63e2aae07109 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 30 Jan 2017 06:04:34 +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" --- packageplugins/scripts/kwin-packagestructure-scripts.desktop | 5 +++++ .../kwin-packagestructure-windowswitcher.desktop | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index 50407642d8..b224011d62 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -11,6 +11,11 @@ Name[ko]=KWin 스크립트 Name[nl]=KWin-script Name[pl]=Skrypt KWin Name[pt]=Programa do KWin +Name[sk]=KWin skript +Name[sr]=К‑винова скрипта +Name[sr@ijekavian]=К‑винова скрипта +Name[sr@ijekavianlatin]=KWinova skripta +Name[sr@latin]=KWinova skripta Name[sv]=Kwin-skript Name[uk]=Скрипт KWin Name[x-test]=xxKWin Scriptxx diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index 7ca437076b..6f628e111e 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -11,6 +11,11 @@ Name[ko]=KWin 창 전환기 Name[nl]=KWin-vensterwisselaar Name[pl]=Przełącznik okien KWin Name[pt]=Mudança de Janelas do KWin +Name[sk]=Prepínač okien KWin +Name[sr]=К‑винов мењач прозора +Name[sr@ijekavian]=К‑винов мењач прозора +Name[sr@ijekavianlatin]=KWinov menjač prozora +Name[sr@latin]=KWinov menjač prozora Name[sv]=Kwin-fönsterbyte Name[uk]=Перемикач вікон KWin Name[x-test]=xxKWin Window Switcherxx