From 8765f5b4c37929c6a6ddcb1f99dd7b4d5c8f433e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 23 Jun 2017 05:46:51 +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/kwincompositing/kwineffect.knsrc | 1 + kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 3 +++ kcmkwin/kwinscripts/kwinscripts.knsrc | 1 + kcmkwin/kwintabbox/kwinswitcher.knsrc | 1 + 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 + plugins/kdecorations/aurorae/src/aurorae.knsrc | 1 + 11 files changed, 14 insertions(+) diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index 1079fbbe93..2d74b2ceef 100644 --- a/effects/frozenapp/package/metadata.desktop +++ b/effects/frozenapp/package/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Dessatura les aplicacions que no responen Name[el]=Αποκορεσμός χρωμάτων μη αποκρινόμενων εφαρμογών 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[he]=מחשיך יישומים שאינם מגיבים Name[it]=Desatura le applicazioni che non rispondono @@ -30,6 +31,7 @@ Comment[ca@valencia]=Dessatura les finestres de les aplicacions que no responen Comment[el]=Αποκορεσμός χρωμάτων παραθύρων μη αποκρινόμενων (κολλημένων) εφαρμογών 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[he]=מחשיך חלונות של יישומים שאינם מגיבים (תקועים) Comment[it]=Desatura le finestre delle applicazione che non rispondono (bloccate) diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index 3573a057b5..9dc924428d 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[eu]=itxi saioa Name[fi]=kirjaudu ulos Name[he]=התנתקות Name[hu]=Kijelentkezés diff --git a/kcmkwin/kwincompositing/kwineffect.knsrc b/kcmkwin/kwincompositing/kwineffect.knsrc index 924cd3e7b3..15f0336718 100644 --- a/kcmkwin/kwincompositing/kwineffect.knsrc +++ b/kcmkwin/kwincompositing/kwineffect.knsrc @@ -8,6 +8,7 @@ Name[de]=Fensterverwaltungs-Effekte Name[el]=Εφέ διαχειριστή παραθύρων Name[en_GB]=Window Manager Effects Name[es]=Efectos del gestor de ventanas +Name[eu]=Leiho kudeatzailearen efektua Name[fi]=Ikkunaohjelman tehosteet Name[fr]=Effets du gestionnaire de fenêtres Name[he]=אפקטי מנהל חלונות diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index c98292268d..adef1393f9 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -18,6 +18,7 @@ Name[de]=Touchscreen Name[el]=Οθόνη αφής Name[en_GB]=Touch Screen Name[es]=Pantalla táctil +Name[eu]=Ukimen-pantaila Name[fi]=Kosketusnäyttö Name[he]=מסך מגע Name[it]=Schermo a sfioramento @@ -41,6 +42,7 @@ 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[eu]=Ukipen-pantailan irrist-keinuak Comment[fi]=Kosketusnäytön pyyhkäisyeleet Comment[he]=מחוות החלקה של מסכי מגע Comment[it]=Gesti dello schermo a sfioramento @@ -65,6 +67,7 @@ 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[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[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 diff --git a/kcmkwin/kwinscripts/kwinscripts.knsrc b/kcmkwin/kwinscripts/kwinscripts.knsrc index 1e3d9657dc..e033f17eaa 100644 --- a/kcmkwin/kwinscripts/kwinscripts.knsrc +++ b/kcmkwin/kwinscripts/kwinscripts.knsrc @@ -8,6 +8,7 @@ Name[de]=Fensterverwaltungs-Skripte Name[el]=Σενάρια διαχειριστή παραθύρων Name[en_GB]=Window Manager Scripts Name[es]=Guiones del gestor de ventanas +Name[eu]=Leiho kudeatzailearen scriptak Name[fi]=Ikkunaohjelman skriptit Name[fr]=Scripts du gestionnaire de fenêtres Name[hu]=Ablakkezelő szkriptek diff --git a/kcmkwin/kwintabbox/kwinswitcher.knsrc b/kcmkwin/kwintabbox/kwinswitcher.knsrc index ecc252fae0..5389ae1add 100644 --- a/kcmkwin/kwintabbox/kwinswitcher.knsrc +++ b/kcmkwin/kwintabbox/kwinswitcher.knsrc @@ -8,6 +8,7 @@ Name[de]=Wechsel-Layout für Fensterverwaltung Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθύρων Name[en_GB]=Window Manager Switching Layouts Name[es]=Esquemas de cambio del gestor de ventanas +Name[eu]=Leiho kudeatzailearen aldatzeko-antolamenduak Name[fi]=Ikkunaohjelman vaihdon asettelut Name[fr]=Changement de disposition du gestionnaire de fenêtres Name[he]=מחליף פריסות של מנהל החלונות diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop index aa85a4529e..631091a442 100644 --- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop +++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop @@ -7,6 +7,7 @@ Name[de]=KWin Aurorae Name[el]=KWin Aurorae Name[en_GB]=KWin Aurorae Name[es]=Aurorae de KWin +Name[eu]=KWin Aurorae Name[fi]=KWin Aurorae Name[hu]=KWin Aurorae Name[it]=Aurorae di Kwin diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop index 5b859b47e9..c512046d17 100644 --- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop +++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop @@ -7,6 +7,7 @@ Name[de]=KWin-Dekoration Name[el]=Διακοσμήσεις KWin Name[en_GB]=KWin Decoration Name[es]=Decoración de KWin +Name[eu]=KWin apainketa Name[fi]=KWin-ikkunakehykset Name[hu]=KWin dekoráció Name[ia]=Decorationes de KWin diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index d3ab248f27..a040525435 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -8,6 +8,7 @@ Name[de]=KWin-Skript Name[el]=Σενάριο KWin Name[en_GB]=KWin Script Name[es]=Guion de KWin +Name[eu]=KWin scripta Name[fi]=KWin-skripti Name[hu]=KWin szkript Name[ia]=Script de KWin diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index 7d3d56289d..b94c679a35 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -8,6 +8,7 @@ Name[de]=KWin-Fensterwechsler Name[el]=Εφαρμογή εναλλαγής παραθύρων Kwin Name[en_GB]=KWin Window Switcher Name[es]=Cambiador de ventanas de KWin +Name[eu]=KWin leiho-aldatzailea Name[fi]=KWin-ikkunanvalitsin Name[hu]=KWin ablakváltó Name[ia]=Commutator de fenestra de KWin diff --git a/plugins/kdecorations/aurorae/src/aurorae.knsrc b/plugins/kdecorations/aurorae/src/aurorae.knsrc index 3416844b69..181b31c391 100644 --- a/plugins/kdecorations/aurorae/src/aurorae.knsrc +++ b/plugins/kdecorations/aurorae/src/aurorae.knsrc @@ -8,6 +8,7 @@ Name[de]=Aurorae-Fensterdekoration Name[el]=Διακοσμήσεις παραθύρου Aurorae Name[en_GB]=Aurorae Window Decorations Name[es]=Decoración de ventanas Aurorae +Name[eu]=Aurorae leihoentzako apaingarriak Name[fi]=Aurorae-ikkunakehykset Name[fr]=Décorations de fenêtres Aurorae Name[hu]=Aurorae ablakdekorációk