From 2e371f9634a7d8ca70ce19ce8a97d5825c29d423 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Oct 2017 03:39:13 +0100 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 9cdae4554e..51deacd6f9 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[da]=Dæmp programmer som ikke svarer Name[el]=Αποκορεσμός χρωμάτων μη αποκρινόμενων εφαρμογών Name[en_GB]=Desaturate Unresponsive Applications Name[es]=Desaturar las aplicaciones que no responden @@ -33,6 +34,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[da]=Dæmp vinduerne for programmer der ikke svarer (er frosset) Comment[el]=Αποκορεσμός χρωμάτων παραθύρων μη αποκρινόμενων (κολλημένων) εφαρμογών Comment[en_GB]=Desaturate windows of unresponsive (frozen) applications Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congeladas) diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index c2e5a6a2d9..77b52f3f88 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -3,6 +3,7 @@ Name=logout Name[ca]=sortida Name[ca@valencia]=eixida Name[cs]=odhlášení +Name[da]=log ud Name[de]=Abmeldung Name[el]=αποσύνδεση Name[en_GB]=logout diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index 235e19bfd3..966cda554d 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -14,6 +14,7 @@ Name=Touch Screen Name[ca]=Pantalla tàctil Name[ca@valencia]=Pantalla tàctil Name[cs]=Dotyková obrazovka +Name[da]=Touchskærm Name[de]=Touchscreen Name[el]=Οθόνη αφής Name[en_GB]=Touch Screen @@ -47,6 +48,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[da]=Strygegestusser til touchskærm Comment[en_GB]=Touch screen swipe gestures Comment[es]=Gestos de deslizamiento en pantalla táctil Comment[eu]=Ukipen-pantailan irrist-keinuak @@ -78,6 +80,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[da]=kwin,vindue,håndtering,manager,effekt,hjørne,kant,handling,skift,skrivebord,kwin skærmkanter,skrivebordskanter,skærmkanter,maksimer vinduer,tile windows,fliser,felter,siden af skærmen,skærmens opførsel,touch,skift skrivebord,virtuelle skriveborde,skærmhjørner,hjørner 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 diff --git a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop index 40bf4b0c2b..266cb90c8f 100644 --- a/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop +++ b/packageplugins/aurorae/kwin-packagestructure-aurorae.desktop @@ -3,6 +3,7 @@ Name=KWin Aurorae Name[ca]=Aurorae del KWin Name[ca@valencia]=Aurorae del KWin Name[cs]=KWin Aurorae +Name[da]=KWin Aurorae Name[de]=KWin Aurorae Name[el]=KWin Aurorae Name[en_GB]=KWin Aurorae diff --git a/packageplugins/decoration/kwin-packagestructure-decoration.desktop b/packageplugins/decoration/kwin-packagestructure-decoration.desktop index 1eb36ac700..9a0a2f5d8f 100644 --- a/packageplugins/decoration/kwin-packagestructure-decoration.desktop +++ b/packageplugins/decoration/kwin-packagestructure-decoration.desktop @@ -3,6 +3,7 @@ Name=KWin Decoration Name[ca]=Decoració del KWin Name[ca@valencia]=Decoració del KWin Name[cs]=Dekorace KWin +Name[da]=KWin-dekoration Name[de]=KWin-Dekoration Name[el]=Διακοσμήσεις KWin Name[en_GB]=KWin Decoration