From b1b8626d1c6b1bd2db7b5b4f1b73c433b02812a4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 21 Nov 2015 19:35:23 +0000
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"
---
 translations.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/translations.desktop b/translations.desktop
index a76678589..68cd1179c 100644
--- a/translations.desktop
+++ b/translations.desktop
@@ -13,6 +13,7 @@ X-KDE-Weight=40
 
 Name=Translations
 Name[ar]=الترجمات
+Name[ast]=Traducciones
 Name[bs]=Prevodi
 Name[ca]=Traduccions
 Name[ca@valencia]=Traduccions