From 07259cfa59057339a852a38737908ff6563dd858 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 28 Jun 2017 09:36:23 +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/frozenapp/package/metadata.desktop | 2 ++ effects/logout/package/metadata.desktop | 1 + kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 3 +++ packageplugins/aurorae/kwin-packagestructure-aurorae.desktop | 1 + .../decoration/kwin-packagestructure-decoration.desktop | 1 + packageplugins/scripts/kwin-packagestructure-scripts.desktop | 1 + .../kwin-packagestructure-windowswitcher.desktop | 1 + 7 files changed, 10 insertions(+) diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index 2d74b2ceef..eb8f5d4624 100644 --- a/effects/frozenapp/package/metadata.desktop +++ b/effects/frozenapp/package/metadata.desktop @@ -7,6 +7,7 @@ Name[en_GB]=Desaturate Unresponsive Applications Name[es]=Desaturar las aplicaciones que no responden Name[eu]=Desasetu erantzuten ez duten aplikazioak Name[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa +Name[fr]=Désature les applications qui ne répondent pas Name[he]=מחשיך יישומים שאינם מגיבים Name[it]=Desatura le applicazioni che non rispondono Name[nl]=Verzadiging van niet responsieve toepassingen verminderen @@ -33,6 +34,7 @@ Comment[en_GB]=Desaturate windows of unresponsive (frozen) applications Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congeladas) Comment[eu]=Desasetu erantzuten ez duten aplikazioen leihoak (izoztuak) Comment[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa (ovat jumittuneet) +Comment[fr]=Désature les fenêtres des applications qui ne répondent pas (gelées) Comment[he]=מחשיך חלונות של יישומים שאינם מגיבים (תקועים) Comment[it]=Desatura le finestre delle applicazione che non rispondono (bloccate) Comment[nl]=Verzadiging van vensters van niet responsieve (bevroren) toepassingen verminderen diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index 9dc924428d..ae06d31a82 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -9,6 +9,7 @@ Name[en_GB]=logout Name[es]=cerrar la sesión Name[eu]=itxi saioa Name[fi]=kirjaudu ulos +Name[fr]=Déconnexion Name[he]=התנתקות Name[hu]=Kijelentkezés Name[ia]=Clausura de session diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index 61048876be..20ebd660bc 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -20,6 +20,7 @@ Name[en_GB]=Touch Screen Name[es]=Pantalla táctil Name[eu]=Ukimen-pantaila Name[fi]=Kosketusnäyttö +Name[fr]=Pavé tactile Name[he]=מסך מגע Name[it]=Schermo a sfioramento Name[lt]=Jutiklinis ekranas @@ -45,6 +46,7 @@ Comment[en_GB]=Touch screen swipe gestures Comment[es]=Gestos de deslizamiento en pantalla táctil Comment[eu]=Ukipen-pantailan irrist-keinuak Comment[fi]=Kosketusnäytön pyyhkäisyeleet +Comment[fr]=Mouvements sur le pavé tactile Comment[he]=מחוות החלקה של מסכי מגע Comment[it]=Gesti dello schermo a sfioramento Comment[nl]=Veeggebaren voor aanraakscherm @@ -70,6 +72,7 @@ X-KDE-Keywords[en_GB]=kwin,window,manager,effect,edge,border,action,switch,deskt 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[eu]=kwin,leiho,kudeatzaile,efektu,izkin,ertz,ekintza,aldatu,mahaigain,mahaigainaren ertzak,pantailen ertzak,pantailaren aldea,pantailaren portaera,ukipen-pantaila 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[fr]=kwin, fenêtre, gestionnaire, effet, bord, bordure, action, bascule, bureau, bords du bureau, bords de l'écran, côté de l'écran, comportement de l'écran, pavé tactile 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 diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop index 631091a442..6bf571fb16 100644 --- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop +++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop @@ -9,6 +9,7 @@ Name[en_GB]=KWin Aurorae Name[es]=Aurorae de KWin Name[eu]=KWin Aurorae Name[fi]=KWin Aurorae +Name[fr]=Module Aurorae de KWin Name[hu]=KWin Aurorae Name[it]=Aurorae di Kwin Name[nl]=KWin Aurorae diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop index c512046d17..5f3f243d04 100644 --- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop +++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop @@ -9,6 +9,7 @@ Name[en_GB]=KWin Decoration Name[es]=Decoración de KWin Name[eu]=KWin apainketa Name[fi]=KWin-ikkunakehykset +Name[fr]=Décorations KWin Name[hu]=KWin dekoráció Name[ia]=Decorationes de KWin Name[it]=Decorazioni di KWin diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index a040525435..4d7c59ab9f 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -10,6 +10,7 @@ Name[en_GB]=KWin Script Name[es]=Guion de KWin Name[eu]=KWin scripta Name[fi]=KWin-skripti +Name[fr]=Script KWin Name[hu]=KWin szkript Name[ia]=Script de KWin Name[it]=Script di KWin diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index b94c679a35..ff8f9bd97d 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -10,6 +10,7 @@ Name[en_GB]=KWin Window Switcher Name[es]=Cambiador de ventanas de KWin Name[eu]=KWin leiho-aldatzailea Name[fi]=KWin-ikkunanvalitsin +Name[fr]=Sélecteur de fenêtres de KWin Name[hu]=KWin ablakváltó Name[ia]=Commutator de fenestra de KWin Name[it]=Scambiafinestre di KWin