From e78b3c9f1dea7f4a4885567d75b00f8c00624a27 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 19 Jan 2020 09:21:44 +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"
---
 kcms/feedback/kcm_feedback.desktop  | 1 +
 krunner/krunner.desktop.cmake       | 4 ++--
 login-sessions/plasma.desktop.cmake | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kcms/feedback/kcm_feedback.desktop b/kcms/feedback/kcm_feedback.desktop
index 53c17ddc2..fa0f0aaf2 100644
--- a/kcms/feedback/kcm_feedback.desktop
+++ b/kcms/feedback/kcm_feedback.desktop
@@ -23,6 +23,7 @@ Name[gl]=Achegas de usuario
 Name[hu]=Felhasználói visszajelzés
 Name[id]=Tanggapan Pengguna
 Name[it]=Segnalazioni dell'utente
+Name[ja]=ユーザ フィードバック
 Name[lt]=Naudotojo grįžtamasis ryšys
 Name[nl]=Terugkoppeling van gebruiker
 Name[nn]=Tilbakemeldingar
diff --git a/krunner/krunner.desktop.cmake b/krunner/krunner.desktop.cmake
index a0ac92c67..9d6d6f216 100644
--- a/krunner/krunner.desktop.cmake
+++ b/krunner/krunner.desktop.cmake
@@ -33,7 +33,7 @@ Name[pa]=ਕੇਰਨਰ
 Name[pl]=KRunner
 Name[pt]=KRunner
 Name[pt_BR]=KRunner
-Name[ru]=KRunner
+Name[ru]=Открыть строку поиска и запуска KRunner
 Name[sk]=KRunner
 Name[sl]=KRunner
 Name[sr]=К‑извођач
@@ -81,7 +81,7 @@ Name[nn]=Køyr kommando på innhaldet på utklippstavla
 Name[pl]=Wykonaj polecenie na zawartości schowka
 Name[pt]=Executar o comando no conteúdo da área de transferência
 Name[pt_BR]=Executar comando no conteúdo da área de transferência
-Name[ru]=Запуск команды из буфера обмена
+Name[ru]=Запустить команду из буфера обмена
 Name[sk]=Spustiť príkaz na obsahu schránky
 Name[sv]=Kör kommando med klippbordets innehåll
 Name[uk]=Виконати команду над вмістом буфера обміну
diff --git a/login-sessions/plasma.desktop.cmake b/login-sessions/plasma.desktop.cmake
index 67bb3c78f..86846e502 100644
--- a/login-sessions/plasma.desktop.cmake
+++ b/login-sessions/plasma.desktop.cmake
@@ -26,7 +26,7 @@ Name[ia]=Plasma
 Name[id]=Plasma
 Name[is]=Plasma
 Name[it]=Plasma
-Name[ja]=プラズマ
+Name[ja]=Plasma
 Name[ko]=Plasma
 Name[lt]=Plasma
 Name[lv]=Plasma