From e3024908f5f1bda1e1d43480d5a2e727224c0d7f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 10 Jun 2017 04:29:59 +0200
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"
---
 effects/fade/package/metadata.desktop                       | 2 +-
 effects/frozenapp/package/metadata.desktop                  | 4 ++--
 effects/logout/package/metadata.desktop                     | 2 +-
 effects/maximize/package/metadata.desktop                   | 2 +-
 kcmkwin/kwindecoration/kwindecoration.desktop               | 2 +-
 kcmkwin/kwinscreenedges/kwintouchscreen.desktop             | 6 +++---
 .../aurorae/kwin-packagestructure-aurorae.desktop           | 2 +-
 .../decoration/kwin-packagestructure-decoration.desktop     | 2 +-
 plugins/kdecorations/aurorae/src/aurorae.knsrc              | 2 +-
 plugins/kdecorations/aurorae/src/kwindecoration.desktop     | 2 +-
 scripts/enforcedeco/metadata.desktop                        | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/effects/fade/package/metadata.desktop b/effects/fade/package/metadata.desktop
index 30bdf2511b..3158f226ca 100644
--- a/effects/fade/package/metadata.desktop
+++ b/effects/fade/package/metadata.desktop
@@ -50,7 +50,7 @@ Name[ne]=फेड
 Name[nl]=Opkomen/vervagen
 Name[nn]=Ton inn og ut
 Name[pa]=ਫਿੱਕਾ
-Name[pl]=Znikanie/wyłanianie
+Name[pl]=Zanikanie/wyłanianie
 Name[pt]=Desvanecer
 Name[pt_BR]=Fade
 Name[ro]=Decolorare
diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop
index e111f7b8d0..90228abd61 100644
--- a/effects/frozenapp/package/metadata.desktop
+++ b/effects/frozenapp/package/metadata.desktop
@@ -4,12 +4,12 @@ Name[ca]=Dessatura les aplicacions que no responen
 Name[ca@valencia]=Dessatura les aplicacions que no responen
 Name[en_GB]=Desaturate Unresponsive Applications
 Name[es]=Desaturar las aplicaciones que no responden
+Name[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa
 Name[he]=מחשיך יישומים שאינם מגיבים
 Name[it]=Desatura le applicazioni che non rispondono
 Name[nl]=Verzadiging van niet responsieve toepassingen verminderen
 Name[pl]=Odbarw nieodpowiadające aplikacje
 Name[pt]=Reduzir a Saturação das Aplicações Bloqueadas
-Name[sk]=Desaturovať neodpovedajúce aplikácie
 Name[sl]=Zmanjšaj nasičenost neodzivnih programov
 Name[sr]=Посивљавање програма без одзива
 Name[sr@ijekavian]=Посивљавање програма без одзива
@@ -27,12 +27,12 @@ Comment[ca]=Dessatura les finestres de les aplicacions que no responen (congelad
 Comment[ca@valencia]=Dessatura les finestres de les aplicacions que no responen (congelades)
 Comment[en_GB]=Desaturate windows of unresponsive (frozen) applications
 Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congeladas)
+Comment[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa (ovat jumittuneet)
 Comment[he]=מחשיך חלונות של יישומים שאינם מגיבים (תקועים)
 Comment[it]=Desatura le finestre delle applicazione che non rispondono (bloccate)
 Comment[nl]=Verzadiging van vensters van niet responsieve (bevroren) toepassingen verminderen
 Comment[pl]=Odbarw okna nieodpowiadających (zawieszonych) aplikacji
 Comment[pt]=Reduzir a saturação das janelas das aplicações sem resposta (bloqueadas)
-Comment[sk]=Desaturovať okná neodpovedajúcich aplikácií
 Comment[sl]=Zmanjšaj nasičenost oken neodzivnih (zamrznjenih) programov
 Comment[sr]=Прозори програма који се не одазивају (смрзнутих) бивају посивљени
 Comment[sr@ijekavian]=Прозори програма који се не одазивају (смрзнутих) бивају посивљени
diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop
index fb2855d53d..db265b2da5 100644
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@@ -7,6 +7,7 @@ Name[de]=Abmeldung
 Name[el]=αποσύνδεση
 Name[en_GB]=logout
 Name[es]=cerrar la sesión
+Name[fi]=kirjaudu ulos
 Name[he]=התנתקות
 Name[hu]=Kijelentkezés
 Name[ia]=Clausura de session
@@ -14,7 +15,6 @@ Name[it]=uscita
 Name[nl]=afmelden
 Name[pl]=wylogowanie
 Name[pt]=encerramento
-Name[sk]=odhlásiť
 Name[sl]=odjavi
 Name[sr]=Одјава
 Name[sr@ijekavian]=Одјава
diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop
index 4768ad12ae..ea28966978 100644
--- a/effects/maximize/package/metadata.desktop
+++ b/effects/maximize/package/metadata.desktop
@@ -27,7 +27,7 @@ Comment[nb]=Animering for et vindu som maksimeres/tilbakestilles fra maksimering
 Comment[nds]=Animeren för en Finster, dat maximeert/vun maximeert wedderherstellt warrt
 Comment[nl]=Animatie voor een venster dat gaat naar maximaliseren/herstellen vanuit maximaliseren
 Comment[nn]=Vindaugsanimasjon i samband med bruk av maksimering/gjenoppretting.
-Comment[pl]=Efekt skalowania okien przy ich maksymalizowaniu i powrocie z niego
+Comment[pl]=Efekt skalowania okien przy maksymalizowaniu i powrocie z niego
 Comment[pt]=Animação para um janela que se vai maximizar/repor da maximização
 Comment[pt_BR]=Animação para uma janela a ser maximizada/restaurada
 Comment[ro]=Animație pentru o fereastră ce trece la maximizare/restabilire din maximizare
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index d647fc2fe9..3259f1a3fe 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -25,7 +25,7 @@ Name[en_GB]=Window Decorations
 Name[es]=Decoración de ventanas
 Name[et]=Akna dekoratsioonid
 Name[eu]=Leiho-apaindurak
-Name[fi]=Ikkunoiden kehykset
+Name[fi]=Ikkunakehykset
 Name[fr]=Décorations de fenêtres
 Name[ga]=Maisiúcháin Fhuinneog
 Name[gl]=Decoración da xanela
diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
index 701a658d6d..4c2d891d79 100644
--- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
+++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
@@ -18,12 +18,12 @@ Name[de]=Touchscreen
 Name[el]=Οθόνη αφής
 Name[en_GB]=Touch Screen
 Name[es]=Pantalla táctil
+Name[fi]=Kosketusnäyttö
 Name[he]=מסך מגע
 Name[it]=Schermo a sfioramento
 Name[nl]=Aanraakscherm
 Name[pl]=Ekran dotykowy
 Name[pt]=Ecrã Táctil
-Name[sk]=Dotyková obrazovka
 Name[sl]=Zaslon na dotik
 Name[sr]=Додирник
 Name[sr@ijekavian]=Додирник
@@ -40,12 +40,12 @@ Comment[ca]=Gestos de lliscament en la pantalla tàctil
 Comment[ca@valencia]=Gestos de lliscament en la pantalla tàctil
 Comment[en_GB]=Touch screen swipe gestures
 Comment[es]=Gestos de deslizamiento en pantalla táctil
+Comment[fi]=Kosketusnäytön pyyhkäisyeleet
 Comment[he]=מחוות החלקה של מסכי מגע
 Comment[it]=Gesti dello schermo a sfioramento
 Comment[nl]=Veeggebaren voor aanraakscherm
 Comment[pl]=Gesty na ekranie dotykowym
 Comment[pt]=Gestos para deslizar o ecrã táctil
-Comment[sk]=Ťahacie gestá dotykovej obrazovky
 Comment[sl]=Kretnje vlečenja za zaslon na dotik
 Comment[sr]=Гестови замаха на додирнику
 Comment[sr@ijekavian]=Гестови замаха на додирнику
@@ -63,11 +63,11 @@ X-KDE-Keywords[ca]=kwin,finestra,gestor,efecte,vora,borde,acció,canvi,escriptor
 X-KDE-Keywords[ca@valencia]=kwin,finestra,gestor,efecte,vora,borde,acció,canvi,escriptori,vores d'escriptori,vores de pantalla,costat de pantalla,comportament de la pantalla,pantalla tàctil
 X-KDE-Keywords[en_GB]=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behaviour,touch screen
 X-KDE-Keywords[es]=kwin,ventana,gestor,efecto,esquina,borde,acción,cambiar,escritorio,bordes del escritorio,bordes de la pantalla,lado de la pantalla,comportamiento de la pantalla,pantalla táctil
+X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,tehoste,kulma,laita,reuna,toiminto,vaihda,työpöytä,työpöydän reunat,näytön reunat,näytön laita,näytön käyttäytyminen,kosketusnäyttö
 X-KDE-Keywords[it]=kwin,finestra,gestore,effetto,angolo,bordo,azione,scambiatore,desktop,bordi desktop,bordi schermo,lato dello schermo,comportamento schermo,schermo a sfioramento
 X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,kant,rand,actie,omschakelen,bureaublad,bureaubladkanten,schermkanten,zijkant van het scherm,schermgedrag,aanraakscherm
 X-KDE-Keywords[pl]=kwin,okno,menadżer,efekt,krawędź,obramowanie,działanie,przełącz,pulpit,krawędzie pulpitu,krawędzie ekranu,strona ekranu,zachowanie ekranu,ekran dotykowy
 X-KDE-Keywords[pt]=kwin,janela,gestor,efeito,extremo,contorno,acção,mudar,ecrã,extremos do ecrã no kwin,extremos do ecrã,maximizar as janelas,janelas lado-a-lado,lado do ecrã,comportamento do ecrã,ecrã táctil
-X-KDE-Keywords[sk]=Kwin, okná, manažér, efekt, okraj, hranice, akcie, prepínač, desktop, okraje plochy,Okraje obrazovky, bočná strana obrazovky, správanie obrazovky, dotyková obrazovka
 X-KDE-Keywords[sl]=kwin,okno,upravljalnik oken,upravljanje oken,učinki,rob,obroba,dejanje,preklopi,preklapljanje,robovi namizja,robovi zaslona,rob zaslona,obnašanje zaslona,zaslon na dotik
 X-KDE-Keywords[sr]=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen,К‑вин,прозор,менаџер,ефекат,ивица,радња,пребаци,површ,ивице екрана,ивице површи,странице прозора,понашање прозора,додирник
 X-KDE-Keywords[sr@ijekavian]=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen,К‑вин,прозор,менаџер,ефекат,ивица,радња,пребаци,површ,ивице екрана,ивице површи,странице прозора,понашање прозора,додирник
diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
index 2a4853b283..528f559e18 100644
--- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
+++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
@@ -7,12 +7,12 @@ Name[de]=KWin Aurorae
 Name[el]=KWin Aurorae
 Name[en_GB]=KWin Aurorae
 Name[es]=Aurorae de KWin
+Name[fi]=KWin Aurorae
 Name[hu]=KWin Aurorae
 Name[it]=Aurorae di Kwin
 Name[nl]=KWin Aurorae
 Name[pl]=KWin Aurorae
 Name[pt]=Aurora do KWin
-Name[sk]=KWin Aurorae
 Name[sl]=KWin Aurorae
 Name[sr]=К‑винова аурора
 Name[sr@ijekavian]=К‑винова аурора
diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop
index 166ec5113a..27669d814f 100644
--- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop
+++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop
@@ -7,13 +7,13 @@ Name[de]=KWin-Dekoration
 Name[el]=Διακοσμήσεις KWin
 Name[en_GB]=KWin Decoration
 Name[es]=Decoración de KWin
+Name[fi]=KWin-ikkunakehykset
 Name[hu]=KWin dekoráció
 Name[ia]=Decorationes de KWin
 Name[it]=Decorazioni di KWin
 Name[nl]=KWin-decoraties
 Name[pl]=Wygląd KWin
 Name[pt]=Decorações do KWin
-Name[sk]=Dekorácie KWin
 Name[sl]=Okraski KWin
 Name[sr]=К‑винова декорација
 Name[sr@ijekavian]=К‑винова декорација
diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc
index 8e5fa485d2..3416844b69 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.knsrc
+++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc
@@ -8,7 +8,7 @@ Name[de]=Aurorae-Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου Aurorae
 Name[en_GB]=Aurorae Window Decorations
 Name[es]=Decoración de ventanas Aurorae
-Name[fi]=Aurorae-ikkunakoristeet
+Name[fi]=Aurorae-ikkunakehykset
 Name[fr]=Décorations de fenêtres Aurorae
 Name[hu]=Aurorae ablakdekorációk
 Name[ia]=Decorationes de fenestra Aurorae
diff --git a/plugins/kdecorations/aurorae/src/kwindecoration.desktop b/plugins/kdecorations/aurorae/src/kwindecoration.desktop
index f3f29e3ce2..8fcf780b55 100644
--- a/plugins/kdecorations/aurorae/src/kwindecoration.desktop
+++ b/plugins/kdecorations/aurorae/src/kwindecoration.desktop
@@ -15,7 +15,7 @@ Comment[en_GB]=KWin Window Decoration
 Comment[es]=Decoración de ventanas de KWin
 Comment[et]=KWini akna dekoratsioon
 Comment[eu]=KWin leihoen apainketa
-Comment[fi]=KWin-ikkunan kehys
+Comment[fi]=KWin-ikkunakehys
 Comment[fr]=Décorations de fenêtres KWin
 Comment[ga]=Maisiúchán Fuinneog KWin
 Comment[gl]=Decoración de xanela de Kwin
diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop
index 50bc6e657c..ed61f015b5 100644
--- a/scripts/enforcedeco/metadata.desktop
+++ b/scripts/enforcedeco/metadata.desktop
@@ -11,7 +11,7 @@ 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[fi]=Pakottaa GTK+-ikkunoiden ikkunakehykset
 Name[fr]=Forcer les décorations de fenêtres avec les fenêtres GTK+
 Name[gl]=Aplica a decoración ás xanelas de GTK+
 Name[he]=אכוף עיצוב מסגרת חלון לחלונות GTK