Catalan translation

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>

monero-wallet-gui.pro

@@ -340,7 +340,11 @@ TRANSLATIONS =  \ # English is default language, no explicit translation file
                 $$PWD/translations/monero-core_sk.ts \ # Slovak
                 $$PWD/translations/monero-core_ar.ts \ # Arabic
                 $$PWD/translations/monero-core_sl.ts \ # Slovenian
+<<<<<<< HEAD
                 $$PWD/translations/monero-core_rs.ts \ # Serbian
+=======
+                $$PWD/translations/monero-core_cat.ts \ # Catalan
+>>>>>>> Catalan translation
 
 CONFIG(release, debug|release) {
     DESTDIR = release/bin

qml.qrc

@@ -130,6 +130,13 @@
         <file>lang/flags/uk.png</file>
         <file>lang/flags/usa.png</file>
         <file>lang/flags/srbija.png</file>
+        <file>lang/flags/israel.png</file>
+        <file>lang/flags/south_korea.png</file>
+        <file>lang/flags/romania.png</file>
+        <file>lang/flags/czech.png</file>
+        <file>lang/flags/slovakia.png</file>
+        <file>lang/flags/egypt.png</file>
+        <file>lang/flags/catalonia.png</file>
         <file>wizard/WizardManageWalletUI.qml</file>
         <file>wizard/WizardRecoveryWallet.qml</file>
         <file>wizard/WizardMemoTextInput.qml</file>