From 35c6aa526b96b56f900505e415d7b6ef8a1af83b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Jun 2017 04:43: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 ++ 1 file changed, 2 insertions(+) diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index 90228abd61..8670482d6e 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[el]=Αποκορεσμός χρωμάτων μη αποκρινόμενων εφαρμογών Name[en_GB]=Desaturate Unresponsive Applications Name[es]=Desaturar las aplicaciones que no responden Name[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa @@ -25,6 +26,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[el]=Αποκορεσμός χρωμάτων παραθύρων μη αποκρινόμενων (κολλημένων) εφαρμογών Comment[en_GB]=Desaturate windows of unresponsive (frozen) applications Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congeladas) Comment[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa (ovat jumittuneet)