From 87e8b090657625eb9893c966f41eadc02e5d7dfa Mon Sep 17 00:00:00 2001
From: EdwardLow <edwardlow@riseup.net>
Date: Sat, 23 Dec 2017 14:43:28 +0100
Subject: Catalan translation

---
 lang/flags/catalonia.png | Bin 0 -> 6823 bytes
 lang/languages.xml       |   4 ++++
 2 files changed, 4 insertions(+)
 create mode 100644 lang/flags/catalonia.png

(limited to 'lang')

diff --git a/lang/flags/catalonia.png b/lang/flags/catalonia.png
new file mode 100644
index 00000000..39c7424e
Binary files /dev/null and b/lang/flags/catalonia.png differ
diff --git a/lang/languages.xml b/lang/languages.xml
index f8bccf54..e37d46fa 100644
--- a/lang/languages.xml
+++ b/lang/languages.xml
@@ -43,5 +43,9 @@ List of available languages for your wallet's seed:
         <language display_name="Slovensky" locale="sk_SK" wallet_language="English" flag="/lang/flags/slovakia.png" qs="none"/>
         <language display_name="Arabic" locale="ar_AR" wallet_language="English" flag="/lang/flags/egypt.png" qs="none"/>
         <language display_name="Slovenski" locale="sl_SI" wallet_language="English" flag="/lang/flags/slovenia.png" qs="none"/>
+<<<<<<< HEAD
         <language display_name="Srpski" locale="rs_RS" wallet_language="English" flag="/lang/flags/srbija.png" qs="none"/>
+=======
+        <language display_name="Català" locale="cat_ES" wallet_language="Catalan" flag="/lang/flags/catalonia.png" qs="none"/>
+>>>>>>> Catalan translation
 </languages>
-- 
cgit v1.2.3