From ae5df024b1d047b0afb704f87f8ffdf48c1224e6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 2 Dec 2016 05:50:58 +0100
Subject: [PATCH 1/7] 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"
---
 plugins/platforms/drm/drm.json               | 2 +-
 plugins/platforms/fbdev/fbdev.json           | 2 +-
 plugins/platforms/hwcomposer/hwcomposer.json | 2 +-
 plugins/platforms/virtual/virtual.json       | 2 +-
 plugins/platforms/wayland/wayland.json       | 2 +-
 plugins/platforms/x11/standalone/x11.json    | 2 +-
 plugins/platforms/x11/windowed/x11.json      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/platforms/drm/drm.json b/plugins/platforms/drm/drm.json
index cd75cb94da..4e977602f9 100644
--- a/plugins/platforms/drm/drm.json
+++ b/plugins/platforms/drm/drm.json
@@ -44,4 +44,4 @@
         "Name[x-test]": "xxdrmxx"
     }, 
     "input": false
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/fbdev/fbdev.json b/plugins/platforms/fbdev/fbdev.json
index 103a7cc534..275f252162 100644
--- a/plugins/platforms/fbdev/fbdev.json
+++ b/plugins/platforms/fbdev/fbdev.json
@@ -49,4 +49,4 @@
         "Name[zh_TW]": "影格緩衝區（framebuffer）"
     }, 
     "input": false
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json
index 445940533c..22e284cb0e 100644
--- a/plugins/platforms/hwcomposer/hwcomposer.json
+++ b/plugins/platforms/hwcomposer/hwcomposer.json
@@ -40,4 +40,4 @@
         "Name[x-test]": "xxhwcomposerxx"
     }, 
     "input": false
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/virtual/virtual.json b/plugins/platforms/virtual/virtual.json
index d55b5af49a..7589c8f468 100644
--- a/plugins/platforms/virtual/virtual.json
+++ b/plugins/platforms/virtual/virtual.json
@@ -50,4 +50,4 @@
         "Name[zh_TW]": "虛擬"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/wayland/wayland.json b/plugins/platforms/wayland/wayland.json
index b927cceb60..656dee2250 100644
--- a/plugins/platforms/wayland/wayland.json
+++ b/plugins/platforms/wayland/wayland.json
@@ -42,4 +42,4 @@
         "Name[x-test]": "xxwaylandxx"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/x11/standalone/x11.json b/plugins/platforms/x11/standalone/x11.json
index 61bddb023d..c5de0da90e 100644
--- a/plugins/platforms/x11/standalone/x11.json
+++ b/plugins/platforms/x11/standalone/x11.json
@@ -50,4 +50,4 @@
         "Name[x-test]": "xxx11-standalonexx"
     }, 
     "input": true
-}
\ No newline at end of file
+}
diff --git a/plugins/platforms/x11/windowed/x11.json b/plugins/platforms/x11/windowed/x11.json
index a26285f3cf..fbaa5fdb17 100644
--- a/plugins/platforms/x11/windowed/x11.json
+++ b/plugins/platforms/x11/windowed/x11.json
@@ -44,4 +44,4 @@
         "Name[x-test]": "xxx11xx"
     }, 
     "input": true
-}
\ No newline at end of file
+}

From 23e500a27324bebb82fd0f5567e8b70ebffb97b1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 5 Dec 2016 05:13:10 +0100
Subject: [PATCH 2/7] 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"
---
 effects/cube/cubeslide_config.desktop        | 2 +-
 effects/fadedesktop/package/metadata.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/effects/cube/cubeslide_config.desktop b/effects/cube/cubeslide_config.desktop
index 6224970a58..2b9b54f71d 100644
--- a/effects/cube/cubeslide_config.desktop
+++ b/effects/cube/cubeslide_config.desktop
@@ -50,7 +50,7 @@ Name[nds]=Animeert Wörpel-Schriefdisch
 Name[nl]=Animatie met bureaubladkubus
 Name[nn]=Kubeskifte av skrivebord
 Name[pa]=ਡੈਸਕਟਾਪ ਘਣ ਐਨੀਮੇਸ਼ਨ
-Name[pl]=Animacja sześcianu pulpitu
+Name[pl]=Animacja sześcianu pulpitów
 Name[pt]=Animação do Cubo de Ecrãs
 Name[pt_BR]=Animação do cubo de áreas de trabalho
 Name[ro]=Animație Cub de birou
diff --git a/effects/fadedesktop/package/metadata.desktop b/effects/fadedesktop/package/metadata.desktop
index be482d776b..a426a9afc3 100644
--- a/effects/fadedesktop/package/metadata.desktop
+++ b/effects/fadedesktop/package/metadata.desktop
@@ -110,7 +110,7 @@ Comment[nds]=Bi't Wesseln de Schriefdischen överenanner blennen
 Comment[nl]=Laat virtuele bureaubladen vervagen en opkomen bij het wisselen
 Comment[nn]=Ton inn og ut ved veksling mellom virtuelle skrivebord
 Comment[pa]=ਜਦੋਂ ਵੁਰਚੁਅਲ ਡੈਸਕਟਾਪ ਵਿੱਚ ਬਦਲਣਾ ਹੋਵੇ ਤਾਂ ਉਹਨਾਂ ਨੂੰ ਫਿੱਕਾ ਕਰੋ
-Comment[pl]=Przenikanie wirtualnych pulpitów podczas przełączania między nimi
+Comment[pl]=Przenikanie wirtualnych pulpitów przy przełączaniu między nimi
 Comment[pt]=Desvanece entre os ecrãs virtuais, ao circular entre eles
 Comment[pt_BR]=Desaparece entre as áreas de trabalho virtuais, ao alternar entre elas
 Comment[ro]=Estompare între birourile virtuale la comutarea între ele

From 818ed8f4ad7dd1d8bd58b70dde073aded791f371 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 13 Dec 2016 05:42:59 +0100
Subject: [PATCH 3/7] 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"
---
 effects/eyeonscreen/package/metadata.desktop    | 2 ++
 effects/fade/package/metadata.desktop           | 2 +-
 effects/fadedesktop/package/metadata.desktop    | 4 ++--
 effects/flipswitch/flipswitch_config.desktop    | 2 +-
 effects/glide/glide_config.desktop              | 2 +-
 effects/maximize/package/metadata.desktop       | 2 +-
 effects/morphingpopups/package/metadata.desktop | 2 ++
 effects/windowaperture/package/metadata.desktop | 2 ++
 kcmkwin/kwincompositing/kcmkwineffects.desktop  | 2 ++
 kcmkwin/kwincompositing/kwincompositing.desktop | 3 +++
 kcmkwin/kwindecoration/kwindecoration.desktop   | 1 +
 kcmkwin/kwindesktop/desktop.desktop             | 1 +
 kcmkwin/kwinoptions/kwinactions.desktop         | 1 +
 kcmkwin/kwinoptions/kwinadvanced.desktop        | 1 +
 kcmkwin/kwinoptions/kwinfocus.desktop           | 1 +
 kcmkwin/kwinoptions/kwinmoving.desktop          | 3 ++-
 kcmkwin/kwinoptions/kwinoptions.desktop         | 2 ++
 kcmkwin/kwinrules/kwinrules.desktop             | 1 +
 kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 2 ++
 kcmkwin/kwintabbox/kwintabbox.desktop           | 1 +
 scripts/enforcedeco/metadata.desktop            | 2 ++
 scripts/minimizeall/metadata.desktop            | 2 ++
 22 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop
index b1eac06b33..d8741bb578 100644
--- a/effects/eyeonscreen/package/metadata.desktop
+++ b/effects/eyeonscreen/package/metadata.desktop
@@ -6,6 +6,7 @@ Name[da]=øjet på skærmen
 Name[en_GB]=eye On Screen
 Name[es]=Ojo a la pantalla
 Name[et]=eye On Screen
+Name[eu]=begia pantailan
 Name[fi]=eye On Screen
 Name[fr]=Jeter un oeil sur le bureau
 Name[gl]=Ollo na pantalla
@@ -41,6 +42,7 @@ Comment[da]=Sug vinduer ind i skrivebordet for at vise dette. Måske minder det
 Comment[en_GB]=Suck windows into desktop to show the latter. This might remind you of something.
 Comment[es]=Succionar las ventanas en el escritorio para mostrarlo. Esto debe recordarle algo.
 Comment[et]=Imeb aknad töölauda ja näitab viimast. See võib midagi meenutada ...
+Comment[eu]=Xurgatu mahaigaineko leihoak, berau erakusteko. Honek zer edo zer gogoraraziko diezazuke.
 Comment[fi]=Imee ikkunat työpöytään näyttääkseen sen. Tämä saattaa muistuttaa sinua jostain.
 Comment[fr]=Aspire toutes les fenêtres pour afficher le bureau.
 Comment[gl]=Que o escritorio succione as xanelas para mostrarse. Isto pode que lle recorde a algo.
diff --git a/effects/fade/package/metadata.desktop b/effects/fade/package/metadata.desktop
index adfa1d0851..2669c14324 100644
--- a/effects/fade/package/metadata.desktop
+++ b/effects/fade/package/metadata.desktop
@@ -17,7 +17,7 @@ Name[en_GB]=Fade
 Name[eo]=Dissolvi
 Name[es]=Fundido
 Name[et]=Hääbumine
-Name[eu]=Iraungi
+Name[eu]=Desagertzea
 Name[fa]=محو کردن
 Name[fi]=Häivytys
 Name[fr]=Fondu
diff --git a/effects/fadedesktop/package/metadata.desktop b/effects/fadedesktop/package/metadata.desktop
index a426a9afc3..a392a47742 100644
--- a/effects/fadedesktop/package/metadata.desktop
+++ b/effects/fadedesktop/package/metadata.desktop
@@ -15,7 +15,7 @@ Name[en_GB]=Fade Desktop
 Name[eo]=Labortablo Dissolvo  
 Name[es]=Difuminar escritorio
 Name[et]=Töölaua hääbumine
-Name[eu]=Iraungi mahaigaina
+Name[eu]=Mahaigaina desagertzea
 Name[fi]=Työpöydän häivytys
 Name[fr]=Effectue un fondu du bureau
 Name[fy]=Buroblêd ferfagje
@@ -83,7 +83,7 @@ Comment[en_GB]=Fade between virtual desktops when switching between them
 Comment[eo]=Disvolvi inter virtualaj labortabloj kiam ŝaltas inter ili.
 Comment[es]=Difumina al cambiar entre escritorios virtuales
 Comment[et]=Hääbumisefekt ühelt virtuaalselt töölaualt teisele lülitudes
-Comment[eu]=Uneko mahaigaina iraungitzen du mahagain batetik bestera aldatzean
+Comment[eu]=Uneko mahaigaina desagerrarazi mahagain batetik bestera aldatzean
 Comment[fi]=Häivytys virtuaalityöpöytien välillä niitä vaihdettaessa
 Comment[fr]=Effectue un fondu entre les bureaux virtuels lors des changements de bureau
 Comment[fy]=By it wikseljen tusken firuele buroblêden in ferfaging dwaan
diff --git a/effects/flipswitch/flipswitch_config.desktop b/effects/flipswitch/flipswitch_config.desktop
index 80993834dd..f29bda35c2 100644
--- a/effects/flipswitch/flipswitch_config.desktop
+++ b/effects/flipswitch/flipswitch_config.desktop
@@ -19,7 +19,7 @@ Name[en_GB]=Flip Switch
 Name[eo]=Turna ŝanĝilo
 Name[es]=Selección de ventana en modo cascada
 Name[et]=Aknalehitseja
-Name[eu]=Leiho pila
+Name[eu]=Biratze aldaketa
 Name[fi]=Kääntövaihtaja
 Name[fr]=Empilement en perspective
 Name[fy]=Flip wiksel
diff --git a/effects/glide/glide_config.desktop b/effects/glide/glide_config.desktop
index 377a5b2074..e801c06205 100644
--- a/effects/glide/glide_config.desktop
+++ b/effects/glide/glide_config.desktop
@@ -18,7 +18,7 @@ Name[el]=Ολίσθηση
 Name[en_GB]=Glide
 Name[es]=Glide
 Name[et]=Liuglemine
-Name[eu]=Lerratu
+Name[eu]=Irristatzea
 Name[fi]=Ikkunaliuku
 Name[fr]=Glisser
 Name[ga]=Sleamhnaigh
diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop
index a1d7863a5c..a05d6ad54b 100644
--- a/effects/maximize/package/metadata.desktop
+++ b/effects/maximize/package/metadata.desktop
@@ -10,7 +10,7 @@ Comment[el]=Εφέ κίνησης για παράθυρο που πρόκειτ
 Comment[en_GB]=Animation for a window going to maximise/restore from maximise
 Comment[es]=Animación para una ventana que se va a maximizar o restaurar de una maximización
 Comment[et]=Maksimeeritava või maksimeeritust taastatava akna animatsioon
-Comment[eu]=Leihoa maximizatzera doanerako/maximizatutik leheneratzen denerako animazioa
+Comment[eu]=Leihoa maximizatzera/maximizatutik leheneratzera doanerako animazioa
 Comment[fi]=Animointi ikkunalle, joka suurennetaan tai palautetaan suurennuksesta
 Comment[fr]=Animation pour une fenêtre passant d'un état maximisé vers un état maximisé / restauré
 Comment[gl]=Animación das xanelas que se maximizan ou restauran maximizadas
diff --git a/effects/morphingpopups/package/metadata.desktop b/effects/morphingpopups/package/metadata.desktop
index a51fd3edb9..de6a1139da 100644
--- a/effects/morphingpopups/package/metadata.desktop
+++ b/effects/morphingpopups/package/metadata.desktop
@@ -6,6 +6,7 @@ Comment[da]=Crossfade-animation når værktøjstip og bekendtgørelser skifter g
 Comment[en_GB]=Cross fade animation when Tooltips or Notifications change their geometry
 Comment[es]=Animación de transición suave cuando las ayudas emergentes o las notificaciones cambian su geometría
 Comment[et]=Animatsioon hääbumisega, kui kohtspikrid või märguanded muudavad geomeetriat
+Comment[eu]=Desagertze gurutzatua tresnen argibideek edo jakinarazpenek geometria aldatzen dutenean
 Comment[fi]=Häivytysanimaatio työkaluvihjeiden tai ilmoitusten koon muuttuessa
 Comment[fr]=Animation de fondu quand les infobulles ou les notifications changent de forme
 Comment[gl]=Usar unha animación de esvaemento cando a xeometría das mensaxes emerxentes de axuda ou notificación cambia.
@@ -38,6 +39,7 @@ Name[da]=Sammensmeltende pop-op'er
 Name[en_GB]=Morphing popups
 Name[es]=Transformación de ventanas emergentes
 Name[et]=Moonduvad hüpikdialoogid
+Name[eu]=Eraldatzen diren gainerakorrak
 Name[fi]=Ponnahdusikkunoiden muodonmuutos
 Name[fr]=Fondu des menus surgissants
 Name[gl]=Xanelas emerxentes cambiantes
diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop
index d632e294c7..bb284946e0 100644
--- a/effects/windowaperture/package/metadata.desktop
+++ b/effects/windowaperture/package/metadata.desktop
@@ -9,6 +9,7 @@ Name[el]=Διάφραγμα παραθύρου
 Name[en_GB]=Window Aperture
 Name[es]=Apertura de ventanas
 Name[et]=Aknaava
+Name[eu]=Leihoa irekitzea
 Name[fi]=Ikkunoiden siirto näytön kulmiin
 Name[fr]=Ouverture de la fenêtre
 Name[gl]=Apertura das xanelas
@@ -45,6 +46,7 @@ Comment[el]=Μετακίνηση παραθύρου στις γωνίες κατ
 Comment[en_GB]=Move window into the corners while showing desktop
 Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio
 Comment[et]=Akende viimine nurkadesse töölauda näidates
+Comment[eu]=Mugitu leihoa izkinetan mahaigana erakutsi bitartean
 Comment[fi]=Siirrä ikkunat näytön kulmiin työpöydän näyttämisen ajaksi
 Comment[fr]=Déplace les fenêtres dans les coins en affichant le bureau
 Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio.
diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop
index a5683b9997..66e59d330c 100644
--- a/kcmkwin/kwincompositing/kcmkwineffects.desktop
+++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop
@@ -24,6 +24,7 @@ Name[el]=Εφέ επιφάνειας εργασίας
 Name[en_GB]=Desktop Effects
 Name[es]=Efectos del escritorio
 Name[et]=Töölauaefektid
+Name[eu]=Mahaigaineko efektuak
 Name[fi]=Työpöytätehosteet
 Name[fr]=Effets de bureau
 Name[gl]=Efectos do escritorio
@@ -70,6 +71,7 @@ Comment[el]=Εφέ επιφάνειας εργασίας
 Comment[en_GB]=Desktop Effects
 Comment[es]=Efectos del escritorio
 Comment[et]=Töölauaefektid
+Comment[eu]=Mahaigaineko efektuak
 Comment[fi]=Työpöytätehosteet
 Comment[fr]=Effets de bureau
 Comment[gl]=Efectos do escritorio
diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop
index cb3c193721..5796766f8c 100644
--- a/kcmkwin/kwincompositing/kwincompositing.desktop
+++ b/kcmkwin/kwincompositing/kwincompositing.desktop
@@ -24,6 +24,7 @@ Name[el]=Συνθέτης
 Name[en_GB]=Compositor
 Name[es]=Compositor
 Name[et]=Komposiitor
+Name[eu]=Konposatzailea
 Name[fi]=Koostin
 Name[fr]=Compositeur
 Name[gl]=Compositor
@@ -67,6 +68,7 @@ Comment[el]=Ρυθμίσεις συνθέτη για τα εφέ επιφάνε
 Comment[en_GB]=Compositor Settings for Desktop Effects
 Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio
 Comment[et]=Komposiitori seadistused töölauaefektide tarbeks
+Comment[eu]=Konposatzailearen ezarpenak mahaigaineko efektuetarako
 Comment[fi]=Koostimen asetukset työpöytätehosteita varten
 Comment[fr]=Paramétrage du compositeur pour les effets de bureau
 Comment[gl]=Configuración do compositor para os efectos de escritorio
@@ -106,6 +108,7 @@ X-KDE-Keywords[de]=kwin,Fenstermanager,Fensterverwaltung,Effekt,Fenster,Composit
 X-KDE-Keywords[en_GB]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed
 X-KDE-Keywords[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio,velocidad de animación
 X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,komposiitor,efekt,3D efektid,ruumilised efektid,2D efektid,OpenGL,XRender,videoseadistused,graafilised efektid,töölauaefektid,animatsiooni kiirus
+X-KDE-Keywords[eu]=kwin,leiho,kudeatzaile,konposatzaile,efektu,3D efektuak,2D efektuak,OpenGL,XRender,bideo ezarpenak,efektu grafikoak,mahiagaineko efektuak,animazioaren abiadura
 X-KDE-Keywords[fi]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,ikkunointiohjelma,ikkunaohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,videoasetukset,graafiset tehosteet,työpöytätehosteet,animointinopeus,animaationopeus
 X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, compositeur, effet, effets 3D, effets 2D, OpenGL, XRender, paramètres vidéo, effets graphiques, effets de bureau, vitesse d'animation
 X-KDE-Keywords[gl]=kwin,xanela,xestor,composición,efecto,3D efectos,2D efectos,OpenGL,XRender,configuración da imaxe,efectos gráficos,efectos do escritorio,animation speed,velocidade das animacións
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index b87e4b1d63..b8490f3faf 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -85,6 +85,7 @@ Comment[el]=Διαμόρφωση της εμφάνισης και αίσθηση
 Comment[en_GB]=Look and Feel of Window Titles
 Comment[es]=Aspecto visual de los títulos de las ventanas
 Comment[et]=Akna tiitliribade välimus ja tunnetus
+Comment[eu]=Leiho-tituluen itxura eta izaera
 Comment[fi]=Ikkunoiden kehysten ulkoasu
 Comment[fr]=Apparence des titres de fenêtre
 Comment[gl]=Aparencia e o comportamento dos títulos das xanelas
diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop
index 9cf00d7413..bb0472225d 100644
--- a/kcmkwin/kwindesktop/desktop.desktop
+++ b/kcmkwin/kwindesktop/desktop.desktop
@@ -87,6 +87,7 @@ Comment[el]=Περιήγηση, αριθμός και διάταξη εικον
 Comment[en_GB]=Navigation, Number and Layout of Virtual Desktops
 Comment[es]=Navegación, número y disposición de los escritorios virtuales
 Comment[et]=Virtuaalsete töölaudade vahel liikumine, nende arv ja paigutus
+Comment[eu]=Nabigazioa, alegiazko mahaigainen kopurua eta antolamendua
 Comment[fi]=Virtuaalityöpöytien vaihtaminen, määrä ja asettelu
 Comment[fr]=Navigation, nombre et disposition des bureaux virtuels
 Comment[gl]=Navegación, cantidade e disposición dos escritorios virtuais
diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop
index eecd28375f..55bf79a21c 100644
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@@ -112,6 +112,7 @@ Comment[el]=Ενέργειες ποντικιού στα παράθυρα
 Comment[en_GB]=Mouse Actions on Windows
 Comment[es]=Acciones del ratón sobre las ventanas
 Comment[et]=Hiiretoimingud akendes
+Comment[eu]=Sagu-ekintzak leihoetan
 Comment[fi]=Ikkunoiden hiiritoiminnot
 Comment[fr]=Actions de souris sur les fenêtres
 Comment[gl]=Accións do rato nas xanelas
diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
index 0565293861..6e311b2d6c 100644
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -111,6 +111,7 @@ Comment[el]=Διαμόρφωση προχωρημένων χαρακτηριστ
 Comment[en_GB]=Advanced Window Management Features
 Comment[es]=Funciones avanzadas del gestor de ventanas
 Comment[et]=Muud aknahalduse omadused
+Comment[eu]=Leiho kudeaketaren ezaugarri aurreratuak
 Comment[fi]=Ikkunoinnin lisäominaisuudet
 Comment[fr]=Fonctionnalités de gestion avancée des fenêtres
 Comment[gl]=Funcionalidades avanzadas da xestión de xanelas
diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop
index 0a7d4f8f18..7a7bec0349 100644
--- a/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/kcmkwin/kwinoptions/kwinfocus.desktop
@@ -108,6 +108,7 @@ Comment[el]=Πολιτική ενεργού παραθύρου
 Comment[en_GB]=Active Window Policy
 Comment[es]=Política de la ventana activa
 Comment[et]=Aktiivse akna reegel
+Comment[eu]=Leiho aktiboentzako politika
 Comment[fi]=Aktiivisen ikkunan valintatapa
 Comment[fr]=Politique pour les fenêtres actives
 Comment[gl]=Política da xanela activa
diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop
index 2ad9663305..08748a6ca8 100644
--- a/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/kcmkwin/kwinoptions/kwinmoving.desktop
@@ -31,7 +31,7 @@ Name[en_GB]=Moving
 Name[eo]=Movanta
 Name[es]=Moviendo
 Name[et]=Liigutamine
-Name[eu]=Lekuz aldatzen
+Name[eu]=Mugitzea
 Name[fa]=حرکت
 Name[fi]=Siirtäminen
 Name[fr]=Déplacement
@@ -110,6 +110,7 @@ Comment[el]=Μετακίνηση παραθύρου
 Comment[en_GB]=Window Moving
 Comment[es]=Movimiento de ventanas
 Comment[et]=Akna liigutamine
+Comment[eu]=Leihoak mugitzea
 Comment[fi]=Ikkunoiden siirtäminen
 Comment[fr]=Déplacement des fenêtres
 Comment[gl]=Movemento da xanela
diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop
index 86ab1dfbde..20d29d9f04 100644
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -113,6 +113,7 @@ Comment[el]=Ενέργειες και συμπεριφορά παραθύρου
 Comment[en_GB]=Window Actions and Behaviour
 Comment[es]=Acciones y comportamiento de las ventanas
 Comment[et]=Akende toimingud ja käitumine
+Comment[eu]=Leihoen ekintzak eta portaera
 Comment[fi]=Ikkunoiden toiminnot ja toiminta
 Comment[fr]=Actions et comportement des fenêtres
 Comment[gl]=Comportamento e accións das xanelas
@@ -155,6 +156,7 @@ X-KDE-Keywords[el]=εστίαση,τοποθέτηση,συμπεριφορά π
 X-KDE-Keywords[en_GB]=focus,placement,window behaviour,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick
 X-KDE-Keywords[es]=foco,posicionamiento,comportamiento de las ventanas,acciones de las ventanas,animación,elevación,autoelevación,ventanas,marco,barra de título,doble clic
 X-KDE-Keywords[et]=fookus,asetus,paigutus,akende käitumine,aknatoimingud,animeerimine,animatsioon,esiletoomine,automaatne esiletoomine,aknad,raam,tiitliriba,topeltklõps
+X-KDE-Keywords[eu]=foku,kokaleku,leihoen portaera,leiho-ekintzak,animazio,igo,automatikoki igo,leihoak,marko,titulu-barra,klik bikoitz
 X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,ikkunoiden toiminta,ikkunoiden toiminnot,animaatio,nosta,automaattinen nosto,ikkunat,kehys,otsikkopalkki,kaksoisnapsautus,tuplanapsautus,kaksoisklikkaus,tuplaklikkaus
 X-KDE-Keywords[fr]=focus, placement, comportement de la fenêtre, actions sur les fenêtres, animation, agrandissement, agrandissement automatique, fenêtres, cadre, barre de titre, double clic
 X-KDE-Keywords[gl]=foco,posicionamento,comportamento das xanelas,accións das xanelas, animación,xanelas,moldura,barra de título,marco
diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop
index b6a598f7af..84d2774ddd 100644
--- a/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kcmkwin/kwinrules/kwinrules.desktop
@@ -86,6 +86,7 @@ Comment[el]=Συμπεριφορά ανεξάρτητου παραθύρου
 Comment[en_GB]=Individual Window Behaviour
 Comment[es]=Comportamiento de las ventanas individuales
 Comment[et]=Konkreetse akna käitumine
+Comment[eu]=Leihoen banakako portaera
 Comment[fi]=Yksittäisten ikkunoiden toiminta
 Comment[fr]=Comportement individuel des fenêtres
 Comment[gl]=Comportamento individual das xanelas
diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
index 286f66107a..7ab5dc9c99 100644
--- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
+++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
@@ -93,6 +93,7 @@ Comment[el]=Ενεργές γωνίες και άκρα οθόνης
 Comment[en_GB]=Active Screen Corners and Edges
 Comment[es]=Esquinas y bordes de la pantalla activa
 Comment[et]=Aktiivsed ekraani nurgad ja servad
+Comment[eu]=Pantaila aktiboaren izkinak eta ertzak
 Comment[fi]=Näytön kulmien ja reunojen toiminnot
 Comment[fr]=Bords et coins actifs de l'écran
 Comment[gl]=Bordos e esquinas activos da pantalla
@@ -133,6 +134,7 @@ X-KDE-Keywords[el]=kwin,παράθυρο,διαχειριστής,εφέ,άκρ
 X-KDE-Keywords[en_GB]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximise windows,tile windows,side of screen,screen behaviour,switch desktop,virtual desktop,screen corners
 X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,esquina,borde,acción,cambiar,escritorio,bordes de pantalla de kwin,bordes del escritorio,bordes de la pantalla,maximizar ventanas,ventanas en mosaico,lado de la pantalla,comportamiento de la pantalla,cambiar escritorio,escritorio virtual,esquinas de la pantalla
 X-KDE-Keywords[et]=kwin,aken,haldur,efekt.nurk,serv,piire,toiming,lülitamine,töölaud,kwini ekraani servad,töölaua servad,ekraani servad,akende maksimeerimine,akende paanimine,ekraani äär,ekraani käitumine,töölaua lülitamine,virtuaalne töölaud,ekraani nurgad
+X-KDE-Keywords[eu]=kwin,leiho,kudeatzaile,efektu,izkin,ertz,ekintza,aldatu,mahaigain,kwin pantailaren ertzak,mahaigainaren ertzak,pantailen ertzak,maximizatu leihoak,lauzatu leihoak,leihoaren alboa,pantailaren portaera,aldatu mahaigaina,mahaigain birtuala,alegiazko mahaigaina,pantailaren izkinak
 X-KDE-Keywords[fi]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,ikkunamanageri,ikkunointiohjelma,tehoste,kulma,reuna,vaihda,vaihto,työpöytä,näytön reunat,työpöydän reunat,suurenna ikkuna,kasaa ikkunat,näytön toiminta,vaihda työpöytää,virtuaalityöpöytä,näytön reunat
 X-KDE-Keywords[fr]=kwin, fenêtre, gestionnaire, effet, bord, coin, bordure, action, bascule, bureau, bords de l'écran kwin, bords du bureau, bords de l'écran, maximisation des fenêtres, mosaïque de fenêtres, cotés de l'écran, comportement de l'écran, changement de bureau, bureaux virtuels, coins de l'écran
 X-KDE-Keywords[gl]=kwin,xanela,xestor,efecto,esquina,beira,bordo,contorno,acción,trocar,escritorio,contorno do escritorio,maximizar xanelas,escritorio virtual,esquinas da pantalla
diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop
index 5d2e9e73c4..cf5350f830 100644
--- a/kcmkwin/kwintabbox/kwintabbox.desktop
+++ b/kcmkwin/kwintabbox/kwintabbox.desktop
@@ -83,6 +83,7 @@ Comment[el]=Περιήγηση στα παράθυρα
 Comment[en_GB]=Navigation Through Windows
 Comment[es]=Navegación a través de las ventanas
 Comment[et]=Akende vahel liikumine
+Comment[eu]=Leihoen artean nabigatu
 Comment[fi]=Ikkunoiden välillä siirtyminen
 Comment[fr]=Navigation dans les fenêtres
 Comment[gl]=Navegación polas xanelas
diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop
index a8c743d341..50bc6e657c 100644
--- a/scripts/enforcedeco/metadata.desktop
+++ b/scripts/enforcedeco/metadata.desktop
@@ -10,6 +10,7 @@ Name[el]=Εξαναγκασμός διακοσμήσεων παραθύρου σ
 Name[en_GB]=Enforces Window Decorations on GTK+ window
 Name[es]=Fuerza decoraciones en las ventanas de GTK+
 Name[et]=Akna dekoratsioonide kehtestamine GTK+ aknas
+Name[eu]=GTK+ leihoengan leiho-apaingarriak behartzen ditu
 Name[fi]=Pakottaa ikkunoiden kehykset GTK+-ikkunoille
 Name[fr]=Forcer les décorations de fenêtres avec les fenêtres GTK+
 Name[gl]=Aplica a decoración ás xanelas de GTK+
@@ -51,6 +52,7 @@ Comment[el]=Διόρθωση λειτουργικών ελαττωμάτων σ
 Comment[en_GB]=Fixes functional deficits for client side decorated windows.
 Comment[es]=Fija deficiencias funcionales en ventanas decoradas en el lado cliente.
 Comment[et]=Kliendipoolsete dekoratsioonidega akende funktsionaalsete puudujääkide parandamine.
+Comment[eu]=Gabezia funtzionala konpontzen die bezeroen aldean apaindutako leihoei
 Comment[fi]=Korjaa asiakkaan kehystämien ikkunoiden toiminnallisia puutteita.
 Comment[fr]=Corrige les défaillances des fenêtres avec décorations gérées par le client.
 Comment[gl]=Soluciona problemas funcionais de xanelas decoradas no lado do cliente.
diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop
index 89eb7be4fc..52a8db8dc1 100644
--- a/scripts/minimizeall/metadata.desktop
+++ b/scripts/minimizeall/metadata.desktop
@@ -9,6 +9,7 @@ Name[el]=ΕλαχιστοποίησηΌλων
 Name[en_GB]=MinimiseAll
 Name[es]=Maximizar todo
 Name[et]=Kõigi minimeerimine
+Name[eu]=Minimizatu guztiak
 Name[fi]=Pienennä kaikki
 Name[fr]=Tout réduire
 Name[gl]=Minimizalo todo
@@ -45,6 +46,7 @@ Comment[el]=Προσθήκη συντόμευσης για την ελαχιστ
 Comment[en_GB]=Adds a shortcut to minimise all windows or unminimise all such way minimised windows
 Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaurar todas las minimizadas de este modo
 Comment[et]=Kiirtoimingu lisamine kõigi akende minimeerimiseks või sel moel minimeeritud akende suuruse taastamiseks
+Comment[eu]=Erantsi lasterbide bat leiho guztiak minimizatzeko edo hala dauden leiho guztiak leheneratzeko
 Comment[fi]=Lisää pikanäppäimen, joka pienentää kaikki ikkunat tai palauttaa kaikki samalla tavalla pienennetyt ikkunat
 Comment[fr]=Ajoute un raccourci pour réduire toutes les fenêtres ou afficher toutes les fenêtres réduites
 Comment[gl]=Engade un atallo para minimizar todas as xanelas e restauralas de novo.

From 4d3809f8e314b602e566ba42469ca3a0836b3e88 Mon Sep 17 00:00:00 2001
From: Jonathan Riddell <jr@jriddell.org>
Date: Tue, 27 Dec 2016 09:27:02 +0000
Subject: [PATCH 4/7] Update version number for 5.8.5 GIT_SILENT

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56e554d0cf..ab636cd35b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(KWIN)
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.5")
 set(PROJECT_VERSION_MAJOR 5)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)

From 516ad25658dd0a6b10bde9e1822dd801228e04a8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 15 Jan 2017 07:48:05 +0100
Subject: [PATCH 5/7] 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"
---
 kcmkwin/kwintabbox/kwinswitcher.knsrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc
index eb2032ee23..4b66a4a821 100644
--- a/kcmkwin/kwintabbox/kwinswitcher.knsrc
+++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc
@@ -2,6 +2,7 @@
 Name=Window Manager Switching Layouts
 Name[ca]=Disposicions del commutador del gestor de finestres
 Name[ca@valencia]=Disposicions del commutador del gestor de finestres
+Name[de]=Wechsel-Layout für Fensterverwaltung
 Name[en_GB]=Window Manager Switching Layouts
 Name[es]=Esquemas de cambio del gestor de ventanas
 Name[ia]=Disposition de commutator de gerente de fenestra

From 81a4156fafd2436b7f27e86ff7663636a680a811 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 16 Jan 2017 07:52:59 +0100
Subject: [PATCH 6/7] 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"
---
 kcmkwin/kwincompositing/kwineffect.knsrc | 1 +
 kcmkwin/kwinscripts/kwinscripts.knsrc    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc
index 4468932968..be799f313e 100644
--- a/kcmkwin/kwincompositing/kwineffect.knsrc
+++ b/kcmkwin/kwincompositing/kwineffect.knsrc
@@ -8,6 +8,7 @@ Name[es]=Efectos del gestor de ventanas
 Name[ia]=Gerente de effectos de fenestra
 Name[it]=Effetti del gestore delle finestre
 Name[nl]=Effecten van vensterbeheerder
+Name[nn]=Effektar for vindaugshandsamar
 Name[pl]=Efekty zarządzania oknami
 Name[pt]=Efeitos do Gestor de Janelas
 Name[sk]=Efekty správcu okien
diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc
index 9ffeacbb8e..06face6c16 100644
--- a/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/kcmkwin/kwinscripts/kwinscripts.knsrc
@@ -8,6 +8,7 @@ Name[es]=Guiones del gestor de ventanas
 Name[ia]=Gerente de scripts de fenestra 
 Name[it]=Script del gestore delle finestre
 Name[nl]=Scripts van vensterbeheerder
+Name[nn]=Skript for vindaugshandsamar
 Name[pl]=Skrypty zarządzania oknami
 Name[pt]=Programas do Gestor de Janelas
 Name[sk]=Skripty správcu okien

From e019c9f61edf20c433ac4bf2e3546ce9b5c1104a Mon Sep 17 00:00:00 2001
From: Roman Gilg <subdiff@gmail.com>
Date: Mon, 16 Jan 2017 19:11:07 +0100
Subject: [PATCH 7/7] [TabBox] Remember current model index on SwitcherItem
 model set

In case we need to set the SwitcherItem model in
`TabBoxHandlerPrivate::show()`, remember the current index row,
otherwise it gets reset to the first item.

Reviewers: #kwin, graesslin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D4162

BUG: 333511
---
 tabbox/tabboxhandler.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tabbox/tabboxhandler.cpp b/tabbox/tabboxhandler.cpp
index 90681748bd..afaf5a12f2 100644
--- a/tabbox/tabboxhandler.cpp
+++ b/tabbox/tabboxhandler.cpp
@@ -323,6 +323,9 @@ void TabBoxHandlerPrivate::show()
         }
     }
     if (SwitcherItem *item = switcherItem()) {
+        // In case the model isn't yet set (see below), index will be reset and therefore we
+        // need to save the current index row (https://bugs.kde.org/show_bug.cgi?id=333511).
+        int indexRow = index.row();
         if (!item->model()) {
             QAbstractItemModel *model = nullptr;
             if (desktopMode) {
@@ -333,7 +336,7 @@ void TabBoxHandlerPrivate::show()
             item->setModel(model);
         }
         item->setAllDesktops(config.clientDesktopMode() == TabBoxConfig::AllDesktopsClients);
-        item->setCurrentIndex(index.row());
+        item->setCurrentIndex(indexRow);
         // everything is prepared, so let's make the whole thing visible
         item->setVisible(true);
     }