From fda0817ad1fb717d09dc98cc266bdd122b239473 Mon Sep 17 00:00:00 2001
From: joaquimbrugues <36763343+joaquimbrugues@users.noreply.github.com>
Date: Thu, 11 Jun 2020 20:41:53 +0200
Subject: [PATCH] Add Catalan language (#928)

* Add Catalan language
* Add 'catalan' string to strings.xml
* Attempt to fix conflicting changes
---
 app/src/main/java/io/lbry/browser/utils/Predefined.java | 3 ++-
 app/src/main/res/values/strings.xml                     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/lbry/browser/utils/Predefined.java b/app/src/main/java/io/lbry/browser/utils/Predefined.java
index 55c75711..48d8ec4e 100644
--- a/app/src/main/java/io/lbry/browser/utils/Predefined.java
+++ b/app/src/main/java/io/lbry/browser/utils/Predefined.java
@@ -1878,7 +1878,8 @@ public final class Predefined {
             new Language("no", "Norwegian", R.string.norwegian),
             new Language("ro", "Romanian", R.string.romanian),
             new Language("hi", "Hindi", R.string.hindi),
-            new Language("el", "Greek", R.string.greek)
+            new Language("el", "Greek", R.string.greek),
+            new Language("ca", "Catalan", R.string.catalan)
     );
 
     public static final String LICENSE_COPYRIGHTED = "Copyrighted";
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7318d0b3..172c111f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -194,6 +194,7 @@
     <string name="romanian">Romanian</string>
     <string name="hindi">Hindi</string>
     <string name="greek">Greek</string>
+    <string name="catalan">Catalan</string>
 
     <string name="none">None</string>
     <string name="public_domain">Public Domain</string>