Add Catalan language (#928)
* Add Catalan language * Add 'catalan' string to strings.xml * Attempt to fix conflicting changes
This commit is contained in:
parent
895ca75506
commit
fda0817ad1
2 changed files with 3 additions and 1 deletions
|
@ -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";
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue