aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/flags/catalonia.pngbin0 -> 6823 bytes
-rw-r--r--lang/flags/srbija.pngbin0 -> 16355 bytes
-rw-r--r--lang/languages.xml7
3 files changed, 6 insertions, 1 deletions
diff --git a/lang/flags/catalonia.png b/lang/flags/catalonia.png
new file mode 100644
index 00000000..39c7424e
--- /dev/null
+++ b/lang/flags/catalonia.png
Binary files differ
diff --git a/lang/flags/srbija.png b/lang/flags/srbija.png
new file mode 100644
index 00000000..7d2f8192
--- /dev/null
+++ b/lang/flags/srbija.png
Binary files differ
diff --git a/lang/languages.xml b/lang/languages.xml
index 2c9bde50..fdd9c42c 100644
--- a/lang/languages.xml
+++ b/lang/languages.xml
@@ -30,7 +30,7 @@ List of available languages for your wallet's seed:
<language display_name="Italiano" locale="it_IT" wallet_language="Italiano" flag="/lang/flags/italy.png" qs="none"/>
<language display_name="日本語" locale="ja_JP" wallet_language="日本語" flag="/lang/flags/japan.png" qs="none"/>
<language display_name="Nederlands" locale="nl_NL" wallet_language="Nederlands" flag="/lang/flags/netherlands.png" qs="none"/>
- <!-- <language display_name="Polski" locale="pl_PL" wallet_language="English" flag="/lang/flags/poland.png" qs="none"/> -->
+ <language display_name="Polski" locale="pl_PL" wallet_language="English" flag="/lang/flags/poland.png" qs="none"/>
<language display_name="Português (BR)" locale="pt-br_BR" wallet_language="Português" flag="/lang/flags/brazil.png" qs="none"/>
<language display_name="Русский язык" locale="ru_RU" wallet_language="русский язык" flag="/lang/flags/russia.png" qs="none"/>
<language display_name="简体中文 (中国)" locale="zh-cn_CN" wallet_language="简体中文 (中国)" flag="/lang/flags/china.png" qs="none"/>
@@ -43,4 +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>