Merge remote-tracking branch 'upstream/pull/5241'

[rails.git] / config / languages.yml

diff --git a/config/languages.yml b/config/languages.yml
index df539c9722b3d91906fcf3089f68040df7c9d116..d4baa3b3e89ca9a0bbb6dda6956ca98810d7bb0e 100644 (file)
--- a/config/languages.yml
+++ b/config/languages.yml
@@ -40,6 +40,9 @@ ba:
 be: 
   english: Belarusian
   native: Беларуская
 be: 
   english: Belarusian
   native: Беларуская

+be-Tarask: 
+  english: Belarusian (Taraškievica orthography)
+  native: беларуская (тарашкевіца)

 bg: 
   english: Bulgarian
   native: Български
 bg: 
   english: Bulgarian
   native: Български


@@ -97,6 +100,9 @@ da:
 de: 
   english: German
   native: Deutsch
 de: 
   english: German
   native: Deutsch

+dsb: 
+  english: Lower Sorbian
+  native: Dolnoserbski

 dv: 
   english: Divehi
   native: ދިވެހިބަސް
 dv: 
   english: Divehi
   native: ދިވެހިބަސް


@@ -142,6 +148,9 @@ fo:
 fr: 
   english: French
   native: Français
 fr: 
   english: French
   native: Français

+fur: 
+  english: Friulian
+  native: Furlan

 fy: 
   english: Western Frisian
   native: Frysk
 fy: 
   english: Western Frisian
   native: Frysk


@@ -468,10 +477,10 @@ sq:
   native: Shqip
 sr: 
   english: Serbian
   native: Shqip
 sr: 
   english: Serbian

-  native: Српски / Srpski
-sr-EC: 
-  english: Serbian Cyrillic ekavian
-  native: Српски (ћирилица)
+  native: Српски
+sr-Latn: 
+  english: Serbian (Latin script)
+  native: srpski (latinica)

 ss: 
   english: Swati
   native: SiSwati
 ss: 
   english: Swati
   native: SiSwati