From 3847dc6d91eda8e121653a1dd4ef28f6386ba81f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 24 Feb 2016 09:12:03 +0000
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"
---
 examples/developerguide/basic/metadata.desktop      | 1 +
 src/desktoptheme/breeze-light/metadata.desktop      | 2 ++
 templates/cpp-plasmoid/src/package/metadata.desktop | 2 ++
 templates/qml-plasmoid/package/metadata.desktop     | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/examples/developerguide/basic/metadata.desktop b/examples/developerguide/basic/metadata.desktop
index 386f0394e..2ae3525f6 100644
--- a/examples/developerguide/basic/metadata.desktop
+++ b/examples/developerguide/basic/metadata.desktop
@@ -15,6 +15,7 @@ Comment[nl]=Basis app
 Comment[pl]=Podstawowa aplikacja
 Comment[pt]=Aplicação Básica
 Comment[pt_BR]=Aplicativo básico
+Comment[ru]=Простейшее приложение
 Comment[sk]=Základná aplikácia
 Comment[sl]=Osnovni program
 Comment[sr]=Основни програм
diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop
index 0f49462e5..ba2ef9863 100644
--- a/src/desktoptheme/breeze-light/metadata.desktop
+++ b/src/desktoptheme/breeze-light/metadata.desktop
@@ -4,10 +4,12 @@ Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[de]=Breeze Light
 Name[en_GB]=Breeze Light
+Name[es]=Brisa claro
 Name[nl]=Breeze Light
 Name[pl]=Lekka Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Light
+Name[ru]=Breeze, светлый вариант
 Name[sk]=Vánok svetlý
 Name[sr]=Поветарац лаки
 Name[sr@ijekavian]=Поветарац лаки
diff --git a/templates/cpp-plasmoid/src/package/metadata.desktop b/templates/cpp-plasmoid/src/package/metadata.desktop
index 29345f031..654c5fcfc 100644
--- a/templates/cpp-plasmoid/src/package/metadata.desktop
+++ b/templates/cpp-plasmoid/src/package/metadata.desktop
@@ -17,6 +17,7 @@ Name[nn]=%{APPNAME}
 Name[pl]=%{APPNAME}
 Name[pt]=%{APPNAME}
 Name[pt_BR]=%{APPNAME}
+Name[ru]=%{APPNAME}
 Name[sk]=%{APPNAME}
 Name[sl]=%{APPNAME}
 Name[sr]=%{APPNAME}
@@ -44,6 +45,7 @@ Comment[nl]=wat uw app doet in een paar woorden
 Comment[pl]=w kilku słowach opis co robi twój program
 Comment[pt]=o que faz a sua aplicação, em poucas palavras
 Comment[pt_BR]=breve descrição do que o seu aplicativo faz
+Comment[ru]=Несколько слов о том, что делает ваша программа
 Comment[sk]=čo vaša aplikácia robí v niekoľkých slovách
 Comment[sl]=kaj vaš program dela, v nekaj besedah
 Comment[sr]=Укратко о томе шта ваш програм ради
diff --git a/templates/qml-plasmoid/package/metadata.desktop b/templates/qml-plasmoid/package/metadata.desktop
index 733c29894..fe85850b1 100644
--- a/templates/qml-plasmoid/package/metadata.desktop
+++ b/templates/qml-plasmoid/package/metadata.desktop
@@ -17,6 +17,7 @@ Name[nn]=%{APPNAME}
 Name[pl]=%{APPNAME}
 Name[pt]=%{APPNAME}
 Name[pt_BR]=%{APPNAME}
+Name[ru]=%{APPNAME}
 Name[sk]=%{APPNAME}
 Name[sl]=%{APPNAME}
 Name[sr]=%{APPNAME}
@@ -44,6 +45,7 @@ Comment[nl]=wat uw app doet in een paar woorden
 Comment[pl]=w kilku słowach opis co robi twój program
 Comment[pt]=o que faz a sua aplicação, em poucas palavras
 Comment[pt_BR]=breve descrição do que o seu aplicativo faz
+Comment[ru]=Несколько слов о том, что делает ваша программа
 Comment[sk]=čo vaša aplikácia robí v niekoľkých slovách
 Comment[sl]=kaj vaš program dela, v nekaj besedah
 Comment[sr]=Укратко о томе шта ваш програм ради