From 80a263f6917155cfaf43741b6ea5db04793c1096 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 24 Mar 2015 12:50:48 +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"
---
 cursors/Breeze_Snow/Breeze_Snow/index.theme       | 1 +
 cursors/Breeze_Snow/src/index.theme               | 1 +
 icons/index.theme                                 | 1 +
 kdecoration/config/breezedecorationconfig.desktop | 3 +++
 kstyle/config/breezestyleconfig.desktop           | 3 +++
 5 files changed, 9 insertions(+)

diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme
index 63c4c7c6..61950dec 100644
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@@ -9,6 +9,7 @@ Name[es]=Brisa nieve
 Name[fi]=Breeze Snow
 Name[fr]=Brise neigeuse
 Name[gl]=Breeze Snow
+Name[hu]=Breeze Snow
 Name[it]=Brezza gelida
 Name[lt]=Breeze sniegas
 Name[nb]=Breeze snø
diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme
index 63c4c7c6..61950dec 100644
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@@ -9,6 +9,7 @@ Name[es]=Brisa nieve
 Name[fi]=Breeze Snow
 Name[fr]=Brise neigeuse
 Name[gl]=Breeze Snow
+Name[hu]=Breeze Snow
 Name[it]=Brezza gelida
 Name[lt]=Breeze sniegas
 Name[nb]=Breeze snø
diff --git a/icons/index.theme b/icons/index.theme
index eda1428c..e1c85199 100644
--- a/icons/index.theme
+++ b/icons/index.theme
@@ -48,6 +48,7 @@ Comment[es]=Tema por omisión de Plasma 5
 Comment[fi]=Plasma 5:n oletusteema
 Comment[fr]=Thème Plasma par défaut
 Comment[gl]=Tema predeterminado de Plasma 5
+Comment[hu]=Alapértelmezett Plasma 5 téma
 Comment[it]=Tema predefinito di Plasma 5
 Comment[ko]=기본 Plasma 5 테마
 Comment[lt]=Numatyta Plasma 5 tema
diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop
index d6278e3f..e8e9be80 100644
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@@ -19,6 +19,7 @@ Name[es]=Decoración de las ventanas
 Name[fi]=Ikkunan kehys
 Name[fr]=Décoration de fenêtre
 Name[gl]=Decoración da xanela
+Name[hu]=Ablakdekoráció
 Name[it]=Decorazione delle finestre
 Name[lt]=Lango dekoracija
 Name[nb]=Vinduspynt
@@ -47,6 +48,7 @@ Comment[es]=Modificar el aspecto de las decoraciones de las ventanas
 Comment[fi]=Muuta ikkunoiden kehysten ulkoasua
 Comment[fr]=Modifier l'apparence des décorations des fenêtres
 Comment[gl]=Modifica a aparencia da decoración da xanela
+Comment[hu]=Az ablakdekorációk megjelenésének módosítása
 Comment[it]=Modifica l'aspetto delle decorazioni delle finestre
 Comment[lt]=Keisti lango dekoracijų išvaizdą
 Comment[nb]=Endre utseende for vindusdekorasjoner
@@ -75,6 +77,7 @@ X-KDE-Keywords[es]=breeze,brisa,decoración
 X-KDE-Keywords[fi]=breeze,decoration,kehys,koriste,koristus,ikkunakehys
 X-KDE-Keywords[fr]=breeze,décoration
 X-KDE-Keywords[gl]=breeze,decoración
+X-KDE-Keywords[hu]=breeze,dekoráció
 X-KDE-Keywords[it]=brezza,decorazione
 X-KDE-Keywords[lt]=breeze,kekoracija
 X-KDE-Keywords[nb]=beeze,dekorasjon
diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop
index 8eb233bf..74768059 100644
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@@ -19,6 +19,7 @@ Name[es]=Estilo de los elementos gráficos
 Name[fi]=Elementtien tyyli
 Name[fr]=Style de composant graphique
 Name[gl]=Estilo do trebello
+Name[hu]=Elemstílus
 Name[it]=Stile degli oggetti
 Name[lt]=Valdiklių stilius
 Name[nb]=Skjermelementstil
@@ -47,6 +48,7 @@ Comment[es]=Modificar el aspecto de los elementos gráficos
 Comment[fi]=Muuta elementtien ulkoasua
 Comment[fr]=Modifier l'apparence des composants graphiques
 Comment[gl]=Modifica a aparencia dos trebellos
+Comment[hu]=Az elemek megjelenésének módosítása
 Comment[it]=Modifica l'aspetto degli oggetti
 Comment[lt]=Keisti valdiklių išvaizdą
 Comment[nb]=Endre utseende for skjermelementer
@@ -76,6 +78,7 @@ X-KDE-Keywords[es]=breeze,brisa,elemento gráfico,widget,estilo
 X-KDE-Keywords[fi]=breeze,widget,style,käyttöliittymäelementti,tyyli,elementti,kontrolli
 X-KDE-Keywords[fr]=brise,composant graphique, style
 X-KDE-Keywords[gl]=breeze,trebello,widget,estilo
+X-KDE-Keywords[hu]=breeze,elem,stílus
 X-KDE-Keywords[it]=brezza,oggetto,stile
 X-KDE-Keywords[lt]=breeze,valdiklis,stilius
 X-KDE-Keywords[nb]=breeze,skjermelement,stil