From c2f443e350a5dc9d573f0a5b48cd6b4c393eefb6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 26 Apr 2017 03:59:24 +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"
---
 applets/clock/metadata.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applets/clock/metadata.desktop b/applets/clock/metadata.desktop
index a654bc04..644e5ada 100644
--- a/applets/clock/metadata.desktop
+++ b/applets/clock/metadata.desktop
@@ -6,6 +6,7 @@ Name[ca]=Rellotge
 Name[ca@valencia]=Rellotge
 Name[cs]=Hodiny
 Name[de]=Uhr
+Name[el]=Ρολόι
 Name[en_GB]=Clock
 Name[es]=Reloj
 Name[nl]=Klok