From f44b04e61eba6db8d1300544067f1a25c1e66dda Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 21 Jun 2018 07:15:30 +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 ++ 1 file changed, 2 insertions(+) diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index 56f07231d1..a225d4aa60 100644 --- a/effects/frozenapp/package/metadata.desktop +++ b/effects/frozenapp/package/metadata.desktop @@ -3,6 +3,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[de]=Sättigung von nicht reagierenden Anwendungen verringern Name[el]=Αποκορεσμός χρωμάτων μη αποκρινόμενων εφαρμογών Name[en_GB]=Desaturate Unresponsive Applications Name[es]=Desaturar las aplicaciones que no responden @@ -38,6 +39,7 @@ 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[de]=Verringert die Sättigung von nicht reagierenden, eingefrorenen Anwendungen Comment[el]=Αποκορεσμός χρωμάτων παραθύρων μη αποκρινόμενων (κολλημένων) εφαρμογών Comment[en_GB]=Desaturate windows of unresponsive (frozen) applications Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congeladas)