From c54ec46b65aa5b84db9bd892aae68dc0e620d2ae Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 3 Feb 2016 09:28:15 +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"
---
 backends/x11/x11.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backends/x11/x11.json b/backends/x11/x11.json
index ca4569053a..3efef9d76b 100644
--- a/backends/x11/x11.json
+++ b/backends/x11/x11.json
@@ -29,6 +29,7 @@
         "Name[ca@valencia]": "X11", 
         "Name[ca]": "X11", 
         "Name[de]": "X11", 
+        "Name[ia]": "x", 
         "Name[pt]": "X11", 
         "Name[sr@ijekavian]": "Икс11", 
         "Name[sr@ijekavianlatin]": "X11",