From 0f66fa648f97eaa802b9e7ee631de0c45c08f8c3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 May 2017 05:32:13 +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 + 5 files changed, 8 insertions(+) diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index 7a38111c11..b23ad76e0f 100644 --- a/effects/frozenapp/package/metadata.desktop +++ b/effects/frozenapp/package/metadata.desktop @@ -2,6 +2,7 @@ Name=Desaturate Unresponsive Applications 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[it]=Desatura le applicazioni che non rispondono Name[nl]=Verzadiging van niet responsieve toepassingen verminderen @@ -23,6 +24,7 @@ Icon=preferences-system-windows-effect-frozenapp Comment=Desaturate windows of unresponsive (frozen) applications Comment[ca]=Dessatura les finestres de les aplicacions que no responen (congelades) 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[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 8ba875269f..c20a7ab2df 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=eixida Name[cs]=odhlášení Name[de]=Abmeldung Name[el]=αποσύνδεση +Name[en_GB]=logout Name[es]=cerrar la sesión Name[hu]=Kijelentkezés Name[ia]=Clausura de session diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index e4b9d0c065..6041efdf4e 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -15,6 +15,7 @@ Name[ca]=Pantalla tàctil Name[ca@valencia]=Pantalla tàctil Name[cs]=Dotyková obrazovka Name[de]=Touchscreen +Name[en_GB]=Touch Screen Name[es]=Pantalla táctil Name[it]=Schermo a sfioramento Name[nl]=Aanraakscherm @@ -35,6 +36,7 @@ Name[zh_TW]=觸控螢幕 Comment=Touch screen swipe gestures 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[it]=Gesti dello schermo a sfioramento Comment[nl]=Veeggebaren voor aanraakscherm @@ -56,6 +58,7 @@ Comment[zh_TW]=觸控螢幕滑動手勢 X-KDE-Keywords=kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen X-KDE-Keywords[ca]=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[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[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/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop index d84cdfb19c..2a4853b283 100644 --- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop +++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Aurorae del KWin Name[cs]=KWin Aurorae Name[de]=KWin Aurorae Name[el]=KWin Aurorae +Name[en_GB]=KWin Aurorae Name[es]=Aurorae de KWin 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 0d2e7b5421..166ec5113a 100644 --- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop +++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Decoració del KWin Name[cs]=Dekorace KWin Name[de]=KWin-Dekoration Name[el]=Διακοσμήσεις KWin +Name[en_GB]=KWin Decoration Name[es]=Decoración de KWin Name[hu]=KWin dekoráció Name[ia]=Decorationes de KWin