diff --git a/lang/languages/aa.textproto b/lang/languages/aa.textproto
new file mode 100644
index 000000000..77ce31cf8
--- /dev/null
+++ b/lang/languages/aa.textproto
@@ -0,0 +1,25 @@
+id: "aa"
+name: "Afar"
+preferred_name: ""
+autonym: "Qafar"
+population: 2119662
+region: "DJ"
+region: "ER"
+region: "ET"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "KkAa"
+  masthead_partial: "Rr"
+  tester: "Seehada le karaamat kee garway inki gide takke edde yaaqitoonu"
+  poster_sm: "Seehadayti"
+  poster_md: "Ummattah"
+  poster_lg: "Karaamat"
+  specimen_48: "Galli-Maroh ayyuntitte qusba addah kukti addal tan seehadayti"
+  specimen_36: "Kulli num ayyunti caddoo kee baad caddola kuktih addal tan garwah addal tanim dudda luk geyaamih gar le."
+  specimen_32: "Seehada le karaamat kee garway inki gide takke edde yaaqitoonu duude waana yaaxigeenim baadal curriyataay, qadlii kee wagari rakiiboh tanim kinnim cedak,"
+  specimen_21: "Seehada le karaamat kee garway inki gide takke edde yaaqitoonu duude waana yaaxigeenim baadal curriyataay, qadlii kee wagari rakiiboh tanim kinnim cedak,\nSeehadayti garwah iggimaa kee bura aliinoh abtoy seehadaytiinô kas cerissat sinam bahtem kee seehada yab kee diini curriyat elle leeh, gilic kee assommik elle tesseqqeh xintu dudda baadih geyto seehadaytuk inkih naba fayxi kinnim cedak,"
+  specimen_16: "Seehada le karaamat kee garway inki gide takke edde yaaqitoonu duude waana yaaxigeenim baadal curriyataay, qadlii kee wagari rakiiboh tanim kinnim cedak,\nSeehadayti garwah iggimaa kee bura aliinoh abtoy seehadaytiinô kas cerissat sinam bahtem kee seehada yab kee diini curriyat elle leeh, gilic kee assommik elle tesseqqeh xintu dudda baadih geyto seehadaytuk inkih naba fayxi kinnim cedak,\nSeehadayti dulmi kee xukkot koosituh ellecaboh eleytoh qeebi haysite wayuh seehadayti garwa garti xintoh dacayri geytam saqlah tanim cedak,\nUmmattah fanal qalliini dadal ilsiisaanam saqlah tanim kinnim cedak,"
+}
diff --git a/lang/languages/aa/language.textproto b/lang/languages/aa/language.textproto
deleted file mode 100644
index fcaea25c1..000000000
--- a/lang/languages/aa/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "aa"
-name: "Afar"
-preferred_name: ""
-autonym: "Qafar"
-population: 2119662
-region: "ET"
-region: "ER"
-region: "DJ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/aa/sampletext.textproto b/lang/languages/aa/sampletext.textproto
deleted file mode 100644
index b882aa3aa..000000000
--- a/lang/languages/aa/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "aa"
diff --git a/lang/languages/ab.textproto b/lang/languages/ab.textproto
new file mode 100644
index 000000000..57656f628
--- /dev/null
+++ b/lang/languages/ab.textproto
@@ -0,0 +1,25 @@
+id: "ab"
+name: "Abkhazian"
+preferred_name: ""
+autonym: "Аԥсшәа"
+population: 91952
+region: "GE"
+region: "TR"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Џ Қ Ҟ Ҩ Ҭ Ҳ Ҵ Ҷ Ҽ Ҿ Ә Ӡ Ӷ Ԥ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я џ қ ҟ ҩ ҭ ҳ ҵ ҷ ҽ ҿ ә ӡ ӷ ԥ"
+  marks: "◌̆"
+}
+sample_text {
+  masthead_full: "ДдАа"
+  masthead_partial: "Рр"
+  tester: "Дызусҭзаалак, ауаатәыҩсатә ҭаацәара иалахәу иҳаҭыри, иара иузиҟәымҭхо"
+  poster_sm: "иара убас ауаҩы"
+  poster_md: "иара убас,"
+  poster_lg: "ауаҩы"
+  specimen_48: "иара убас ажәларқәа реиҩызара аизҳазыҕьара ацхыраара шаҭахыу"
+  specimen_36: "Дызусҭзаалак, ауаатәыҩсатә ҭаацәара иалахәу иҳаҭыри, иара иузиҟәымҭхо имоу изинқәеи, ахақәиҭреи, аиашареи,"
+  specimen_32: "Дызусҭзаалак, ауаатәыҩсатә ҭаацәара иалахәу иҳаҭыри, иара иузиҟәымҭхо имоу изинқәеи, ахақәиҭреи, аиашареи, адунеижәларбжьаратәи аҭынчреи шьаҭас ишрымоу хшыҩзышьҭра азуа,"
+  specimen_21: "Дызусҭзаалак, ауаатәыҩсатә ҭаацәара иалахәу иҳаҭыри, иара иузиҟәымҭхо имоу изинқәеи, ахақәиҭреи, аиашареи, адунеижәларбжьаратәи аҭынчреи шьаҭас ишрымоу хшыҩзышьҭра азуа,\nиара убас ауаҩы изинқәа ратәамбареи хырҩаа рымҭареи, ламыс змоу дарбанзаалак изымычҳаша агыгшәыгратә хымҩаҧгашьа аҟынӡа ауаҩы дышнанагахьо еилкааны, насгьы ауаҩы иажәеи идунеихәаҧшышьеи дрықәиҭны, ашәареи амамзаареи дыдмыргәаҟуа – адунеи иахьабалак абри аҩыза аҧсҭазаара аҧҵара ауаҩы зегь иреиҳау игәыҕрақәа ишыруакыу хшыҩзышьҭра азуа,"
+  specimen_16: "Дызусҭзаалак, ауаатәыҩсатә ҭаацәара иалахәу иҳаҭыри, иара иузиҟәымҭхо имоу изинқәеи, ахақәиҭреи, аиашареи, адунеижәларбжьаратәи аҭынчреи шьаҭас ишрымоу хшыҩзышьҭра азуа,\nиара убас ауаҩы изинқәа ратәамбареи хырҩаа рымҭареи, ламыс змоу дарбанзаалак изымычҳаша агыгшәыгратә хымҩаҧгашьа аҟынӡа ауаҩы дышнанагахьо еилкааны, насгьы ауаҩы иажәеи идунеихәаҧшышьеи дрықәиҭны, ашәареи амамзаареи дыдмыргәаҟуа – адунеи иахьабалак абри аҩыза аҧсҭазаара аҧҵара ауаҩы зегь иреиҳау игәыҕрақәа ишыруакыу хшыҩзышьҭра азуа,\nиара убас, ауаҩы аџьамыҕәеи ахәуреи иаартны дырҿамгылар ада царҭа имамкәа аҟынӡа инамгараз, ауаҩы изинқәа азакуан амчра иамыхьчар ада ҧсыхәа шыҟам хшыҩзышьҭра азуа,"
+}
diff --git a/lang/languages/ab/language.textproto b/lang/languages/ab/language.textproto
deleted file mode 100644
index 7e0245f59..000000000
--- a/lang/languages/ab/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "ab"
-name: "Abkhazian"
-preferred_name: ""
-autonym: "Аԥсшәа"
-population: 91952
-region: "TR"
-region: "GE"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Џ Қ Ҟ Ҩ Ҭ Ҳ Ҵ Ҷ Ҽ Ҿ Ә Ӡ Ӷ Ԥ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я џ қ ҟ ҩ ҭ ҳ ҵ ҷ ҽ ҿ ә ӡ ӷ ԥ"
-  marks: "◌̆"
-}
diff --git a/lang/languages/ab/sampletext.textproto b/lang/languages/ab/sampletext.textproto
deleted file mode 100644
index 38dbfa26f..000000000
--- a/lang/languages/ab/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ab"
diff --git a/lang/languages/abr/language.textproto b/lang/languages/abr.textproto
similarity index 84%
rename from lang/languages/abr/language.textproto
rename to lang/languages/abr.textproto
index c0d5a72ff..2be67f975 100644
--- a/lang/languages/abr/language.textproto
+++ b/lang/languages/abr.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 exemplar_chars {
   base: "A B D E F G H I K L M N O P R S T U W Y Ɛ Ɔ a b d e f g h i k l m n o p r s t u w y ɛ ɔ"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ace.textproto b/lang/languages/ace.textproto
new file mode 100644
index 000000000..cf0482e36
--- /dev/null
+++ b/lang/languages/ace.textproto
@@ -0,0 +1,24 @@
+id: "ace"
+name: "Achinese"
+preferred_name: ""
+autonym: "Bahsa Acèh"
+population: 3738364
+region: "ID"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E G H I J K L M N O P R S T W Y É È Ë Ô Ö a b c d e g h i j k l m n o p r s t w y é è ë ô ö \'"
+  marks: "◌̀ ◌́ ◌̂ ◌̈"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Nn"
+  tester: "Ta bileung‐bileung ranub lam puan han tok deulapan di dalam raga"
+  poster_sm: "Teuseubot bak"
+  poster_md: "Suai kedua"
+  poster_lg: "Bandum"
+  specimen_48: "Rasa teumakot tiep uroue sabee udep ngon matee hana leu bida"
+  specimen_36: "Tan sidroe ureung patot tasiksa jeut tadeura peuturot palak atawa tahukom ban‐ban na hawa atawa tahina ban‐ban na galak."
+  specimen_32: "Tiep‐tiep ureung cit na hak droe na hak meungakue di likeu hukom tapeulaku ureung nyan sebagoe pribadi dro hanjeut beurangsoe tapubuet kon‐kon."
+  specimen_21: "Tiep ureung saban bak mata hukom salah ngon beuna ta kalon teuma tiep ureung na hak lindongan hukom tan na bida deungon laen manusia. Patot hai rakan tanyoe tapuphom hanjeut hai ampon tapeubida‐bida jelaih nyan meuneuntang Peunyataan Umum Teuntang Hak‐Hak Asasi Manusia.\nHana sidroe ureung hai cutwa inseun jeut ban seuwenang‐wenang didrop ngon ditheun atawa diboh dipeuaseng di uteun di rimba atawa dengan laen cara nyang tak semeuna‐meuna."
+  specimen_16: "Bandum ureung, hai teungku raja ateuh peuradilan na saban hak peuradilan nyang adee ngon teubuka lee peungadilan bebah hana meumihak.\nHukom nasional dan internasional pieh dipeugah hanjeut kheun salah watee buet nyan teujadi hanjeut peubeurat hukoman si salah dari nyang haroih teujadi hai teungku sidi.\nTiep ureung na hak, wahei nyak intan ateuh kebeubasan pikeran, agama ngon atee nuranie teumasok meuganto agama atawa kepeucayaan meunan keuh dipeupham lee Peunyataan Umum PBB supaya meusampo, wahee samlako ajaran nyan haroih tapeuaja, tapeubuet, tapeutaat, sidroe‐droe atawa beusama, di likeu umum atawa sidroe‐droe ngon beurangsoe."
+}
diff --git a/lang/languages/ace/language.textproto b/lang/languages/ace/language.textproto
deleted file mode 100644
index 6f9d84ee4..000000000
--- a/lang/languages/ace/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "ace"
-name: "Achinese"
-preferred_name: ""
-autonym: "Bahsa Acèh"
-population: 3738364
-region: "ID"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E G H I J K L M N O P R S T W Y É È Ë Ô Ö a b c d e g h i j k l m n o p r s t w y é è ë ô ö \'"
-  marks: "◌̀ ◌́ ◌̂ ◌̈"
-}
diff --git a/lang/languages/ace/sampletext.textproto b/lang/languages/ace/sampletext.textproto
deleted file mode 100644
index 6a5aad144..000000000
--- a/lang/languages/ace/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ace"
diff --git a/lang/languages/ach/language.textproto b/lang/languages/ach.textproto
similarity index 74%
rename from lang/languages/ach/language.textproto
rename to lang/languages/ach.textproto
index cc33c3c98..d70a106b0 100644
--- a/lang/languages/ach/language.textproto
+++ b/lang/languages/ach.textproto
@@ -7,3 +7,6 @@ region: "UG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ada.textproto b/lang/languages/ada.textproto
new file mode 100644
index 000000000..89aeb136b
--- /dev/null
+++ b/lang/languages/ada.textproto
@@ -0,0 +1,24 @@
+id: "ada"
+name: "Adangme"
+preferred_name: ""
+autonym: ""
+population: 880206
+region: "GH"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E Ɛ F G H I J K L M N O Ɔ P S T U V W Y Z a b d e ɛ f g h i j k l m n o ɔ p s t u v w y z"
+  auxiliary: "C Q R X c q r x"
+}
+sample_text {
+  masthead_full: "AaDd"
+  masthead_partial: "Ee"
+  tester: "Be abɔ nɛ a le odehe si himi nɛ Mawu bɔ adesahi tsuo nɛ a hi"
+  poster_sm: "Be abɔ nɛ adesa"
+  poster_md: "Be abɔ nɛ,"
+  poster_lg: "Adesahi"
+  specimen_48: "Be abɔ nɛ kake peemi he hia he je ɔ, e sa kaa a to blɔ nya kɛ"
+  specimen_36: "A be nɔ ko nɔ ko woe ngɔ pee nyɔguɛ loo a maa tsi e nya yaka gu. A maa gu nyɔguɛ yemi kɛ nyɔguɛ jua yemi pɛsɛpɛsɛ."
+  specimen_32: "He blɔ ngɛ ha nɔ fɛɛ nɔ, nɛ Amlaalɔ ɔ e kojoli kpakpahi a dlaa nɛ a kojoɔ e sane ɔ haa lɛ, ke munyu ko maa te si kɛ si he blɔhi klɛdɛɛ nɛ mlaa kɛ ma nɔ yemi mlaa haa lɛ ɔ."
+  specimen_21: "He blɔ be nɛ a nuu nɔ ko gu, aloo a tsiɔ nɔ ko nya ngɛ polisihi a nine nɔ, aloo a fieɔ nɔ ko kɛ jee e ma mi nɛ sisi numi be he.\nNɔ tsuaa nɔ ngɛ he blɔ sɔsɔɛ nɛ kojoli nɛ hɛɛ a he, nɛ a be gɔdɔgɔdɔ maa kojp e sane ha lɛ pɛpɛɛpɛ ke kaa e na sane ko nɛ kɔɔ e he blɔhi loo e blɔ nya ni tsumi ko, aloo a ngɔ mlaa tɔmi nɛ kɔɔ awi yemi sane ko kɛ si lɛ."
+  specimen_16: "He blɔ be nɛ a woɔ nya ngɔ woɔ nɔ ko e kɔkɔɔ mi sane loo e weku munyu, e we mi loo e womi mi munyuhi a mi bɔ nɛ sɛ, aloo a gbee e he guɛ kɛ puɛɔ e blɔ nya nɛ e hɛɛ. He blɔ ngɛ ha nɔ fɛɛ nɔ nɛ mlaa ma fa e he ngɛ nya womi kɛ e sanehi a mi womi kɛ e he guɛ gbemi blɔ fa mi.\nNɔ fɛɛ nɔ ngɛ he blɔ nɛ e peeɔ nɔ nɛ e susumi kɛ e he nile kɛ e jami deɔ lɛ. E ngɛ he blɔ hu nɛ e tsakeɔ e jami loo e hemi kɛ yemi, aloo e fiɛɔ e jami loo e hemi kɛ yemi ngɔ tsɔɔ ngɛ ma nɔ loo laami mi, nɛ e tsuɔ e jami he ni, lɛ nɔ kake loo ngɛ juami mi.\nNɔ tsuaa nɔ maa ye kuu mi nɛ e ngɛ ɔ kɛ mahi tsuo a kpɛti mlaa mɔ, konɛ he blɔhi kɛ he jɔmi a he blɔ nya nɛ a to ngɛ womi nɛ ɔ mi ɔ, e ye manye."
+}
diff --git a/lang/languages/ada/language.textproto b/lang/languages/ada/language.textproto
deleted file mode 100644
index fbf008783..000000000
--- a/lang/languages/ada/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "ada"
-name: "Adangme"
-preferred_name: ""
-autonym: ""
-population: 880206
-region: "GH"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E Ɛ F G H I J K L M N O Ɔ P S T U V W Y Z a b d e ɛ f g h i j k l m n o ɔ p s t u v w y z"
-  auxiliary: "C Q R X c q r x"
-}
diff --git a/lang/languages/ada/sampletext.textproto b/lang/languages/ada/sampletext.textproto
deleted file mode 100644
index 1328602ea..000000000
--- a/lang/languages/ada/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ada"
diff --git a/lang/languages/ady.textproto b/lang/languages/ady.textproto
new file mode 100644
index 000000000..1362b5bf5
--- /dev/null
+++ b/lang/languages/ady.textproto
@@ -0,0 +1,25 @@
+id: "ady"
+name: "Adyghe"
+preferred_name: ""
+autonym: "Адыгабзэ"
+population: 444583
+region: "RU"
+region: "TR"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӏ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӏ"
+  marks: "◌̆ ◌̈"
+}
+sample_text {
+  masthead_full: "ЦцIi"
+  masthead_partial: "Ыы"
+  tester: "мы джэпсалъэр сыдигъуи янэгу кIагъэтызэ, мыщ къыщыхэщырэ цIыф"
+  poster_sm: "ЦIыф пстэури"
+  poster_md: "Хэтрэ цIыфи"
+  poster_lg: "ЦIыф"
+  specimen_48: "Ащ нэмыкIэу, къэрал шъхьэфити, нэмыкIым иунашъо кIэти, зышъхьэфитыжьныгъэ"
+  specimen_36: "Дунэепстэу Къэрал Зэгохьэныгъэм (ДКъЗ) и Зэфэсым егъэIу;\nДунэепстэу цIыфыгъэм къыхиубытэрэ хэтрэ зы цIыфи зэгохьэныгъи;"
+  specimen_32: "мы джэпсалъэр сыдигъуи янэгу кIагъэтызэ, мыщ къыщыхэщырэ цIыф фэшъуашэхэмрэ фитыныгъэхэмрэ янэIэ зэрэтырагъэтырэм, фашIырэ лъытэныгъэм егъэджэныгъэ-гъэсэныгъэ гъогукIэ зырагъэужьынэу;"
+  specimen_21: "Дунэепстэу Къэрал Зэгохьэныгъэм (ДКъЗ) и Зэфэсым егъэIу;\nДунэепстэу цIыфыгъэм къыхиубытэрэ хэтрэ зы цIыфи зэгохьэныгъи;\nмы джэпсалъэр сыдигъуи янэгу кIагъэтызэ, мыщ къыщыхэщырэ цIыф фэшъуашэхэмрэ фитыныгъэхэмрэ янэIэ зэрэтырагъэтырэм, фашIырэ лъытэныгъэм егъэджэныгъэ-гъэсэныгъэ гъогукIэ зырагъэужьынэу;\nцIыф фэшъуашэхэм афэгъэхьыгъэу цIыф жъугъэхэми лъэпкъхэми язэфэдэ идеал"
+  specimen_16: "Дунэепстэу Къэрал Зэгохьэныгъэм (ДКъЗ) и Зэфэсым егъэIу;\nДунэепстэу цIыфыгъэм къыхиубытэрэ хэтрэ зы цIыфи зэгохьэныгъи;\nмы джэпсалъэр сыдигъуи янэгу кIагъэтызэ, мыщ къыщыхэщырэ цIыф фэшъуашэхэмрэ фитыныгъэхэмрэ янэIэ зэрэтырагъэтырэм, фашIырэ лъытэныгъэм егъэджэныгъэ-гъэсэныгъэ гъогукIэ зырагъэужьынэу;\nхэгъэгу кIоцIхэми дунэепстэуми кIо къэсми нахьы зыщызыужьырэ амалхэр зыфагъэшъхьэпэзэ мы зэгохьэныгъэм хэт къэралхэм ежьымэ ялъэпкъхэри, яунашъо кIагъэтырэ нэмыкIрэ къэралмэ ялъэпкъхэри къызэкIиубытэу, дунэепстэум и тэдэрэ чIапIи мы цIыф фэшъуашэхэмрэ фитыныгъэхэмрэ къыщащтэным, лъэшэу щызэрагъэкIоным, щагъэцэкIэным фэкъудыинхэу,"
+}
diff --git a/lang/languages/ady/language.textproto b/lang/languages/ady/language.textproto
deleted file mode 100644
index 632233bd6..000000000
--- a/lang/languages/ady/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "ady"
-name: "Adyghe"
-preferred_name: ""
-autonym: "Адыгабзэ"
-population: 444583
-region: "RU"
-region: "TR"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӏ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӏ"
-  marks: "◌̆ ◌̈"
-}
diff --git a/lang/languages/ady/sampletext.textproto b/lang/languages/ady/sampletext.textproto
deleted file mode 100644
index 88133bf63..000000000
--- a/lang/languages/ady/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ady"
diff --git a/lang/languages/aeb/language.textproto b/lang/languages/aeb.textproto
similarity index 90%
rename from lang/languages/aeb/language.textproto
rename to lang/languages/aeb.textproto
index 698eda5c5..b0d326900 100644
--- a/lang/languages/aeb/language.textproto
+++ b/lang/languages/aeb.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٰ"
   numerals: "٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/af.textproto b/lang/languages/af.textproto
new file mode 100644
index 000000000..2ccc309e6
--- /dev/null
+++ b/lang/languages/af.textproto
@@ -0,0 +1,30 @@
+id: "af"
+name: "Afrikaans"
+preferred_name: ""
+autonym: "Afrikaans"
+population: 9318845
+region: "BW"
+region: "NA"
+region: "ZA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z È Ê Ë Î Ï Ö Ô Û Ü a b c d e f g h i j k l m n o p q r s t u v w x y z è ê ë î ï ö ô û ü"
+  auxiliary: "à å ä ã æ ç í ì ó ò ú ù ü ý"
+  marks: "◌̀ ◌̂ ◌̈"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Ee"
+  tester: "AANGESIEN erkenning vir die inherente waardigheid en die gelyke"
+  poster_sm: "AANGESIEN dit"
+  poster_md: "AANGESIEN"
+  poster_lg: "Alle"
+  specimen_48: "AANGESIEN die volke wat lid van die Verenigde Volke Organisasie"
+  specimen_36: "AANGESIEN ’n algemene begrip van hierdie regte en vryhede van groot belang vir die bereiking van hierdie voorneme is,"
+  specimen_32: "Hierdie Universele Verklaring van Menseregte as ’n algemene standaard vir die verwesenliking deur alle mense en nasies, om te verseker dat elke individu en elke"
+  specimen_21: "deel van die gemeenskap hierdie Verklaring in ag sal neem en deur opvoeding, respek vir hierdie regte en vryhede te bevorder, op nasionale en internasionale vlak, daarna sal strewe om die universele en effektiewe erkenning en agting van hierdie regte te verseker, nie net vir die mense van die Lidstate nie, maar ook vir die mense in die gebiede onder hul jurisdiksie."
+  specimen_16: "Alle menslike wesens word vry, met gelyke waardigheid en regte, gebore. Hulle het rede en gewete en behoort in die gees van broederskap teenoor mekaar op te tree.\nElke persoon het die reg tot al die regte en vryhede soos in die Verklaring vervat is, sonder uitsondering van enige aard soos op grond van ras, geslag, kleur, taal, godsdiens, geboorte of enige ander status.\nDaarbenewens sal geen onderskeid op grond van politieke, geregtelike of internasionale status van die land of gebied waartoe ’n persoon behoort gemaak word nie, hetsy dit ’n onafhanklike trust, nie‐selfregerend of onder enige ander beperking van soewereiniteit is."
+}
diff --git a/lang/languages/af/language.textproto b/lang/languages/af/language.textproto
deleted file mode 100644
index d5165494a..000000000
--- a/lang/languages/af/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "af"
-name: "Afrikaans"
-preferred_name: ""
-autonym: "Afrikaans"
-population: 9318845
-region: "ZA"
-region: "BW"
-region: "NA"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z È Ê Ë Î Ï Ö Ô Û Ü a b c d e f g h i j k l m n o p q r s t u v w x y z è ê ë î ï ö ô û ü"
-  auxiliary: "à å ä ã æ ç í ì ó ò ú ù ü ý"
-  marks: "◌̀ ◌̂ ◌̈"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/af/sampletext.textproto b/lang/languages/af/sampletext.textproto
deleted file mode 100644
index 4ad10fe06..000000000
--- a/lang/languages/af/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "af"
diff --git a/lang/languages/agq/language.textproto b/lang/languages/agq.textproto
similarity index 93%
rename from lang/languages/agq/language.textproto
rename to lang/languages/agq.textproto
index ebe90ea81..6cd675314 100644
--- a/lang/languages/agq/language.textproto
+++ b/lang/languages/agq.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E Ɛ F G H I Ɨ K L M N Ŋ O Ɔ P S T U Ʉ V W Y Z ʔ"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ak.textproto b/lang/languages/ak.textproto
new file mode 100644
index 000000000..c212a8b93
--- /dev/null
+++ b/lang/languages/ak.textproto
@@ -0,0 +1,26 @@
+id: "ak"
+name: "Akan"
+preferred_name: ""
+autonym: "Fante"
+population: 11442678
+region: "GH"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E F G H I K M N O P R S T U W Y Z Ɛ Ɔ a b d e f g h i k m n o p r s t u w y z ɛ ɔ"
+  auxiliary: "c j q v z"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C D E Ɛ F G H I J K L M N O Ɔ P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "WwƆɔ"
+  masthead_partial: "Oo"
+  tester: "Ɔnam dɛ adasa hɔn enyimnyam yɛ pɛr na ndzinoa a obi nngye mmfi"
+  poster_sm: "Ɔnam dɛ tsia"
+  poster_md: "Ɔnam dɛ ohia"
+  poster_lg: "Wɔwo"
+  specimen_48: "Ɔnam dɛ ohia dɛ wotu aman na aman ntamu anyɛnkoyɛ nkitahodzi"
+  specimen_36: "Onnyi dɛ wɔdze obiara to nkowaasom mu anaadɛ wɔma ɔsom ɔsomhun; ɔwɔ dɛ wogu nkowaasom na ndɔnkɔgua korakora."
+  specimen_32: "Obiara a wɔayɛ bɔn etsia ne ndzinoa a mbra na amambu ho mbra ma no ho kwan no, wɔ ho kwan dɛ odua asɛndzi baguafo do gye nsiesie anaa mpata a ɔfata."
+  specimen_21: "Onnyi dɛ abɔtsirmu ara wɔkyer obi, wɔdze no sie, anaa wotwa no esu.\nObiara wɔ ho kwan dɛ bagua asɛndzifo a wɔnntɔn hɔn asowa nndzi tsena hwehwɛ n\'asɛm mu pefee wɔ ne ndzinoa, n\'asadze anaa ewudzisɛm ho sombo bi a wɔdze abɔ no ho.\nOnnyi dɛ abɔtsirmu ara wɔdze ɔho hyehyɛ obi no kɔkoamunsɛm, n\'ebusuasɛm anaa n\'efisɛm mu; anaadɛ wogu n\'enyimnyam na ne dzin ho fi. Ɔyɛ obiara ne ndzinoa dɛ mbra bɔ no ho ban tsia ndzeyɛɛ a ɔtsetse dɛm yi."
+  specimen_16: "Obiara wɔ ndzinoa dɛ ɔyɛ n\'adwen, ɔsoa noara ne tsibowa, ɔfa nyamesom biara a ɔpɛ. Dɛm ndzinoa yi ne fã bi nye kwan a obiara wɔ dɛ ɔsesa ne nyamesom anaa ne gyedzi na kwan so a ɔfa do dze ma ne gyedzi no da edzi wɔ bagua mu anaa nsumaa mu, dɛ ɔno nko anaadɛ nyimpa binom kã ho wɔ iyi mu.\nObiara wɔ ho kwan dɛ ɔkyerɛ n\'adwen wɔ biribi ho. Dza ɔkã dɛm ndzinoa yi ho nye dɛ obiara botum ayɛ n\'adwen wɔ biribi ho a ntotoananmu biara nnyi mu. Dza ɔkã ho bio so nye dɛ otum anaa otsie asɛm nye nsusui biara a ɔnam kwan biara do na efi mbea nyina, na ɔma nyimpa binom so tse."
+}
diff --git a/lang/languages/ak/language.textproto b/lang/languages/ak/language.textproto
deleted file mode 100644
index 0296a287a..000000000
--- a/lang/languages/ak/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "ak"
-name: "Akan"
-preferred_name: ""
-autonym: "Twi"
-population: 11442678
-region: "GH"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E F G H I K L M N O P R S T U W Y Ɛ Ɔ a b d e f g h i k l m n o p r s t u w y ɛ ɔ"
-  auxiliary: "c j q v z"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C D E Ɛ F G H I J K L M N O Ɔ P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/ak/sampletext.textproto b/lang/languages/ak/sampletext.textproto
deleted file mode 100644
index 15a8ea614..000000000
--- a/lang/languages/ak/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ak"
diff --git a/lang/languages/aln/language.textproto b/lang/languages/aln.textproto
similarity index 87%
rename from lang/languages/aln/language.textproto
rename to lang/languages/aln.textproto
index bf57fe392..05245036a 100644
--- a/lang/languages/aln/language.textproto
+++ b/lang/languages/aln.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç Ë a b c d e f g h i j k l m n o p q r s t u v w x y z ç ë"
   marks: "◌̈ ◌̧"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/alt.textproto b/lang/languages/alt.textproto
new file mode 100644
index 000000000..2025edf40
--- /dev/null
+++ b/lang/languages/alt.textproto
@@ -0,0 +1,24 @@
+id: "alt"
+name: "Southern Altai"
+preferred_name: ""
+autonym: "Алтайча"
+population: 19841
+region: "RU"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ј Ҥ Ӧ Ӱ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ј ҥ ӧ ӱ"
+  marks: "◌̆ ◌̈"
+}
+sample_text {
+  masthead_full: "ОоНн"
+  masthead_partial: "Чч"
+  tester: "Кижилик билезиниҥ  ончо турчыларыныҥ јарамыкту, јакшы јанын, онойдо"
+  poster_sm: "Кажы ла кижиде"
+  poster_md: "Ого ӱзеери"
+  poster_lg: "Ончо"
+  specimen_48: "Кажы ла кижи јадын‐јӱрӱмге, јайымга ла таҥынаҥ бойына тийерге јарабас"
+  specimen_36: "Кем де кандый да кыйынга эмезе оныҥ учурын, тоомјызын тӱжӱрип турган кижи  кӱӱни јок базынышка алдыртпас учурлу."
+  specimen_32: "Кажы ла кижи ого Конституцияла эмезе јасакла берилген тӧс тап‐эриктери бузулган тужында ийделӱ, тоомјылу эл јаргыларда  тап‐эриктерин једимдӱ орныктырарга тап‐эриктӱ."
+  specimen_21: "Кемди де тууразынаҥ олјолоорго, тударга эмезе сӱрерге јарабас.\nКажы ла кижи оныҥ тап‐эриктерин ле молјуларын чокымдаарга, онойдо ок ого эдилген уголовный бурулаштыҥ тӧзӧгӧзин чокымдаарга толо теҥ‐тайга тайанып, оныҥ кереги ачык‐јарык айалгада кӧрӱлзин ле јаргы ак‐чек, кемнеҥ де камаанду эмес чындык болзын деп тап‐эриктӱ."
+  specimen_16: "Оныҥ таҥынаҥ ла билелик јӱрӱмине тууразынаҥ кем де киришпес учурлу. Онойдо ок кем де оныҥ айыл‐јуртына, корреспонденциязыныҥ  јажыдына эмезе оныҥ ады‐јолына, јӱрӱмине тууразынаҥ кирижер учуры јок. Кажы ла кижи ондый табарудаҥ, кирижеринеҥ коруланар јасакка тап‐эриктӱ.\nКажы ла кижи јайым кӱӱн‐санаага, ак‐чекке ле кудай јаҥына тап‐эриктӱ; бу тап‐эрикке бойыныҥ кудай јаҥын эмезе кӧрӱмин солыыры кирет, бойыныҥ јаҥын јайым јаҥдаары эмезе кӧрӱмин таҥынаҥ бойы, эмезе ӧскӧ улусла кожо јаҥдаары база кирет. Кудайлык чӱм‐јаҥ јаҥжыгуларды ӧткӱреринде тапэриктӱ.\nКажы ла кижи амыраарга ла бош ӧйгӧ тап‐эриктӱ. Онойдо ок иштеер кӱнди керектӱ кеминде тузаланары ла тӧлӧлип турган јаҥжыккан  амыралта (отпуск) керегинде тап‐эрик база кирет."
+}
diff --git a/lang/languages/alt/language.textproto b/lang/languages/alt/language.textproto
deleted file mode 100644
index a82461ca6..000000000
--- a/lang/languages/alt/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "alt"
-name: "Southern Altai"
-preferred_name: ""
-autonym: "Алтайча"
-population: 19841
-region: "RU"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ј Ҥ Ӧ Ӱ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ј ҥ ӧ ӱ"
-  marks: "◌̆ ◌̈"
-}
diff --git a/lang/languages/alt/sampletext.textproto b/lang/languages/alt/sampletext.textproto
deleted file mode 100644
index e154efccf..000000000
--- a/lang/languages/alt/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "alt"
diff --git a/lang/languages/am.textproto b/lang/languages/am.textproto
new file mode 100644
index 000000000..7f58700a9
--- /dev/null
+++ b/lang/languages/am.textproto
@@ -0,0 +1,27 @@
+id: "am"
+name: "Amharic"
+preferred_name: ""
+autonym: "ኣማርኛ"
+population: 35728475
+region: "ET"
+region: "IL"
+script: "Ethiopic"
+exemplar_chars {
+  base: "ሀ ሁ ሂ ሃ ሄ ህ ሆ ኰ ኲ ኳ ኴ ኵ ለ ሉ ሊ ላ ሌ ል ሎ ዀ ዂ ዃ ዄ ዅ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ወ ዉ ዊ ዋ ዌ ው ዎ መ ሙ ሚ ማ ሜ ም ሞ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ረ ሩ ሪ ራ ሬ ር ሮ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ሰ ሱ ሲ ሳ ሴ ስ ሶ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ሸ ሹ ሺ ሻ ሼ ሽ ሾ የ ዩ ዪ ያ ዬ ይ ዮ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ደ ዱ ዲ ዳ ዴ ድ ዶ ቈ ቊ ቋ ቌ ቍ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ገ ጉ ጊ ጋ ጌ ግ ጎ ቘ ቚ ቛ ቜ ቝ ጐ ጒ ጓ ጔ ጕ በ ቡ ቢ ባ ቤ ብ ቦ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ተ ቱ ቲ ታ ቴ ት ቶ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ቸ ቹ ቺ ቻ ቼ ች ቾ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ነ ኑ ኒ ና ኔ ን ኖ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ፈ ፉ ፊ ፋ ፌ ፍ ፎ አ ኡ ኢ ኣ ኤ እ ኦ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ከ ኩ ኪ ካ ኬ ክ ኮ ቨ ቩ ቪ ቫ ቬ ቭ ቮ"
+  numerals: "፩ ፪ ፫ ፬ ፭ ፮ ፯ ፰ ፱ ፲ ፳ ፴ ፵ ፶ ፷ ፸ ፹ ፺ ፻"
+  punctuation: "‐ – , ፡ ፣ ፤ ፥ ፦ ! ? . ። ‹ › « » ( ) \\[ \\]"
+  index: "ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ"
+}
+sample_text {
+  masthead_full: "የሰውል"
+  masthead_partial: "ጅሁ"
+  tester: "የሰው፡ልጅ፡ሁሉ፡ሲወለድ፡ነጻና፡በክብርና፡በመብትም፡እኩልነት፡ያለው፡ነው።፡የተፈጥሮ፡ማስተዋልና፡ሕሊና፡ስላለው፡አንዱ፡ሌላውን፡በወንድማማችነት"
+  poster_sm: "እያንዳንዱ፡ሰው፡የዘር"
+  poster_md: "ከዚህም፡በተቀረ"
+  poster_lg: "የሰው"
+  specimen_48: "ማንም፡ሰው፡ቢሆን፡የጭካኔ፡ስቃይ፡እንዳይደርስበት፡ወይም፡ከሰብዓዊ፡አፈጻጸም፡ውጭ፡የሆነ፡የተዋረድ፡ተግባር፡ወይም፡ቅጣት፡አይፈጸምበትም"
+  specimen_36: "ሰው፡ሁሉ፡በሕግ፡ፊት፡እኩል፡ነው።፡ያለአንዳች፡ልዩነትም፡ሕጉ፡ደህንነቱን፡እንዲጠበቅለት፡እኩል፡የሆነ፡መብት፡አለው።፡ይህንን፡ውሳኔ፡በመጣስ፡ከሚደረግ፡ልዩነት፡ለማድረግ፡ከሚነሳሳ፡እንዲጠበቅ፡ሁሉም፡የእኩል፡መብት፡አለው።፡"
+  specimen_32: "እያንዳንዱ፡ሰው፡የሃሳብ፡የሕሊናና፡የሃይማኖት፡ነጻነት፡መብት፡አለው።፡ይህም፡መብት፡ሃይማኖቱን፡ወይም፡እምነቱን፡የመለወጥ፡ነጻነትንና፡ብቻውን፡ወይም፡ከሌሎች፡ጋር፡በኀብረት፡በይፋ፡ወይም፡በግል፡ሆኖ፡ሃይማኖቱን፡ወይም፡እምነቱን፡የማስተማር፣፡በተግባር፡የመግለጽ፡የማምለክና፡የማክበር፡ነጻነትን፡ይጨምራል።"
+  specimen_21: "እያንዳንዱ፡ሰው፡የሐሳብና፡ሐሳቡን፡የመግለጽ፡መብት፡አለው።፡ይህም፡መብት፡ያለጣልቃ፡ገብነት፡በሐሳብ፡የመጽናትንና፡ዜናን፡ወይም፡ሐሳቦችን፡ያላንዳች፡የድንበር፡ገደብ፡የማግኘትን፡የመቀበልንና፡ወይም፡የማካፈልን፡ነጻነትም፡ይጨምራል።\nእያንዳንዱ፡ሰው፡የኀብረ፡ሰብ፡አባል፡እንደመሆኑ፡በኀብረ፡ሰብ፡ደህንነቱ፡እንዲጠበቅ፡መብት፡አለው።፡እንዲሁም፡በብሔራዊ፡ጥረትና፡በኢንተርናሽናል፡መተባበር፡አማካይነትና፡በእያንዳንዱ፡መንግስት፡ድርጅትም፡የሀብት፡ምንጮች፡መሰረት፡ለክብሩና፡ለሰብዓዊ፡አቅሙ፡ነጻ፡እድገት፡የግድ፡አስፈላጊ፡የሆኑት፡የኤኮኖሚ፡የማኀበራዊ፡ኑሮና፡የባህል፡መብቶች፡በተግባር፡እንዲገለጹለት፡መብት፡አለው።\nእያንዳንዱ፡ሰው፡የዕረፍትና፡የመዝናናት፡እንዲሁም፡በአግባብ፡የተወሰኑ፡የሥራ፡ሰዓቶች፡እንዲኖሩትና፡በየጊዜው፡የዕረፍት፡ጊዜያትን፡ከደመወዝ፡ጋር፡የማግኘት፡መብት፡አለው።"
+  specimen_16: "እያንዳንዱ፡ሰው፡በዚህ፡ውሳን፡ውስጥ፡የተዘረዘሩት፡መብቶችና፡ነጻነቶች፡በሙሉ፡በተግባር፡እንዲውሉ፡ለሚደረግባቸው፡የኀብረሰብና፡የኢንተርናሽናል፡ሥርዓት፡የመጠቀም፡መብት፡አለው።\nበዚህ፡ውሳኔ፡ከላይ፡የተዘረዘረው፡ሁሉ፡በዚሁ፡ውስጥ፡የተጠቀሱትን፡ማናቸውም፡መብቶች፡ወይም፡ነጻነቶች፡ለማበላሸት፡በታሰበ፡ማንኛውም፡ዓይነት፡ተግባር፡ለማዋል፡ወይም፡ድርጊትን፡ለመፈጸም፡ለማንኛውም፡መንግሥት፡ወይም፡ድርጅት፡ወይም፡ሰው፡የተባሉ፡አይተረጎሙም።\nየሰው፡ልጅ፡ሁሉ፡ሲወለድ፡ነጻና፡በክብርና፡በመብትም፡እኩልነት፡ያለው፡ነው።፡የተፈጥሮ፡ማስተዋልና፡ሕሊና፡ስላለው፡አንዱ፡ሌላውን፡በወንድማማችነት፡መንፈስ፡መመልከት፡ይገባዋል።\nእያንዳንዱ፡ሰው፡የዘር፡የቀለም፡የጾታ፡የቋንቋ፡የሃይማኖት፡የፖለቲካ፡ወይም፡የሌላ፡ዓይነት፡አስተሳሰብ፡የብሔራዊ፡ወይም፡የኀብረተሰብ፡ታሪክ፡የሀብት፡የትውልድ፡ወይም፡የሌላ፡ደረጃ፡ልዩነት፡ሳይኖሩ፡በዚሁ፡ውሳኔ፡የተዘረዘሩት፡መብቶችንና፡ነጻነቶች፡ሁሉ፡እንዲከበሩለት፡ይገባል።\nከዚህም፡በተቀረ፡አንድ፡ሰው፡ከሚኖርበት፡አገር፡ወይም፡ግዛት፡የፖለቲካ፡የአገዛዝ፡ወይም፡የኢንተርናሽናል፡አቋም፡የተነሳ፡አገሩ፡ነጻም፡ሆነ፡በሞግዚትነት፡አስተዳደር፡ወይም፡እራሱን፡ችሎ፡የማይተዳደር፡አገር፡ተወላጅ፡ቢሆንም፡በማንኛውም፡ዓይነት፡ገደብ፡ያለው፡አገዛዝ፡ሥር፡ቢሆንም፡ልዩነት፡አይፈጸምበትም።"
+}
diff --git a/lang/languages/am/language.textproto b/lang/languages/am/language.textproto
deleted file mode 100644
index 0848f00c1..000000000
--- a/lang/languages/am/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "am"
-name: "Amharic"
-preferred_name: ""
-autonym: "ኣማርኛ"
-population: 35728475
-region: "ET"
-region: "IL"
-script: "Ethiopic"
-exemplar_chars {
-  base: "ሀ ሁ ሂ ሃ ሄ ህ ሆ ኰ ኲ ኳ ኴ ኵ ለ ሉ ሊ ላ ሌ ል ሎ ዀ ዂ ዃ ዄ ዅ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ወ ዉ ዊ ዋ ዌ ው ዎ መ ሙ ሚ ማ ሜ ም ሞ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ረ ሩ ሪ ራ ሬ ር ሮ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ሰ ሱ ሲ ሳ ሴ ስ ሶ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ሸ ሹ ሺ ሻ ሼ ሽ ሾ የ ዩ ዪ ያ ዬ ይ ዮ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ደ ዱ ዲ ዳ ዴ ድ ዶ ቈ ቊ ቋ ቌ ቍ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ገ ጉ ጊ ጋ ጌ ግ ጎ ቘ ቚ ቛ ቜ ቝ ጐ ጒ ጓ ጔ ጕ በ ቡ ቢ ባ ቤ ብ ቦ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ተ ቱ ቲ ታ ቴ ት ቶ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ቸ ቹ ቺ ቻ ቼ ች ቾ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ነ ኑ ኒ ና ኔ ን ኖ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ፈ ፉ ፊ ፋ ፌ ፍ ፎ አ ኡ ኢ ኣ ኤ እ ኦ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ከ ኩ ኪ ካ ኬ ክ ኮ ቨ ቩ ቪ ቫ ቬ ቭ ቮ"
-  numerals: "፩ ፪ ፫ ፬ ፭ ፮ ፯ ፰ ፱ ፲ ፳ ፴ ፵ ፶ ፷ ፸ ፹ ፺ ፻"
-  punctuation: "‐ – , ፡ ፣ ፤ ፥ ፦ ! ? . ። ‹ › « » ( ) \\[ \\]"
-  index: "ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ"
-}
diff --git a/lang/languages/am/sampletext.textproto b/lang/languages/am/sampletext.textproto
deleted file mode 100644
index 7a81a8055..000000000
--- a/lang/languages/am/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "am"
diff --git a/lang/languages/amo/language.textproto b/lang/languages/amo.textproto
similarity index 73%
rename from lang/languages/amo/language.textproto
rename to lang/languages/amo.textproto
index 26f5bf22e..df03fe2a1 100644
--- a/lang/languages/amo/language.textproto
+++ b/lang/languages/amo.textproto
@@ -7,3 +7,6 @@ region: "NG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/an/language.textproto b/lang/languages/an.textproto
similarity index 87%
rename from lang/languages/an/language.textproto
rename to lang/languages/an.textproto
index 77940dd7c..ff424f7ef 100644
--- a/lang/languages/an/language.textproto
+++ b/lang/languages/an.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ñ Ó Ú a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ñ ó ú"
   marks: "◌́ ◌̃"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/aoz/language.textproto b/lang/languages/aoz.textproto
similarity index 88%
rename from lang/languages/aoz/language.textproto
rename to lang/languages/aoz.textproto
index ba8c5c339..e01adedc6 100644
--- a/lang/languages/aoz/language.textproto
+++ b/lang/languages/aoz.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Ê Í Ó Ú Û a b c d e f g h i j k l m n o p q r s t u v w x y z á é ê í ó ú û"
   marks: "◌́ ◌̂"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ar.textproto b/lang/languages/ar.textproto
new file mode 100644
index 000000000..0f7d87900
--- /dev/null
+++ b/lang/languages/ar.textproto
@@ -0,0 +1,63 @@
+id: "ar"
+name: "Arabic"
+preferred_name: ""
+autonym: "العربية"
+population: 350901500
+region: "AE"
+region: "BH"
+region: "CM"
+region: "CY"
+region: "DJ"
+region: "DZ"
+region: "EG"
+region: "EH"
+region: "ER"
+region: "IL"
+region: "IQ"
+region: "IR"
+region: "JO"
+region: "KE"
+region: "KM"
+region: "KW"
+region: "LB"
+region: "LY"
+region: "MA"
+region: "ML"
+region: "MR"
+region: "NE"
+region: "NG"
+region: "OM"
+region: "PS"
+region: "QA"
+region: "SA"
+region: "SD"
+region: "SO"
+region: "SS"
+region: "SY"
+region: "TD"
+region: "TJ"
+region: "TN"
+region: "TR"
+region: "YE"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "ي و ه ن م ل ك ق ف غ ع ظ ط ض ص ش س ز ر ذ د خ ح ج ث ت ب ا ة"
+  auxiliary: "ڛ ڢ ٯ ڧ ک ی ڤ ڥ پ چ گ ڨ ڭ ڠ"
+  marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٰ"
+  numerals: "٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩"
+  punctuation: "\\- ‐ ‑ – — ، ؛ \\: ! ؟ . … \' \" « » ( ) \\[ \\]"
+  index: "ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي"
+}
+sample_text {
+  masthead_full: "يولد"
+  masthead_partial: "جم"
+  tester: "لمّا كان الاعتراف بالكرامة المتأصلة في جميع أعضاء الأسرة البشرية"
+  poster_sm: "ولما كان تناسي"
+  poster_md: "ولما كان"
+  poster_lg: "يولد"
+  specimen_48: "ولما كانت شعوب الأمم المتحدة قد أكدت في الميثاق من جديد إيمانها"
+  specimen_36: "يولد جميع الناس أحرارًا متساوين في الكرامة والحقوق. وقد وهبوا عقلاً وضميرًا وعليهم أن يعامل بعضهم بعضًا بروح الإخاء."
+  specimen_32: "كل الناس سواسية أمام القانون ولهم الحق في التمتع بحماية متكافئة عنه دون أية تفرقة، كما أن لهم جميعاً الحق في حماية متساوية ضد أي تمييز يُخل بهذا الإعلان وضد أي تحريض على تمييز كهذا."
+  specimen_21: "لكل شخص الحق في أن يلجأ إلى المحاكم الوطنية لإنصافه عن أعمال فيها اعتداء على الحقوق الأساسية التي يمنحها له القانون.\nلا يجوز القبض على أي إنسان أو حجزه أو نفيه تعسفاً.\nلكل إنسان الحق، على قدم المساواة التامة مع الآخرين، في أن تنظر قضيته أمام محكمة مستقلة نزيهة نظراً عادلاً علنياً للفصل في حقوقه والتزاماته وأية تهمة جنائية توجه له."
+  specimen_16: "لا يعرض أحد لتدخل تعسفي في حياته الخاصة أو أسرته أو مسكنه أو مراسلاته أو لحملات على شرفه وسمعته. ولكل شخص الحق في حماية القانون من مثل هذا التدخل أو تلك الحملات.\nلكل شخص الحق في حرية التفكير والضمير والدين. ويشمل هذا الحق حرية تغيير ديانته أو عقيدته، وحرية الإعراب عنهما بالتعليم والممارسة وإقامة الشعائر ومراعاتها سواء أكان ذلك سرا أم مع الجماعة.\nلكل شخص الحق في حرية الرأي والتعبير. ويشمل هذا الحق حرية اعتناق الآراء دون أي تدخل، واستقاء الأنباء والأفكار وتلقيها وإذاعتها بأية وسيلة كانت دون تقيد بالحدود الجغرافية.\nلكل شخص بصفته عضوا في المجتمع الحق في الضمانة الاجتماعية وفي أن تحقق بوساطة المجهود القومي والتعاون الدولي وبما يتفق ونظم كل دولة ومواردها الحقوق الاقتصادية والاجتماعية والتربوية التي لا غنى عنها لكرامته وللنمو الحر لشخصيته."
+}
diff --git a/lang/languages/ar/language.textproto b/lang/languages/ar/language.textproto
deleted file mode 100644
index a595fae86..000000000
--- a/lang/languages/ar/language.textproto
+++ /dev/null
@@ -1,50 +0,0 @@
-id: "ar"
-name: "Arabic"
-preferred_name: ""
-autonym: "العربية"
-population: 350901500
-region: "SA"
-region: "LY"
-region: "NE"
-region: "TN"
-region: "AE"
-region: "SS"
-region: "MA"
-region: "YE"
-region: "NG"
-region: "OM"
-region: "ER"
-region: "CM"
-region: "EH"
-region: "BH"
-region: "DJ"
-region: "IQ"
-region: "TJ"
-region: "JO"
-region: "LB"
-region: "KE"
-region: "CY"
-region: "TR"
-region: "KM"
-region: "SD"
-region: "EG"
-region: "ML"
-region: "SO"
-region: "KW"
-region: "DZ"
-region: "MR"
-region: "QA"
-region: "SY"
-region: "PS"
-region: "IR"
-region: "TD"
-region: "IL"
-script: "Perso-Arabic"
-exemplar_chars {
-  base: "ي و ه ن م ل ك ق ف غ ع ظ ط ض ص ش س ز ر ذ د خ ح ج ث ت ب ا ة"
-  auxiliary: "ڛ ڢ ٯ ڧ ک ی ڤ ڥ پ چ گ ڨ ڭ ڠ"
-  marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٰ"
-  numerals: "٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩"
-  punctuation: "\\- ‐ ‑ – — ، ؛ \\: ! ؟ . … \' \" « » ( ) \\[ \\]"
-  index: "ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي"
-}
diff --git a/lang/languages/ar/sampletext.textproto b/lang/languages/ar/sampletext.textproto
deleted file mode 100644
index e03406fe1..000000000
--- a/lang/languages/ar/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ar"
diff --git a/lang/languages/arn.textproto b/lang/languages/arn.textproto
new file mode 100644
index 000000000..33c58cc4e
--- /dev/null
+++ b/lang/languages/arn.textproto
@@ -0,0 +1,24 @@
+id: "arn"
+name: "Mapuche"
+preferred_name: ""
+autonym: "Mapudungun"
+population: 272802
+region: "CL"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G I J K L M N O P Q R S T U W X Y Z Ü Ñ a b c d e f g i j k l m n o p q r s t u w x y z ü ñ"
+  marks: "◌̃ ◌̈"
+}
+sample_text {
+  masthead_full: "KkOo"
+  masthead_partial: "Mm"
+  tester: "Kimnieel fij mapu mew tañi kimgen kvme felen kisugvnew felen"
+  poster_sm: "Tañi mvlenoam"
+  poster_md: "Ka kimnieel"
+  poster_lg: "Kom"
+  specimen_48: "Femueci mvlcy ñi kimniegeael kom mapu mew nor kvme felen ka kisugvnew"
+  specimen_36: "EPU. Kom pu xokiñ ce, cem az mogengeayrume mvlelu fij mapu, ka femueci xvr nvwkvley tvfaci Fvxa Cijka mew."
+  specimen_32: "Kom femgey ce wigka ñi wirikon zugu mew (\"Ley\" pi ta wigka) fey mew kom pu ce pepi nvway tvfaci zugu mew. Yamgerumenole cuci sugu rume wirintukulelu tvfaci \"Fvxa Cijka\" mew."
+  specimen_21: "Pu wigka mew mvley kiñe ruka cew ñi norvmgekemum ixofij wezake zugu; fey mew pepi nvway kom pu ce tañi igkañmageam, yamvñmagenole tvfeyci nor zugu wirintukulelu fvta cijka mew \"Constitución\" pigelu, nielu kom pu xokiñke ce fij mapu.\nGelay iney rume ñi koraltukugeael ka wemvnentugeael ka wemvnentugeael tañi mapu mew wezakamekenole."
+  specimen_16: "Tvfeyci wigka norvmzuguwe ruka mew, kom pu ce mvley ajkvtuñmageael ñi zugu, tañi kimgeam ñi weza femvn kam femnon ka tañi kimgeam cumueci ñi feletuael ragi kakelu pu ce.\nWigka ñi wirikon zugu mew (\"Ley\" pi ta wigka) nvwkvley kom pu ce ka fey mew mvley ñi igkañmageael egvn kake ce zugukonle ñi mogen mew, kam ka ce pekanka lef konle ñi ruka mew, kom tañi felen mew ka wezaka zuguyekañmagele.\nCem rakizuam rume cem feyentun rume nieay fij pu ce gelayay cumuelu ñi mvntuñmageael ka takuñmageael. Kisuzuam kvpa konle kake feyentun mew femay mvten, kvpa kimelle ñi rakizuam ka feyentun ka pepi kimelafi."
+}
diff --git a/lang/languages/arn/language.textproto b/lang/languages/arn/language.textproto
deleted file mode 100644
index 2c99c217c..000000000
--- a/lang/languages/arn/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "arn"
-name: "Mapuche"
-preferred_name: ""
-autonym: "Mapudungun"
-population: 272802
-region: "CL"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G I J K L M N O P Q R S T U W X Y Z Ü Ñ a b c d e f g i j k l m n o p q r s t u w x y z ü ñ"
-  marks: "◌̃ ◌̈"
-}
diff --git a/lang/languages/arn/sampletext.textproto b/lang/languages/arn/sampletext.textproto
deleted file mode 100644
index 049485ef8..000000000
--- a/lang/languages/arn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "arn"
diff --git a/lang/languages/aro/language.textproto b/lang/languages/aro.textproto
similarity index 74%
rename from lang/languages/aro/language.textproto
rename to lang/languages/aro.textproto
index 16d6768e0..7438557a2 100644
--- a/lang/languages/aro/language.textproto
+++ b/lang/languages/aro.textproto
@@ -7,3 +7,6 @@ region: "BO"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/arq/language.textproto b/lang/languages/arq.textproto
similarity index 90%
rename from lang/languages/arq/language.textproto
rename to lang/languages/arq.textproto
index 3f540bd3e..fb5bde303 100644
--- a/lang/languages/arq/language.textproto
+++ b/lang/languages/arq.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٰ"
   numerals: "٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/ars/language.textproto b/lang/languages/ars.textproto
similarity index 90%
rename from lang/languages/ars/language.textproto
rename to lang/languages/ars.textproto
index 33f9c3c0a..6a8097fb5 100644
--- a/lang/languages/ars/language.textproto
+++ b/lang/languages/ars.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٰ"
   numerals: "٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/ary/language.textproto b/lang/languages/ary.textproto
similarity index 90%
rename from lang/languages/ary/language.textproto
rename to lang/languages/ary.textproto
index 7c6966e26..24e7fbcff 100644
--- a/lang/languages/ary/language.textproto
+++ b/lang/languages/ary.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٰ"
   numerals: "٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/arz/language.textproto b/lang/languages/arz.textproto
similarity index 90%
rename from lang/languages/arz/language.textproto
rename to lang/languages/arz.textproto
index 1bd3a5178..5ccbee3a7 100644
--- a/lang/languages/arz/language.textproto
+++ b/lang/languages/arz.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٰ"
   numerals: "٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/as/language.textproto b/lang/languages/as.textproto
similarity index 95%
rename from lang/languages/as/language.textproto
rename to lang/languages/as.textproto
index b84c8a649..d82a64589 100644
--- a/lang/languages/as/language.textproto
+++ b/lang/languages/as.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … । \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "\\u09BC অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ং ঃ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ৎ ত থ দ ধ ন প ফ ব ভ ম য ৰ ল ৱ শ ষ স হ \\u09CD"
 }
+sample_text {
+  fallback_language: "bn"
+}
diff --git a/lang/languages/asa/language.textproto b/lang/languages/asa.textproto
similarity index 88%
rename from lang/languages/asa/language.textproto
rename to lang/languages/asa.textproto
index d7233bf12..793c0b65d 100644
--- a/lang/languages/asa/language.textproto
+++ b/lang/languages/asa.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "Q X q x"
   index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ast.textproto b/lang/languages/ast.textproto
new file mode 100644
index 000000000..765bed850
--- /dev/null
+++ b/lang/languages/ast.textproto
@@ -0,0 +1,28 @@
+id: "ast"
+name: "Asturian"
+preferred_name: ""
+autonym: "Asturianu"
+population: 650205
+region: "ES"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I L M N O P Q R S T U V X Y Z Á É Í Ñ Ó Ú Ü Ḥ Ḷ a b c d e f g h i l m n o p q r s t u v x y z á é í ñ ó ú ü ḥ ḷ"
+  auxiliary: "ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī j k º ò ŏ ô ö ø ō œ ù ŭ û ū w ÿ"
+  marks: "◌́ ◌̃ ◌̈ ◌̣"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? ¿ . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\\\ \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I L M N Ñ O P Q R S T U V X Y Z"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Ll"
+  tester: "Visto que la llibertá, la xusticia y la paz en mundu sofítense"
+  poster_sm: "Visto que ye"
+  poster_md: "Visto que"
+  poster_lg: "Tolos"
+  specimen_48: "Visto que los pueblos dexaron llantáu na Carta de les Naciones"
+  specimen_36: "Naide nun será sometíu a esclavismu nin a servidume; l\'esclavismu y el comerciu d\'esclavos prohíbense en toles sos formes."
+  specimen_32: "Toa persona non solo tien drechu al descansu y a la folganza, sinón tamién a una duración razonable del tiempu de trabayu y a vacaciones periódiques pagaes."
+  specimen_21: "Toa persona tien drechu a que s\'estableza un orde social y internacional u los drechos y llibertaes proclamaos nesta Declaración aporten a ser efeutivos dafechu.\nNada de la presente Declaración nun podrá interpretase nel sen d\'atribuyi-y al Estáu, a un grupu o a una persona\'l drechu d\'entamar y desendolcar actividaes o realizar aiciones empobinaes a desaniciar cualesquier drechu o llibertá de les que nesta Declaración se proclamen."
+  specimen_16: "Visto que la llibertá, la xusticia y la paz en mundu sofítense na reconocencia de la dignidá intrínseca y de los drechos iguales y inayenables de tolos miembros que formen la familia humana;\nVisto que desconocer o facer de menos los drechos humanos foi la causa d\'actos xabaces y dañibles pa la conciencia de la humanidá, y que se proclamó, comu aspiración cimera del home, el llogru d\'un mundu onde los seres humanos, llibres del mieu y de la llaceria, gocen de la llibertá de palabra y de la llibertá de creyencies;\nVisto que ye esencial un réxime de Drechu que protexa los drechos humanos, p\'asina nun se ver emburriáu l\'home al recursu caberu de rebelase escontra de la tiranía y de la opresión;"
+}
diff --git a/lang/languages/ast/language.textproto b/lang/languages/ast/language.textproto
deleted file mode 100644
index 40d9d7b82..000000000
--- a/lang/languages/ast/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "ast"
-name: "Asturian"
-preferred_name: ""
-autonym: "Asturianu"
-population: 650205
-region: "ES"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I L M N O P Q R S T U V X Y Z Á É Í Ñ Ó Ú Ü Ḥ Ḷ a b c d e f g h i l m n o p q r s t u v x y z á é í ñ ó ú ü ḥ ḷ"
-  auxiliary: "ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī j k º ò ŏ ô ö ø ō œ ù ŭ û ū w ÿ"
-  marks: "◌́ ◌̃ ◌̈ ◌̣"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? ¿ . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\\\ \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I L M N Ñ O P Q R S T U V X Y Z"
-}
diff --git a/lang/languages/ast/sampletext.textproto b/lang/languages/ast/sampletext.textproto
deleted file mode 100644
index 6f90d94ed..000000000
--- a/lang/languages/ast/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ast"
diff --git a/lang/languages/atj/language.textproto b/lang/languages/atj.textproto
similarity index 74%
rename from lang/languages/atj/language.textproto
rename to lang/languages/atj.textproto
index 6df4cb122..80f8f9810 100644
--- a/lang/languages/atj/language.textproto
+++ b/lang/languages/atj.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/av/language.textproto b/lang/languages/av.textproto
similarity index 89%
rename from lang/languages/av/language.textproto
rename to lang/languages/av.textproto
index 30164f91a..3db0fe8ea 100644
--- a/lang/languages/av/language.textproto
+++ b/lang/languages/av.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӏ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӏ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/awa/language.textproto b/lang/languages/awa.textproto
similarity index 93%
rename from lang/languages/awa/language.textproto
rename to lang/languages/awa.textproto
index 45bcfdc58..ecc740043 100644
--- a/lang/languages/awa/language.textproto
+++ b/lang/languages/awa.textproto
@@ -3,8 +3,8 @@ name: "Awadhi"
 preferred_name: ""
 autonym: "अवधी"
 population: 25862923
-region: "NP"
 region: "IN"
+region: "NP"
 script: "Devanagari"
 exemplar_chars {
   base: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ऄ ‌ ‍"
@@ -13,3 +13,6 @@ exemplar_chars {
   numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
   punctuation: "। ॥ ॰"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/ay.textproto b/lang/languages/ay.textproto
new file mode 100644
index 000000000..bbbb54126
--- /dev/null
+++ b/lang/languages/ay.textproto
@@ -0,0 +1,25 @@
+id: "ay"
+name: "Aymara"
+preferred_name: ""
+autonym: "Aymar"
+population: 2838620
+region: "BO"
+region: "PE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ï Ñ Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ä ï ñ ü ’"
+  marks: "◌̃ ◌̈"
+}
+sample_text {
+  masthead_full: "TtAa"
+  masthead_partial: "Qq"
+  tester: "UNANCHASA, aka pachana jaqejh munañanïsina, cheqpacha amuyasisa,"
+  poster_sm: "UNANCHASA, jaqen"
+  poster_md: "UNANCHASA,"
+  poster_lg: "Taqpach"
+  specimen_48: "UNANCHASA, Mathapit Mayachat Markanakan Arupa taqjhatasna akham"
+  specimen_36: "UNANCHASA, Mathapit Markanakan amuyasitanakapa yatisina khuskat taqpachanipaw wayt\'asipjhañapa phoqasiñapataki."
+  specimen_32: "Ukhamaraki, janiw juk\'ampíkaspas ukhama uñjasispati jach\'a markanakaru isk\'a markanakat sipanjha; taqpacha markanakajh tinkusitäpjhew, jaqenakapasti chikasitapjharakiw."
+  specimen_21: "Sapaqat jaqejh jan khitirus ajhsarasa jakañapa, munañapa, amuyasiñapa, jaqe kankañapa taqjhatasiñapaw.\nJaniw j aqenakat maynikisa uywarj ama aljhatäkaspati, ukhamarus jan jupa munasin janiw kuna urañarus, irnaqañarus wayt\'asitäspati.\nJanirakiw taqe jaqenakat maynikis khuyaña mutuñanakampi chhojrinchatäñapati."
+  specimen_16: "Jaqejh, jaqëtapat layku, kauki markankipansa jaqe kankañapajh wali chaninchatëñapaw.\nJiliri p\'eqeñanakajh taqe mayniru khuskat uñjapjhañapaw. Taqe mayniw arjhatatäñapa; kunapachati markanakan hualinkañapataki inoqat arunaka khitis t\'unjaña munaspa ukajha, qhananchatäñapaw.\nKhititejh ñanqhachat uñjasisp ukajha, jach\'a j ilirinakaruwa yatiyasiñapa arjhatatäñapataki.\nJaniw khitis markapana mutuyatäniti, janirakiw khitis markapata alismukutäniti.\nTaqe mayniw juchanchata uñjasisa mä cheqa arun jilirimpi ist\'ayasiñap wakisi qhananchayasiñataki, uka qepatsti cheq cheqaru t \'aqayasiñataki."
+}
diff --git a/lang/languages/ay/language.textproto b/lang/languages/ay/language.textproto
deleted file mode 100644
index 478ed00ef..000000000
--- a/lang/languages/ay/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "ay"
-name: "Aymara"
-preferred_name: ""
-autonym: "Aymar"
-population: 2838620
-region: "PE"
-region: "BO"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ï Ñ Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ä ï ñ ü ’"
-  marks: "◌̃ ◌̈"
-}
diff --git a/lang/languages/ay/sampletext.textproto b/lang/languages/ay/sampletext.textproto
deleted file mode 100644
index 097567491..000000000
--- a/lang/languages/ay/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ay"
diff --git a/lang/languages/az/language.textproto b/lang/languages/az.textproto
similarity index 94%
rename from lang/languages/az/language.textproto
rename to lang/languages/az.textproto
index 565d21ad5..af46b7a5d 100644
--- a/lang/languages/az/language.textproto
+++ b/lang/languages/az.textproto
@@ -3,12 +3,12 @@ name: "Azerbaijani"
 preferred_name: ""
 autonym: "Азәрбајҹан"
 population: 9690091
-region: "AZ"
 region: "AM"
+region: "AZ"
 region: "TR"
-script: "Perso-Arabic"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V X Y Z Ç Ö Ü Ğ Ş Ə a b c d e f g h i j k l m n o p q r s t u v x y z ç ö ü ğ İ ı ş ə ʼ"
   auxiliary: "Ä ä"
@@ -17,3 +17,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "A B C Ç D E Ə F G Ğ H X I İ J K Q L M N O Ö P R S Ş T U Ü V Y Z W"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/az_Arab/language.textproto b/lang/languages/az_Arab.textproto
similarity index 83%
rename from lang/languages/az_Arab/language.textproto
rename to lang/languages/az_Arab.textproto
index 8f0cca6c5..3db1fda79 100644
--- a/lang/languages/az_Arab/language.textproto
+++ b/lang/languages/az_Arab.textproto
@@ -4,10 +4,13 @@ preferred_name: ""
 autonym: ""
 population: 21614414
 region: "IQ"
-region: "TR"
 region: "IR"
-script: "Perso-Arabic"
+region: "TR"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/az_Cyrl/language.textproto b/lang/languages/az_Cyrl.textproto
similarity index 92%
rename from lang/languages/az_Cyrl/language.textproto
rename to lang/languages/az_Cyrl.textproto
index e20b61abf..52514cf38 100644
--- a/lang/languages/az_Cyrl/language.textproto
+++ b/lang/languages/az_Cyrl.textproto
@@ -5,12 +5,15 @@ autonym: ""
 population: 1142175
 region: "AZ"
 region: "RU"
-script: "Perso-Arabic"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "а ә б в г ғ д е ж з и й ј к ҝ л м н о ө п р с т у ү ф х һ ч ҹ ш ы"
   auxiliary: "ц щ ъ ь э ю я"
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "А Ә Б В Г Ғ Д Е Ж З И Й Ј К Ҝ Л М Н О Ө П Р С Т У Ү Ф Х Һ Ч Ҹ Ш Ы"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/ba/language.textproto b/lang/languages/ba.textproto
similarity index 90%
rename from lang/languages/ba/language.textproto
rename to lang/languages/ba.textproto
index 05952a7b4..64296e232 100644
--- a/lang/languages/ba/language.textproto
+++ b/lang/languages/ba.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ç Ö Ü Č Ğ Ķ Ņ Ś Ş Š Ź a b c d e f g h i j k l m n o p q r s t u v w x y z ä ç ö ü č ğ İ ı ķ ņ ś ş š ź"
   marks: "◌́ ◌̆ ◌̇ ◌̈ ◌̌ ◌̧"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/bal/language.textproto b/lang/languages/bal.textproto
similarity index 90%
rename from lang/languages/bal/language.textproto
rename to lang/languages/bal.textproto
index ef4adf9b1..6f89695c4 100644
--- a/lang/languages/bal/language.textproto
+++ b/lang/languages/bal.textproto
@@ -5,11 +5,14 @@ autonym: "بلۏچی"
 population: 10796398
 region: "AE"
 region: "IR"
-region: "PK"
 region: "OM"
+region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
   base: "ء آ ا ب ت ج د ر ز س ش ل م ن ه و ٹ پ چ ڈ ژ ک گ ی ۏ ے ݔ ࢣ"
   marks: "◌َ ◌ُ ◌ِ ◌ٓ"
   numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/ban.textproto b/lang/languages/ban.textproto
new file mode 100644
index 000000000..301916de9
--- /dev/null
+++ b/lang/languages/ban.textproto
@@ -0,0 +1,27 @@
+id: "ban"
+name: "Balinese"
+preferred_name: ""
+autonym: "Bali"
+population: 4806468
+region: "ID"
+script: "Latin"
+exemplar_chars {
+  base: "ᬳ ᬦ ᬘ ᬭ ᬓ ᬤ ᬢ ᬲ ᬯ ᬮ ᬫ ᬕ ᬩ ᬗ ᬧ ᬚ ᬬ ᬜ ᬅ ᬆ ᬇ ᬈ ᬋ ᬌ ᬍ ᬎ ᬉ ᬊ ᬏ ᬐ ᬑ ᬒ"
+  auxiliary: "ᬡ ᬙ ᬔ ᬥ ᬟ ᬠ ᬣ ᬝ ᬞ ᬰ ᬱ ᬖ ᬪ ᬨ ᬛ"
+  marks: "◌ᬀ ◌ᬁ ◌ᬂ ◌ᬃ ◌ᬄ ◌᬴ ◌ᬵ ◌ᬶ ◌ᬷ ◌ᬸ ◌ᬹ ◌ᬺ ◌ᬾ ◌ᬿ"
+  numerals: "᭐ ᭕ ᭑ ᭖ ᭒ ᭗ ᭓ ᭘ ᭔ ᭙ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "᭞ ᭟ ᭝ ᭜ ᭚ ᭛ ᭠"
+}
+sample_text {
+  masthead_full: "SsAa"
+  masthead_partial: "Mm"
+  tester: "Manimbang riantukan pangangken ring subhakarma lan hak-hak sane"
+  poster_sm: "Pangawedar"
+  poster_md: "Satunggil"
+  poster_lg: "Sami"
+  specimen_48: "Selantur ipun nenten pacang kawentenang pabinayan sangkaning"
+  specimen_36: "Manimbang riantukan ngupapira paiketan pasawitran ring sajeroning negara-negara patut kautsahayang.\nMAJELIS UMUM"
+  specimen_32: "Manimbang riantukan pahaning wirasa sane pateh ngenenin indik hak-hak lan kebebasan-kebebasan punika mabuat pisan maka panglaksana sane sumeken pisan saking semaya punika, mawinan,"
+  specimen_21: "Manimbang riantukan pangangken ring subhakarma lan hak-hak sane pateh tur pastika saking paguyuban kulawarga manusa sami inggih punika dasar kemerdekaan, keadilan lan perdamaian ring jagat.\nManimbang riantukan hak-hak manusa patut kaayomin malarapan peraturan hukum mangda para jana nenten kadulumuk milih pamargi andaga utsaha penguntat maka panungkas kaduratmakan miwah penjajahan."
+  specimen_16: "Manimbang riantukan pangangken ring subhakarma lan hak-hak sane pateh tur pastika saking paguyuban kulawarga manusa sami inggih punika dasar kemerdekaan, keadilan lan perdamaian ring jagat.\nManimbang riantukan ngelempasang lan ngandapang hak azasi manusia janten ngawinang parilaksana-parilaksana sane kaon sane ngawinang rasa kroda sajeroning herdaya (unteng pekayunan) manusapada, tur kamanggehang jagat genah manusa pacang muponin bebas mawicara lan maagama tur luput saking rasa ajrih miwah kakirangan, punika sampun kajantenang pinaka tatujon pilih utama saking para jana."
+}
diff --git a/lang/languages/ban/language.textproto b/lang/languages/ban/language.textproto
deleted file mode 100644
index f5e805c94..000000000
--- a/lang/languages/ban/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "ban"
-name: "Balinese"
-preferred_name: ""
-autonym: "Bali"
-population: 4806468
-region: "ID"
-script: "Latin"
-exemplar_chars {
-  base: "ᬳ ᬦ ᬘ ᬭ ᬓ ᬤ ᬢ ᬲ ᬯ ᬮ ᬫ ᬕ ᬩ ᬗ ᬧ ᬚ ᬬ ᬜ ᬅ ᬆ ᬇ ᬈ ᬋ ᬌ ᬍ ᬎ ᬉ ᬊ ᬏ ᬐ ᬑ ᬒ"
-  auxiliary: "ᬡ ᬙ ᬔ ᬥ ᬟ ᬠ ᬣ ᬝ ᬞ ᬰ ᬱ ᬖ ᬪ ᬨ ᬛ"
-  marks: "◌ᬀ ◌ᬁ ◌ᬂ ◌ᬃ ◌ᬄ ◌᬴ ◌ᬵ ◌ᬶ ◌ᬷ ◌ᬸ ◌ᬹ ◌ᬺ ◌ᬾ ◌ᬿ"
-  numerals: "᭐ ᭕ ᭑ ᭖ ᭒ ᭗ ᭓ ᭘ ᭔ ᭙ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "᭞ ᭟ ᭝ ᭜ ᭚ ᭛ ᭠"
-}
diff --git a/lang/languages/ban/sampletext.textproto b/lang/languages/ban/sampletext.textproto
deleted file mode 100644
index 410d0afe0..000000000
--- a/lang/languages/ban/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ban"
diff --git a/lang/languages/bap/language.textproto b/lang/languages/bap.textproto
similarity index 75%
rename from lang/languages/bap/language.textproto
rename to lang/languages/bap.textproto
index f3f84e8b0..e568097e2 100644
--- a/lang/languages/bap/language.textproto
+++ b/lang/languages/bap.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/bar/language.textproto b/lang/languages/bar.textproto
similarity index 76%
rename from lang/languages/bar/language.textproto
rename to lang/languages/bar.textproto
index 1a816c9a8..78ef55ce2 100644
--- a/lang/languages/bar/language.textproto
+++ b/lang/languages/bar.textproto
@@ -8,3 +8,6 @@ region: "DE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bas/language.textproto b/lang/languages/bas.textproto
similarity index 93%
rename from lang/languages/bas/language.textproto
rename to lang/languages/bas.textproto
index 06acb3173..74c639602 100644
--- a/lang/languages/bas/language.textproto
+++ b/lang/languages/bas.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B Ɓ C D E Ɛ F G H I J K L M N Ŋ O Ɔ P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bax.textproto b/lang/languages/bax.textproto
new file mode 100644
index 000000000..d04f29a70
--- /dev/null
+++ b/lang/languages/bax.textproto
@@ -0,0 +1,23 @@
+id: "bax"
+name: "Bamun"
+preferred_name: ""
+autonym: "ꛀꛣꚧꚳ"
+population: 332940
+region: "CM"
+script: "Bamum"
+exemplar_chars {
+  base: "ꚠ ꚰ ꛀ ꛐ ꛠ ꚡ ꚱ ꛁ ꛑ ꛡ ꚢ ꚲ ꛂ ꛒ ꛢ ꛲ ꚣ ꚳ ꛃ ꛓ ꛣ ꛳ ꚤ ꚴ ꛄ ꛔ ꛤ ꛴ ꚥ ꚵ ꛅ ꛕ ꛥ ꛵ ꚦ ꚶ ꛆ ꛖ ꛦ ꛶ ꚧ ꚷ ꛇ ꛗ ꛧ ꛷ ꚨ ꚸ ꛈ ꛘ ꛨ ꚩ ꚹ ꛉ ꛙ ꛩ ꚪ ꚺ ꛊ ꛚ ꛪ ꚫ ꚻ ꛋ ꛛ ꛫ ꚬ ꚼ ꛌ ꛜ ꛬ ꚭ ꚽ ꛍ ꛝ ꛭ ꚮ ꚾ ꛎ ꛞ ꛮ ꚯ ꚿ ꛏ ꛟ ꛯ"
+}
+sample_text {
+  masthead_full: "PpEe"
+  masthead_partial: "Nn"
+  tester: "Lo’ te ka kúmshe nga wûme, yúe a njit ne gú púen te ngúet púen"
+  poster_sm: "Wupme pa te"
+  poster_md: "Lo’ te ka"
+  poster_lg: "mvé"
+  specimen_48: "Lo’ te ka, te mâ kèn, túm túm te nda shut ngu ngu mbône kpa’ mbit"
+  specimen_36: "Mo’ nshié mún ntap ndo’ pe’i mkpèn ké te mbe fa’kpèn ne, me nga kâ kpèn pua ntèn kpèn ka kpa’ njié kèn te gû mbe map mentèn na."
+  specimen_32: "Nshié mún ghét mféé kèr’ùe a mbe nsa’ lo’ te fâne púen pua ngu ngu, mgbète kèn küka pa mféé kêt pua kú ghétkét ngam te yire yi nsa’ nga njú njetne yi mbe wumkéri ntúúm na."
+  specimen_21: "Mo’ nshié me yúe’ne lo’ te yire yi nsa’ ngam mâ njetni suo kú nshié nsa’ ngu, lap lap pùen ké ndî mún ne, ne yi ngét nshié mféé kêt te ghét pesa’kúe yúe pe fa a nyé’re pa mféé kêt puo kú ghétkét ngam’ùe pe ntanke ntúúm ma.\nLo’ te ka kúmshe nga wûme, yúe a njit ne gú púen te ngúet púen nyütu pua pa mféé kêr’ap ngúenengúe sebe, pe na yire mbe map(ureyúe’ne) kú ghét ngam pua sappé ne fúeshe te njú na, lo’ te ka fét kwen pua tâne pa mféé kêt mún nyütu kpa’ nkiére gû ngétne nga pâre yúe a mfiébe"
+  specimen_16: "Lo’ te ka kúmshe nga wûme, yúe a njit ne gú púen te ngúet púen nyütu pua pa mféé kêr’ap ngúenengúe sebe, pe na yire mbe map(ureyúe’ne) kú ghét ngam pua sappé ne fúeshe te njú na, lo’ te ka fét kwen pua tâne pa mféé kêt mún nyütu kpa’ nkiére gû ngétne nga pâre yúe a mfiébe\nWupme pa te njú na, pua ka tuo tuo njú mfé ira yúe púen nyütu ntuo pe ne kú shúkét pua kú wûshe te túm túme puô pua ngúe’, shi na mbe pô yi nsa’ me pum yu sha’ múm nyütu na,\nLo’ te ka a nta’ mi pa mféékêt mún nyütu kpa’ mbe yu shî te nsa’ngu mféékêt me shi’ mi a me yétne yi njit mún nyütu me ndînî ne pi’ tu te nsa’kpen pua yit mún te ngu na,"
+}
diff --git a/lang/languages/bax/language.textproto b/lang/languages/bax/language.textproto
deleted file mode 100644
index 395787cef..000000000
--- a/lang/languages/bax/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "bax"
-name: "Bamun"
-preferred_name: ""
-autonym: "ꛀꛣꚧꚳ"
-population: 332940
-region: "CM"
-script: "Bamum"
-exemplar_chars {
-  base: "ꚠ ꚰ ꛀ ꛐ ꛠ ꚡ ꚱ ꛁ ꛑ ꛡ ꚢ ꚲ ꛂ ꛒ ꛢ ꛲ ꚣ ꚳ ꛃ ꛓ ꛣ ꛳ ꚤ ꚴ ꛄ ꛔ ꛤ ꛴ ꚥ ꚵ ꛅ ꛕ ꛥ ꛵ ꚦ ꚶ ꛆ ꛖ ꛦ ꛶ ꚧ ꚷ ꛇ ꛗ ꛧ ꛷ ꚨ ꚸ ꛈ ꛘ ꛨ ꚩ ꚹ ꛉ ꛙ ꛩ ꚪ ꚺ ꛊ ꛚ ꛪ ꚫ ꚻ ꛋ ꛛ ꛫ ꚬ ꚼ ꛌ ꛜ ꛬ ꚭ ꚽ ꛍ ꛝ ꛭ ꚮ ꚾ ꛎ ꛞ ꛮ ꚯ ꚿ ꛏ ꛟ ꛯ"
-}
diff --git a/lang/languages/bax/sampletext.textproto b/lang/languages/bax/sampletext.textproto
deleted file mode 100644
index 923c81d7d..000000000
--- a/lang/languages/bax/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bax"
diff --git a/lang/languages/bbc/language.textproto b/lang/languages/bbc.textproto
similarity index 88%
rename from lang/languages/bbc/language.textproto
rename to lang/languages/bbc.textproto
index e3411ec80..87ec96f25 100644
--- a/lang/languages/bbc/language.textproto
+++ b/lang/languages/bbc.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   marks: "◌ᯩ ◌ᯪ ◌ᯬ ◌ᯮ ◌ᯰ ◌᯲"
   punctuation: "᯼ ᯽ ᯾ ᯿"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bbj/language.textproto b/lang/languages/bbj.textproto
similarity index 74%
rename from lang/languages/bbj/language.textproto
rename to lang/languages/bbj.textproto
index 8d3dbe985..c13a3ddda 100644
--- a/lang/languages/bbj/language.textproto
+++ b/lang/languages/bbj.textproto
@@ -7,3 +7,6 @@ region: "CM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bci.textproto b/lang/languages/bci.textproto
new file mode 100644
index 000000000..fd1caa966
--- /dev/null
+++ b/lang/languages/bci.textproto
@@ -0,0 +1,23 @@
+id: "bci"
+name: "Baoulé"
+preferred_name: ""
+autonym: ""
+population: 3022921
+region: "CI"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E Ɛ F G I J K L M N O Ɔ P R S T U V W Y Z a b c d e ɛ f g i j k l m n o ɔ p r s t u v w y z"
+}
+sample_text {
+  masthead_full: "SsRr"
+  masthead_partial: "Aa"
+  tester: "Kɛ ɔ fin kɛ sran kwlakwa i sran bulɛ ɔ fin blɔlɔ\'n ti, kɛ i sran-mmla"
+  poster_sm: "Kɛ ɔ fin kɛ"
+  poster_md: "Kɛ ɔ fin"
+  poster_lg: "Sran"
+  specimen_48: "Kɛ ɔ fin kɛ like nga ɔ ti kpa dan yɛlɛ mɛn mun b\'afiɛn janvuɛ"
+  specimen_36: "Kɛ ɔ fin kɛ nga ɔ ti kpa dan yɛlɛ kɛ sran mun be ngba be fa be ti be wlɛ sran-mmla ɔ nin sran-fɔundi be bo\'n ti"
+  specimen_32: "Sran mun be ngba, kɛ be wu be ɔ, be ngba be sɛ, fɔndi nun, sran-mmala nun. Be si akundanbu, be si su ɔ fata kɛ sran mun be tran\'n, be tran aniaan nun tranlɛ."
+  specimen_21: "Sran-mmla ɔ nin sran-fɔundi nga ɔ wo Ndɛ dan nun, sran kwlakwla kwla fa ye iliɛ; ɔ le\'a kɛ e ti sran nvle ngunmin, kɛ e wunnɛn ti\'a kun, e aniɛn ti\'a kun, e bo lika ti\'a kun, e like sɔwa ɔ ti i ngunmin, e politiki angundan ti\'a kun, e fin\'a lika kun, ɔ le\'a kɛ wie ti sikafuɛ, wie ti yalɛfuɛ, kɛ wie mun be osu ti wlengbi, wie mun be osu ti kanga."
+  specimen_16: "I kungba yekun, be kwla\'a kpaman sran mun be nun be se\'akɛ nga ti bue nga su sran, nga be wun\'ɛn i liɛ wlɛ\'n kpa, be wun\'an mɛn nga su ɔ fin ɔ: be kwla\'a be se\'a sɔ, kanzɛ sran fin nvle uflɛ suo, sɛ nvle sɔ ɔ le i fɔundio, kanze i ti wo mɛn uflɛ i bo o, ɔ nunmɛn i ti bo nun tilɛ o.\nSran kwalakwla, ɔ fata kɛ be sɛsɛ i nguan, be wukɛ i ɔ di i fɔundi, be sɛsɛ ibɔbɔ ba unmuan.\nBe kwla\'a be fa-man sran be kaci\'a kanga. Sran kanga yolɛ nin i fatɔ ɔ nin i ninge i fa sɔ mun be yowa, ba tanninnin be ngba be atin.\nBe kwla\'a be ye\'a sran fi like tɛtɛ mun, be wlɛ-mɛn i bisva, be kwla\'a be yo-mɛn i ninge nga mɔ ɔ ye sran finfin, mɔ ɔ kaci sran kɛ blo nnɛn mun be sa."
+}
diff --git a/lang/languages/bci/language.textproto b/lang/languages/bci/language.textproto
deleted file mode 100644
index aa5fb6e65..000000000
--- a/lang/languages/bci/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "bci"
-name: "Baoulé"
-preferred_name: ""
-autonym: ""
-population: 3022921
-region: "CI"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E Ɛ F G I J K L M N O Ɔ P R S T U V W Y Z a b c d e ɛ f g i j k l m n o ɔ p r s t u v w y z"
-}
diff --git a/lang/languages/bci/sampletext.textproto b/lang/languages/bci/sampletext.textproto
deleted file mode 100644
index e558f13ec..000000000
--- a/lang/languages/bci/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bci"
diff --git a/lang/languages/be.textproto b/lang/languages/be.textproto
new file mode 100644
index 000000000..af0ca442b
--- /dev/null
+++ b/lang/languages/be.textproto
@@ -0,0 +1,30 @@
+id: "be"
+name: "Belarusian"
+preferred_name: ""
+autonym: "Беларуская"
+population: 10064517
+region: "BY"
+region: "PL"
+region: "UA"
+script: "Cyrillic"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ć Č Ł Ń Ś Š Ŭ Ź Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ć č ł ń ś š ŭ ź ž"
+  auxiliary: "Ґ ґ"
+  marks: "◌́ ◌̆ ◌̌"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ , ; \\: ! ? . « » ( ) \\[ \\] \\{ \\}"
+  index: "А Б В Г Д Е Ё Ж З І Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ы Ь Э Ю Я"
+}
+sample_text {
+  masthead_full: "УуСс"
+  masthead_partial: "Ее"
+  tester: "Прымаючы пад увагу, што прызнанне годнасці, якая ўласціва ўсім"
+  poster_sm: "прымаючы пад"
+  poster_md: "прымаючы"
+  poster_lg: "Усе"
+  specimen_48: "прымаючы пад увагу, што неабходна садзейнічаць развіццю дружалюбных"
+  specimen_36: "Ні над кім не павінны ўчыняцца катаванні або жорсткія, бесчалавечныя або ўніжаючыя яго годнасць абыходжанне і пакаранне."
+  specimen_32: "Кожны чалавек мае права на эфектыўнае аднаўленне ў правах кампетэнтнымі нацыянальнымі судамі ў выпадках парушэння яго асноўных правоў, якія дадзены яму канстытуцыяй або законам."
+  specimen_21: "Ні над кім не павінны ўчыняцца самавольны арышт, затрыманне або выгнанне.\nКожны чалавек, для вызначэння яго правоў і абавязкаў і для ўстанаўлення абгрунтаванасці прадʼяўленага яму крымінальнага абвінавачання, мае права, на падставе поўнай роўнасці, на тое, каб яго справа была разгледжана публічна і з захаваннем усіх патрабаванняў справядлівасці незалежным і непрадузятым судом."
+  specimen_16: "Ні над кім не павінны ўчыняцца самавольнае ўмяшанне ў яго асабістае і сямейнае жыццё, самавольны замах на недатыкальнасць яго жылля, тайну яго карэспандэнцыі або на яго гонар і рэпутацыю. Кожны чалавек мае права на абарону закону ад такога ўмяшання або такіх замахаў.\nКожны чалавек мае права на свабоду думкі, сумлення і рэлігіі; гэта права ўключае свабоду мяняць сваю рэлігію або пераканні і свабоду спавядаць сваю рэлігію або перакананні як аднаасобна, так і разам з іншымі, публічным або прыватным парадкам у вучэнні, богаслужэнні і выкананні рэлігійных і рытуальных абрадаў."
+}
diff --git a/lang/languages/be/language.textproto b/lang/languages/be/language.textproto
deleted file mode 100644
index df2e44844..000000000
--- a/lang/languages/be/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "be"
-name: "Belarusian"
-preferred_name: ""
-autonym: "Беларуская"
-population: 10064517
-region: "BY"
-region: "PL"
-region: "UA"
-script: "Cyrillic"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ć Č Ł Ń Ś Š Ŭ Ź Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ć č ł ń ś š ŭ ź ž"
-  auxiliary: "Ґ ґ"
-  marks: "◌́ ◌̆ ◌̌"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ , ; \\: ! ? . « » ( ) \\[ \\] \\{ \\}"
-  index: "А Б В Г Д Е Ё Ж З І Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ы Ь Э Ю Я"
-}
diff --git a/lang/languages/be/sampletext.textproto b/lang/languages/be/sampletext.textproto
deleted file mode 100644
index 70645cc09..000000000
--- a/lang/languages/be/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "be"
diff --git a/lang/languages/bej/language.textproto b/lang/languages/bej.textproto
similarity index 75%
rename from lang/languages/bej/language.textproto
rename to lang/languages/bej.textproto
index 0cafe2c1f..0bee5067f 100644
--- a/lang/languages/bej/language.textproto
+++ b/lang/languages/bej.textproto
@@ -7,3 +7,6 @@ region: "SD"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/bem.textproto b/lang/languages/bem.textproto
new file mode 100644
index 000000000..5c29776f3
--- /dev/null
+++ b/lang/languages/bem.textproto
@@ -0,0 +1,25 @@
+id: "bem"
+name: "Bemba"
+preferred_name: ""
+autonym: "Chibemba"
+population: 5402246
+region: "ZM"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P S T U V W Y a b c d e f g h i j k l m n o p s t u v w y"
+  auxiliary: "d h q r v x z"
+  index: "A B C E F G I J K L M N O P S {SH} T U W Y"
+}
+sample_text {
+  masthead_full: "AaBb"
+  masthead_partial: "Nn"
+  tester: "Apo kwaba ukwishiba ubucindami bwa muntu nomulinganya pamo ne"
+  poster_sm: "Apo uku kana"
+  poster_md: "Apo caba"
+  poster_lg: "Abantu"
+  specimen_48: "Apo abantu bamu kabungwe kafyalo fyaikatana muli kalata balibwekeshapo"
+  specimen_36: "Apo pakwishiba ishi nsambu nobuntungwa ecikankala sana pakuti ici cilayo cinga fikilishiwa ukupwililika,"
+  specimen_32: "Abantu bonse bafyalwa abalubuka nokulingana mu mucinshi nensambu. Balikwata amano nokutontonkanya, eico bafwile ukulacita ifintu ku banabo mu mutima wa bwananyina."
+  specimen_21: "Cila muntu ali linga ukukwata ishi nsambu no buntungwa filelondololwa, ukwabula akapatulula kali konse ngaka mutuntu, inkanda, umwaume nangu umwanakashi, ululimi, uko apepa, ifyo atontonkanya pa fikansa fya calo, uko atula ku calo, ifyuma akwata, uko afyalwa nangu akapatulula akali konse.\nKabili, takuli kapatulula kali nokucitwa pa mulandu wafikansa fya calo, ifyo balubulula imilandu nangu umucinshi icalo afumako cakwata ku fyalo fimbi, cibe cila iteka, cilatekwa nangu capelwa ku calo cimbi ukutekwa."
+  specimen_16: "Cila muntu alikwata insabu ya mweo, ukucita ico alefwaya elyo noku icingilila umwine.\nTakuli nangu umo ukuba umusha nangu mu busha. Ubusha nokushitishana mu busha fili nokubindwa mu nshila ili yonse.\nTapali nangu umo atwile kucitwa kunkalwe, ukucushiwa nokucitwa nge nama paku kandwa.\nOnse alikwata insambu ukwishibikwa ukuli konse ngo muntu pa menso ya cilye.\nBonse bali lingana pa menso ya cilye kabili balikwata insambu ukwabula akapatulula, ukupokolwa mu mulinganya pa menso ya cilye. Bonse balikwata insambu yakupokololwa mu mulinganya ku kapatulula akali konse ukupula muli uku kusosa ukubikapo ukupokololwa nakuli balya batunka bambi ukuti bale patulula."
+}
diff --git a/lang/languages/bem/language.textproto b/lang/languages/bem/language.textproto
deleted file mode 100644
index b6d46649b..000000000
--- a/lang/languages/bem/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "bem"
-name: "Bemba"
-preferred_name: ""
-autonym: "Chibemba"
-population: 5402246
-region: "ZM"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P S T U V W Y a b c d e f g h i j k l m n o p s t u v w y"
-  auxiliary: "d h q r v x z"
-  index: "A B C E F G I J K L M N O P S {SH} T U W Y"
-}
diff --git a/lang/languages/bem/sampletext.textproto b/lang/languages/bem/sampletext.textproto
deleted file mode 100644
index fb7776109..000000000
--- a/lang/languages/bem/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bem"
diff --git a/lang/languages/bew/language.textproto b/lang/languages/bew.textproto
similarity index 74%
rename from lang/languages/bew/language.textproto
rename to lang/languages/bew.textproto
index b09751c40..4c1cc9960 100644
--- a/lang/languages/bew/language.textproto
+++ b/lang/languages/bew.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bez/language.textproto b/lang/languages/bez.textproto
similarity index 88%
rename from lang/languages/bez/language.textproto
rename to lang/languages/bez.textproto
index 336234373..abf44592f 100644
--- a/lang/languages/bez/language.textproto
+++ b/lang/languages/bez.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "x"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bfd/language.textproto b/lang/languages/bfd.textproto
similarity index 74%
rename from lang/languages/bfd/language.textproto
rename to lang/languages/bfd.textproto
index 2a20dc0c3..40c805b53 100644
--- a/lang/languages/bfd/language.textproto
+++ b/lang/languages/bfd.textproto
@@ -7,3 +7,6 @@ region: "CM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bfq/language.textproto b/lang/languages/bfq.textproto
similarity index 74%
rename from lang/languages/bfq/language.textproto
rename to lang/languages/bfq.textproto
index 2ad937e63..487c0888e 100644
--- a/lang/languages/bfq/language.textproto
+++ b/lang/languages/bfq.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Tamil"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ta"
+}
diff --git a/lang/languages/bft/language.textproto b/lang/languages/bft.textproto
similarity index 77%
rename from lang/languages/bft/language.textproto
rename to lang/languages/bft.textproto
index b48d86d50..35fbda7be 100644
--- a/lang/languages/bft/language.textproto
+++ b/lang/languages/bft.textproto
@@ -3,8 +3,11 @@ name: "Balti"
 preferred_name: ""
 autonym: ""
 population: 502519
-region: "PK"
 region: "IN"
+region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/bfy/language.textproto b/lang/languages/bfy.textproto
similarity index 77%
rename from lang/languages/bfy/language.textproto
rename to lang/languages/bfy.textproto
index 2f44de12c..017351aa7 100644
--- a/lang/languages/bfy/language.textproto
+++ b/lang/languages/bfy.textproto
@@ -3,8 +3,11 @@ name: "Bagheli"
 preferred_name: ""
 autonym: ""
 population: 654423
-region: "NP"
 region: "IN"
+region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/bg.textproto b/lang/languages/bg.textproto
new file mode 100644
index 000000000..267600f39
--- /dev/null
+++ b/lang/languages/bg.textproto
@@ -0,0 +1,33 @@
+id: "bg"
+name: "Bulgarian"
+preferred_name: ""
+autonym: "Български"
+population: 7878314
+region: "BG"
+region: "GR"
+region: "MD"
+region: "RO"
+region: "TR"
+region: "UA"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ь Ю Я Ѐ Ѝ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ь ю я ѐ ѝ"
+  auxiliary: "А̀ О̀ У̀ Ъ̀ Ю̀ Я̀ а̀ о̀ у̀ ъ̀ ю̀ я̀"
+  marks: "◌̀ ◌̆"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ ( ) \\[ \\] § @ * / ″ №"
+  index: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я"
+}
+sample_text {
+  masthead_full: "ВвСс"
+  masthead_partial: "Ии"
+  tester: "Като взе предвид, че признаването на достойнството, присъщо на"
+  poster_sm: "провъзгласява"
+  poster_md: "Всички хора"
+  poster_lg: "Всички"
+  specimen_48: "Всеки човек има право на всички права и свободи, провъзгласени"
+  specimen_36: "Никой не трябва да бъде подлаган на изтезания или на жестоко, нечовешко или унизително третиране или наказание."
+  specimen_32: "Всеки човек има право на социален и международен ред, при който правата и свободите, провъзгласени в тази декларация, могат да бъдат напълно осъществени."
+  specimen_21: "Нищо в тази Декларация не може да бъде тълкувано като предоставящо право на дадена държава, група или лице да се занимават с каквато и да е дейност или да извършват действия, насочени към унищожаване на правата и свободите, провъзгласени в нея.\nКато взе предвид, че признаването на достойнството, присъщо на всички членове на човешкия род, на техните равни и неотменими права представлява основа на свободата, справедливостта и мира в света,"
+  specimen_16: "Като взе предвид, че признаването на достойнството, присъщо на всички членове на човешкия род, на техните равни и неотменими права представлява основа на свободата, справедливостта и мира в света,\nКато взе предвид, че пренебрегването и неуважаването на правата на човека доведоха до варварски деяния, които потресоха съвестта на човечеството, и че създаването на един свят, в който хората ще се радват на свобода на словото и убежденията си и ще бъдат свободни от страх и лишения бе провъзгласено за най‐съкровения стремеж на човека,\nКато взе предвид, че е необходимо правата на човека да бъдат закриляни от закона така, че човек да не бъде принуждаван да прибягва към бунт срещу тиранията и потисничеството, като последен изход,"
+}
diff --git a/lang/languages/bg/language.textproto b/lang/languages/bg/language.textproto
deleted file mode 100644
index 0b768b6cb..000000000
--- a/lang/languages/bg/language.textproto
+++ /dev/null
@@ -1,20 +0,0 @@
-id: "bg"
-name: "Bulgarian"
-preferred_name: ""
-autonym: "Български"
-population: 7878314
-region: "GR"
-region: "MD"
-region: "TR"
-region: "RO"
-region: "BG"
-region: "UA"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ь Ю Я Ѐ Ѝ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ь ю я ѐ ѝ"
-  auxiliary: "А̀ О̀ У̀ Ъ̀ Ю̀ Я̀ а̀ о̀ у̀ ъ̀ ю̀ я̀"
-  marks: "◌̀ ◌̆"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ ( ) \\[ \\] § @ * / ″ №"
-  index: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я"
-}
diff --git a/lang/languages/bg/sampletext.textproto b/lang/languages/bg/sampletext.textproto
deleted file mode 100644
index 17daafe6c..000000000
--- a/lang/languages/bg/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bg"
diff --git a/lang/languages/bgc/language.textproto b/lang/languages/bgc.textproto
similarity index 75%
rename from lang/languages/bgc/language.textproto
rename to lang/languages/bgc.textproto
index b0d0b540c..c18880c16 100644
--- a/lang/languages/bgc/language.textproto
+++ b/lang/languages/bgc.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/bgn/language.textproto b/lang/languages/bgn.textproto
similarity index 89%
rename from lang/languages/bgn/language.textproto
rename to lang/languages/bgn.textproto
index 0c14955d6..49a4f155f 100644
--- a/lang/languages/bgn/language.textproto
+++ b/lang/languages/bgn.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   marks: "◌َ ◌ُ ◌ِ ◌ٓ"
   numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/bgx/language.textproto b/lang/languages/bgx.textproto
similarity index 76%
rename from lang/languages/bgx/language.textproto
rename to lang/languages/bgx.textproto
index a329577e9..c13e415a9 100644
--- a/lang/languages/bgx/language.textproto
+++ b/lang/languages/bgx.textproto
@@ -7,3 +7,6 @@ region: "TR"
 script: "Greek"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "el"
+}
diff --git a/lang/languages/bhb/language.textproto b/lang/languages/bhb.textproto
similarity index 75%
rename from lang/languages/bhb/language.textproto
rename to lang/languages/bhb.textproto
index e8e84023e..b9d1d4895 100644
--- a/lang/languages/bhb/language.textproto
+++ b/lang/languages/bhb.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/bhi/language.textproto b/lang/languages/bhi.textproto
similarity index 75%
rename from lang/languages/bhi/language.textproto
rename to lang/languages/bhi.textproto
index d9240cfca..518f440dc 100644
--- a/lang/languages/bhi/language.textproto
+++ b/lang/languages/bhi.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/bho.textproto b/lang/languages/bho.textproto
new file mode 100644
index 000000000..58a29b6e1
--- /dev/null
+++ b/lang/languages/bho.textproto
@@ -0,0 +1,29 @@
+id: "bho"
+name: "Bhojpuri"
+preferred_name: ""
+autonym: "भोजपुरी"
+population: 32934797
+region: "IN"
+region: "MU"
+region: "NP"
+script: "Devanagari"
+exemplar_chars {
+  base: "𑂃 𑂄 𑂅 𑂆 𑂇 𑂈 𑂉 𑂊 𑂋 𑂌 𑂍 𑂎 𑂏 𑂐 𑂑 𑂒 𑂓 𑂔 𑂕 𑂖 𑂗 𑂘 𑂙 𑂚 𑂛 𑂜 𑂝 𑂞 𑂟 𑂠 𑂡 𑂢 𑂣 𑂤 𑂥 𑂦 𑂧 𑂨 𑂩 𑂪 𑂫 𑂬 𑂭 𑂮 𑂯"
+  auxiliary: "ॐ"
+  marks: "◌𑂀 ◌𑂂 ◌𑂰 ◌𑂲 ◌𑂳 ◌𑂴 ◌𑂵 ◌𑂶 ◌𑂸 ◌𑂺"
+  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "। ॥ ॰"
+}
+sample_text {
+  masthead_full: "सबहल"
+  masthead_partial: "कन"
+  tester: "सबहिं के ओकर उचित सम्मान आओर मानव परिवार के सभे आदिमी के बराबरी के हक ही विश्व समुदाय"
+  poster_sm: "मानवाधिकार के उल्लंघन"
+  poster_md: "यदि केहु तानाशाही"
+  poster_lg: "सबहि"
+  specimen_48: "संयुक्त राष्ट्र के लोगिन आपन चार्टर में मौलिक मानवाधिकार, मानव के सम्मान आओर उपयोगिता तथा"
+  specimen_36: "केहु के खिलाफ अपराधिक मामला होखे चाहे केकरो अधिकार और कर्तव्य के निर्धारण के सिलसिला में कौनो स्वतंत्रा आओर निष्पक्ष संगठन के सामने निष्पक्ष सुनवाई खातिर समान अधिकार हवे ।"
+  specimen_32: "सब लोगनि के सोचे के आओर कौनो धर्म अपनावे के अधिकार हवे तथा ओ आपन धर्म और मान्यता में भी बदलाव ला सकेला। संगे ओ अकेले आओर समूह में कौनो सार्वजनिक या नीजि जगह पर आपन धर्म या विश्वास के पालन, प्रवचन आओर पूजा-पाठ के जरिए कर सकेला।"
+  specimen_21: "सबहिं के विचार आओर अभियक्ति के अधिकार हवे। आओर ओकर ई विचार में कौनो दखल ना हो सकता, संगे ओ संचार के कौनो साधन के जरिए कही से कैसनो सूचना आओर विचार प्राप्त कर सकेला।\nसमाज के हरेक आदिमी के सामाजिक सुरक्षा के अधिकार हवे। साथहिं देश के आर्थिक, सामाजिक आओर सांस्कृतिक अधिकार के उपयोग करे के अधिकार ह, जे ओकर व्यक्तिघ् के उपयोग राष्टघीय प्रयास आओर अन्तर्राष्ट्रीय सहयोग से ही संभव हो सकेला जे ओ राष्ट्र के संसाधन ओओर संगठन पर निर्भर करता।"
+  specimen_16: "सबकरा के आराम तथा छुघ् मनाबे के अधिकार बा तथा काज करे के समय के सेहो एक उचित सीमा बा तथा समय-समय पर वेतन सहित छुघेि के उपभोग करे के अधिकारो बा।\nसबहिं के इ घोषणा में निर्धारित अधिकार आओर आजादी के सामाजिक आओर अन्तर्राष्ट्रीय स्तर पर पावे के अधिकार बा।\nई घोषणा में लिखल कौनो अनुच्छेद के मतलब इ ना ह कि कौनो राज्य, समूह चाहे व्यक्ति कौनो ऐसन काज में शामिल होखे चाहे कौनो ऐसन काम करे, जेकरा से ए में लिखल अधिकार और स्वतंत्रता नष्ट होखे।\nसबहिं के ओकर उचित सम्मान आओर मानव परिवार के सभे आदिमी के बराबरी के हक ही विश्व समुदाय के अजादी, न्याय आओर शांति के बुनियाद हवे।\nमानवाधिकार के उल्लंघन हरदम अमानवीय काज के कारणो होखेला जा के चलते मानवता के अंत:करण दु:खी होखेला। एक आम आदिमी के सबसे बड़ा इच्छा इहे होखेला कि इ दुनिया में ओके भाषण और विचार के आजादी मिले साथ हि डर आओर इच्छा से हो मुक्ति मिले।"
+}
diff --git a/lang/languages/bho/language.textproto b/lang/languages/bho/language.textproto
deleted file mode 100644
index db83ef1a7..000000000
--- a/lang/languages/bho/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "bho"
-name: "Bhojpuri"
-preferred_name: ""
-autonym: "भोजपुरी"
-population: 32934797
-region: "MU"
-region: "NP"
-region: "IN"
-script: "Devanagari"
-exemplar_chars {
-  base: "𑂃 𑂄 𑂅 𑂆 𑂇 𑂈 𑂉 𑂊 𑂋 𑂌 𑂍 𑂎 𑂏 𑂐 𑂑 𑂒 𑂓 𑂔 𑂕 𑂖 𑂗 𑂘 𑂙 𑂚 𑂛 𑂜 𑂝 𑂞 𑂟 𑂠 𑂡 𑂢 𑂣 𑂤 𑂥 𑂦 𑂧 𑂨 𑂩 𑂪 𑂫 𑂬 𑂭 𑂮 𑂯"
-  auxiliary: "ॐ"
-  marks: "◌𑂀 ◌𑂂 ◌𑂰 ◌𑂲 ◌𑂳 ◌𑂴 ◌𑂵 ◌𑂶 ◌𑂸 ◌𑂺"
-  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "। ॥ ॰"
-}
diff --git a/lang/languages/bho/sampletext.textproto b/lang/languages/bho/sampletext.textproto
deleted file mode 100644
index 755b55a76..000000000
--- a/lang/languages/bho/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bho"
diff --git a/lang/languages/bi.textproto b/lang/languages/bi.textproto
new file mode 100644
index 000000000..09750b2ea
--- /dev/null
+++ b/lang/languages/bi.textproto
@@ -0,0 +1,23 @@
+id: "bi"
+name: "Bislama"
+preferred_name: ""
+autonym: "Bislama"
+population: 268499
+region: "VU"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "EeVv"
+  masthead_partial: "Rr"
+  tester: "From se Jenerol Asembli i luksave respek mo ikwol raet blong"
+  poster_sm: "From se fasin"
+  poster_md: "From se hemi"
+  poster_lg: "Evri"
+  specimen_48: "From se i gat nid blong promotem fasin blong developem frensip"
+  specimen_36: "From se hemi impoten tumas blong evriwan i luksave ol raet mo fridom blong promis ia i save tekemples fulwan,"
+  specimen_32: "Evri man mo woman i bon fri mo ikwol long respek mo ol raet. Oli gat risen mo tingting mo oli mas tritim wanwan long olgeta olsem ol brata mo sista."
+  specimen_21: "Evriwan i gat raet long evri raet mo fridom we i stap long Deklereisen ia, wetaot eni kaen difrens, olsem long reis, kala blong skin, seks, langwis, rilijen, politikol o narafala kaen tingting, we i kamaot long saed blong neisen o sosol, propeti, taem we man i bon long hem o emi narafala sosol saed olsem.\nEvriwan i gat raet blong laef, fridommo sekuriti blong man mo woman."
+  specimen_16: "Bambae man i no tekem narafala man o woman olsem slev blong hem. Bambae hemi agensem loa blong eni kaen fasin blong slev mo fasin blong salem man o woman olsem slev i tekemples.\nBambae man mo woman i no save mekem fasin blong mekem narafala man o woman i safa o mekem rabis fasin long hem, fasin we i nogud long man o woman o tritim man o woman long fasin o panismen we i soem se man o woman i luk daon long man o woman.\nEvriwan i gat raet blong narafala man i luksave hem olsem wan man o woman we i stap anda long loa.\nEvriwan i gat raet blong kasem wan stret fasin blong stretem problem we ol stret nasonol traebuno blong ol akt we oli go agensem ol stamba raet we Konstitusen o loa givim, oli mekem."
+}
diff --git a/lang/languages/bi/language.textproto b/lang/languages/bi/language.textproto
deleted file mode 100644
index b7282e027..000000000
--- a/lang/languages/bi/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "bi"
-name: "Bislama"
-preferred_name: ""
-autonym: "Bislama"
-population: 268499
-region: "VU"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/bi/sampletext.textproto b/lang/languages/bi/sampletext.textproto
deleted file mode 100644
index 6197e4003..000000000
--- a/lang/languages/bi/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bi"
diff --git a/lang/languages/bik.textproto b/lang/languages/bik.textproto
new file mode 100644
index 000000000..8c21dc281
--- /dev/null
+++ b/lang/languages/bik.textproto
@@ -0,0 +1,24 @@
+id: "bik"
+name: "Bikol"
+preferred_name: ""
+autonym: "Pandan Bikol"
+population: 3275430
+region: "PH"
+script: "Latin"
+exemplar_chars {
+  base: "A B D G H I K L M N O P R S T U W Y a b d g h i k l m n o p r s t u w y"
+  auxiliary: "C E F J Q V X Z c e f j q v x z"
+}
+sample_text {
+  masthead_full: "AaNn"
+  masthead_partial: "Gg"
+  tester: "Huli ta an pagkamidbid kan dignidad intrinseca asin an parantay"
+  poster_sm: "Huli ta an"
+  poster_md: "Huli ta sa"
+  poster_lg: "gabos"
+  specimen_48: "Huli ta an mga Estados Miembros, nangako na maghingoa na makamtan,"
+  specimen_36: "Mayo nin siisay man an ipapasairarom sa labi-labing pagkulog o sa brutal o bako sa tawong kastigo o pagmaltrato."
+  specimen_32: "An lambang saro igwa nin derecho sa pagpahingalo asin paglibang, kaibahan an tamang limitacion sa oras nin pagtrabaho asin sa regular na vacacion na may bayad."
+  specimen_21: "An lambang saro igwa nin derecho sa social asin internacional na sistema kun saen an mga derechos asin mga katalinkasan na ipinahayag kaining Declaracion bilog na makamtan.\nMayo nin ano man sa Declaracion na ini an puedeng saboton na minatao sa ano man na Estado, grupo o siisay man, nin derecho sa mga gawe-gawe o kagibuhan para sa supresion kan ano man na derechos asin mga katalinkasan na ipinahayag kaining Declaracion."
+  specimen_16: "Huli ta an pagkamidbid kan dignidad intrinseca asin an parantay asin inalienableng mga derechos kan gabos na miembros kan familia humana iyo an fundacion nin katalinkasan , justicia asin katoninongan sa bilog na kinaban,\nHuli ta an ginikanan nin mga makangirongirhat na mga gawe laban sa conciencia nin katawohan iyo an pagbalga asin pagmenos kan derechos humanos, asin ta sa pagpahayag na an pinakahalangkaw na kamawotan nin katawohan iyo an magkaigwa nin sarong kinaban na kun saen an gabos na tawo mayo nin pagkatakot asin miseria, asin igwang katalinkasan sa pagtaram asin man katalinkasan nin pagtubod,"
+}
diff --git a/lang/languages/bik/language.textproto b/lang/languages/bik/language.textproto
deleted file mode 100644
index cdca99407..000000000
--- a/lang/languages/bik/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "bik"
-name: "Bikol"
-preferred_name: ""
-autonym: "Pandan Bikol"
-population: 3275430
-region: "PH"
-script: "Latin"
-exemplar_chars {
-  base: "A B D G H I K L M N O P R S T U W Y a b d g h i k l m n o p r s t u w y"
-  auxiliary: "C E F J Q V X Z c e f j q v x z"
-}
diff --git a/lang/languages/bik/sampletext.textproto b/lang/languages/bik/sampletext.textproto
deleted file mode 100644
index 309023283..000000000
--- a/lang/languages/bik/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bik"
diff --git a/lang/languages/bin.textproto b/lang/languages/bin.textproto
new file mode 100644
index 000000000..98b299c2b
--- /dev/null
+++ b/lang/languages/bin.textproto
@@ -0,0 +1,24 @@
+id: "bin"
+name: "Bini"
+preferred_name: ""
+autonym: "Ẹ̀dó"
+population: 1519598
+region: "NG"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E F G H I K L M N O P R S T U V W Y Z Á É È Ẹ Í Ó Ò Ọ Ú a b d e f g h i k l m n o p r s t u v w y z á é è ẹ í ó ò ọ ú \'"
+  marks: "◌̀ ◌́ ◌̣"
+}
+sample_text {
+  masthead_full: "EeMm"
+  masthead_partial: "Ww"
+  tester: "Vbene a na mie wee ayere ero wee etin ne o kheke emwan hia fere"
+  poster_sm: "Vbene a na"
+  poster_md: "Vbene a ne"
+  poster_lg: "Emwan"
+  specimen_48: "Vbene a na mie wee okere na ru alaghodaro oghe ayin-kugbe vbe"
+  specimen_36: "Vbene a na mie wee okere na ru alaghodaro oghe ayin-kugbe vbe ose vbe adese uhunmwun evbo hia,\nRhunmwunda ona, nia"
+  specimen_32: "Vbene a mie wee agbon hia renren wee etin nii hia ne o kheke ne omwan gha mween kevbe arriegbe oro re emwin ne o kpolo se kpataki na ya ru amuse ye eyan na,"
+  specimen_21: "Vbene a na mie wee ayere ero wee etin ne o kheke emwan hia fere oro re eyato oghe arhiegbe, emwanta kevbe ofunmwengbe vbe agbon.\nVbene a na mie wee etin emwin ne o kheke ne omwan ne a ma ka yo, ne o si uyinmwen obuluku-obuluza, ne o rhu emwan aro ekhoe, kevbe agbon node ne emwan nagbon gha na ghao rhie orhienrhien arriegbe ne omwan ya ta emwen ne o ho ne o ta vbe uwu amuentinyan kevbe arhiegbe hin obo ohan ke aimwen rre, ne a ya wewe zeevbe ida-eho oghe emwan kekan hia,"
+  specimen_16: "Vbene a na mie wee ayere ero wee etin ne o kheke emwan hia fere oro re eyato oghe arhiegbe, emwanta kevbe ofunmwengbe vbe agbon.\nVbene a na mie wee etin emwin ne o kheke ne omwan ne a ma ka yo, ne o si uyinmwen obuluku-obuluza, ne o rhu emwan aro ekhoe, kevbe agbon node ne emwan nagbon gha na ghao rhie orhienrhien arriegbe ne omwan ya ta emwen ne o ho ne o ta vbe uwu amuentinyan kevbe arhiegbe hin obo ohan ke aimwen rre, ne a ya wewe zeevbe ida-eho oghe emwan kekan hia,\nVbene a ne mie wee emwin ne o kere ne o wee na ghe ye atua tua emwan, ne iran ghe ya gha gbodan ghe uyinmwen ne o wegbe kevbe oderhu emwan ne i mween ase serrio wee ne ilele, oghe uhi ru gue etin omwan ne o khekee,"
+}
diff --git a/lang/languages/bin/language.textproto b/lang/languages/bin/language.textproto
deleted file mode 100644
index 53180efc4..000000000
--- a/lang/languages/bin/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "bin"
-name: "Bini"
-preferred_name: ""
-autonym: "Ẹ̀dó"
-population: 1519598
-region: "NG"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E F G H I K L M N O P R S T U V W Y Z Á É È Ẹ Í Ó Ò Ọ Ú a b d e f g h i k l m n o p r s t u v w y z á é è ẹ í ó ò ọ ú \'"
-  marks: "◌̀ ◌́ ◌̣"
-}
diff --git a/lang/languages/bin/sampletext.textproto b/lang/languages/bin/sampletext.textproto
deleted file mode 100644
index 4bdd24ab5..000000000
--- a/lang/languages/bin/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bin"
diff --git a/lang/languages/bjj/language.textproto b/lang/languages/bjj.textproto
similarity index 75%
rename from lang/languages/bjj/language.textproto
rename to lang/languages/bjj.textproto
index f5e0133dc..936c1edd5 100644
--- a/lang/languages/bjj/language.textproto
+++ b/lang/languages/bjj.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/bjn/language.textproto b/lang/languages/bjn.textproto
similarity index 76%
rename from lang/languages/bjn/language.textproto
rename to lang/languages/bjn.textproto
index debe41746..132b4d12d 100644
--- a/lang/languages/bjn/language.textproto
+++ b/lang/languages/bjn.textproto
@@ -8,3 +8,6 @@ region: "MY"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bjt/language.textproto b/lang/languages/bjt.textproto
similarity index 72%
rename from lang/languages/bjt/language.textproto
rename to lang/languages/bjt.textproto
index 05a8897e5..2811dc835 100644
--- a/lang/languages/bjt/language.textproto
+++ b/lang/languages/bjt.textproto
@@ -6,3 +6,6 @@ population: 95992
 region: "SN"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bkm/language.textproto b/lang/languages/bkm.textproto
similarity index 74%
rename from lang/languages/bkm/language.textproto
rename to lang/languages/bkm.textproto
index 03db49e98..f0efdb787 100644
--- a/lang/languages/bkm/language.textproto
+++ b/lang/languages/bkm.textproto
@@ -7,3 +7,6 @@ region: "CM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bku/language.textproto b/lang/languages/bku.textproto
similarity index 74%
rename from lang/languages/bku/language.textproto
rename to lang/languages/bku.textproto
index 00f0ceb25..e21169d27 100644
--- a/lang/languages/bku/language.textproto
+++ b/lang/languages/bku.textproto
@@ -7,3 +7,6 @@ region: "PH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bm.textproto b/lang/languages/bm.textproto
new file mode 100644
index 000000000..64c33ff5e
--- /dev/null
+++ b/lang/languages/bm.textproto
@@ -0,0 +1,26 @@
+id: "bm"
+name: "Bambara"
+preferred_name: ""
+autonym: "Bamanankan"
+population: 8994564
+region: "ML"
+script: "Latin"
+script: "N’Ko"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P R S T U W Y Z Ŋ Ɔ Ɛ Ɲ a b c d e f g h i j k l m n o p r s t u w y z ŋ ɔ ɛ ɲ"
+  auxiliary: "Q V X q v x"
+  index: "A B C D E Ɛ F G H I J K L M N Ɲ Ŋ O Ɔ P R S T U W Y Z"
+}
+sample_text {
+  masthead_full: "HhAa"
+  masthead_partial: "Dd"
+  tester: "K’a d’a kan ko dine hɔrɔnɲa ni tilennenɲa ni lafiya sintin ye hadamaden"
+  poster_sm: "K’a d’a kan ko"
+  poster_md: "K’a d’a kan"
+  poster_lg: "bɛɛ"
+  specimen_48: "K’a d’a kan ko kanu jiidili ka kan ka kɔkɔrɔdon kabilaw ni ɲɔgɔn"
+  specimen_36: "Bɛɛ ka kan i lafiɲɛ ni ɲɛnajɛ ye, ani baarawaati dannen hakɛ la, ani waati ni waati sɛgɛnnabɔ min tɛ sara la."
+  specimen_32: "Bɛɛ jo bɛ k’a ɲini labɛn ka kɛ maaya la ani jamanaw cɛ la, min b’a to josira ni hɔrɔnɲa baju minnu dantigɛlen filɛ Dantigɛkan in kɔnɔ, olu ka sira sɔrɔ a ɲɛ ma."
+  specimen_21: "Jɔyɔrɔ fɛn o fɛn dantigɛlen ye nin Dantigɛkan in kɔnɔ, Fanga wali jɛkulu wali mɔgɔ kelen sijo tɛ k’o minɛ yamaruya ye ka sira taama, wali ka walekɛ, min kun ye hadamaden josira ni hɔrɔnɲasira jiralen ninnu tiɲɛni ye.\nK’a d’a kan ko dine hɔrɔnɲa ni tilennenɲa ni lafiya sintin ye hadamaden bɛɛ danbe dɔnni n’u josiraw danmakɛɲneni ye,"
+  specimen_16: "K’a d’a kan ko dine hɔrɔnɲa ni tilennenɲa ni lafiya sintin ye hadamaden bɛɛ danbe dɔnni n’u josiraw danmakɛɲneni ye,\nK’a d’a kan ko hadamaden josiraw n’u kɔnni kɛra dannajuguya caman sababu ye minnu bɛ maaya ɲugun, ani ko hadamaden haju bɛɛ la gɛlɛnman ye de ka diɲe kura dabali min den si tɛ bali k’a hakilila fɔ nink’a dannasira batu, min den bɛɛ tangalen bɛ bagabagali ni ɲani ma,\nK’a d’a kan ko a tɛ ɲɛ fo hadamaden josiraw ka lakana sariyabatufanga de fe yaasa muruti kana kɛ mɔgɔ ma jagoya ye tɔɲɔn ni degun kanma,\nK’a d’a kan ko kanu jiidili ka kan ka kɔkɔrɔdon kabilaw ni ɲɔgɔn cɛ,"
+}
diff --git a/lang/languages/bm/language.textproto b/lang/languages/bm/language.textproto
deleted file mode 100644
index 2714a7142..000000000
--- a/lang/languages/bm/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "bm"
-name: "Bambara"
-preferred_name: ""
-autonym: "Bamanankan"
-population: 8994564
-region: "ML"
-script: "Latin"
-script: "N’Ko"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P R S T U W Y Z Ŋ Ɔ Ɛ Ɲ a b c d e f g h i j k l m n o p r s t u w y z ŋ ɔ ɛ ɲ"
-  auxiliary: "Q V X q v x"
-  index: "A B C D E Ɛ F G H I J K L M N Ɲ Ŋ O Ɔ P R S T U W Y Z"
-}
diff --git a/lang/languages/bm/sampletext.textproto b/lang/languages/bm/sampletext.textproto
deleted file mode 100644
index 37c013a1a..000000000
--- a/lang/languages/bm/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bm"
diff --git a/lang/languages/bm_Nkoo/language.textproto b/lang/languages/bm_Nkoo.textproto
similarity index 78%
rename from lang/languages/bm_Nkoo/language.textproto
rename to lang/languages/bm_Nkoo.textproto
index 2f57ba984..d64dc86c2 100644
--- a/lang/languages/bm_Nkoo/language.textproto
+++ b/lang/languages/bm_Nkoo.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 script: "N’Ko"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "bm"
+}
diff --git a/lang/languages/bmq/language.textproto b/lang/languages/bmq.textproto
similarity index 74%
rename from lang/languages/bmq/language.textproto
rename to lang/languages/bmq.textproto
index 1150a6f67..93f130f2c 100644
--- a/lang/languages/bmq/language.textproto
+++ b/lang/languages/bmq.textproto
@@ -7,3 +7,6 @@ region: "ML"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bn.textproto b/lang/languages/bn.textproto
new file mode 100644
index 000000000..b96586846
--- /dev/null
+++ b/lang/languages/bn.textproto
@@ -0,0 +1,31 @@
+id: "bn"
+name: "Bangla"
+preferred_name: ""
+autonym: "বাংলা"
+population: 267280377
+region: "BD"
+region: "GB"
+region: "IN"
+region: "NP"
+script: "Bangla"
+exemplar_chars {
+  base: "৺ অ আ ই ঈ উ ঊ ঋ ৠ ঌ ৡ এ ঐ ও ঔ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ত ৎ থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ ঽ"
+  auxiliary: "\\u200C\\u200D ৲ ৳ ৴ ৵ ৶ ৷ ৸ ৹ ৰ ৱ"
+  marks: "◌ঁ ◌ং ◌ঃ ◌় ◌া ◌ি ◌ী ◌ু ◌ূ ◌ৃ ◌ৄ ◌ে ◌ৈ ◌্ ◌ৗ ◌ৢ ◌ৣ"
+  numerals: "০ ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ক {ক\\u09CDষ} খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ত থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ"
+}
+sample_text {
+  masthead_full: "সমতন"
+  masthead_partial: "ষব"
+  tester: "যেহেতু মানব পরিবারের সকল সদস্যের সমান ও অবিচ্ছেদ্য অধিকারসমূহ এবং সহজাত মর্যাদার স্বীকৃতি‌ই"
+  poster_sm: "যেহেতু মানব অধিকারের"
+  poster_md: "যেহেতু মানুষ যাতে"
+  poster_lg: "সমস্ত"
+  specimen_48: "যেহেতু সদস্য জাতিসমূহ জাতিসংঘের সনদে মৌলিক মানবাধিকার, মানব দেহের মর্যাদা ও মূল্য এবং নারী"
+  specimen_36: "যেহেতু সদস্য রাষ্ট্রসমূহ জাতিসংঘের সহযোগিতায় মানবাধিকার ও মৌলিক স্বাধীনতা সমূহের প্রতি সার্বজনীন সন্মান বৃদ্ধি এবং এদের যথাযথ পালন নিশ্চিতকরণের লক্ষ্য অর্জনে অঙ্গীকারবদ্ধ;"
+  specimen_32: "কোন দেশ বা ভূখণ্ডের রাজনৈতিক, সীমানাগত বা আন্তর্জাতিক মর্যাদার ভিত্তিতে তার কোন অধিবাসীর প্রতি কোনরূপ বৈষম্য করা হবেনা; সে দেশ বা ভূখণ্ড স্বাধীন‌ই হোক, হোক অছিভূক্ত, অস্বায়ত্বশাসিত কিংবা সার্বভৌমত্বের অন্য কোন সীমাবদ্ধতায় বিরাজমান।"
+  specimen_21: "জীবন, স্বাধীনতা এবং দৈহিক নিরাপত্তায় প্রত্যেকের অধিকার আছে।\nকা‌উকে অধীনতা বা দাসত্বে আবদ্ধ করা যাবে না। সকল প্রকার ক্রীতদাস প্রথা এবং দাসব্যবসা নিষিদ্ধ করা হবে।\nকা‌উকে নির্যাতন করা যাবে না; কিংবা কারো প্রতি নিষ্ঠুর, অমানবিক বা অবমাননাকর আচরণ করা যাবে না অথবা কা‌উকে এহেন শাস্তি দেওয়া যাবে না।\nআ‌ইনের সামনে প্রত্যেকের‌ই ব্যক্তি হিসেবে স্বীকৃতি লাভের অধিকার আছে।\nআ‌ইনের চোখে সবা‌ই সমান এবং ব্যক্তিনির্বিশেষে সকলে‌ই আ‌ইনের আশ্রয় সমানভাবে ভোগ করবে। এ‌ই ঘোষণা লঙ্ঘন করে এমন কোন বৈষম্য বা বৈষম্য সৃষ্টির প্ররোচনার মুখে সমান ভাবে আশ্রয় লাভের অধিকার প্রত্যেকের‌ই আছে।"
+  specimen_16: "শাসনতন্ত্রে বা আ‌ইনে প্রদত্ত মৌলিক অধিকার লঙ্ঘনের ক্ষেত্রে উপযুক্ত জাতীয় বিচার আদালতের কাছ থেকে কার্যকর প্রতিকার লাভের অধিকার প্রত্যেকের‌ই রয়েছে।\nকা‌উকে‌ই খেয়ালখুশীমত গ্রেপ্তার বা অন্তরীণ করা কিংবা নির্বাসন দে‌ওয়া যাবে না।\nনিজের অধিকার ও দায়িত্ব নির্ধারণ এবং নিজের বিরুদ্ধে আনীত ফৌজদারি অভিযোগ নিরূপণের জন্য প্রত্যেকের‌ই পূর্ণ সমতার ভিত্তিতে একটি স্বাধীন এবং নিরপেক্ষ বিচার-আদালতে প্রকাশ্য শুনানি লাভের অধিকার রয়েছে।\nকারো ব্যক্তিগত গোপনীয়তা কিংবা তাঁর গৃহ, পরিবার ও চিঠিপত্রের ব্যাপারে খেয়ালখুশীমত হস্তক্ষেপ কিংবা তাঁর সুনাম ও সম্মানের উপর আঘাত করা চলবে না। এ ধরনের হস্তক্ষেপ বা আঘাতের বিরুদ্ধে আ‌ইনের আশ্রয় লাভের অধিকার প্রত্যেকের‌ই রয়েছে।\nপ্রত্যেকের‌ই ধর্ম, বিবেক ও চিন্তার স্বাধীনতায় অধিকার রয়েছে। এ অধিকারের সঙ্গে ধর্ম বা বিশ্বাস পরিবর্তনের অধিকার এবং এ‌ই সঙ্গে, প্রকাশ্যে বা একান্তে, একা বা অন্যের সঙ্গে মিলিতভাবে, শিক্ষাদান, অনুশীলন, উপাসনা বা আচারব্রত পালনের মাধ্যমে ধর্ম বা বিশ্বাস ব্যক্ত করার অধিকার‌ও অন্তর্ভূক্ত থাকবে।"
+}
diff --git a/lang/languages/bn/language.textproto b/lang/languages/bn/language.textproto
deleted file mode 100644
index b6a40f973..000000000
--- a/lang/languages/bn/language.textproto
+++ /dev/null
@@ -1,18 +0,0 @@
-id: "bn"
-name: "Bangla"
-preferred_name: ""
-autonym: "বাংলা"
-population: 267280377
-region: "NP"
-region: "BD"
-region: "IN"
-region: "GB"
-script: "Bangla"
-exemplar_chars {
-  base: "৺ অ আ ই ঈ উ ঊ ঋ ৠ ঌ ৡ এ ঐ ও ঔ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ত ৎ থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ ঽ"
-  auxiliary: "\\u200C\\u200D ৲ ৳ ৴ ৵ ৶ ৷ ৸ ৹ ৰ ৱ"
-  marks: "◌ঁ ◌ং ◌ঃ ◌় ◌া ◌ি ◌ী ◌ু ◌ূ ◌ৃ ◌ৄ ◌ে ◌ৈ ◌্ ◌ৗ ◌ৢ ◌ৣ"
-  numerals: "০ ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ক {ক\\u09CDষ} খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ত থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ"
-}
diff --git a/lang/languages/bn/sampletext.textproto b/lang/languages/bn/sampletext.textproto
deleted file mode 100644
index cc55152f8..000000000
--- a/lang/languages/bn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bn"
diff --git a/lang/languages/bo.textproto b/lang/languages/bo.textproto
new file mode 100644
index 000000000..e522a4f03
--- /dev/null
+++ b/lang/languages/bo.textproto
@@ -0,0 +1,30 @@
+id: "bo"
+name: "Tibetan"
+preferred_name: ""
+autonym: "བོད་སྐད་"
+population: 3006696
+region: "CN"
+region: "IN"
+region: "NP"
+script: "Tibetan"
+exemplar_chars {
+  base: "ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ"
+  auxiliary: "ༀ"
+  marks: "◌ི ◌ུ ◌ེ ◌ོ"
+  numerals: "༠ ༡ ༢ ༣ ༤ ༥ ༦ ༧ ༨ ༩"
+  punctuation: "༄ ༈ ་ ། ༎ ༔ ༺ ༻"
+  index: "ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ"
+}
+sample_text {
+  masthead_full: "འགབམ"
+  masthead_partial: "རས"
+  tester: "༈ འགྲོ་བ་མིའི་ཁྱིམ་ཚང་ཁག་གི་ནང་མི་ཡོངས་ལ་རང་བཞིན་ཉིད་ནས་ཡོད་པའི་ཆེ་མཐོངས་དང་འདྲ་མཉམ། སུས་ཀྱང་འཕྲོག་ཏུ་མི་རུང་བའི་ཐོབ་ཐང་བཅས་ཀྱི་གནད་དོན་རྟོགས"
+  poster_sm: "རྒྱལ་ཁབ་ཁག་གི་དབར"
+  poster_md: "གོང་གསལ་ཐོབ་ཐང་དང༌།"
+  poster_lg: "མི་རིགས་དང།"
+  specimen_48: "སྐྱེ་བོ་རེ་རེར་གསལ་བསྒྲགས་འདི་ནང་བཀོད་པའི་ཐོབ་ཐང་དང་རང་དབང་སྟེ། མི་རིགས་དང། ཤ་མདོག། ཕོ་མོ། སྐད་ཡིག། ཆོས་ལུགས། སྲིད་དོན་བཅས་སམ།"
+  specimen_36: "༈ འགྲོ་བ་མིའི་ཁྱིམ་ཚང་ཁག་གི་ནང་མི་ཡོངས་ལ་རང་བཞིན་ཉིད་ནས་ཡོད་པའི་ཆེ་མཐོངས་དང་འདྲ་མཉམ། སུས་ཀྱང་འཕྲོག་ཏུ་མི་རུང་བའི་ཐོབ་ཐང་བཅས་ཀྱི་གནད་དོན་རྟོགས པར་བྱེད་པ་ནི། འཛམ་གླིང་ནང་གི་རང་དབང་དང༌། དྲང་བདེན། ཞི་བདེ་བཅས་ཀྱི་རྣང་གཞི་ལྟེ་བ་ཡིན།"
+  specimen_32: "མཉམ་སྦྲེལ་རྒྱལ་ཚོགས་ཀྱི་མི་མང་རྣམས་ཀྱི་རང་དབང་རྒྱ་ཆེའི་ཐོག་ནས་སྒྲིག་ཡིག་གི་གཞི་རྩའི་རང་དབང་དང༌། འགྲོ་བ་མིའི་ཐོབ་ཐང༌། འགྲོ་བ་མིའི་ཆེ་མཐོངས་དང་འོས་མཐོངས། ཕོ་མོ་འདྲ་མཉམ་བཅས་ལ་བློ་མོས་གདེངས་འཁེལ་གྱིས་སྤྱི་ཚོགས་ཡར་རྒྱས་གོང་སྤེལ་ལ་ནུས་ཤུགས་འདོན་པ་དང༌། འཚོ་བའི་གནས་ཚད་ལེགས་སུ་གཏོང་རྒྱུར་སེམས་ཐགགཙང་མར་བཅད་ཡོད།"
+  specimen_21: "༈ འགྲོ་བ་མིའི་ཁྱིམ་ཚང་ཁག་གི་ནང་མི་ཡོངས་ལ་རང་བཞིན་ཉིད་ནས་ཡོད་པའི་ཆེ་མཐོངས་དང་འདྲ་མཉམ། སུས་ཀྱང་འཕྲོག་ཏུ་མི་རུང་བའི་ཐོབ་ཐང་བཅས་ཀྱི་གནད་དོན་རྟོགས པར་བྱེད་པ་ནི། འཛམ་གླིང་ནང་གི་རང་དབང་དང༌། དྲང་བདེན། ཞི་བདེ་བཅས་ཀྱི་རྣང་གཞི་ལྟེ་བ་ཡིན།\nའགྲོ་བ་མིའི་ཐོབ་ཐང་ལ་སྣང་ཆུང་ཁྱད་གསོད་དང༌། དམའ་འབེབས་བྱས་པ་ལ་བརྟེན་ནས་ཀླ་ཀློའི་བྱེད་སྟངས་ཤིག་བྱུང་ཡོད་པ་སྟེ། དེ་ནི་མིའི་རིགས་ཀྱི་བསམ་ཚུལ་བཟང་པོ་དང་མི་མཐུན་པའི་གནས་ཚུལ་ཞིག་བྱུང་བ་རེད།འགྲོ་བ་མིའི་རིགས་ལ་གཏམ་བརྗོད་དང༌། དད་མོས་ཀྱི་རང་དབང་སྐུང་སྐྱོབ། དགོས་མཁོ་སྒྲུབ་པའི་རང་དབང་བཅས་ལ་ལོངས་སུ་སྤྱད་ཆོག་པའི་འཛམ་གླིང་ཞིག་འབྱུང་ཐབས་དེ་ནི་སྤྱིར་བཏང་མི་མང་ཡོངས་ཀྱི་རེ་འདོད་ཆེ་ཤོས་ཤིག་ཏུ་ངེས་པ་རྒྱ་ཁྱབ་ཡོངས་སུ་གྲགས་པ་ཡིན།"
+  specimen_16: "༈ འགྲོ་བ་མིའི་ཁྱིམ་ཚང་ཁག་གི་ནང་མི་ཡོངས་ལ་རང་བཞིན་ཉིད་ནས་ཡོད་པའི་ཆེ་མཐོངས་དང་འདྲ་མཉམ། སུས་ཀྱང་འཕྲོག་ཏུ་མི་རུང་བའི་ཐོབ་ཐང་བཅས་ཀྱི་གནད་དོན་རྟོགས པར་བྱེད་པ་ནི། འཛམ་གླིང་ནང་གི་རང་དབང་དང༌། དྲང་བདེན། ཞི་བདེ་བཅས་ཀྱི་རྣང་གཞི་ལྟེ་བ་ཡིན།\nའགྲོ་བ་མིའི་ཐོབ་ཐང་ལ་སྣང་ཆུང་ཁྱད་གསོད་དང༌། དམའ་འབེབས་བྱས་པ་ལ་བརྟེན་ནས་ཀླ་ཀློའི་བྱེད་སྟངས་ཤིག་བྱུང་ཡོད་པ་སྟེ། དེ་ནི་མིའི་རིགས་ཀྱི་བསམ་ཚུལ་བཟང་པོ་དང་མི་མཐུན་པའི་གནས་ཚུལ་ཞིག་བྱུང་བ་རེད།འགྲོ་བ་མིའི་རིགས་ལ་གཏམ་བརྗོད་དང༌། དད་མོས་ཀྱི་རང་དབང་སྐུང་སྐྱོབ། དགོས་མཁོ་སྒྲུབ་པའི་རང་དབང་བཅས་ལ་ལོངས་སུ་སྤྱད་ཆོག་པའི་འཛམ་གླིང་ཞིག་འབྱུང་ཐབས་དེ་ནི་སྤྱིར་བཏང་མི་མང་ཡོངས་ཀྱི་རེ་འདོད་ཆེ་ཤོས་ཤིག་ཏུ་ངེས་པ་རྒྱ་ཁྱབ་ཡོངས་སུ་གྲགས་པ་ཡིན།\nསྐྱེ་བོ་དག་གིས་འུ་ཐུག་ཐབས་ཟད་ཀྱིས་རྐྱེན་པས་བཙན་དབང་དང༌། གཉའ་གནོན་ལ་ངོ་རྒོལ་སྒེར་ལངས་བྱེད་པའི་མཐའ་མའི་བྱ་ཐབས་ལག་བསྟར་མི་དགོས་པ་ཞིག་བྱེད་ན། དེ་ནི་ཁྲིམས་ལུགས་དྲང་འཛིན་གྱི་སྒོ་ནས་འགྲོ་བ་མིའི་ཐོབ་ཐང་ལ་སྲུང་བརྩི་བྱེད་པ་དེ་རང་གལ་གནད་ཆེ་བ་ཡིན།\nརྒྱལ་ཁབ་ཁག་གི་དབར་མཛའ་མཐུན་གྱི་འབྲེལ་བ་ཡར་རྒྱས་གོང་འཕེལ་གཏོང་རྒྱུར་འབད་བརྩོན་ཆེ་བསྐྱེད་དགོས་པ་དེ་ནི་ཧ་ཅང་གལ་གནད་ཆེ་བ་ཞིག་ཡིན།\nམཉམ་སྦྲེལ་རྒྱལ་ཚོགས་ཀྱི་མི་མང་རྣམས་ཀྱི་རང་དབང་རྒྱ་ཆེའི་ཐོག་ནས་སྒྲིག་ཡིག་གི་གཞི་རྩའི་རང་དབང་དང༌། འགྲོ་བ་མིའི་ཐོབ་ཐང༌། འགྲོ་བ་མིའི་ཆེ་མཐོངས་དང་འོས་མཐོངས། ཕོ་མོ་འདྲ་མཉམ་བཅས་ལ་བློ་མོས་གདེངས་འཁེལ་གྱིས་སྤྱི་ཚོགས་ཡར་རྒྱས་གོང་སྤེལ་ལ་ནུས་ཤུགས་འདོན་པ་དང༌། འཚོ་བའི་གནས་ཚད་ལེགས་སུ་གཏོང་རྒྱུར་སེམས་ཐགགཙང་མར་བཅད་ཡོད།"
+}
diff --git a/lang/languages/bo/language.textproto b/lang/languages/bo/language.textproto
deleted file mode 100644
index b12fe28f9..000000000
--- a/lang/languages/bo/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "bo"
-name: "Tibetan"
-preferred_name: ""
-autonym: "བོད་སྐད་"
-population: 3006696
-region: "IN"
-region: "NP"
-region: "CN"
-script: "Tibetan"
-exemplar_chars {
-  base: "ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ"
-  auxiliary: "ༀ"
-  marks: "◌ི ◌ུ ◌ེ ◌ོ"
-  numerals: "༠ ༡ ༢ ༣ ༤ ༥ ༦ ༧ ༨ ༩"
-  punctuation: "༄ ༈ ་ ། ༎ ༔ ༺ ༻"
-  index: "ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ"
-}
diff --git a/lang/languages/bo/sampletext.textproto b/lang/languages/bo/sampletext.textproto
deleted file mode 100644
index a7078fd86..000000000
--- a/lang/languages/bo/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bo"
diff --git a/lang/languages/bpy/language.textproto b/lang/languages/bpy.textproto
similarity index 92%
rename from lang/languages/bpy/language.textproto
rename to lang/languages/bpy.textproto
index 7dded2ba4..8497cb036 100644
--- a/lang/languages/bpy/language.textproto
+++ b/lang/languages/bpy.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   marks: "◌ঁ ◌ং ◌ঃ ◌় ◌া ◌ি ◌ী ◌ু ◌ূ ◌ৃ ◌ে ◌ৈ ◌্ ◌ৗ"
   numerals: "০ ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯"
 }
+sample_text {
+  fallback_language: "bn"
+}
diff --git a/lang/languages/bqi/language.textproto b/lang/languages/bqi.textproto
similarity index 76%
rename from lang/languages/bqi/language.textproto
rename to lang/languages/bqi.textproto
index 2beb1d2af..2da3e1aea 100644
--- a/lang/languages/bqi/language.textproto
+++ b/lang/languages/bqi.textproto
@@ -7,3 +7,6 @@ region: "IR"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/bqv/language.textproto b/lang/languages/bqv.textproto
similarity index 75%
rename from lang/languages/bqv/language.textproto
rename to lang/languages/bqv.textproto
index 1e062ab36..fa6f05b9b 100644
--- a/lang/languages/bqv/language.textproto
+++ b/lang/languages/bqv.textproto
@@ -7,3 +7,6 @@ region: "CI"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/br.textproto b/lang/languages/br.textproto
new file mode 100644
index 000000000..57b67757d
--- /dev/null
+++ b/lang/languages/br.textproto
@@ -0,0 +1,28 @@
+id: "br"
+name: "Breton"
+preferred_name: ""
+autonym: "Brezhoneg"
+population: 563140
+region: "FR"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P R S T U V W X Y Z Ê Ñ Ù a b c d e f g h i j k l m n o p r s t u v w x y z ê ñ ù"
+  auxiliary: "á à ă â å ä ã ā æ c ç é è ĕ ë ē í ì ĭ î ï ī ó ò ŏ ô ö ø ō œ q ú ŭ û ü ū ÿ"
+  marks: "◌̀ ◌̂ ◌̃"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}"
+  index: "A B C D E F G H I J K L M N O P R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "DdIi"
+  masthead_partial: "Ee"
+  tester: "–O vezañ ma’z eo war anaout an dellezegezh enstag ouzh holl izili"
+  poster_sm: "–o vezañ ma’z"
+  poster_md: "-o vezañ ma’z"
+  poster_lg: "Dieub"
+  specimen_48: "evel uhelvennad boutin da vezañ diraezet gant an holl bobloù"
+  specimen_36: "Ne vo dalc’het den er sklaverezh nag er sujidigezh; berzet e vo kement stumm a sklaverezh hag a werzhañ-sklaved."
+  specimen_32: "Pep hini en deus gwir da gaout digoll gwirion dirak lezioù-barn broadel kenveliek evit oberoù o dije torret ar gwirioù diazez anavezet dezhañ gant ar Vonreizh pa al lezenn."
+  specimen_21: "Den ebet ne vo harzet, bac’het pe harluet diouzh c’hoant.\nUr gwir par da hini ar re all a zo gant pep hini da vezañ klevet dirak an holl ha gant reizhded gant ul lez-varn dizalc’h ha neptu, dezhi da dermenañ e wirioù ha dleadoù hag an tamalloù graet dezhañ.\nDen ebet ne vo emellet diouzh c’hoant en e vuhez prevez, e diegezh, e annez pe e lizhiri, ha ne vo ket stoket ouzh e enor nag ouzh e vrud. Pep hini en deus gwir da gaout gwarez digant al lezenn diouzh emelladennoù ha tagadennoù a seurt-se."
+  specimen_16: "Pep den en deus gwir da gaout frankiz ar soñj, ar goustiañs hag ar relijion; er gwir-mañ emañ ivez ar frankiz da gemmañ e relijion pe e gredenn, hag ivez ar frankiz da ziskuliañ e relijion pe e gredenn, eunan pe a-stroll, dirak an holl pe en-prevez, dre ar c’helenn, an oberoù, an azeulerezh pe al liderezh.\nPep hini en deus gwir d’ar frankiz d’ober e veno ha d’en disklêriañ, da lavarout eo gwir da chom hep bezañ trubuilhet en abeg d’e vennozhioù, gwir da glask, da resev ha da skignañ keleier ha mennozhioù, dre n’eus forzh pe zoare disklêriañ, hep teurel pled ouzh an harzoù."
+}
diff --git a/lang/languages/br/language.textproto b/lang/languages/br/language.textproto
deleted file mode 100644
index 618912866..000000000
--- a/lang/languages/br/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "br"
-name: "Breton"
-preferred_name: ""
-autonym: "Brezhoneg"
-population: 563140
-region: "FR"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P R S T U V W X Y Z Ê Ñ Ù a b c d e f g h i j k l m n o p r s t u v w x y z ê ñ ù"
-  auxiliary: "á à ă â å ä ã ā æ c ç é è ĕ ë ē í ì ĭ î ï ī ó ò ŏ ô ö ø ō œ q ú ŭ û ü ū ÿ"
-  marks: "◌̀ ◌̂ ◌̃"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}"
-  index: "A B C D E F G H I J K L M N O P R S T U V W X Y Z"
-}
diff --git a/lang/languages/br/sampletext.textproto b/lang/languages/br/sampletext.textproto
deleted file mode 100644
index a4d6020c6..000000000
--- a/lang/languages/br/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "br"
diff --git a/lang/languages/bra/language.textproto b/lang/languages/bra.textproto
similarity index 74%
rename from lang/languages/bra/language.textproto
rename to lang/languages/bra.textproto
index c3b8b18c4..bceb2ddfc 100644
--- a/lang/languages/bra/language.textproto
+++ b/lang/languages/bra.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/brh/language.textproto b/lang/languages/brh.textproto
similarity index 75%
rename from lang/languages/brh/language.textproto
rename to lang/languages/brh.textproto
index 17b7904f9..7eeb9c0ab 100644
--- a/lang/languages/brh/language.textproto
+++ b/lang/languages/brh.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/brx/language.textproto b/lang/languages/brx.textproto
similarity index 94%
rename from lang/languages/brx/language.textproto
rename to lang/languages/brx.textproto
index 4448dc153..e64f7445c 100644
--- a/lang/languages/brx/language.textproto
+++ b/lang/languages/brx.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: "। ॥ ॰"
   index: "अ आ इ ई उ ऊ ऍ ए ऐ ऑ ओ औ क ख ग घ च छ ज झ ञ ट ठ ड {ड\\u093C} ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/bs/language.textproto b/lang/languages/bs.textproto
similarity index 93%
rename from lang/languages/bs/language.textproto
rename to lang/languages/bs.textproto
index c2b074cd5..92e4f4f3e 100644
--- a/lang/languages/bs/language.textproto
+++ b/lang/languages/bs.textproto
@@ -14,3 +14,6 @@ exemplar_chars {
   punctuation: "‐ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] @ * / ′ ″"
   index: "A B C Č Ć D {DŽ} E F G H I J K L {LJ} M N {NJ} O P Q R S Š T U V W X Y Z Ž"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/bs_Cyrl/language.textproto b/lang/languages/bs_Cyrl.textproto
similarity index 91%
rename from lang/languages/bs_Cyrl/language.textproto
rename to lang/languages/bs_Cyrl.textproto
index b1273b29e..ccc2e3d86 100644
--- a/lang/languages/bs_Cyrl/language.textproto
+++ b/lang/languages/bs_Cyrl.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "А Б В Г Д Ђ Е Ж З И Ј К Л Љ М Н Њ О П Р С Т Ћ У Ф Х Ц Ч Џ Ш"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/bsc/language.textproto b/lang/languages/bsc.textproto
similarity index 71%
rename from lang/languages/bsc/language.textproto
rename to lang/languages/bsc.textproto
index dc945ba96..c5ae15538 100644
--- a/lang/languages/bsc/language.textproto
+++ b/lang/languages/bsc.textproto
@@ -6,3 +6,6 @@ population: 15264
 region: "SN"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bss/language.textproto b/lang/languages/bss.textproto
similarity index 74%
rename from lang/languages/bss/language.textproto
rename to lang/languages/bss.textproto
index e5c515ffc..1282af675 100644
--- a/lang/languages/bss/language.textproto
+++ b/lang/languages/bss.textproto
@@ -7,3 +7,6 @@ region: "CM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bto/language.textproto b/lang/languages/bto.textproto
similarity index 86%
rename from lang/languages/bto/language.textproto
rename to lang/languages/bto.textproto
index 95bf039cf..75355132d 100644
--- a/lang/languages/bto/language.textproto
+++ b/lang/languages/bto.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B D G H I K L M N O P R S T U W Y a b d g h i k l m n o p r s t u w y"
   auxiliary: "C E F J Q V X Z c e f j q v x z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/btv/language.textproto b/lang/languages/btv.textproto
similarity index 76%
rename from lang/languages/btv/language.textproto
rename to lang/languages/btv.textproto
index 87499b491..a67f6b961 100644
--- a/lang/languages/btv/language.textproto
+++ b/lang/languages/btv.textproto
@@ -3,8 +3,11 @@ name: "Bateri"
 preferred_name: ""
 autonym: ""
 population: 78843
-region: "PK"
 region: "IN"
+region: "PK"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/bua/language.textproto b/lang/languages/bua.textproto
similarity index 87%
rename from lang/languages/bua/language.textproto
rename to lang/languages/bua.textproto
index 9d2389103..f71b4ae28 100644
--- a/lang/languages/bua/language.textproto
+++ b/lang/languages/bua.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C Ç D E F G H I J K L M N O Ө P R S Ş T U V X Y Z Ƶ a b c ç d e f g h i j k l m n o ө p r s ş t u v x y z ƶ"
   marks: "◌̧"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/buc.textproto b/lang/languages/buc.textproto
new file mode 100644
index 000000000..8f8ef3f4a
--- /dev/null
+++ b/lang/languages/buc.textproto
@@ -0,0 +1,25 @@
+id: "buc"
+name: "Bushi"
+preferred_name: ""
+autonym: "Kibushi"
+population: 44620
+region: "YT"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E F G H I K L M N O P R S T U V W X Y Z Ɓ Ɗ N̈ a b d e f g h i k l m n o p r s t u v w x y z ɓ ɗ n̈"
+  auxiliary: "C J Q c j q"
+  marks: "◌̈"
+}
+sample_text {
+  masthead_full: "ƁɓIi"
+  masthead_partial: "Nn"
+  tester: "An-fahitaŋa amba, fikuɓaliaŋa amba ɓinadamu djabi nitirahinyi ndreka"
+  poster_sm: "An-fahitaŋa"
+  poster_md: "An- fahitaŋa"
+  poster_lg: "Ɓinadamu"
+  specimen_48: "An- fahitaŋa amba, fikutrugaŋa djumla nin-sharia ndreka nafasi retu"
+  specimen_36: "Tsisi huluŋu mbu atou andevu au andivuzaŋa : fandivuzaŋa ndreka kula kalite nin-fanyiraha ki andevu, tsi kuruhusuŋu."
+  specimen_32: "Kula huluŋu misi haki an-faŋabwahaŋa vaha ndreka fangalaŋa nafasi, amin’ni zenyi, an-faŋanovaŋa mupaka mikustahiki amin’ni muda nin-hasa ndreka anfaŋabwahaŋa vaha ifaŋa nim-muda."
+  specimen_21: "Kula huluŋu misi haki an-faŋanovaŋa modeli atà utrilivu amin’ni maisha ki ɓinadamu ndreka amin’ni ulemengu ikuɓala atà haki ndreka unafasi nikudukuruŋu aŋatim- Matekelezo itì, ikurumianaŋa namuna nin-kulazimu.\nTsisi atà sharia areki nim-Matekelezo itì mbu heti kutafaswirinyi amin’ni lalaŋa mikuruhusu, Daula, shikao au huluŋu areki, ihisi haki itsokao yotsi nin-faŋanovaŋa mahafala au ãmali mandrubaka haki ndreka unafasi nikudukuruŋu etu."
+  specimen_16: "An-fahitaŋa amba, fikuɓaliaŋa amba ɓinadamu djabi nitirahinyi ndreka usheu ndreka haki meraŋa nandzari ro musingi nin-nafasi, nin-haki ndreka usalama duniani ;\nAn-fahitaŋa amba, tsifahizaŋa ndreka fipuzisaŋa haki-l-adamì ro mikutsonga faŋanovaŋa shitrendro ki katili maneitri rohu nin-umati djabi, amin’ni zenyi, fitunga nin-ulemengu mbu kuruhusu ɓinadamu ivulaŋa ndreka ikwamini aminnafasi, ɓilà tahutru wala taãɓu nin-ufukara, ro nikutekelezaŋa kirasimi, ustaãraɓu beheben-djabi ninhulumbelu ;\nAn- fahitaŋa amba, Daula Aŋatin-shama itì ndreka shama nin-Uvumoja nin-Twaifa (Shama nin-Daula nin-Ulemengu) nangala wahadi an-ndreu aŋaraka kaɓaru retu atà haki-ladamì ndreka nafasi musingi ikustehinyi nankitinyi amin’ni dunia mafia ;"
+}
diff --git a/lang/languages/buc/language.textproto b/lang/languages/buc/language.textproto
deleted file mode 100644
index d66ce03e6..000000000
--- a/lang/languages/buc/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "buc"
-name: "Bushi"
-preferred_name: ""
-autonym: "Kibushi"
-population: 44620
-region: "YT"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E F G H I K L M N O P R S T U V W X Y Z Ɓ Ɗ N̈ a b d e f g h i k l m n o p r s t u v w x y z ɓ ɗ n̈"
-  auxiliary: "C J Q c j q"
-  marks: "◌̈"
-}
diff --git a/lang/languages/buc/sampletext.textproto b/lang/languages/buc/sampletext.textproto
deleted file mode 100644
index 7185e4693..000000000
--- a/lang/languages/buc/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "buc"
diff --git a/lang/languages/bug.textproto b/lang/languages/bug.textproto
new file mode 100644
index 000000000..bb117a680
--- /dev/null
+++ b/lang/languages/bug.textproto
@@ -0,0 +1,26 @@
+id: "bug"
+name: "Buginese"
+preferred_name: ""
+autonym: "Basa Ugi"
+population: 4298211
+region: "ID"
+region: "MY"
+script: "Latin"
+exemplar_chars {
+  base: "ᨀ ᨁ ᨂ ᨃ ᨄ ᨅ ᨆ ᨇ ᨈ ᨉ ᨊ ᨋ ᨌ ᨍ ᨎ ᨏ ᨐ ᨑ ᨒ ᨓ ᨔ ᨕ ᨖ"
+  marks: "◌ᨗ ◌ᨘ ◌ᨙ ◌ᨚ ◌ᨛ"
+  punctuation: "᨞ ᨟"
+}
+sample_text {
+  masthead_full: "SsIi"
+  masthead_partial: "Nn"
+  tester: "Pura ritimbang nasengnge dipattongengngi ri asengnge allebbireng"
+  poster_sm: "Pura ritimbang"
+  poster_md: "Riasengnge"
+  poster_lg: "Sininna"
+  specimen_48: "Sininna rupa tau ri jajiangngi rilinoe nappunnai manengngi riasengnge"
+  specimen_36: "Sininna rupa tau nappunai hak ripattongeng ri olona hukungnge nasengnge allebbireng seddi seddi tau , motega tega monro."
+  specimen_32: "Sininna rupa tau nappunai hak riaseng attennangeng na pakansi sibawa ripattentui wettunna ajamangnge na wettu pakansie ,na tette natarima gajinna."
+  specimen_21: "Sininna rupa tau nappunai hak ri asengnge addecengeng tuwo ri linoe na sininna hak kebebasan pura taruki maneng ri laleng na ada assaturuseng na sibole bolena riala sanreseng.\nDegaga mo seddi rilalenna ada assamaturusengnge napalalo ri tafsir nasenggnge dibukkang laleng seddi negara, kelompk, iya ga seddi rupa tau nappunai hak nateru terrusi nasengnge mappigau pangkaukang salae ye wedding na solangi riasengnge allebbirirenna hak-hakna kebebasang kebebasang ye tarukie ri lalenna ada assaturusengnge."
+  specimen_16: "Pura ritimbang nasengnge dipattongengngi ri asengnge allebbireng napanjajie puang seuwae na hak-hak pada nappunnai manengnge salasureng padatta rupa tau ianaro simulangenna riasengnge merdeka e . Ade\'e na atennangengnge tuo ri linoe.\nPura ritimbang nasengnge gau de\'e nasipakalebbireng pole padatta rupa tau ianaro mancaji pangkaukang makassara najajianni maggoppo maneng accairengnge na ajapparu\'e ri laleng atina rupa tau. na ri purennuangi rijajiangi seddi lino naonroi\'e padatta rupa tau ye\'paneddingi\'e riasengnge ininnawa mappau ada tongeng na ininawa suju\'e ri Puang seuwae sibawa ininnawa leppe\'e pole riasengnge akkitaureng na teggennekengnge pura mancaji seddi purennuang marilaleng pole taumaegae."
+}
diff --git a/lang/languages/bug/language.textproto b/lang/languages/bug/language.textproto
deleted file mode 100644
index ed3f72eb5..000000000
--- a/lang/languages/bug/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "bug"
-name: "Buginese"
-preferred_name: ""
-autonym: "Basa Ugi"
-population: 4298211
-region: "ID"
-region: "MY"
-script: "Latin"
-exemplar_chars {
-  base: "ᨀ ᨁ ᨂ ᨃ ᨄ ᨅ ᨆ ᨇ ᨈ ᨉ ᨊ ᨋ ᨌ ᨍ ᨎ ᨏ ᨐ ᨑ ᨒ ᨓ ᨔ ᨕ ᨖ"
-  marks: "◌ᨗ ◌ᨘ ◌ᨙ ◌ᨚ ◌ᨛ"
-  punctuation: "᨞ ᨟"
-}
diff --git a/lang/languages/bug/sampletext.textproto b/lang/languages/bug/sampletext.textproto
deleted file mode 100644
index 91cf9753e..000000000
--- a/lang/languages/bug/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bug"
diff --git a/lang/languages/bum.textproto b/lang/languages/bum.textproto
new file mode 100644
index 000000000..0823bab9b
--- /dev/null
+++ b/lang/languages/bum.textproto
@@ -0,0 +1,22 @@
+id: "bum"
+name: "Bulu"
+preferred_name: ""
+autonym: ""
+population: 1276269
+region: "CM"
+script: "Latin"
+exemplar_chars {
+}
+sample_text {
+  masthead_full: "AaBb"
+  masthead_partial: "Ii"
+  tester: "Eyóñ bia noñ na fili, sosoo ai mvoe bia so bia olugu biave ekokom"
+  poster_sm: "Eyóñ bia noñ"
+  poster_md: "Eyóñ bia"
+  poster_lg: "Abiali"
+  specimen_48: "Eyóñ bia noñ na fulu mbga etam, fulu anyañ, fulu ediñ ndzo ene"
+  specimen_36: "Eyóñ bia noñ na abui minnam mbamena ai Ekuan Elad meyoñ mo yebe ovañ ye na si ese ebaala memvende m\'enyiñ ma."
+  specimen_32: "Eyóñ bia noñ na fili ya nyol ai a nsisim ene dzom ya mod ose ayi, adzeñe fe, ai na ndimi, tege yene, ebiandi y\'akar so e minsingi ai minyanda a minnam."
+  specimen_21: "Eyóñ bia noñ na fili, sosoo ai mvoe bia so bia olugu biave ekokom mod.\nEyóñ bia noñ na fili ya nyol ai a nsisim ene dzom ya mod ose ayi, adzeñe fe, ai na ndimi, tege yene, ebiandi y\'akar so e minsingi ai minyanda a minnam.\nEyóñ bia noñ na ngomena ayian kala enyiñ asu e na bod be za bam nge batibili bo.\nEyóñ bia noñ na fulu mbga etam, fulu anyañ, fulu ediñ ndzo ene mfi asu mie bod ya minnam."
+  specimen_16: "Eyóñ bia noñ na fili, sosoo ai mvoe bia so bia olugu biave ekokom mod.\nEyóñ bia noñ na fili ya nyol ai a nsisim ene dzom ya mod ose ayi, adzeñe fe, ai na ndimi, tege yene, ebiandi y\'akar so e minsingi ai minyanda a minnam.\nEyóñ bia noñ na ngomena ayian kala enyiñ asu e na bod be za bam nge batibili bo.\nEyóñ bia noñ na fulu mbga etam, fulu anyañ, fulu ediñ ndzo ene mfi asu mie bod ya minnam.\nEyóñ bia noñ na Akōk Memvende Ekuan Elad Meyoñ amem na aluman asu na enyiñ bod bese etebe etu dzia.\nEyóñ bia noñ na abui minnam mbamena ai Ekuan Elad meyoñ mo yebe ovañ ye na si ese ebaala memvende m\'enyiñ ma."
+}
diff --git a/lang/languages/bum/language.textproto b/lang/languages/bum/language.textproto
deleted file mode 100644
index 41c1fe804..000000000
--- a/lang/languages/bum/language.textproto
+++ /dev/null
@@ -1,9 +0,0 @@
-id: "bum"
-name: "Bulu"
-preferred_name: ""
-autonym: ""
-population: 1276269
-region: "CM"
-script: "Latin"
-exemplar_chars {
-}
diff --git a/lang/languages/bum/sampletext.textproto b/lang/languages/bum/sampletext.textproto
deleted file mode 100644
index 5cb8b8910..000000000
--- a/lang/languages/bum/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "bum"
diff --git a/lang/languages/bvb/language.textproto b/lang/languages/bvb.textproto
similarity index 74%
rename from lang/languages/bvb/language.textproto
rename to lang/languages/bvb.textproto
index d3b10cab6..fccd6886d 100644
--- a/lang/languages/bvb/language.textproto
+++ b/lang/languages/bvb.textproto
@@ -7,3 +7,6 @@ region: "GQ"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/byn/language.textproto b/lang/languages/byn.textproto
similarity index 74%
rename from lang/languages/byn/language.textproto
rename to lang/languages/byn.textproto
index fa444331f..92e6dfc7a 100644
--- a/lang/languages/byn/language.textproto
+++ b/lang/languages/byn.textproto
@@ -7,3 +7,6 @@ region: "ER"
 script: "Ethiopic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "am"
+}
diff --git a/lang/languages/byv/language.textproto b/lang/languages/byv.textproto
similarity index 74%
rename from lang/languages/byv/language.textproto
rename to lang/languages/byv.textproto
index 66e62a718..872d457f3 100644
--- a/lang/languages/byv/language.textproto
+++ b/lang/languages/byv.textproto
@@ -7,3 +7,6 @@ region: "CM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/bze/language.textproto b/lang/languages/bze.textproto
similarity index 75%
rename from lang/languages/bze/language.textproto
rename to lang/languages/bze.textproto
index c4472ab84..7883b8dc0 100644
--- a/lang/languages/bze/language.textproto
+++ b/lang/languages/bze.textproto
@@ -7,3 +7,6 @@ region: "ML"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ca.textproto b/lang/languages/ca.textproto
new file mode 100644
index 000000000..1b2883fd4
--- /dev/null
+++ b/lang/languages/ca.textproto
@@ -0,0 +1,31 @@
+id: "ca"
+name: "Catalan"
+preferred_name: ""
+autonym: "Català"
+population: 8679138
+region: "AD"
+region: "ES"
+region: "FR"
+region: "IT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Ç È É Í Ï Ò Ó Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à ç è é í ï ò ó ú ü"
+  auxiliary: "Ŀ ŀ"
+  marks: "◌̀ ◌́ ◌̈ ◌̧"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? ¿ . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\\\ \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Ss"
+  tester: "Considerant que el reconeixement de la dignitat inherent i dels"
+  poster_sm: "Considerant"
+  poster_md: "L’Assemblea"
+  poster_lg: "Tots"
+  specimen_48: "Proclama aquesta Declaració Universal de Drets Humans com l’ideal"
+  specimen_36: "Ningú no serà sotmès a esclavitud o servitud: l’esclavitud i el tràfic d’esclaus són prohibits en totes llurs formes."
+  specimen_32: "Tota persona té dret al descans i al lleure i, particularment, a una limitació raonable de la jornada de treball i a vacances periòdiques pagades."
+  specimen_21: "Tota persona té dret a un ordre social i internacional en què els drets i llibertats proclamats en aquesta Declaració puguin ser plenament efectius.\nRes en aquesta Declaració no podrà interpretar-se en el sentit que doni cap dret a un Estat, a un grup o a una persona a emprendre activitats o a realitzar actes que tendeixin a la supressió de qualsevol dels drets i llibertats que s’hi enuncien."
+  specimen_16: "Considerant que el reconeixement de la dignitat inherent i dels drets iguals i inalienables de tots els membres de la família humana és el fonament de la llibertat, la justícia i la pau en el món,\nConsiderant que el desconeixement i el menyspreu dels drets humans han originat actes de barbàrie que han ultratjat la consciència de la humanitat; i que s’ha proclamat com l’aspiració més elevada de tothom l’adveniment d’un món on els éssers humans, deslliurats del temor i la misèria, puguin gaudir de llibertat d’expressió i de creença,\nConsiderant que és essencial que els drets humans siguin protegits per un règim de dret per tal que les persones no es vegin forçades, com a últim recurs, a la rebel·lió contra la tirania i l’opressió,"
+}
diff --git a/lang/languages/ca/language.textproto b/lang/languages/ca/language.textproto
deleted file mode 100644
index b1581c370..000000000
--- a/lang/languages/ca/language.textproto
+++ /dev/null
@@ -1,18 +0,0 @@
-id: "ca"
-name: "Catalan"
-preferred_name: ""
-autonym: "Català"
-population: 8679138
-region: "FR"
-region: "IT"
-region: "AD"
-region: "ES"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Ç È É Í Ï Ò Ó Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à ç è é í ï ò ó ú ü"
-  auxiliary: "Ŀ ŀ"
-  marks: "◌̀ ◌́ ◌̈ ◌̧"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? ¿ . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\\\ \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/ca/sampletext.textproto b/lang/languages/ca/sampletext.textproto
deleted file mode 100644
index 7ea7c2401..000000000
--- a/lang/languages/ca/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ca"
diff --git a/lang/languages/cad/language.textproto b/lang/languages/cad.textproto
similarity index 73%
rename from lang/languages/cad/language.textproto
rename to lang/languages/cad.textproto
index ad60cd47a..fd3cd6d51 100644
--- a/lang/languages/cad/language.textproto
+++ b/lang/languages/cad.textproto
@@ -7,3 +7,6 @@ region: "US"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/cch/language.textproto b/lang/languages/cch.textproto
similarity index 74%
rename from lang/languages/cch/language.textproto
rename to lang/languages/cch.textproto
index c75f91230..be19b88ff 100644
--- a/lang/languages/cch/language.textproto
+++ b/lang/languages/cch.textproto
@@ -7,3 +7,6 @@ region: "NG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ccp.textproto b/lang/languages/ccp.textproto
new file mode 100644
index 000000000..e4f4b3514
--- /dev/null
+++ b/lang/languages/ccp.textproto
@@ -0,0 +1,30 @@
+id: "ccp"
+name: "Chakma"
+preferred_name: ""
+autonym: ""
+population: 729137
+region: "BD"
+region: "IN"
+script: "Bangla"
+script: "Chakma"
+exemplar_chars {
+  base: "𑄃 𑄄 𑄅 𑄆 𑄇 𑄈 𑄉 𑄊 𑄋 𑄌 𑄍 𑄎 𑄏 𑄐 𑄑 𑄒 𑄓 𑄔 𑄕 𑄖 𑄗 𑄘 𑄙 𑄚 𑄛 𑄜 𑄝 𑄞 𑄟 𑄠 𑄡 𑄢 𑄣 𑄤 𑄥 𑄦"
+  auxiliary: ""
+  marks: "◌𑄀 ◌𑄁 ◌𑄂 ◌𑄧 ◌𑄨 ◌𑄩 ◌𑄪 ◌𑄫 ◌𑄬 ◌𑄭 ◌𑄰 ◌𑄱 ◌𑄲 ◌𑄳 ◌𑄴"
+  numerals: "𑄶 𑄷 𑄸 𑄹 𑄺 𑄻 𑄼 𑄽 𑄾 𑄿 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "𑅁 𑅂 𑅃 𑅀"
+  index: "𑄃 𑄄 𑄅 𑄆 𑄇 𑄈 𑄉 𑄊 𑄋 𑄌 𑄍 𑄎 𑄏 𑄐 𑄑 𑄒 𑄓 𑄔 𑄕 𑄖 𑄗 𑄘 𑄙 𑄚 𑄛 𑄜 𑄝 𑄞 𑄟 𑄠 𑄡 𑄢 𑄣 𑄤 𑄥 𑄦"
+}
+sample_text {
+  masthead_full: "𑄝𑄇𑄟𑄚"
+  masthead_partial: "𑄌𑄢"
+  tester: " 𑄡𑄨𑄠𑄚𑄧𑄖𑄳𑄠𑄬 𑄟𑄚𑄬𑄭 𑄉𑄨𑄢𑄨𑄢𑄴 𑄝𑄬𑄇𑄴𑄅𑄚𑄧𑄖𑄳𑄠𑄴 𑄥𑄧𑄁 𑄃𑄮 𑄑𑄚𑄑𑄚𑄳𑄠𑄴 𑄝𑄚𑄝𑄚𑄳𑄠𑄴 𑄃𑄇𑄴𑄇𑄥𑄁𑄃𑄚𑄩 𑄃𑄳𑄃 𑄃𑄟𑄧𑄚𑄧 𑄎𑄘𑄧𑄢𑄴 𑄃𑄨𑄌𑄴𑄎𑄮𑄘𑄧𑄢𑄴"
+  poster_sm: "𑄡𑄨𑄠𑄚𑄧𑄖𑄳𑄠𑄬 𑄟𑄚𑄬𑄭 𑄃𑄇𑄴𑄇𑄥𑄁𑄃𑄧𑄢𑄴"
+  poster_md: "𑄡𑄨𑄠𑄚𑄧𑄖𑄳𑄠𑄬 𑄟𑄚𑄬𑄭"
+  poster_lg: "𑄟𑄚𑄪𑄌𑄴"
+  specimen_48: "𑄡𑄨𑄠𑄚𑄧𑄖𑄳𑄠𑄬 𑄥𑄧𑄘𑄧𑄥𑄳𑄠𑄧 𑄎𑄖𑄴𑄅𑄚𑄴 𑄎𑄖𑄨𑄥𑄧𑄁𑄊𑄧𑄢𑄴 𑄥𑄧𑄚𑄧𑄘𑄬 𑄃𑄢𑄁 𑄟𑄚𑄬𑄭𑄠𑄮𑄢𑄴 𑄃𑄇𑄴𑄇𑄥𑄁, 𑄟𑄚𑄬𑄭 𑄇𑄬𑄠𑄬𑄢𑄴 𑄃𑄨𑄌𑄴𑄎𑄮𑄖𑄴 𑄃𑄮 𑄘𑄟𑄴 𑄃𑄳𑄃 𑄟𑄨𑄣𑄬"
+  specimen_36: "𑄡𑄨𑄠𑄚𑄧𑄖𑄳𑄠𑄬 𑄥𑄧𑄘𑄧𑄥𑄳𑄠𑄧 𑄢𑄬𑄎𑄳𑄠𑄧𑄠𑄚𑄨 𑄎𑄖𑄨𑄥𑄧𑄁𑄊𑄧𑄢𑄴 𑄝𑄧𑄣𑄝𑄧𑄣𑄴𑄘𑄨𑄠𑄬𑄭 𑄟𑄚𑄬𑄭𑄃𑄇𑄴𑄇𑄥𑄁 𑄃𑄮 𑄃𑄢𑄁 𑄥𑄙𑄩𑄚𑄧𑄖𑄃𑄚𑄩𑄢𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄝𑄬𑄇𑄴𑄅𑄚𑄧𑄖𑄳𑄠𑄴 𑄃𑄨𑄌𑄴𑄎𑄮𑄖𑄴 𑄝𑄢𑄚 𑄃𑄳𑄃 𑄃𑄬𑄘𑄢𑄢𑄴 𑄘𑄧𑄟𑄬𑄘𑄣𑄬 𑄈𑄟𑄇𑄭𑄭 𑄛𑄣𑄚𑄢𑄴 𑄖𑄇𑄴𑄉𑄧𑄢𑄨 𑄜𑄬𑄝𑄖𑄳𑄠𑄬 𑄃𑄨𑄟𑄚𑄴-𑄎𑄧𑄝𑄚𑄴 𑄃𑄬𑄇𑄴𑄎𑄧𑄙;"
+  specimen_32: "𑄇𑄢𑄧 𑄚𑄨𑄎𑄮𑄢𑄴 𑄉𑄮𑄛𑄧𑄚𑄴 𑄇𑄨𑄁𑄝 𑄖𑄢𑄴 𑄊𑄧𑄢𑄧𑄢𑄴, 𑄉𑄨𑄢𑄨 𑄃𑄮 𑄌𑄨𑄙𑄨𑄛𑄘𑄨𑄢𑄴 𑄃𑄨𑄌𑄳𑄠𑄴𑄟𑄧𑄖𑄧 𑄎𑄨𑄠𑄚𑄴𑄛𑄭 𑄉𑄧𑄢𑄚 𑄇𑄨𑄁𑄝 𑄖𑄢𑄴 𑄥𑄪𑄚𑄟𑄴 𑄃𑄮  𑄃𑄨𑄌𑄴𑄎𑄮𑄘𑄧 𑄅𑄪𑄢𑄪𑄢𑄬 𑄛𑄨𑄢𑄬 𑄜𑄪𑄘𑄬 𑄛𑄢 𑄉𑄧𑄢 𑄚𑄧 𑄌𑄧𑄣𑄨𑄝𑄧𑅁 𑄃𑄬 𑄝𑄝𑄧𑄖𑄳𑄠𑄴 𑄎𑄨𑄠𑄚𑄴𑄛𑄭 𑄉𑄧𑄢𑄚 𑄝 𑄛𑄨𑄢𑄬𑄛𑄚𑄢𑄴 𑄛𑄨𑄌𑄴𑄥𑄨𑄠𑄚𑄴𑄘𑄨 𑄃𑄃𑄨𑄚𑄮𑄢𑄴 𑄃𑄌𑄴𑄥𑄳𑄢𑄧𑄠𑄴 𑄣𑄞𑄧𑄢𑄴 𑄃𑄇𑄴𑄇𑄥𑄁 𑄝𑄬𑄇𑄴𑄅𑄚𑄮𑄢𑄴 𑄢𑄧𑄠𑄬𑅁"
+  specimen_21: "𑄝𑄬𑄇𑄴𑄅𑄚𑄧𑄢𑄴 𑄙𑄧𑄢𑄴𑄟𑄧, 𑄃𑄬𑄘 𑄃𑄮 𑄌𑄨𑄘𑄳𑄠𑄬 𑄥𑄙𑄩𑄚𑄧𑄖𑄠𑄴 𑄃𑄇𑄴𑄇𑄥𑄁 𑄢𑄧𑄠𑄬𑅁 𑄃𑄬 𑄃𑄇𑄴𑄇𑄥𑄁 𑄥𑄧𑄟𑄢𑄬 𑄙𑄧𑄢𑄴𑄟𑄧 𑄝 𑄝𑄨𑄌𑄴𑄥𑄬𑄌𑄴 𑄝𑄧𑄘𑄧𑄣𑄚𑄢𑄴 𑄃𑄇𑄴𑄇𑄥𑄁 𑄃𑄳𑄃 𑄃𑄬𑄭 𑄥𑄧𑄟𑄢𑄬, 𑄘𑄬𑄉𑄬𑄛𑄢 𑄝 𑄟𑄪𑄢𑄬 𑄟𑄪𑄢𑄬, 𑄉𑄭 𑄝 𑄃𑄧𑄚𑄳𑄠𑄧𑄢𑄴 𑄥𑄧𑄟𑄢𑄬 𑄟𑄨𑄣𑄨𑄚𑄬𑄭, 𑄥𑄨𑄇𑄴𑄈𑄬𑄘𑄚𑄴, 𑄣𑄢𑄴𑄌𑄢𑄴, 𑄙𑄨𑄠𑄚𑄴 𑄉𑄧𑄢𑄚 𑄝 𑄛𑄣𑄬𑄝𑄢𑄴 𑄟𑄖𑄴𑄙𑄧𑄟𑄬 𑄙𑄧𑄢𑄴𑄟𑄧 𑄝 𑄝𑄨𑄌𑄴𑄥𑄬𑄌𑄴 𑄉𑄧𑄢𑄨𑄝𑄢𑄴 𑄃𑄇𑄴𑄇𑄥𑄁𑄃𑄮 𑄃𑄨𑄠𑄮𑄖𑄴 𑄗𑄬𑄝𑄧𑅁\n𑄝𑄬𑄇𑄴𑄅𑄚𑄧𑄢𑄴 𑄟𑄧𑄖𑄴 𑄘𑄨𑄝𑄢𑄴 𑄃𑄳𑄃 𑄟𑄧𑄖𑄴 𑄜𑄧𑄉𑄧𑄘𑄁𑄋𑄨𑄢𑄴 𑄥𑄙𑄩𑄚𑄧𑄖𑄠𑄴 𑄃𑄇𑄴𑄇𑄥𑄁 𑄢𑄧𑄠𑄬𑅁 𑄃𑄧𑄉𑄪𑄢𑄴 𑄟𑄧𑄖𑄴 𑄘𑄨𑄘𑄢𑄴 𑄃𑄳𑄃 𑄢𑄬𑄎𑄳𑄠𑄧𑄢𑄴 𑄥𑄨𑄟𑄨𑄚𑄬 𑄌𑄯𑄦𑄨𑄖𑄨𑄨 𑄡𑄬 𑄇𑄧𑄚𑄧 𑄟𑄖𑄴𑄙𑄧𑄟𑄬 𑄈𑄧𑄝𑄧𑄢𑄴 𑄛𑄚 𑄘𑄮𑄇𑄳𑄠𑄴 𑄃𑄳𑄃 𑄖𑄧𑄖𑄧𑄧𑄱 𑄉𑄬𑄛𑄧𑄚𑄴, 𑄣𑄧𑄚 𑄃𑄮 𑄃𑄪𑄙𑄮𑄣𑄧𑄚 𑄥𑄙𑄩𑄚𑄧𑄖𑄃𑄮 𑄃𑄬 𑄃𑄇𑄴𑄇𑄥𑄁𑄃𑄧𑄢𑄴 𑄟𑄧𑄖𑄴𑄙𑄳𑄠 𑄛𑄧𑄢𑄬𑅁\n𑄥𑄧𑄟𑄎𑄧𑄢𑄴 𑄥𑄧𑄘𑄧𑄥𑄳𑄠𑄧 𑄃𑄨𑄏𑄬𑄝𑄬 𑄝𑄬𑄇𑄴𑄅𑄚𑄧𑄢𑄴 𑄥𑄟𑄎𑄨𑄇𑄴 𑄚𑄨𑄢𑄛𑄧𑄖𑄳𑄦𑄴𑄢𑄴 𑄃𑄇𑄴𑄇𑄥𑄁 𑄃𑄊𑄬𑅁 𑄎𑄖𑄩𑄠𑄧 𑄌𑄬𑄢𑄬𑄖𑄳𑄦𑄴 𑄃𑄮 𑄛𑄨𑄖𑄨𑄨𑄟𑄨𑄢𑄴 𑄝𑄧𑄣𑄴𑄘𑄨𑄠𑄘𑄨𑄢𑄴 𑄟𑄖𑄴𑄙𑄧𑄟𑄬 𑄢𑄮𑄎𑄳𑄠𑄧𑄢𑄴 𑄥𑄧𑄁𑄎𑄧𑄙 𑄃𑄮 𑄥𑄧𑄟𑄴𑄛𑄧𑄘𑄧𑄢𑄴 𑄥𑄧𑄟𑄢𑄬 𑄥𑄧𑄟𑄚𑄴 𑄢𑄉𑄬𑄚𑄬𑄭 𑄝𑄬𑄇𑄴𑄅𑄚𑄧𑄢𑄬 𑄃𑄟𑄧𑄚𑄧𑄢𑄴 𑄃𑄨𑄌𑄎𑄮𑄖𑄴 𑄃𑄳𑄃 𑄟𑄚𑄧𑄢𑄴 𑄃𑄧𑄞𑄬𑄘𑄧𑄢𑄴 𑄜𑄧𑄉𑄧𑄘𑄋𑄧𑄖𑄳𑄠𑄬 𑄈𑄟𑄇𑄭𑄭 𑄥𑄟𑄎𑄨𑄇𑄴, 𑄃𑄧𑄢𑄴𑄗𑄧𑄚𑄨𑄖𑄨𑄇𑄴 𑄃𑄮 𑄥𑄁𑄌𑄴𑄇𑄳𑄢𑄨𑄖𑄨𑄇𑄴 𑄃𑄇𑄴𑄇𑄥𑄁 𑄃𑄘𑄠𑄧𑄢𑄴 𑄃𑄇𑄴𑄇𑄥𑄁 𑄢𑄧𑄠𑄬𑅁"
+  specimen_16: "𑄝𑄬𑄇𑄴𑄅𑄚𑄧𑄢𑄴 𑄏𑄨𑄢𑄬𑄚 𑄃𑄮 𑄃𑄏𑄬𑄢𑄴 𑄗𑄢𑄚𑄴 𑄃𑄇𑄴𑄇𑄥𑄁 𑄢𑄧𑄠𑄬; 𑄘𑄨𑄚𑄴𑄟𑄉𑄬𑄚𑄬 𑄃𑄧𑄇𑄴𑄖𑄧 𑄟𑄪𑄎𑄨𑄟𑄴 𑄝𑄬𑄖𑄧𑄚𑄴𑄥𑄪𑄟𑄪𑄖𑄴𑄘𑄳𑄠𑄧 𑄍𑄪𑄑𑄨 𑄃𑄳𑄃 𑄛𑄬𑄥𑄉𑄧𑄖𑄧 𑄇𑄟𑄧𑄢𑄴 𑄡𑄪𑄇𑄴𑄖𑄨𑄥𑄧𑄁 𑄥𑄩𑄟𑄃𑄮 𑄃𑄬 𑄃𑄇𑄴𑄇𑄥𑄁 𑄞𑄨𑄘𑄨𑄢𑄬 𑄢𑄧𑄠𑄬𑅁\n𑄃𑄬 𑄓𑄇𑄴𑄣𑄢𑄬𑄥𑄧𑄚𑄬 𑄘𑄬𑄉𑄬𑄠𑄬 𑄃𑄇𑄴𑄇𑄥𑄁 𑄃𑄮 𑄥𑄙𑄩𑄚𑄧𑄖𑄊𑄚𑄩𑄢𑄴 𑄇𑄟𑄧𑄖𑄴𑄣𑄉𑄚 𑄥𑄧𑄟𑄴𑄞𑄧𑄛𑄴 𑄃𑄬𑄟𑄧𑄚𑄴 𑄃𑄬𑄇𑄳𑄦𑄴𑄚𑄴 𑄥𑄟𑄎𑄨𑄇𑄴 𑄃𑄮 𑄛𑄨𑄖𑄨𑄨𑄟𑄨 𑄝𑄳𑄠𑄝𑄧𑄌𑄴𑄗𑄭 𑄃𑄧𑄁𑄥𑄩𑄘𑄢𑄨𑄖𑄳𑄠𑄬𑄢𑄴 𑄃𑄇𑄴𑄇𑄥𑄁 𑄝𑄬𑄇𑄴𑄅𑄚𑄧𑄢𑄴 𑄃𑄊𑄬𑅁  \n𑄇𑄧𑄚𑄧 𑄢𑄬𑄎𑄳𑄠𑄧, 𑄉𑄪𑄖𑄨𑄨 𑄝 𑄟𑄚𑄪𑄌𑄴 𑄃𑄬 𑄓𑄨𑄇𑄴𑄣𑄢𑄬𑄥𑄧𑄚𑄧𑄢𑄴 𑄇𑄧𑄚𑄧 𑄇𑄨𑄌𑄴𑄅 𑄃𑄬𑄟𑄧𑄚𑄴𑄞𑄝𑄬 𑄝𑄳𑄠𑄈𑄳𑄠 𑄉𑄧𑄢𑄨 𑄚𑄧 𑄛𑄢𑄨𑄝𑄇𑄴, 𑄡𑄢𑄴 𑄝𑄧𑄣𑄬 𑄖𑄢 𑄃𑄬𑄭 𑄓𑄨𑄇𑄴𑄣𑄢𑄬𑄥𑄧𑄚𑄬 𑄘𑄬𑄉𑄬𑄠𑄬 𑄃𑄇𑄴𑄇𑄥𑄁 𑄃𑄮 𑄥𑄙𑄩𑄚𑄧𑄖𑄃𑄚𑄩 𑄥𑄢𑄚𑄘 𑄉𑄧𑄢𑄨 𑄛𑄢𑄧𑄚𑄴 𑄃𑄬𑄟𑄧𑄚𑄴 𑄇𑄧𑄚𑄧 𑄇𑄟𑄬 𑄣𑄨𑄛𑄴𑄖𑄧 𑄦𑄰𑄠𑄴 𑄛𑄢𑄬 𑄇𑄨𑄁𑄝 𑄥𑄬𑄙𑄮𑄇𑄳𑄠𑄬 𑄇𑄧𑄚𑄧 𑄇𑄟𑄴 𑄃𑄬𑄏𑄣𑄴𑄘𑄬𑄚 𑄉𑄧𑄢𑄨 𑄛𑄢𑄬𑅁\n 𑄡𑄨𑄠𑄚𑄧𑄖𑄳𑄠𑄬 𑄟𑄚𑄬𑄭 𑄉𑄨𑄢𑄨𑄢𑄴 𑄝𑄬𑄇𑄴𑄅𑄚𑄧𑄖𑄳𑄠𑄴 𑄥𑄧𑄁 𑄃𑄮 𑄑𑄚𑄑𑄚𑄳𑄠𑄴 𑄝𑄚𑄝𑄚𑄳𑄠𑄴 𑄃𑄇𑄴𑄇𑄥𑄁𑄃𑄚𑄩 𑄃𑄳𑄃 𑄃𑄟𑄧𑄚𑄧 𑄎𑄘𑄧𑄢𑄴 𑄃𑄨𑄌𑄴𑄎𑄮𑄘𑄧𑄢𑄴 𑄟𑄚𑄚𑄩 𑄦𑄧𑄣𑄧𑄘𑄳𑄠𑄬 𑄛𑄨𑄖𑄨𑄨𑄟𑄨𑄖𑄴 𑄥𑄚𑄴𑄘𑄨, 𑄥𑄙𑄩𑄚𑄧𑄖 𑄃𑄳𑄃 𑄉𑄧𑄟𑄴 𑄝𑄨𑄏𑄬𑄢𑄧𑄢𑄴 𑄈𑄪𑄙𑄨 𑄃𑄨𑄝𑄬;\n𑄡𑄨𑄠𑄚𑄧𑄖𑄳𑄠𑄬 𑄟𑄚𑄬𑄭 𑄃𑄇𑄴𑄇𑄥𑄁𑄃𑄧𑄢𑄴 𑄛𑄳𑄢𑄧𑄖𑄨 𑄃𑄧𑄣𑄬𑄦𑄧𑄚𑄴 𑄃𑄳𑄃 𑄊𑄨𑄚𑄬𑄚𑄢𑄴 𑄜𑄧𑄣𑄬 𑄟𑄚𑄬𑄭𑄦𑄮𑄢𑄴 𑄃𑄬𑄘 𑄣𑄌𑄴𑄈𑄬𑄚𑄬𑄭 𑄃𑄬𑄘𑄮𑄇𑄳𑄠𑄴 𑄉𑄧𑄢𑄨 𑄃𑄬𑄟𑄚𑄴 𑄟𑄢𑄚 𑄘𑄮𑄇𑄳𑄠𑄴 𑄝𑄬𑄙𑄮𑄇𑄳𑄠𑄴 𑄇𑄟𑄴 𑄉𑄧𑄢𑄨𑄚𑄬𑄭 𑄃𑄳𑄃 𑄡𑄨𑄠𑄚𑄧𑄖𑄳𑄠𑄬 𑄃𑄬𑄘𑄮𑄇𑄳𑄠𑄴 𑄃𑄬𑄇𑄳𑄦𑄴𑄚𑄴 𑄛𑄨𑄖𑄨𑄨𑄟𑄨𑄢𑄴 𑄜𑄪𑄢𑄨𑄅𑄪𑄘𑄨𑄚𑄬𑄭 𑄃𑄧𑄎𑄧𑄃𑄌𑄴 𑄟𑄚𑄬𑄭𑄦𑄮𑄢𑄴 𑄝𑄬𑄉𑄧 𑄓𑄋𑄧𑄢𑄴 𑄃𑄏 𑄉𑄧𑄢 𑄦𑄧𑄠𑄬, 𑄡𑄨𑄠𑄚𑄧𑄖𑄴 𑄝𑄬𑄇𑄴 𑄟𑄚𑄬𑄭𑄦𑄮𑄢𑄴 𑄙𑄧𑄢𑄴𑄟𑄧 𑄃𑄳𑄃 𑄇𑄧𑄙 𑄇𑄧𑄚𑄢𑄴 𑄎𑄪 𑄛𑄬𑄝𑄇𑄴 𑄃𑄳𑄃 𑄇𑄧𑄚𑄧 𑄢𑄖𑄴 𑄃𑄮 𑄚𑄧 𑄓𑄮𑄢𑄬𑄠𑄬 𑄎𑄨𑄁𑄇𑄚𑄩 𑄇𑄘𑄬𑄝𑄇𑄴;"
+}
diff --git a/lang/languages/ccp/language.textproto b/lang/languages/ccp/language.textproto
deleted file mode 100644
index 58f413c0e..000000000
--- a/lang/languages/ccp/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "ccp"
-name: "Chakma"
-preferred_name: ""
-autonym: ""
-population: 729137
-region: "BD"
-region: "IN"
-script: "Bangla"
-script: "Chakma"
-exemplar_chars {
-  base: "𑄃 𑄄 𑄅 𑄆 𑄇 𑄈 𑄉 𑄊 𑄋 𑄌 𑄍 𑄎 𑄏 𑄐 𑄑 𑄒 𑄓 𑄔 𑄕 𑄖 𑄗 𑄘 𑄙 𑄚 𑄛 𑄜 𑄝 𑄞 𑄟 𑄠 𑄡 𑄢 𑄣 𑄤 𑄥 𑄦"
-  auxiliary: ""
-  marks: "◌𑄀 ◌𑄁 ◌𑄂 ◌𑄧 ◌𑄨 ◌𑄩 ◌𑄪 ◌𑄫 ◌𑄬 ◌𑄭 ◌𑄰 ◌𑄱 ◌𑄲 ◌𑄳 ◌𑄴"
-  numerals: "𑄶 𑄷 𑄸 𑄹 𑄺 𑄻 𑄼 𑄽 𑄾 𑄿 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "𑅁 𑅂 𑅃 𑅀"
-  index: "𑄃 𑄄 𑄅 𑄆 𑄇 𑄈 𑄉 𑄊 𑄋 𑄌 𑄍 𑄎 𑄏 𑄐 𑄑 𑄒 𑄓 𑄔 𑄕 𑄖 𑄗 𑄘 𑄙 𑄚 𑄛 𑄜 𑄝 𑄞 𑄟 𑄠 𑄡 𑄢 𑄣 𑄤 𑄥 𑄦"
-}
diff --git a/lang/languages/ccp/sampletext.textproto b/lang/languages/ccp/sampletext.textproto
deleted file mode 100644
index 5a7564964..000000000
--- a/lang/languages/ccp/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ccp"
diff --git a/lang/languages/ce/language.textproto b/lang/languages/ce.textproto
similarity index 94%
rename from lang/languages/ce/language.textproto
rename to lang/languages/ce.textproto
index 9f851c3a5..b845c200e 100644
--- a/lang/languages/ce/language.textproto
+++ b/lang/languages/ce.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
   index: "А Б В Г Д Е Ё Ж З И К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/ceb.textproto b/lang/languages/ceb.textproto
new file mode 100644
index 000000000..f10b9608d
--- /dev/null
+++ b/lang/languages/ceb.textproto
@@ -0,0 +1,26 @@
+id: "ceb"
+name: "Cebuano"
+preferred_name: ""
+autonym: "Binisaya"
+population: 26203440
+region: "PH"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E G H I K L M N O P R S T U W Y a b d e g h i k l m n o p r s t u w y"
+  auxiliary: "c f j ñ q v x z"
+  punctuation: "\\- ‑ , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] @ * / \\& # ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "AaNn"
+  masthead_partial: "Gg"
+  tester: "Samtamg ang pag-ila sa tiunay nga kabililhon ug sa managsama ug"
+  poster_sm: "Samtang ang"
+  poster_md: "Samtang kini"
+  poster_lg: "Ang"
+  specimen_48: "Samtang kini gikinahanglan sa pagpauswag sa paglambo sa hinigala"
+  specimen_36: "Samtang yanong gikasabutan niining mga katungod ug mga kagawasan ang sangputanan sa bug-os nga pagtuman sa maong saad."
+  specimen_32: "Ang tanang katawhan gipakatawo nga may kagawasan ug managsama sa kabililhon. Sila gigasahan sa salabutan ug tanlag og mag-ilhanay isip managsoon sa usa\'g-usa diha sa diwa sa ospiritu."
+  specimen_21: "Ang matag usa adunay luna sa tanang mga katungod ug mga kagawasan gihan-ay niining Deklarasyon, sa walay pagpihig sa bisan unsa, sama sa kaliwat, tribu, bulok sekso, pinulongan, relihiyon, politikal o sosyal nga kagikan, kabtangan, pagkatawo o uban pang kahimtang.\nAng matag usa adunay katungod sa kinabuhi, kaugalingnan ug seguridad sa pagkatawo."
+  specimen_16: "Walay bisan kinsa nga ibanlod sa pagkaulipon o pugson sa paghimo sa bug-at nga buluhaton kay ginadili ang tanang matang sa paghimo niini.\nWalay bisan kinsa ang ibutang sa kasakit o sa sinalbahis, dili makatawo o pagpakaulaw o kastiguhon.\nAng matag usa adunay katungod nga ilhon isip tawo atubangan sa balaod.\nAng tanan managsama atubangan sa balaod ug may katungod sa walay pagpihig sa managsamang panalipod sa balaod. Ang tanan adunay katungod sa managsamang panalipod batok sa bisan unsang pagpihig nga makapalas niining Deklarasyon ug batok sa bisan unsang hinungdan sa maong pagpihig."
+}
diff --git a/lang/languages/ceb/language.textproto b/lang/languages/ceb/language.textproto
deleted file mode 100644
index 8d66b67d6..000000000
--- a/lang/languages/ceb/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "ceb"
-name: "Cebuano"
-preferred_name: ""
-autonym: "Binisaya"
-population: 26203440
-region: "PH"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E G H I K L M N O P R S T U W Y a b d e g h i k l m n o p r s t u w y"
-  auxiliary: "c f j ñ q v x z"
-  punctuation: "\\- ‑ , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] @ * / \\& # ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/ceb/sampletext.textproto b/lang/languages/ceb/sampletext.textproto
deleted file mode 100644
index 148a532d8..000000000
--- a/lang/languages/ceb/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ceb"
diff --git a/lang/languages/cgg/language.textproto b/lang/languages/cgg.textproto
similarity index 87%
rename from lang/languages/cgg/language.textproto
rename to lang/languages/cgg.textproto
index b5ef77250..44ed31c63 100644
--- a/lang/languages/cgg/language.textproto
+++ b/lang/languages/cgg.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ch.textproto b/lang/languages/ch.textproto
new file mode 100644
index 000000000..1032bd39f
--- /dev/null
+++ b/lang/languages/ch.textproto
@@ -0,0 +1,25 @@
+id: "ch"
+name: "Chamorro"
+preferred_name: ""
+autonym: "Chamorru"
+population: 46324
+region: "GU"
+region: "MP"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z å ñ"
+  marks: "◌̃ ◌̊"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Dd"
+  tester: "Asi como i recognision pot i inherente (natural)na dignidad yan"
+  poster_sm: "Asi como i"
+  poster_md: "Asi como"
+  poster_lg: "Todo"
+  specimen_48: "Asi como necesario na umaadelanta i kinalanten i amestao (inamigo)"
+  specimen_36: "Pago, Pot eso,\ni Heneralna Assemblia\naproklama\nTodo mangai derecho pot linala, libertad yan seguridad i persona."
+  specimen_32: "Todo taotao siha man mafanago libertao yan pareho gi dignidad yan derecho siha, man manae siha hinaso yan consiencia yan debe de ufatinas contra uno yan otro gi un espiritun chumelo."
+  specimen_21: "Asi como i recognision pot i inherente (natural)na dignidad yan pot i pareho yan inahenable (tisina maamot) na derechon todo i membron i humano na familia guiya i fundacion i liberta, justicia yan pas gi todo i tano.\nAsi como necesario, yangin i taotao ti para uenebliga na uespiha recurso (hinagon), como i utimo na fandiskansayan gi rebulasion contra i crueldad yan bahacion enao na i derecho siha para i taotao umaprotehe nui arreglon i lai."
+  specimen_16: "Asi como i recognision pot i inherente (natural)na dignidad yan pot i pareho yan inahenable (tisina maamot) na derechon todo i membron i humano na familia guiya i fundacion i liberta, justicia yan pas gi todo i tano.\nAsi como i dinisatende yan i denisprecia i derecho siha para i taotao manhuyon ti civilisao na finatinas siha ni esta hasen insulta i consencian i taotao yan i finato gi tano anai taotao siha umagosa i libertad kumentos, yan hinenge yan libertad gine minanao yan minalago esta maproclama como i mas takilo na aspirasion (tinanga) i comodo (regular) na taotao siha."
+}
diff --git a/lang/languages/ch/language.textproto b/lang/languages/ch/language.textproto
deleted file mode 100644
index eb91b4b68..000000000
--- a/lang/languages/ch/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "ch"
-name: "Chamorro"
-preferred_name: ""
-autonym: "Chamorru"
-population: 46324
-region: "MP"
-region: "GU"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z å ñ"
-  marks: "◌̃ ◌̊"
-}
diff --git a/lang/languages/ch/sampletext.textproto b/lang/languages/ch/sampletext.textproto
deleted file mode 100644
index cd9a6ea3f..000000000
--- a/lang/languages/ch/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ch"
diff --git a/lang/languages/chk.textproto b/lang/languages/chk.textproto
new file mode 100644
index 000000000..9d9ef88b4
--- /dev/null
+++ b/lang/languages/chk.textproto
@@ -0,0 +1,24 @@
+id: "chk"
+name: "Chuukese"
+preferred_name: ""
+autonym: "Chuuk"
+population: 30730
+region: "FM"
+script: "Latin"
+exemplar_chars {
+  base: "A C E F H I K M N O P R S T U W Y Á É Ó Ú a c e f h i k m n o p r s t u w y á é ó ú"
+  marks: "◌́"
+}
+sample_text {
+  masthead_full: "EeSs"
+  masthead_partial: "Aa"
+  tester: "Pokiten kich mei sinei pwe popunapen pung me kinamwe non fonufan"
+  poster_sm: "Pokiten a fen"
+  poster_md: "Pokiten mi"
+  poster_lg: "Esap"
+  specimen_48: "Pokiten mu meinisin non United Nations ra affata me non nour"
+  specimen_36: "Emon me emon epwe kinamwe non tumunun me punguochchun tettenin an aramas rait are pung usun mi mak non ei Poraus."
+  specimen_32: "Ese wor och sokkun kapas non ei Poraus mi mutngeni eu mu, eu mwichen aramas are emon aramas an epwe fori och sokkun foffor ren an epwe ataeno ekkei rait me pung mi mak non ei Poraus."
+  specimen_21: "Pokiten kich mei sinei pwe popunapen pung me kinamwe non fonufan a popuseni ukukun ach miriti nonnofengenin an aramas meinisin rait,\nPokiten a fen fis chommong fitikoko ren an akkaemon aramas atai an pwan ekkoch aramas rait nge kich mi fen sinei pwe aramasen unusen fonufan mi wesewesen mochen pwe repwe kinamwe non ar kewe rait,"
+  specimen_16: "Pokiten kich mei sinei pwe popunapen pung me kinamwe non fonufan a popuseni ukukun ach miriti nonnofengenin an aramas meinisin rait,\nPokiten a fen fis chommong fitikoko ren an akkaemon aramas atai an pwan ekkoch aramas rait nge kich mi fen sinei pwe aramasen unusen fonufan mi wesewesen mochen pwe repwe kinamwe non ar kewe rait,\nPokiten mi auchea an aramas rait me non annuk an esap wor ariaffou are an esap wor emon epwe ariaffoua pwan emon,\nPoikiten mi fakkun namot an mu me mu repwe tongofengen,\nPokiten mu meinisin ra fen en me pon pwe repwe ansi ewe mwichen United Nations ne asinengeni unusen fonufan usun angangen are napanapen an aramas rait,"
+}
diff --git a/lang/languages/chk/language.textproto b/lang/languages/chk/language.textproto
deleted file mode 100644
index 48cc8021c..000000000
--- a/lang/languages/chk/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "chk"
-name: "Chuukese"
-preferred_name: ""
-autonym: "Chuuk"
-population: 30730
-region: "FM"
-script: "Latin"
-exemplar_chars {
-  base: "A C E F H I K M N O P R S T U W Y Á É Ó Ú a c e f h i k m n o p r s t u w y á é ó ú"
-  marks: "◌́"
-}
diff --git a/lang/languages/chk/sampletext.textproto b/lang/languages/chk/sampletext.textproto
deleted file mode 100644
index aa741d465..000000000
--- a/lang/languages/chk/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "chk"
diff --git a/lang/languages/chm/language.textproto b/lang/languages/chm.textproto
similarity index 90%
rename from lang/languages/chm/language.textproto
rename to lang/languages/chm.textproto
index dfdc6ed49..761152193 100644
--- a/lang/languages/chm/language.textproto
+++ b/lang/languages/chm.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ҥ Ӧ Ӱ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ҥ ӧ ӱ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/cho/language.textproto b/lang/languages/cho.textproto
similarity index 74%
rename from lang/languages/cho/language.textproto
rename to lang/languages/cho.textproto
index 547ca9d8f..960d7e3b5 100644
--- a/lang/languages/cho/language.textproto
+++ b/lang/languages/cho.textproto
@@ -7,3 +7,6 @@ region: "US"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/chp/language.textproto b/lang/languages/chp.textproto
similarity index 74%
rename from lang/languages/chp/language.textproto
rename to lang/languages/chp.textproto
index b4d94d771..38ccc6563 100644
--- a/lang/languages/chp/language.textproto
+++ b/lang/languages/chp.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/chr.textproto b/lang/languages/chr.textproto
new file mode 100644
index 000000000..3f5c2b5fc
--- /dev/null
+++ b/lang/languages/chr.textproto
@@ -0,0 +1,27 @@
+id: "chr"
+name: "Cherokee"
+preferred_name: ""
+autonym: "ᏣᎳᎩ ᎦᏬᏂᎯᏍᏗ"
+population: 25613
+region: "US"
+script: "Cherokee"
+exemplar_chars {
+  base: "Ꭰ Ꭱ Ꭲ Ꭳ Ꭴ Ꭵ Ꭶ Ꭷ Ꭸ Ꭹ Ꭺ Ꭻ Ꭼ Ꭽ Ꭾ Ꭿ Ꮀ Ꮁ Ꮂ Ꮃ Ꮄ Ꮅ Ꮆ Ꮇ Ꮈ Ꮉ Ꮊ Ꮋ Ꮌ Ꮍ Ꮎ Ꮏ Ꮐ Ꮑ Ꮒ Ꮓ Ꮔ Ꮕ Ꮖ Ꮗ Ꮘ Ꮙ Ꮚ Ꮛ Ꮜ Ꮝ Ꮞ Ꮟ Ꮠ Ꮡ Ꮢ Ꮣ Ꮤ Ꮥ Ꮦ Ꮧ Ꮨ Ꮩ Ꮪ Ꮫ Ꮬ Ꮭ Ꮮ Ꮯ Ꮰ Ꮱ Ꮲ Ꮳ Ꮴ Ꮵ Ꮶ Ꮷ Ꮸ Ꮹ Ꮺ Ꮻ Ꮼ Ꮽ Ꮾ Ꮿ Ᏸ Ᏹ Ᏺ Ᏻ Ᏼ ꭰ ꭱ ꭲ ꭳ ꭴ ꭵ ꭶ ꭷ ꭸ ꭹ ꭺ ꭻ ꭼ ꭽ ꭾ ꭿ ꮀ ꮁ ꮂ ꮃ ꮄ ꮅ ꮆ ꮇ ꮈ ꮉ ꮊ ꮋ ꮌ ꮍ ꮎ ꮏ ꮐ ꮑ ꮒ ꮓ ꮔ ꮕ ꮖ ꮗ ꮘ ꮙ ꮚ ꮛ ꮜ ꮝ ꮞ ꮟ ꮠ ꮡ ꮢ ꮣ ꮤ ꮥ ꮦ ꮧ ꮨ ꮩ ꮪ ꮫ ꮬ ꮭ ꮮ ꮯ ꮰ ꮱ ꮲ ꮳ ꮴ ꮵ ꮶ ꮷ ꮸ ꮹ ꮺ ꮻ ꮼ ꮽ ꮾ ꮿ ᏸ ᏹ ᏺ ᏻ ᏼ"
+  auxiliary: ""
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "Ꭰ Ꭶ Ꭽ Ꮃ Ꮉ Ꮎ Ꮖ Ꮜ Ꮣ Ꮬ Ꮳ Ꮹ Ꮿ"
+}
+sample_text {
+  masthead_full: "ᏂꮒᎦꭶ"
+  masthead_partial: "Ꮣꮣ"
+  tester: "ᎬᏂᏳᏉ ᏗᏓᏂᎸᏨ ᎾᏍᎩ ᎠᏠᏯᏍᏗᏍᎩ ᎠᏢᏉᏙᏗ ᎠᎴ ᎾᏍᎩᏃ ᎢᎦᏘ ᎠᎴ ᎤᏙᎯᏳᎯᏯ ᎤᏂᎲ ᎢᏳᎾᏛᏗ"
+  poster_sm: "ᎬᏂᏳᏉ ᎠᎦᏎᏍᏔᏅᎾ"
+  poster_md: "ᎬᏂᏳᏉ ᎾᏍᎩ"
+  poster_lg: "ᏂᎦᏓ"
+  specimen_48: "ᎬᏂᏳᏉ ᎾᏍᎩ ᎠᏂᏴᏫ ᎾᏍᎩᏃ ᎤᎾᏓᏚᏕᏫᏛ ᎠᏰᎵ ᏚᎾᏙᏢᏒ ᏄᏅᎿᏅ ᎾᎿ ᎠᏓᎵᏍᎪᎸᏓᏁᎯ ᏗᎳᏏᏙᏗ"
+  specimen_36: "ᎤᏙᎯᏳᎯ ᏝᎩᎶᎢ ᎠᏥᏂᏴᏗ ᎾᏍᎩ ᏗᎨᏥᎾᏝᎥ ᎠᎴ ᎦᏌᏙᏯᏍᏗ ᎠᏥᎾᏝᎢ ᏱᎨᏎᏍᏗ; ᏗᎨᏥᎾᏝᎥ ᎠᎴ ᎾᏍᎩ ᏗᎨᏥᎾᏝ ᏗᎦᎾᏗᏅᏗ ᎤᏙᎯᏳᎯᏯ ᎦᏅᏍᏙᏍᎨᏍᏗ ᎾᏍᎩ ᏂᎦᎥ ᎾᏍᎩ ᎢᏳᏍᏗ."
+  specimen_32: "ᏂᎦᏛ ᎠᏂᏴᏫ ᎤᏂᎮᏍᏗ ᎾᏍᎩ ᏚᏳᎪᏛ ᎢᏳᎾᏛᏗᎢ ᎾᎢ ᏕᎫᎪᏔᏅᎩ ᎢᏳᎵᏍᏙᏗ ᎾᏍᎩ ᏰᎵ ᏂᎬᏩᎾᏛᏗ ᎨᏒ ᎠᏰᎵ ᏧᎾᏓᏱᎵᏓᏍᏗ ᎾᏍᎩᎾ ᏚᎵᏁᏨᎩ ᎠᏍᎦᏅᏨᎢ ᎾᏍᎩ ᏚᎾᎳᏏᏛ ᏚᏂᎲᎩ ᎤᎵᏍᎪᎸᏓᏁᎸᎩ ᎾᏍᎩᏃ ᎦᎫᏍᏛᏗ ᎠᎴ ᎾᏍᎩᏃ ᏗᎧᎿᏩᏛᏍᏗ."
+  specimen_21: "ᎤᏙᎯᏳᎯ ᏝᎩᎶᎢ ᎠᏎᏊᏊ ᏣᎫᎪᏓᏁᏗ ᏱᎨᏎᏍᏗ ᎾᎢ ᎠᏥᏂᏴᏗ ᏱᎨᏎᏍᏗ, ᎠᏥᏍᏚᏗ ᎠᎴ ᎠᏰᎵ ᎠᏥᏄᎪᏫᏍᏗ.\nᏂᎦᏛ ᎠᏂᏴᏫ ᎤᏂᎭ ᎤᎾᏓᏂᏜᏅᎢ ᎾᏍᎩ ᎤᎧᎵᏨᎯ ᎢᏧᎳᎭᏉᏃ ᎢᏳᎾᏛᏁᏗ ᎤᏂᎯ ᎾᏍᎩ ᏚᏳᎪᏛ ᎠᎴ ᎠᏰᎵ ᎨᎦᏛᏓᏍᏙᏗ ᎾᏍᎩᏃ ᎤᎾᏓᏤᎵᏓ ᎠᎴ ᎤᎾᎵᎪᎯ ᏂᎨᏒᎾ ᏧᎾᏓᏱᎵᏓᏍᏗ, ᎾᎿ ᎾᏍᎩ ᏓᏅᎪᏔᏂᏙᎲᎩ ᎾᏍᎩ ᎤᏂᎲ ᎤᏤᎵ ᎠᎴ ᎤᎾᏓᏚᏓᎸᎲᏍᎬ ᎠᎴ ᏂᎦᎥ ᎠᏍᎦᏅᏨ ᎠᎫᎯᏍᏛ ᎤᏡᏗᏍᎩ.\nᏝᎩᎶᎢ ᏭᏓᎪᎾᏛᎢ ᎠᏎᏊᏊ ᏣᎫᎪᏓᏁᏗ ᎠᎵᏌᎳᏁᏗ ᎤᎵᎪᎯ ᎾᏍᎩ ᎤᏕᎵᏓ, ᏏᏓᏁᎸ, ᎤᏇᏅᏒ ᎠᎴ ᏓᎾᏓᏛᎪᏗᏍᎬ, ᎥᏝ ᏗᎦᏘᎸᏍᏗ ᎦᎸᏉᏙᏗ ᎨᏒ ᎠᎴ ᎠᎦᏓᏅᏖᏗᏱ. ᏂᎦᏛ ᎠᏂᏴᏫ ᎤᏂᎲ ᏚᏳᎪᏛ ᎬᏩᏂᏍᏕᎸᏙᏗ ᎨᏎᏍᏗ ᎾᏍᎩ ᎠᏡᏗᏍᎩ ᏗᎧᎿᏩᏛᏍᏗ ᎪᎱᏍᏗ ᎠᎵᏌᎳᏁᏗ ᎠᎴ ᏗᎦᏘᎸᏍᏗ."
+  specimen_16: "ᏂᎦᏛ ᎠᏂᏴᏫ ᎤᏂᎲ ᎾᏍᎩ ᏚᏳᎪᏛ ᎾᎢ ᏙᎯᏉ ᎤᎾᏕᏗᎢ, ᏧᏄᎪᏙᏗᏱ ᎠᎴ ᏧᎾᏁᎵᏗ; ᎯᎠ ᎤᏂᎲ ᏚᏳᎪᏛ ᎠᏠᏯᏍᏗ ᏙᎯ ᎠᏕᏗᎢ ᎾᏍᏉ ᎦᏁᏟᏴᏍᏗ ᎤᎲᎢ ᏧᏁᎵᏗ ᎨᏒ ᎠᎴ ᎤᏬᎯᏳᏒᎢ, ᎠᎴ ᏙᎯ ᎠᏕᏗᎢ, ᎢᏧᎳᏉ ᎤᏩᏒ ᎠᎴ ᎾᎿᎢ ᏚᏂᏚᏒᎩ ᎤᏠᏯᏍᏗ ᏐᎢ ᎠᎴ ᎾᎿᎢ ᏴᏫ ᎤᎾᏓᏍᏗᎢ ᎠᎴ ᎤᏕᎵᏓ, ᏚᎾᎳᏏᏛ ᎤᏂᎲ ᏧᎾᏁᎵᏗ ᎠᎴ ᎤᏃᎯᏳᏒᎩ ᎾᎿ ᏓᎾᏕᏲᎲᏍᎬ, ᎠᎾᎵᏏᎾᎯᏍᏗᏍᎬ, ᎠᎾᏓᏙᎵᏍᏗᏍᎬ ᎠᎴ ᎠᎦᏎᏍᏔᏅᎩ.\nᏂᎦᏛ ᎠᏂᏴᏫ ᎤᏂᎲ ᎾᏍᎩ ᏚᏳᎪᏛ ᏙᎯᏉ ᎠᏕᏗᎢ ᎾᏍᎩ ᎪᎵᏨᎢ ᎠᎴ ᎤᏟᏁᏨᎢ; ᎯᎠ ᏚᏳᎪᏛ ᎤᏂᎲ ᏚᏳᎪᏛ ᎠᏠᏯᏍᏗ ᏙᎯ ᎠᏕᏗᎢ ᎤᏒᎦᎴᏍᏗ ᏄᏍᏛ ᎪᎵᎬᎢ ᏅᏠᏯᏍᏗᏍᎬᎾ ᎾᏓᏲᏍᏓᏁᎲᎾ ᎠᎴ ᎤᏂᏲᎲᎩ, ᎠᏂᎩᏍᏗ ᎠᎴ ᏩᏓᏁᏗᏱ ᎬᏂᎨᏒ ᎢᎬᏩᏁᏗ ᎠᎴ ᎠᏓᏅᏖᏍᎬ ᎠᎦᏛᎵᏍᏔᏅ ᏂᎦᎥ ᎧᏃᎮᏓ ᎤᎾᏗᎦᎴᏯᏍᏗ ᎠᎴ ᏱᏂᎦᎵᏍᏗᏉ ᎤᎾᎢ ᎠᏍᏓᏅᏅ ᏗᏟᎶᏛ.\nᏂᎦᏛ ᎠᏂᏴᏫ, ᎾᏍᎩ ᎠᏁᎳ ᎨᏒ ᏴᏫ, ᎤᏂᎲ ᎾᏍᎩ ᏚᏳᎪᏛ ᎾᏍᎩ ᏩᏥᏂ ᎠᏚᏓᎸᏗ ᎠᎴ ᎤᎾᏓᏂᏜᏅᎢ ᎾᏍᎩ ᎠᏓᏙᏟᏍᏗ, ᎠᎦᏛᎵᏍᏔᏅ ᎠᏰᎵ ᎤᎾᏙᏢᏒ ᎠᏁᎸᏗᏍᎬᎩ ᎠᎴ ᎠᏰᎵ ᏚᎾᏙᏢᏒ ᎤᎾᎵᎪᏒ-ᎤᎵᎪᎯ ᎠᎴ ᎾᏍᎩ ᏂᎬᏅ ᎤᎵᎪᎯ ᎾᏍᎩ ᏧᎾᏙᏢᏃᏅᎯ ᎠᎴ ᏧᎬᏩᎶᏗ ᎤᎾᎢ ᏂᎦᏓ ᏍᎦᏚᎩ, ᎾᏍᎩ ᎠᎳᏏᏅᏙᏗ, ᏴᏫ ᎠᎴ ᎤᏂᎲ ᎢᏳᎾᏛᏁᎵᏗ ᏚᏳᎪᏛᎢ ᎢᏳᎵᏍᏙᏗ ᎾᏍᎩᎾ ᎤᎲ ᎠᏢᏉᏙᏗ ᎠᎴ ᎾᏍᎩ ᎤᎲ ᎤᏓᏅᏘᏗᎢ ᎾᏍᎩ ᎠᏎᏊ ᎤᏙᎷᏩᏛᎲᎩ."
+}
diff --git a/lang/languages/chr/language.textproto b/lang/languages/chr/language.textproto
deleted file mode 100644
index bca3a0b75..000000000
--- a/lang/languages/chr/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "chr"
-name: "Cherokee"
-preferred_name: ""
-autonym: "ᏣᎳᎩ ᎦᏬᏂᎯᏍᏗ"
-population: 25613
-region: "US"
-script: "Cherokee"
-exemplar_chars {
-  base: "Ꭰ Ꭱ Ꭲ Ꭳ Ꭴ Ꭵ Ꭶ Ꭷ Ꭸ Ꭹ Ꭺ Ꭻ Ꭼ Ꭽ Ꭾ Ꭿ Ꮀ Ꮁ Ꮂ Ꮃ Ꮄ Ꮅ Ꮆ Ꮇ Ꮈ Ꮉ Ꮊ Ꮋ Ꮌ Ꮍ Ꮎ Ꮏ Ꮐ Ꮑ Ꮒ Ꮓ Ꮔ Ꮕ Ꮖ Ꮗ Ꮘ Ꮙ Ꮚ Ꮛ Ꮜ Ꮝ Ꮞ Ꮟ Ꮠ Ꮡ Ꮢ Ꮣ Ꮤ Ꮥ Ꮦ Ꮧ Ꮨ Ꮩ Ꮪ Ꮫ Ꮬ Ꮭ Ꮮ Ꮯ Ꮰ Ꮱ Ꮲ Ꮳ Ꮴ Ꮵ Ꮶ Ꮷ Ꮸ Ꮹ Ꮺ Ꮻ Ꮼ Ꮽ Ꮾ Ꮿ Ᏸ Ᏹ Ᏺ Ᏻ Ᏼ ꭰ ꭱ ꭲ ꭳ ꭴ ꭵ ꭶ ꭷ ꭸ ꭹ ꭺ ꭻ ꭼ ꭽ ꭾ ꭿ ꮀ ꮁ ꮂ ꮃ ꮄ ꮅ ꮆ ꮇ ꮈ ꮉ ꮊ ꮋ ꮌ ꮍ ꮎ ꮏ ꮐ ꮑ ꮒ ꮓ ꮔ ꮕ ꮖ ꮗ ꮘ ꮙ ꮚ ꮛ ꮜ ꮝ ꮞ ꮟ ꮠ ꮡ ꮢ ꮣ ꮤ ꮥ ꮦ ꮧ ꮨ ꮩ ꮪ ꮫ ꮬ ꮭ ꮮ ꮯ ꮰ ꮱ ꮲ ꮳ ꮴ ꮵ ꮶ ꮷ ꮸ ꮹ ꮺ ꮻ ꮼ ꮽ ꮾ ꮿ ᏸ ᏹ ᏺ ᏻ ᏼ"
-  auxiliary: ""
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "Ꭰ Ꭶ Ꭽ Ꮃ Ꮉ Ꮎ Ꮖ Ꮜ Ꮣ Ꮬ Ꮳ Ꮹ Ꮿ"
-}
diff --git a/lang/languages/chr/sampletext.textproto b/lang/languages/chr/sampletext.textproto
deleted file mode 100644
index e188ec571..000000000
--- a/lang/languages/chr/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "chr"
diff --git a/lang/languages/cic.textproto b/lang/languages/cic.textproto
new file mode 100644
index 000000000..0e5c6a26c
--- /dev/null
+++ b/lang/languages/cic.textproto
@@ -0,0 +1,24 @@
+id: "cic"
+name: "Chickasaw"
+preferred_name: ""
+autonym: "Chikashshanompa\'"
+population: 0
+region: "US"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ó Ú a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ó ú \'"
+  marks: "◌́"
+}
+sample_text {
+  masthead_full: "HhIi"
+  masthead_partial: "Mm"
+  tester: "Hattakat yaakni\' áyya\'shakat mó̱makat ittíllawwi bíyyi\'ka. Naalhpisa\'at"
+  poster_sm: "Nannalhpisa\'"
+  poster_md: "Nanna mó̱maka̱"
+  poster_lg: "Himmaka\'"
+  specimen_48: "Himmaka\' nittakookano hattak yokasht toksalicha\'nikat ki\'yo. Hattak"
+  specimen_36: "Anompa kanihmo\'si yappa̱ hattakat haklocha kani̱hchit anokfilli bannakmat anokfilla\'ni. Nannaho̱ kanihmi bannakmat yahma\'ni."
+  specimen_32: "Hookya nannalhpisa\' ihíngbittooka̱ ittimi̱lat taha. Himmaka̱ hattakat aa-áyya\'shahookano ilaapo\' nanna anokfillikakoot nannikchokmoho̱ anokfillihootokoot yammako̱ yahmichi bannahoot áyya\'sha."
+  specimen_21: "Hattakat yaakni\' áyya\'shakat mó̱makat ittíllawwi bíyyi\'ka. Naalhpisa\'at hattak mó̱makat immi\'. A̱lhínchikma̱ hattak mó̱makat ishtayoppa\'ni.\nHookya nannalhpisa\' ihíngbittooka̱ ittimi̱lat taha. Himmaka̱ hattakat aa-áyya\'shahookano ilaapo\' nanna anokfillikakoot nannikchokmoho̱ anokfillihootokoot yammako̱ yahmichi bannahoot áyya\'sha."
+  specimen_16: "Hattakat yaakni\' áyya\'shakat mó̱makat ittíllawwi bíyyi\'ka. Naalhpisa\'at hattak mó̱makat immi\'. A̱lhínchikma̱ hattak mó̱makat ishtayoppa\'ni.\nHookya nannalhpisa\' ihíngbittooka̱ ittimi̱lat taha. Himmaka̱ hattakat aa-áyya\'shahookano ilaapo\' nanna anokfillikakoot nannikchokmoho̱ anokfillihootokoot yammako̱ yahmichi bannahoot áyya\'sha.\nNannalhpisa\' ihíngbittookookano kaniya\'chi ki\'yo. Immoot mahá̱a\'chi hattakat áyya\'sha aalhlhika̱.\nNannalhpisa\' ihíngbittooka̱ immoot mahá̱ahookya hattakat ikayoppa\'chokmat ibaachaffa ikbannokmat ilaapo\' nanna aanokfillikakoot yahmichi bannahoot áyya\'sha.\nHattak mó̱makat nannaka̱ ittibaachaffa bíyyi\'kakma̱ chokma\'ni. Hattak yaakni\' áyya\'shakat nannalhpisa\'a̱ naapiisa\' alhihaat mó̱makat ittibaachaffa bíyyi\'kakma̱ nanna mó̱makat alhpi\'sa bíyyi\'ka\'ni."
+}
diff --git a/lang/languages/cic/language.textproto b/lang/languages/cic/language.textproto
deleted file mode 100644
index 08a4b456d..000000000
--- a/lang/languages/cic/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "cic"
-name: "Chickasaw"
-preferred_name: ""
-autonym: "Chikashshanompa\'"
-population: 0
-region: "US"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ó Ú a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ó ú \'"
-  marks: "◌́"
-}
diff --git a/lang/languages/cic/sampletext.textproto b/lang/languages/cic/sampletext.textproto
deleted file mode 100644
index 2acf1f9a3..000000000
--- a/lang/languages/cic/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "cic"
diff --git a/lang/languages/cja/language.textproto b/lang/languages/cja.textproto
similarity index 76%
rename from lang/languages/cja/language.textproto
rename to lang/languages/cja.textproto
index b3d750416..f16633d77 100644
--- a/lang/languages/cja/language.textproto
+++ b/lang/languages/cja.textproto
@@ -7,3 +7,6 @@ region: "KH"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/cjm/language.textproto b/lang/languages/cjm.textproto
similarity index 74%
rename from lang/languages/cjm/language.textproto
rename to lang/languages/cjm.textproto
index 4ad597480..be417a97d 100644
--- a/lang/languages/cjm/language.textproto
+++ b/lang/languages/cjm.textproto
@@ -7,3 +7,6 @@ region: "VN"
 script: "Cham"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "cjm"
+}
diff --git a/lang/languages/ckb.textproto b/lang/languages/ckb.textproto
new file mode 100644
index 000000000..8dd7ea85a
--- /dev/null
+++ b/lang/languages/ckb.textproto
@@ -0,0 +1,28 @@
+id: "ckb"
+name: "Central Kurdish"
+preferred_name: ""
+autonym: "Soranî"
+population: 11086548
+region: "IQ"
+region: "IR"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "ا ب ت ج ح خ د ر ز س ش ع غ ف ق ل م ن و پ چ ڕ ژ ڤ ک گ ڵ ھ ۆ ی ێ ە"
+  auxiliary: "Ḧ Ẍ ḧ ẍ \'"
+  marks: "◌̂ ◌̈ ◌̌ ◌̧"
+  numerals: "\\u200E\\u200F \\- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩"
+  index: "ئ ا ب پ ت ج چ ح خ د ر ز ڕ ژ س ش ع غ ف ڤ ق ک گ ل ڵ م ن ھ ە و ۆ ی ێ"
+}
+sample_text {
+  masthead_full: "HhEe"
+  masthead_partial: "Mm"
+  tester: "Herwekî nasîna weqara pêgirê hemû endamên malbata mirovî û mafên"
+  poster_sm: "Herwekî nenasîn"
+  poster_md: "wekî îdeala"
+  poster_lg: "Hemû"
+  specimen_48: "Hemû mirov azad û di weqar û mafan de wekhev tên dinyayê. Ew xwedî"
+  specimen_36: "Ewê tukes di koletî an bindestiyê de neyê girtin; koletî û bazirganiya koleyan bi hemû teşeyên xwe ve qedexe ne."
+  specimen_32: "Herkes maf heye ku li hemberî kirinên ku mafên bingehî yên ku qanûna bingehî an qanûn jê re dinasin ihlal dikin, serî li mehkemeyên neteweyî yên selahiyetdar bixe."
+  specimen_21: "Tukes nikare bi awayekî kêfî bê girtin, hebs an sirgûn kirin.\nHerkes, di wekheviyeke temamî de, maf heye ku doza wî li ber mehkemeyeke serbixwe û bê alî bi awayekî adil û eşkere bê bihîstin ji bo diyarkirina maf û wacibên wî û ya her tawana curmî li dijî wî.\nNabe ku tukes bibe amanca têkilbûnên kêfî yên nav jiyana wî ya arizî, malbata wî, mala wî an nameyên wî, an ziyangihandina şeref û şana wî. Herkes xwediyê mafê parastina qanûn e li hemberî têkilbûn û ziyangihanên wilo."
+  specimen_16: "Herkes mafê azadiya fikr, wijdan û olê heye; azadiya ol an bawerî guhartin û azadiya ol û baweriya xwe bi tenê an bi hev re him eşkere him arizî, bi hînkirin, emel, îbadet û bicihanîna ayînan nîşandanê jî di nav vî mafî de ne.\nHerkes mafê azadiya fikr û îfade heye; mafê ji ber ramanên xwe nehatin êşandin û herweha mafê bêî nasîna tu sînoran û bi her cure navgînan li agahdariyan û fikran gerîn, wan bi dest xistin û îfade û belavkirin dikevin nav vî mafî.\nHerkes, wekî endamê civakî, mafê ewleyiya sosyal heye; Ew mafdar e ku bi riya xebata neteweyî û hevkariya navneteweyî û li gora tenzîm û hatiniyên her dewletê, doza bidestxistina mafên aborî, civakî û çandî yên ku jo bo weqara wî û geşbûna serbest a şexsiyeta wî ferz in, bike."
+}
diff --git a/lang/languages/ckb/language.textproto b/lang/languages/ckb/language.textproto
deleted file mode 100644
index df67ed61b..000000000
--- a/lang/languages/ckb/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "ckb"
-name: "Central Kurdish"
-preferred_name: ""
-autonym: "Soranî"
-population: 11086548
-region: "IQ"
-region: "IR"
-script: "Perso-Arabic"
-exemplar_chars {
-  base: "ا ب ت ج ح خ د ر ز س ش ع غ ف ق ل م ن و پ چ ڕ ژ ڤ ک گ ڵ ھ ۆ ی ێ ە"
-  auxiliary: "Ḧ Ẍ ḧ ẍ \'"
-  marks: "◌̂ ◌̈ ◌̌ ◌̧"
-  numerals: "\\u200E\\u200F \\- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩"
-  index: "ئ ا ب پ ت ج چ ح خ د ر ز ڕ ژ س ش ع غ ف ڤ ق ک گ ل ڵ م ن ھ ە و ۆ ی ێ"
-}
diff --git a/lang/languages/ckb/sampletext.textproto b/lang/languages/ckb/sampletext.textproto
deleted file mode 100644
index 035481b1f..000000000
--- a/lang/languages/ckb/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ckb"
diff --git a/lang/languages/co.textproto b/lang/languages/co.textproto
new file mode 100644
index 000000000..6e91e7cb2
--- /dev/null
+++ b/lang/languages/co.textproto
@@ -0,0 +1,24 @@
+id: "co"
+name: "Corsican"
+preferred_name: ""
+autonym: "Corsu"
+population: 162835
+region: "FR"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Â È Ì Ï Ü Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à â è ì ï ü ò ù"
+  marks: "◌̀ ◌̂ ◌̈"
+}
+sample_text {
+  masthead_full: "NnAa"
+  masthead_partial: "Ss"
+  tester: "Cunsidarendu ch’ellu ci voli à ricunnoscia a dignità propria di"
+  poster_sm: "Cunsidarendu"
+  poster_md: "cum’è fini"
+  poster_lg: "Nascinu"
+  specimen_48: "Nascinu tutti l’omi libari è pari di dignità è di diritti. Pussedinu"
+  specimen_36: "In la schiavitù o in la sirvitù ùn sarà tinutu nimu; sò pruibiti a schiavitù è u cumerciu di i schiavi in qualunqua forma."
+  specimen_32: "Hà dirittu ogni parsona à u riposu è à u tempu libaru, vali à dì ch’ellu ùn devi essa troppu u so tempu di travagliu, è ch’ella devi avè i vacanzi à tempi fissi."
+  specimen_21: "Ogni parsona hà dirittu ch’ellu regni, in la sucità è trà i Stati, un ordini chì dessi tuttu u so pesu à i diritti è libertà ch’ella sprimi issa dichjarazioni.\nNisuna dispusizioni d’issa dichjarazioni pò essa capita cum’è s’ella dessi ad unu Statu, ad un gruppu o ad u individuu un dirittu qualunqua d’avè una attività o d’agiscia cù u scopu di fà spariscia i diritti è i libertà chì ci si trovanu scritti."
+  specimen_16: "Cunsidarendu ch’ellu ci voli à ricunnoscia a dignità propria di tutti i membri di a famiglia umana è i so diritti pari ed inalienabili par ch’elli sianu fundati a libertà, a ghjustizia è a paci ind’u mondu,\nCunsidarendu chì, ùn cunniscendu o sprizzendu i diritti di l’omu, si hè ghjuntu à atti barbari chì a cuscenza umana ni hè rivultata, è ch’ella hè stata chjamata a spiranza più alta di l’omu quilla di fà nascia un mondu duva elli saranu libari l’omi di parlà è di creda, libarati da u tarrori è da e miseria,\nCunsidarendu ch’ella hè una primura maiò ch’elli sianu prutetti i diritti di l’omu da un guvernu di dirittu, da ch’ellu ùn sia custrettu l’omu, ghjuntu à i punti stremi, à rivultà si contru à a tirannia è l’upprissioni,"
+}
diff --git a/lang/languages/co/language.textproto b/lang/languages/co/language.textproto
deleted file mode 100644
index 37d005351..000000000
--- a/lang/languages/co/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "co"
-name: "Corsican"
-preferred_name: ""
-autonym: "Corsu"
-population: 162835
-region: "FR"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Â È Ì Ï Ü Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à â è ì ï ü ò ù"
-  marks: "◌̀ ◌̂ ◌̈"
-}
diff --git a/lang/languages/co/sampletext.textproto b/lang/languages/co/sampletext.textproto
deleted file mode 100644
index df3461973..000000000
--- a/lang/languages/co/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "co"
diff --git a/lang/languages/cps/language.textproto b/lang/languages/cps.textproto
similarity index 74%
rename from lang/languages/cps/language.textproto
rename to lang/languages/cps.textproto
index 0c6c1b9cb..134746420 100644
--- a/lang/languages/cps/language.textproto
+++ b/lang/languages/cps.textproto
@@ -7,3 +7,6 @@ region: "PH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/cr/language.textproto b/lang/languages/cr.textproto
similarity index 76%
rename from lang/languages/cr/language.textproto
rename to lang/languages/cr.textproto
index 111dad477..02a701613 100644
--- a/lang/languages/cr/language.textproto
+++ b/lang/languages/cr.textproto
@@ -4,7 +4,10 @@ preferred_name: ""
 autonym: ""
 population: 41463
 region: "CA"
-script: "UCAS"
 script: "Latin"
+script: "UCAS"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "cr"
+}
diff --git a/lang/languages/crh.textproto b/lang/languages/crh.textproto
new file mode 100644
index 000000000..8cfc42ec9
--- /dev/null
+++ b/lang/languages/crh.textproto
@@ -0,0 +1,24 @@
+id: "crh"
+name: "Crimean Turkish"
+preferred_name: ""
+autonym: "Къырымтатар"
+population: 245968
+region: "UA"
+script: "Cyrillic"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç Ñ Ö Ü Ğ Ş a b c d e f g h i j k l m n o p q r s t u v w x y z ç ñ ö ü ğ ş ı"
+  marks: "◌̃ ◌̆ ◌̈ ◌̧"
+}
+sample_text {
+  masthead_full: "BbÜü"
+  masthead_partial: "Tt"
+  tester: "İnsan ailesiniñ cemi azalarına has olğan menlik duyğusı em de"
+  poster_sm: "insan aqlarına"
+  poster_md: "insannıñ"
+  poster_lg: "Bütün"
+  specimen_48: "milletler arasında dostluq munasebetleriniñ inkişafını desteklemekniñ"
+  specimen_36: "İç bir kimse qullıq ya da esaret altında bulunmamalıdır; qullıq ve qul ticaretiniñ bütün çeşitleri yasaqtır."
+  specimen_32: "Er kes onıñ, anayasa ya da qanun teminlegen, esas aqları bozulğan taqdirde, selâhiyetli milliy mahkemeler tarafından bu aqları tiklenmek aqqına maliktir."
+  specimen_21: "İç kimse esassız yaqalanmaz, tutuvlanmaz yahut sürgün etilmez.\nEr kes, onıñ aqları ve borcunı belgilemek em de oña qarşı kösterilgen cinaiy qabaatlanuvnıñ delilligini tesbit etmek içün, tolu musaviylik esasında, onıñ işi mustaqil ve bitaraf mahkeme tarafından aşkâr ve adaletli tarzda baqılmaq aqqına maliktir."
+  specimen_16: "Kimse, onıñ şahsiy ve aileviy ömürine, meskenine tiyilmemezlik, yazışmaq sırına yahut onıñ namus ve itibarına esassız kirişmek, qast etmek areketlerine oğratıla bilmez. Er kes, böyle kirişmek yahut qastlardan qanun qorçalavı aqqına maliktir.\nEr kes fikir, itiqat ve din serbestligi aqqına malik; bu aq – em şahsiy tarzda, em de başqalarnen beraberlikte, alem-aşkâre ya da hususiy alda, oquvda, ibadet etüvde ve diniy merasimlerni becergende – öz dinini yahut itiqatlarını deñiştirmek ve öz dinini yahut itiqatlarnı izar etmek serbestligini içine almaqta.\nEr kes raatlanmaq, eglenmek, şu cümleden iş saatleriniñ aqılane sıñırlanması ve ödenilgen devriy tatil aqqına maliktir."
+}
diff --git a/lang/languages/crh/language.textproto b/lang/languages/crh/language.textproto
deleted file mode 100644
index cbe1da249..000000000
--- a/lang/languages/crh/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "crh"
-name: "Crimean Turkish"
-preferred_name: ""
-autonym: "Къырымтатар"
-population: 245968
-region: "UA"
-script: "Cyrillic"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç Ñ Ö Ü Ğ Ş a b c d e f g h i j k l m n o p q r s t u v w x y z ç ñ ö ü ğ ş ı"
-  marks: "◌̃ ◌̆ ◌̈ ◌̧"
-}
diff --git a/lang/languages/crh/sampletext.textproto b/lang/languages/crh/sampletext.textproto
deleted file mode 100644
index 94732bf52..000000000
--- a/lang/languages/crh/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "crh"
diff --git a/lang/languages/crj/language.textproto b/lang/languages/crj.textproto
similarity index 75%
rename from lang/languages/crj/language.textproto
rename to lang/languages/crj.textproto
index 27123e61e..95e92ee1c 100644
--- a/lang/languages/crj/language.textproto
+++ b/lang/languages/crj.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "UCAS"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "cr"
+}
diff --git a/lang/languages/crk/language.textproto b/lang/languages/crk.textproto
similarity index 75%
rename from lang/languages/crk/language.textproto
rename to lang/languages/crk.textproto
index db5231906..df353d2f7 100644
--- a/lang/languages/crk/language.textproto
+++ b/lang/languages/crk.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "UCAS"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "cr"
+}
diff --git a/lang/languages/crl/language.textproto b/lang/languages/crl.textproto
similarity index 75%
rename from lang/languages/crl/language.textproto
rename to lang/languages/crl.textproto
index 855e2e1d8..092774fe4 100644
--- a/lang/languages/crl/language.textproto
+++ b/lang/languages/crl.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "UCAS"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "cr"
+}
diff --git a/lang/languages/crm/language.textproto b/lang/languages/crm.textproto
similarity index 74%
rename from lang/languages/crm/language.textproto
rename to lang/languages/crm.textproto
index eb964aa3b..aeab4dd1a 100644
--- a/lang/languages/crm/language.textproto
+++ b/lang/languages/crm.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "UCAS"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "cr"
+}
diff --git a/lang/languages/crs.textproto b/lang/languages/crs.textproto
new file mode 100644
index 000000000..88f62dd0c
--- /dev/null
+++ b/lang/languages/crs.textproto
@@ -0,0 +1,23 @@
+id: "crs"
+name: "Seselwa Creole French"
+preferred_name: ""
+autonym: "Seselwa"
+population: 94061
+region: "SC"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "NnOo"
+  masthead_partial: "Uu"
+  tester: "An rekonnesans ki dignite imen e bann drwa egal e enseparab pou"
+  poster_sm: "Alor, Lasanble"
+  poster_md: "Nou tou imen"
+  poster_lg: "Nou"
+  specimen_48: "Sakenn-de-nou ganny drwa zwir tou nou bann drwa ek nou bann liberte"
+  specimen_36: "Personn pa devret ganny arete, obyen ganny met an detansyon, obyen ganny anvoye an ekzile an bonnavini."
+  specimen_32: "Tou dimoun merit en lord sosyal e enternasyonal kot nou bann drwa ek nou bann liberte, dapre sa kiín ekri dan sa Deklarasyon, a vin en realite konplet."
+  specimen_21: "Napa narnyen dan sa Deklarasyon ki devret ganny enterprete komkwa en leta, an group obyen en dimoun annan en drwa kelkonk pou fer nenport ki aktivite obyen aksyon ki kapab detri bann drwa ek bann liberte kin ganny ekri ladan.\nAn rekonnesans ki dignite imen e bann drwa egal e enseparab pou tou manm lafanmiyr imen I fondasyon pou laliberte, lazistis e lape dan lemonn,"
+  specimen_16: "An rekonnesans ki dignite imen e bann drwa egal e enseparab pou tou manm lafanmiyr imen I fondasyon pou laliberte, lazistis e lape dan lemonn,\nAn konsiderasyon ki mank konnesans e respe pou bann drwa imen in okazyonn en bann aksyon barbar kiín boulvers konsyans limanite, e osi larive en monn kot imen a kapab eksprim zot lekor dan laliberte e dapre zot konsyans san okenn lafreyer obyen mank mwayen, parey in ganny proklanmen konman laspirasyon pli o pou tou imen,\nAn konsiderasyon ki I esansyel ki bann drwa imen I ganny proteze par en sistenm lalwa kot dimoun pa oblize, konman en dernyen rekour, pou revolte kont la tirani e lopresyon,"
+}
diff --git a/lang/languages/crs/language.textproto b/lang/languages/crs/language.textproto
deleted file mode 100644
index f599b2e05..000000000
--- a/lang/languages/crs/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "crs"
-name: "Seselwa Creole French"
-preferred_name: ""
-autonym: "Seselwa"
-population: 94061
-region: "SC"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/crs/sampletext.textproto b/lang/languages/crs/sampletext.textproto
deleted file mode 100644
index ff8242db9..000000000
--- a/lang/languages/crs/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "crs"
diff --git a/lang/languages/cs.textproto b/lang/languages/cs.textproto
new file mode 100644
index 000000000..aa64654e9
--- /dev/null
+++ b/lang/languages/cs.textproto
@@ -0,0 +1,29 @@
+id: "cs"
+name: "Czech"
+preferred_name: ""
+autonym: "Čeština"
+population: 13045532
+region: "CZ"
+region: "SK"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ó Ú Ý Č Ď Ě Ň Ř Š Ť Ů Ž a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ó ú ý č ď ě ň ř š ť ů ž"
+  auxiliary: "à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī ľ ł ñ ò ŏ ô ö ø ō œ ŕ ù ŭ û ü ū ÿ"
+  marks: "◌́ ◌̊ ◌̌"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] § @ * / \\&"
+  index: "A B C Č D E F G H {CH} I J K L M N O P Q R Ř S Š T U V W X Y Z Ž"
+}
+sample_text {
+  masthead_full: "VvŠš"
+  masthead_partial: "Ii"
+  tester: "že uznání přirozené důstojnosti a rovných a nezcizitelných práv"
+  poster_sm: "že zneuznání"
+  poster_md: "že je nutné,"
+  poster_lg: "Všichni"
+  specimen_48: "že lid Spojených národů zdůraznil v Chartě znovu svou víru v"
+  specimen_36: "Nikdo nesmí být držen v otroctví nebo nevolnictví; všechny formy otroctví a obchodu s otroky jsou zakázány."
+  specimen_32: "Každý má právo, aby mu příslušné vnitrostátní soudy poskytly účinnou ochranu proti činům porušujícím základní práva, která jsou mu přiznána ústavou nebo zákonem."
+  specimen_21: "Nikdo nesmí být svévolně zatčen, držen ve vazbě nebo vyhoštěn do vyhnanství.\nKaždý má úplně stejné právo, aby byl spravedlivě a veřejně vyslechnut nezávislým a nestranným soudem, který rozhoduje buď o jeho právech a povinnostech, nebo o jakémkoli trestním obvinění vzneseném proti němu.\nNikdo nesmí být vystaven svévolnému zasahování do soukromého života, do rodiny, domova nebo korespondence, ani útokům na svou čest a pověst. Každý má právo na zákonnou ochranu proti takovým zásahům nebo útokům."
+  specimen_16: "Každý má právo na svobodu myšlení, svědomí a náboženství; toto právo zahrnuje v sobě i volnost změnit své náboženství nebo víru, jakož i svobodu projevovat své náboženství nebo víru, sám nebo společně s jinými, ať veřejně nebo soukromě, vyučováním, prováděním náboženských úkonů, bohoslužbou a zachováváním obřadů.\nKaždý má právo na svobodu přesvědčení a projevu; toto právo nepřipouští, aby někdo trpěl újmu pro své přesvědčení, a zahrnuje právo vyhledávat, přijímat a rozšiřovat informace a myšlenky jakýmikoli prostředky a bez ohledu na hranice.\nKaždý má právo na odpočinek a na zotavení, zejména také na rozumné vymezení pracovních hodin a na pravidelnou placenou dovolenou."
+}
diff --git a/lang/languages/cs/language.textproto b/lang/languages/cs/language.textproto
deleted file mode 100644
index c2f8b4a3f..000000000
--- a/lang/languages/cs/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "cs"
-name: "Czech"
-preferred_name: ""
-autonym: "Čeština"
-population: 13045532
-region: "CZ"
-region: "SK"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ó Ú Ý Č Ď Ě Ň Ř Š Ť Ů Ž a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ó ú ý č ď ě ň ř š ť ů ž"
-  auxiliary: "à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī ľ ł ñ ò ŏ ô ö ø ō œ ŕ ù ŭ û ü ū ÿ"
-  marks: "◌́ ◌̊ ◌̌"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] § @ * / \\&"
-  index: "A B C Č D E F G H {CH} I J K L M N O P Q R Ř S Š T U V W X Y Z Ž"
-}
diff --git a/lang/languages/cs/sampletext.textproto b/lang/languages/cs/sampletext.textproto
deleted file mode 100644
index 7a5131508..000000000
--- a/lang/languages/cs/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "cs"
diff --git a/lang/languages/csb/language.textproto b/lang/languages/csb.textproto
similarity index 90%
rename from lang/languages/csb/language.textproto
rename to lang/languages/csb.textproto
index 2c1729fc6..b55a1a7a5 100644
--- a/lang/languages/csb/language.textproto
+++ b/lang/languages/csb.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ã É Ë Ò Ó Ô Ù Ą Ę Ł Ń Ś Ż a b c d e f g h i j k l m n o p q r s t u v w x y z ã é ë ò ó ô ù ą ę ł ń ś ż"
   marks: "◌̀ ◌́ ◌̂ ◌̃ ◌̇ ◌̈ ◌̨"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/csw.textproto b/lang/languages/csw.textproto
new file mode 100644
index 000000000..78fedf96e
--- /dev/null
+++ b/lang/languages/csw.textproto
@@ -0,0 +1,23 @@
+id: "csw"
+name: "Swampy Cree"
+preferred_name: ""
+autonym: "ᓀᐦᐃᔭᐍᐏᐣ"
+population: 4900
+region: "CA"
+script: "UCAS"
+exemplar_chars {
+  base: "ᐁ ᐃ ᐅ ᐊ ᐍ ᐏ ᐑ ᐓ ᐕ ᐘ ᐚ ᐤ ᐯ ᐱ ᐲ ᐳ ᐴ ᐸ ᐹ ᑊ ᑌ ᑎ ᑏ ᑐ ᑑ ᑕ ᑖ ᐟ ᑫ ᑭ ᑮ ᑯ ᑰ ᑲ ᑳ ᐠ ᒉ ᒋ ᒌ ᒍ ᒎ ᒐ ᒑ ᐨ ᒣ ᒥ ᒦ ᒧ ᒨ ᒪ ᒫ ᒼ ᓀ ᓂ ᓃ ᓄ ᓅ ᓇ ᓈ ᐣ ᓭ ᓯ ᓰ ᓱ ᓲ ᓴ ᓵ ᐢ ᔦ ᔨ ᔩ ᔪ ᔫ ᔭ ᔮ ᓬ ᕒ ᐦ ᐩ ᕁ ᑵ"
+}
+sample_text {
+  masthead_full: "ᒥᓯᐌᐃ"
+  masthead_partial: "ᓂᐤ"
+  tester: "ᐃᑕ ᐁ ᐃᔑ ᓂᓯᑕᐎᓂᒋᑲᑌᐠ ᒥᓯᐌ ᑲ ᑕᔑᐟ ᐎᒋᔕᓂᑐᐎᓂᐠ ᑭᐡᑌᓂᑕᑯᓯᐎᓂᐠ ᐁᑭ ᐃᔑ ᓂᑕᐎᑭᐟ ᓀᐢᑕ"
+  poster_sm: "ᐁᑯ ᒪᑲ ᐁᑲ ᐁ"
+  poster_md: "ᐁ ᑭᐢᑌᓂᑕᑾᐠ"
+  poster_lg: "ᒥᓯᐌ"
+  specimen_48: "ᓀᐢᑕ ᐊᓂᑭ ᐃᓂᓂᐗᐠ ᐱᒋ ᒪᒪᐎ ᐃᑕᐢᑲᓀᓯᐎᓂᐠ ᐱᒋ ᐅᓇᔓᐌᐎᓂᐠ ᐁ ᑕᐱ ᐃᑗᒋᐠ ᐁ ᑕᐺᔦᓂᑕᑭᐠ"
+  specimen_36: "ᓀᐢᑕ ᐁ ᑭᐢᑌᓂᑕᑾᐠ ᑭᒋ ᔑᑭᑕᓂᐗᐠ ᐅᑐᑌᒥᒥᑐᐎᓂᐠ ᑭᒋ ᐃᔑ ᑲᓇᐗᐸᒥᑐᒋᐠ ᐃᑕᐢᑲᓀᓯᐎᓇ᙮\nᒥᓯᐌ ᐊᐌᓇ ᐃᔑ ᒥᓂᑯᐎᓯᐤ ᑭᒋ ᐱᒪᑎᓯᐟ ᓀᐢᑕ ᑎᐯᓂᒥᑎᓱᐎᓂᓂᐤ ᓀᐢᑕ ᐁᑲ ᑭᒋ ᐅᒋ ᓇᓂᓴᓂᓯᐟ᙮"
+  specimen_32: "ᐁ ᑭᐢᑌᓂᑕᑾᐠ ᒪᑲ ᐃᓂᓂᐎ ᒥᓂᑯᐎᓯᐎᐣ ᑭᒋ ᑲᓇᐌᓂᒋᑲᑌᐠ ᐱᒋ ᐅᓇᔓᐌᐎᓂᐠ ᒪᑲ ᑭᔕᐢᐱᐣ ᐃᓂᓂᐤ ᐁᑲ ᑲ ᐸᑭᑎᓂᐟ ᑭᒋ ᐊᔭᐢᐸᐣ ᐱᑐᐡ ᑫᑾᓂᐤ ᑫ ᑭᑐᑕᐠ ᑲᓇᑫ ᒪᒋᐨ ᑫ ᐅᒋ ᒪᔑᑕᐟ ᐅᑭᒪᐎᐎᓂᓂᐤ ᐯᔭᐠ ᑭᒋ ᐅᑭᒪᐤ ᐁ ᑎᐯᐣᒋᑫᐟ ᓀᐢᑕ ᐁ ᐸᑕᑯᓄᐌᐟ᙮"
+  specimen_21: "ᐃᑕ ᐁ ᐃᔑ ᓂᓯᑕᐎᓂᒋᑲᑌᐠ ᒥᓯᐌ ᑲ ᑕᔑᐟ ᐎᒋᔕᓂᑐᐎᓂᐠ ᑭᐡᑌᓂᑕᑯᓯᐎᓂᐠ ᐁᑭ ᐃᔑ ᓂᑕᐎᑭᐟ ᓀᐢᑕ ᐊᓂᐃ ᒥᓂᑯᐎᓯᐎᓇ ᐯᔭᑾᓄᐠ ᐁ ᐃᔑ ᒥᓂᑯᐎᓯᐟ ᓀᐢᑕ ᐁᑲ ᒋᑭ ᐊᓂᐢᑫᐸᓂᓂᐠ ᐎᓇ ᐱᑯ ᑲ ᑭ ᐃᔑ ᒥᓂᑯᐎᓯᐟ ᐁᑯᑕ ᐌᒋ ᓂᐸᐎᒪᑲᐠ ᑎᐯᓂᒥᑎᓱᐎᐣ ᓀᐢᑕ ᑾᔭᐢᑭᑕᑎᓯᐎᐣ ᓀᐢᑕ ᑲᔭᒣᓂᑕᒧᐎᐣ ᐅᑕ ᐊᐢᑭᐠ᙮\nᐁᑯ ᒪᑲ ᐁᑲ ᐁ ᐱᓯᐢᑫᓂᒋᑲᑌᐠ ᓀᐢᑕ ᐁ ᐱᑯᓂᑲᑌᑭ ᐃᓂᓂᐎ ᒥᓂᑯᐎᓯᐎᓇ ᐁ ᑲᑾᑕᑭᐃᒋᐠ ᐃᓂᓂᐗᐠ ᐁ ᑭᔑᐗᐃᑯᓇᓂᐗᐠ ᓀᐢᑕ ᐁ ᐊᑎ ᓄᑾᐠ ᐊᐢᑭᐠ ᐃᓂᓂᐤ ᐁ ᐸᑭᑎᓇᒪᑯᐎᓯᐟ ᑭᒋ ᒥᓉᓂᑕᐠ ᐗᐃᑗᐟ ᐱᑯ ᑫᑾᓂᐤ ᑭᒋ ᐃᑗᐟ ᓀᐢᑕ ᐅᑕᐺᔦᓂᑕᒧᐎᐣ ᓀᐢᑕ ᐅᑎᐯᓂᒥᑎᓱᐎᐣ ᐁᑲ ᑭᒋ ᓇᓂᒋᐟ ᓀᐢᑕ ᐱᑯ ᑭᒋ ᓄᑌᐸᓂᐟ ᐁ ᑭᒋ ᐃᑡᓂᐗᐠ ᐅᑕ ᐁ ᐅᑯᒪ ᒪᐗᐨ ᑲ ᐃᔑ ᒧᐡᑌᔦᓂᑕᐠ ᐃᓂᓂᐤ᙮"
+  specimen_16: "ᐃᑕ ᐁ ᐃᔑ ᓂᓯᑕᐎᓂᒋᑲᑌᐠ ᒥᓯᐌ ᑲ ᑕᔑᐟ ᐎᒋᔕᓂᑐᐎᓂᐠ ᑭᐡᑌᓂᑕᑯᓯᐎᓂᐠ ᐁᑭ ᐃᔑ ᓂᑕᐎᑭᐟ ᓀᐢᑕ ᐊᓂᐃ ᒥᓂᑯᐎᓯᐎᓇ ᐯᔭᑾᓄᐠ ᐁ ᐃᔑ ᒥᓂᑯᐎᓯᐟ ᓀᐢᑕ ᐁᑲ ᒋᑭ ᐊᓂᐢᑫᐸᓂᓂᐠ ᐎᓇ ᐱᑯ ᑲ ᑭ ᐃᔑ ᒥᓂᑯᐎᓯᐟ ᐁᑯᑕ ᐌᒋ ᓂᐸᐎᒪᑲᐠ ᑎᐯᓂᒥᑎᓱᐎᐣ ᓀᐢᑕ ᑾᔭᐢᑭᑕᑎᓯᐎᐣ ᓀᐢᑕ ᑲᔭᒣᓂᑕᒧᐎᐣ ᐅᑕ ᐊᐢᑭᐠ᙮\nᐁᑯ ᒪᑲ ᐁᑲ ᐁ ᐱᓯᐢᑫᓂᒋᑲᑌᐠ ᓀᐢᑕ ᐁ ᐱᑯᓂᑲᑌᑭ ᐃᓂᓂᐎ ᒥᓂᑯᐎᓯᐎᓇ ᐁ ᑲᑾᑕᑭᐃᒋᐠ ᐃᓂᓂᐗᐠ ᐁ ᑭᔑᐗᐃᑯᓇᓂᐗᐠ ᓀᐢᑕ ᐁ ᐊᑎ ᓄᑾᐠ ᐊᐢᑭᐠ ᐃᓂᓂᐤ ᐁ ᐸᑭᑎᓇᒪᑯᐎᓯᐟ ᑭᒋ ᒥᓉᓂᑕᐠ ᐗᐃᑗᐟ ᐱᑯ ᑫᑾᓂᐤ ᑭᒋ ᐃᑗᐟ ᓀᐢᑕ ᐅᑕᐺᔦᓂᑕᒧᐎᐣ ᓀᐢᑕ ᐅᑎᐯᓂᒥᑎᓱᐎᐣ ᐁᑲ ᑭᒋ ᓇᓂᒋᐟ ᓀᐢᑕ ᐱᑯ ᑭᒋ ᓄᑌᐸᓂᐟ ᐁ ᑭᒋ ᐃᑡᓂᐗᐠ ᐅᑕ ᐁ ᐅᑯᒪ ᒪᐗᐨ ᑲ ᐃᔑ ᒧᐡᑌᔦᓂᑕᐠ ᐃᓂᓂᐤ᙮\nᐁ ᑭᐢᑌᓂᑕᑾᐠ ᒪᑲ ᐃᓂᓂᐎ ᒥᓂᑯᐎᓯᐎᐣ ᑭᒋ ᑲᓇᐌᓂᒋᑲᑌᐠ ᐱᒋ ᐅᓇᔓᐌᐎᓂᐠ ᒪᑲ ᑭᔕᐢᐱᐣ ᐃᓂᓂᐤ ᐁᑲ ᑲ ᐸᑭᑎᓂᐟ ᑭᒋ ᐊᔭᐢᐸᐣ ᐱᑐᐡ ᑫᑾᓂᐤ ᑫ ᑭᑐᑕᐠ ᑲᓇᑫ ᒪᒋᐨ ᑫ ᐅᒋ ᒪᔑᑕᐟ ᐅᑭᒪᐎᐎᓂᓂᐤ ᐯᔭᐠ ᑭᒋ ᐅᑭᒪᐤ ᐁ ᑎᐯᐣᒋᑫᐟ ᓀᐢᑕ ᐁ ᐸᑕᑯᓄᐌᐟ᙮"
+}
diff --git a/lang/languages/csw/language.textproto b/lang/languages/csw/language.textproto
deleted file mode 100644
index 428878bbe..000000000
--- a/lang/languages/csw/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "csw"
-name: "Swampy Cree"
-preferred_name: ""
-autonym: "ᓀᐦᐃᔭᐍᐏᐣ"
-population: 4900
-region: "CA"
-script: "UCAS"
-exemplar_chars {
-  base: "ᐁ ᐃ ᐅ ᐊ ᐍ ᐏ ᐑ ᐓ ᐕ ᐘ ᐚ ᐤ ᐯ ᐱ ᐲ ᐳ ᐴ ᐸ ᐹ ᑊ ᑌ ᑎ ᑏ ᑐ ᑑ ᑕ ᑖ ᐟ ᑫ ᑭ ᑮ ᑯ ᑰ ᑲ ᑳ ᐠ ᒉ ᒋ ᒌ ᒍ ᒎ ᒐ ᒑ ᐨ ᒣ ᒥ ᒦ ᒧ ᒨ ᒪ ᒫ ᒼ ᓀ ᓂ ᓃ ᓄ ᓅ ᓇ ᓈ ᐣ ᓭ ᓯ ᓰ ᓱ ᓲ ᓴ ᓵ ᐢ ᔦ ᔨ ᔩ ᔪ ᔫ ᔭ ᔮ ᓬ ᕒ ᐦ ᐩ ᕁ ᑵ"
-}
diff --git a/lang/languages/csw/sampletext.textproto b/lang/languages/csw/sampletext.textproto
deleted file mode 100644
index 21dfb216a..000000000
--- a/lang/languages/csw/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "csw"
diff --git a/lang/languages/cu/language.textproto b/lang/languages/cu.textproto
similarity index 92%
rename from lang/languages/cu/language.textproto
rename to lang/languages/cu.textproto
index 564c0b7cc..7c9c0991a 100644
--- a/lang/languages/cu/language.textproto
+++ b/lang/languages/cu.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Ю Є Ѕ Џ Ѥ Ѩ Ѭ Ҁ І Ї Ѡ Ѣ Ѧ Ѫ Ѯ Ѱ Ѳ Ѵ Ѷ Ѻ Ѽ Ѿ Ꙁ Ꙋ Ꙍ Ꙗ Ꙃ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь ю є ѕ џ ѥ ѩ ѭ ҁ і ї ѡ ѣ ѧ ѫ ѯ ѱ ѳ ѵ ѷ ѻ ѽ ѿ ꙁ ꙋ ꙍ ꙗ ꙃ"
   marks: "◌́ ◌̆ ◌̈ ◌̏"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/cv/language.textproto b/lang/languages/cv.textproto
similarity index 90%
rename from lang/languages/cv/language.textproto
rename to lang/languages/cv.textproto
index d3f494417..06a18c8f3 100644
--- a/lang/languages/cv/language.textproto
+++ b/lang/languages/cv.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ҫ Ӑ Ӗ Ӳ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ҫ ӑ ӗ ӳ"
   marks: "◌̆ ◌̈ ◌̋"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/cy.textproto b/lang/languages/cy.textproto
new file mode 100644
index 000000000..047b70a30
--- /dev/null
+++ b/lang/languages/cy.textproto
@@ -0,0 +1,29 @@
+id: "cy"
+name: "Welsh"
+preferred_name: ""
+autonym: "Cymraeg"
+population: 536376
+region: "AR"
+region: "GB"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â Ä È É Ê Ë Ì Í Î Ï Ò Ó Ô Ö Ù Ú Û Ü Ý Ÿ Ŵ Ŷ Ẁ Ẃ Ẅ Ỳ a b c d e f g h i j k l m n o p q r s t u v w x y z à á â ä è é ê ë ì í î ï ò ó ô ö ù ú û ü ý ÿ ŵ ŷ ẁ ẃ ẅ ỳ"
+  auxiliary: "ă å ã ā æ ç ĕ ē ĭ ī k ñ ŏ ø ō œ q ŭ ū v x z"
+  marks: "◌̀ ◌́ ◌̂ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C {CH} D {DD} E F {FF} G {NG} H I J K L {LL} M N O P {PH} Q R {RH} S T {TH} U V W X Y Z"
+}
+sample_text {
+  masthead_full: "GgEe"
+  masthead_partial: "Nn"
+  tester: "Gan mai cydnabod urddas cynhenid a hawliau cydradd a phriod holl"
+  poster_sm: "Gan i anwybyddu"
+  poster_md: "Gan fod yn"
+  poster_lg: "Genir"
+  specimen_48: "Gan fod pobloedd y Cenhedloedd Unedig yn y Siarter wedi ail ddatgan"
+  specimen_36: "gwr a gwragedd, ac wedi penderfynu hyrwyddo cynnydd cymdeithasol a safonau byw gwell mewn rhyddid helaethach,"
+  specimen_32: "Gan fod y Gwladwriaethau sy’n Aelodau wedi ymrwymo, mewn cydweithrediad â’r Cenhedloedd Unedig, i sicrhau hyrwyddo parch cyffredinol i hawliau dynol a’r rhyddfreintiau sylfaenol, a’u cadw,"
+  specimen_21: "Gan fod deall yr hawliau a’r rhyddfreintiau hyn gan bawb o’r pwys mwyaf i lwyr sylweddoli’r ymrwymiad hwn,\nFelly, y mae’r\nCynulliad Cyffredinol\nyn awr yn cyhoeddi’r\nDatganiad Cyffredinol hwn o Hawliau Dynol\nGenir pawb yn rhydd ac yn gydradd â’i gilydd mewn urddas a hawliau. Fe’u cynysgaeddir â rheswm a chydwybod, a dylai pawb ymddwyn y naill at y llall mewn ysbryd cymodlon."
+  specimen_16: "Y mae gan bawb hawl i’r holl hawliau a’r rhyddfreintiau a nodir yn y Datganiad hwn, heb unrhyw wahaniaeth o gwbl, yn arbennig unrhyw wahaniaeth hil, lliw, rhyw, iaith, crefydd, barn boliticaidd neu unrhyw farn arall, tarddiad cenedlaethol neu gymdeithasol, eiddo, geni neu safle arall.\nYmhellach, ni ddylid gwahaniaethu ar sail safle politicaidd, gyfreithiol na chydwladol unrhyw wlad neu diriogaeth y mae pawb yn perthyn iddi, p’un ai yw honno’n annibynnol, dan nawdd, heb hunanlywodraeth, neu dan unrhyw gyfyngiad arall ar ei sofraniaeth.\nY mae gan bawb hawl i fywyd, rhyddid a diogelwch."
+}
diff --git a/lang/languages/cy/language.textproto b/lang/languages/cy/language.textproto
deleted file mode 100644
index 49e5f6efe..000000000
--- a/lang/languages/cy/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "cy"
-name: "Welsh"
-preferred_name: ""
-autonym: "Cymraeg"
-population: 536376
-region: "AR"
-region: "GB"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â Ä È É Ê Ë Ì Í Î Ï Ò Ó Ô Ö Ù Ú Û Ü Ý Ÿ Ŵ Ŷ Ẁ Ẃ Ẅ Ỳ a b c d e f g h i j k l m n o p q r s t u v w x y z à á â ä è é ê ë ì í î ï ò ó ô ö ù ú û ü ý ÿ ŵ ŷ ẁ ẃ ẅ ỳ"
-  auxiliary: "ă å ã ā æ ç ĕ ē ĭ ī k ñ ŏ ø ō œ q ŭ ū v x z"
-  marks: "◌̀ ◌́ ◌̂ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C {CH} D {DD} E F {FF} G {NG} H I J K L {LL} M N O P {PH} Q R {RH} S T {TH} U V W X Y Z"
-}
diff --git a/lang/languages/cy/sampletext.textproto b/lang/languages/cy/sampletext.textproto
deleted file mode 100644
index 5097f399b..000000000
--- a/lang/languages/cy/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "cy"
diff --git a/lang/languages/da.textproto b/lang/languages/da.textproto
new file mode 100644
index 000000000..daa544811
--- /dev/null
+++ b/lang/languages/da.textproto
@@ -0,0 +1,31 @@
+id: "da"
+name: "Danish"
+preferred_name: ""
+autonym: "Dansk"
+population: 7072056
+region: "DE"
+region: "DK"
+region: "GL"
+region: "IS"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Æ Ø a b c d e f g h i j k l m n o p q r s t u v w x y z å æ ø"
+  auxiliary: "Ǻ ǻ"
+  marks: "◌̊ ◌́"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å"
+}
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Ee"
+  tester: "Da anerkendelse af den mennesket iboende værdighed og af de lige"
+  poster_sm: "da det er af"
+  poster_md: "da det er"
+  poster_lg: "Alle"
+  specimen_48: "da De forenede Nationers folk i pagten påny har bekræftet deres"
+  specimen_36: "Enhver har ret til hvile og fritid, herunder en rimelig begrænsning af arbejdstiden, og til periodisk ferie med løn."
+  specimen_32: "da det er af afgørende betydning, at menneskerettighederne beskyttes af loven, hvis ikke mennesket som en sidste udvej skal tvinges til at gøre oprør mod tyranni og undertrykkelse,"
+  specimen_21: "Da anerkendelse af den mennesket iboende værdighed og af de lige og ufortabelige rettigheder for alle medlemmer af den menneskelige familie er grundlaget for frihed, retfærdighed og fred i verden,\nda tilsidesættelse af og foragt for menneskerettighederne har ført til barbariske handlinger, der har oprørt menneskehedens samvittighed, og da skabelsen af en verden, hvor menneskene nyder tale- og trosfrihed og frihed for frygt og nød, er blevet forkyndt som folkenes højeste mål,"
+  specimen_16: "Da anerkendelse af den mennesket iboende værdighed og af de lige og ufortabelige rettigheder for alle medlemmer af den menneskelige familie er grundlaget for frihed, retfærdighed og fred i verden,\nda tilsidesættelse af og foragt for menneskerettighederne har ført til barbariske handlinger, der har oprørt menneskehedens samvittighed, og da skabelsen af en verden, hvor menneskene nyder tale- og trosfrihed og frihed for frygt og nød, er blevet forkyndt som folkenes højeste mål,\nda det er af afgørende betydning, at menneskerettighederne beskyttes af loven, hvis ikke mennesket som en sidste udvej skal tvinges til at gøre oprør mod tyranni og undertrykkelse,"
+}
diff --git a/lang/languages/da/language.textproto b/lang/languages/da/language.textproto
deleted file mode 100644
index 874b46115..000000000
--- a/lang/languages/da/language.textproto
+++ /dev/null
@@ -1,18 +0,0 @@
-id: "da"
-name: "Danish"
-preferred_name: ""
-autonym: "Dansk"
-population: 7072056
-region: "IS"
-region: "GL"
-region: "DK"
-region: "DE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Æ Ø a b c d e f g h i j k l m n o p q r s t u v w x y z å æ ø"
-  auxiliary: "Ǻ ǻ"
-  marks: "◌̊ ◌́"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å"
-}
diff --git a/lang/languages/da/sampletext.textproto b/lang/languages/da/sampletext.textproto
deleted file mode 100644
index f7f276402..000000000
--- a/lang/languages/da/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "da"
diff --git a/lang/languages/dak/language.textproto b/lang/languages/dak.textproto
similarity index 74%
rename from lang/languages/dak/language.textproto
rename to lang/languages/dak.textproto
index 8294472ae..023ccf16f 100644
--- a/lang/languages/dak/language.textproto
+++ b/lang/languages/dak.textproto
@@ -7,3 +7,6 @@ region: "US"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/dar/language.textproto b/lang/languages/dar.textproto
similarity index 89%
rename from lang/languages/dar/language.textproto
rename to lang/languages/dar.textproto
index 890a35973..db93db32c 100644
--- a/lang/languages/dar/language.textproto
+++ b/lang/languages/dar.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӏ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӏ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/dav/language.textproto b/lang/languages/dav.textproto
similarity index 88%
rename from lang/languages/dav/language.textproto
rename to lang/languages/dav.textproto
index cb84e979f..d14911494 100644
--- a/lang/languages/dav/language.textproto
+++ b/lang/languages/dav.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "Q X q x"
   index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/dcc/language.textproto b/lang/languages/dcc.textproto
similarity index 75%
rename from lang/languages/dcc/language.textproto
rename to lang/languages/dcc.textproto
index 3cfe9deef..6410883e1 100644
--- a/lang/languages/dcc/language.textproto
+++ b/lang/languages/dcc.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/de/language.textproto b/lang/languages/de.textproto
similarity index 95%
rename from lang/languages/de/language.textproto
rename to lang/languages/de.textproto
index c7f9553b1..2e58dab8e 100644
--- a/lang/languages/de/language.textproto
+++ b/lang/languages/de.textproto
@@ -3,33 +3,33 @@ name: "German"
 preferred_name: ""
 autonym: "Deutsch"
 population: 134799567
-region: "HU"
-region: "US"
-region: "GB"
-region: "RO"
-region: "KZ"
-region: "DK"
 region: "AT"
-region: "LT"
-region: "LI"
-region: "BR"
-region: "LU"
-region: "FR"
-region: "CZ"
-region: "SK"
-region: "NA"
 region: "BE"
-region: "CA"
-region: "SI"
-region: "NL"
-region: "IT"
-region: "CH"
-region: "PY"
-region: "FI"
-region: "GR"
 region: "BG"
-region: "PL"
+region: "BR"
+region: "CA"
+region: "CH"
+region: "CZ"
 region: "DE"
+region: "DK"
+region: "FI"
+region: "FR"
+region: "GB"
+region: "GR"
+region: "HU"
+region: "IT"
+region: "KZ"
+region: "LI"
+region: "LT"
+region: "LU"
+region: "NA"
+region: "NL"
+region: "PL"
+region: "PY"
+region: "RO"
+region: "SI"
+region: "SK"
+region: "US"
 script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ß ä ö ü"
@@ -39,3 +39,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/den/language.textproto b/lang/languages/den.textproto
similarity index 74%
rename from lang/languages/den/language.textproto
rename to lang/languages/den.textproto
index b5998bc63..e900593f9 100644
--- a/lang/languages/den/language.textproto
+++ b/lang/languages/den.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/dgr/language.textproto b/lang/languages/dgr.textproto
similarity index 74%
rename from lang/languages/dgr/language.textproto
rename to lang/languages/dgr.textproto
index 2b2197f7f..71f025619 100644
--- a/lang/languages/dgr/language.textproto
+++ b/lang/languages/dgr.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/dje/language.textproto b/lang/languages/dje.textproto
similarity index 92%
rename from lang/languages/dje/language.textproto
rename to lang/languages/dje.textproto
index d54d10d23..a1f845f26 100644
--- a/lang/languages/dje/language.textproto
+++ b/lang/languages/dje.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E F G H I J K L M N Ɲ Ŋ O P Q R S T U W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/dnj/language.textproto b/lang/languages/dnj.textproto
similarity index 74%
rename from lang/languages/dnj/language.textproto
rename to lang/languages/dnj.textproto
index dd242d8e0..611f8c328 100644
--- a/lang/languages/dnj/language.textproto
+++ b/lang/languages/dnj.textproto
@@ -7,3 +7,6 @@ region: "CI"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/doi/language.textproto b/lang/languages/doi.textproto
similarity index 95%
rename from lang/languages/doi/language.textproto
rename to lang/languages/doi.textproto
index 3253775ef..6f4039ce4 100644
--- a/lang/languages/doi/language.textproto
+++ b/lang/languages/doi.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   punctuation: "_ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) § @ * / \\& # † ‡ ′ ″"
   index: "अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/dsb/language.textproto b/lang/languages/dsb.textproto
similarity index 95%
rename from lang/languages/dsb/language.textproto
rename to lang/languages/dsb.textproto
index cf86dc04e..4fdf9a993 100644
--- a/lang/languages/dsb/language.textproto
+++ b/lang/languages/dsb.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
   index: "A B C Č Ć D E F G H {Ch} I J K Ł L M N O P Q R S Š Ś T U V W X Y Z Ž Ź"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/dtm/language.textproto b/lang/languages/dtm.textproto
similarity index 75%
rename from lang/languages/dtm/language.textproto
rename to lang/languages/dtm.textproto
index dc069ef16..1f031f3a3 100644
--- a/lang/languages/dtm/language.textproto
+++ b/lang/languages/dtm.textproto
@@ -7,3 +7,6 @@ region: "ML"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/dtp/language.textproto b/lang/languages/dtp.textproto
similarity index 75%
rename from lang/languages/dtp/language.textproto
rename to lang/languages/dtp.textproto
index f1704de81..79ca36f50 100644
--- a/lang/languages/dtp/language.textproto
+++ b/lang/languages/dtp.textproto
@@ -7,3 +7,6 @@ region: "MY"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/dty/language.textproto b/lang/languages/dty.textproto
similarity index 93%
rename from lang/languages/dty/language.textproto
rename to lang/languages/dty.textproto
index 5b6825a5a..8849a9d05 100644
--- a/lang/languages/dty/language.textproto
+++ b/lang/languages/dty.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
   punctuation: "। ॥ ॰"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/dua/language.textproto b/lang/languages/dua.textproto
similarity index 91%
rename from lang/languages/dua/language.textproto
rename to lang/languages/dua.textproto
index 3e158a1f4..5b397d41c 100644
--- a/lang/languages/dua/language.textproto
+++ b/lang/languages/dua.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B Ɓ C D Ɗ E Ɛ F G I J K L M N Ŋ O Ɔ P S T U W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/dv.textproto b/lang/languages/dv.textproto
new file mode 100644
index 000000000..163054307
--- /dev/null
+++ b/lang/languages/dv.textproto
@@ -0,0 +1,25 @@
+id: "dv"
+name: "Divehi"
+preferred_name: ""
+autonym: "ދިވެހި"
+population: 372368
+region: "IN"
+region: "MV"
+script: "Thaana"
+exemplar_chars {
+  base: "އ ކ ޅ ބ ރ ނ ށ ހ ޏ ގ ލ ތ ދ ފ މ ވ ޗ ޖ ޕ ޔ ޓ ޒ ޑ ސ ޱ ‎"
+  marks: "◌ަ ◌ާ ◌ި ◌ީ ◌ު ◌ޫ ◌ެ ◌ޭ ◌ޮ ◌ޯ ◌ް"
+}
+sample_text {
+  masthead_full: "ހރއނ"
+  masthead_partial: "ސވ"
+  tester: "ދެންފަހެ، މިނިވަންކަމާއި، ޢަދުލުވެރިކަމާއި، ޞުލްޙަވެރިކަން ދުނިޔޭގައި ޤާއިމުވެ އޮތުމުގެ އަސާސަކީ، ކަމޭހިތެވިގެންވާ ދަރަޖައަކާއި،"
+  poster_sm: "ދެންފަހެ، އަނިޔާވެރިކަމާއި"
+  poster_md: "އިންސާނުންގެ އަސާސީ"
+  poster_lg: "ހުރިހާ"
+  specimen_48: "ދެންފަހެ، އިންސާނީ ޙައްޤުތަކާއި އަސާސީ މިނިވަން ކަމުގެ މިންގަނޑުތަކަސް ޢާންމުކޮށް އިޙްތިރާމް ކުރުމާއި، އެޙައްޤުތަކަށް"
+  specimen_36: "އެއްވެސް މީހަކު، އަޅުވެތިކަމުގައި، ނުވަތަ މަޖުބޫރުން ޚިދުމަތް ކުރުވުމުގައި، ގެންގުޅެވިގެން ނުވާނެއެވެ. އަޅުވެތިކަމާއި، އަޅުންގެ ވިޔަފާރިއަކީ، އޭގެ ހުރިހާ ބާވަތެއްވެސް ހިމެނޭގޮތުން، މަނާކުރެވިގެންވާ ކަންކަމެވެ."
+  specimen_32: "ދެންފަހެ، މިނިވަންކަމާއި، ޢަދުލުވެރިކަމާއި، ޞުލްޙަވެރިކަން ދުނިޔޭގައި ޤާއިމުވެ އޮތުމުގެ އަސާސަކީ، ކަމޭހިތެވިގެންވާ ދަރަޖައަކާއި، ހަމަހަމަ އަދި ނިގުޅައިނުގަނެވޭނެ ޙައްޤުތަކެއް، އި ންސާނީ ދަރިފަސްކޮޅުގެ އެންމެހައި ފަރުދުންނަށް ލިބިގެންވާކަން ދެނެގަނެ ޤަބޫލުކުރުން ކަމުގައިވީ ހިނދު؛"
+  specimen_21: "ދެންފަހެ، މިނިވަންކަމާއި، ޢަދުލުވެރިކަމާއި، ޞުލްޙަވެރިކަން ދުނިޔޭގައި ޤާއިމުވެ އޮތުމުގެ އަސާސަކީ، ކަމޭހިތެވިގެންވާ ދަރަޖައަކާއި، ހަމަހަމަ އަދި ނިގުޅައިނުގަނެވޭނެ ޙައްޤުތަކެއް، އި ންސާނީ ދަރިފަސްކޮޅުގެ އެންމެހައި ފަރުދުންނަށް ލިބިގެންވާކަން ދެނެގަނެ ޤަބޫލުކުރުން ކަމުގައިވީ ހިނދު؛\nދެންފަހެ، އިންސާނީ ޙައްޤުތަކަށް އެއްވެސް ސަމާލުކަމެއް ދިނުމެއް ނެތި، އިންސާނީ ޙައްޤުތަކުގެ ޙުރުމަތް ކެނޑުމުގެ ނަތީޖާއެއްގެ ގޮ ތުން، އިންސާނީ ދަރިފަސްކޮޅުގެ ހެޔޮބުއްދިއަށް ޤަބޫލުކުރެވެންވެސް ނެތްފަދަ ޢަމަލުތަކާ ކުރިމަތިލާން ޖެހިފައިވާކަމާއި، އަދި ޢާންމު ފަރުދުންގެ އެންމެ އިސް އުންމީދު ކަމުގައި ހާމަވެ ފާޅުވެގެންދަނީ ޚިޔާލުފާޅުކުރުމުގެ މިނިވަންކަމާއި، އަސާސީ ބޭނުންތަކުންނާއި ބިރުވެރިކަމުން މިންޖުވެގެންވާ ބަޔަކު ދިރިއުޅޭ ދުނިޔެއެއްގެ އުފެދުން ކަމުގައިވީހިނދު؛"
+  specimen_16: "ދެންފަހެ، މިނިވަންކަމާއި، ޢަދުލުވެރިކަމާއި، ޞުލްޙަވެރިކަން ދުނިޔޭގައި ޤާއިމުވެ އޮތުމުގެ އަސާސަކީ، ކަމޭހިތެވިގެންވާ ދަރަޖައަކާއި، ހަމަހަމަ އަދި ނިގުޅައިނުގަނެވޭނެ ޙައްޤުތަކެއް، އި ންސާނީ ދަރިފަސްކޮޅުގެ އެންމެހައި ފަރުދުންނަށް ލިބިގެންވާކަން ދެނެގަނެ ޤަބޫލުކުރުން ކަމުގައިވީ ހިނދު؛\nދެންފަހެ، އިންސާނީ ޙައްޤުތަކަށް އެއްވެސް ސަމާލުކަމެއް ދިނުމެއް ނެތި، އިންސާނީ ޙައްޤުތަކުގެ ޙުރުމަތް ކެނޑުމުގެ ނަތީޖާއެއްގެ ގޮ ތުން، އިންސާނީ ދަރިފަސްކޮޅުގެ ހެޔޮބުއްދިއަށް ޤަބޫލުކުރެވެންވެސް ނެތްފަދަ ޢަމަލުތަކާ ކުރިމަތިލާން ޖެހިފައިވާކަމާއި، އަދި ޢާންމު ފަރުދުންގެ އެންމެ އިސް އުންމީދު ކަމުގައި ހާމަވެ ފާޅުވެގެންދަނީ ޚިޔާލުފާޅުކުރުމުގެ މިނިވަންކަމާއި، އަސާސީ ބޭނުންތަކުންނާއި ބިރުވެރިކަމުން މިންޖުވެގެންވާ ބަޔަކު ދިރިއުޅޭ ދުނިޔެއެއްގެ އުފެދުން ކަމުގައިވީހިނދު؛\nދެންފަހެ، އަނިޔާވެރިކަމާއި ފިއްތުންތެރިކަމާ ދެކޮޅަށް މަސައްކަތް ކުރުމުގައި، އެހެންގޮތެއް ނެތިގެން ބަޣާވާތަށް ހުރަހެޅުމަށް، އިންސާނާއަށް މަޖުބޫރު ކުރުވަން ބޭނުން ނުވާނަމަ، އިންސާނީ ޙައްޤުތަކަކީ ޤާނޫނުގެ ޒަރީޢާއިން ރައްކާތެރި ކުރެވިގެންވާ ޙައްޤުތަކަކަށް ހެދުމަކީ، ނުހަނު ބޭނުން ތެރި ކަމަކަށްވީހިނދު؛"
+}
diff --git a/lang/languages/dv/language.textproto b/lang/languages/dv/language.textproto
deleted file mode 100644
index 6f664379e..000000000
--- a/lang/languages/dv/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "dv"
-name: "Divehi"
-preferred_name: ""
-autonym: "ދިވެހި"
-population: 372368
-region: "MV"
-region: "IN"
-script: "Thaana"
-exemplar_chars {
-  base: "އ ކ ޅ ބ ރ ނ ށ ހ ޏ ގ ލ ތ ދ ފ މ ވ ޗ ޖ ޕ ޔ ޓ ޒ ޑ ސ ޱ ‎"
-  marks: "◌ަ ◌ާ ◌ި ◌ީ ◌ު ◌ޫ ◌ެ ◌ޭ ◌ޮ ◌ޯ ◌ް"
-}
diff --git a/lang/languages/dv/sampletext.textproto b/lang/languages/dv/sampletext.textproto
deleted file mode 100644
index 0447c7e45..000000000
--- a/lang/languages/dv/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "dv"
diff --git a/lang/languages/dyo.textproto b/lang/languages/dyo.textproto
new file mode 100644
index 000000000..66ab72099
--- /dev/null
+++ b/lang/languages/dyo.textproto
@@ -0,0 +1,27 @@
+id: "dyo"
+name: "Jola-Fonyi"
+preferred_name: ""
+autonym: "Jóola-Fóoñi"
+population: 409146
+region: "SN"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Á É Í Ñ Ó Ú Ŋ a b c d e f g h i j k l m n o p q r s t u v w x y á é í ñ ó ú ŋ"
+  auxiliary: "Z z"
+  marks: "◌́ ◌̃"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C D E F G H I J K L M N Ñ Ŋ O P Q R S T U V W X Y"
+}
+sample_text {
+  masthead_full: "BbUu"
+  masthead_partial: "Kk"
+  tester: "Yíneni aat mati faŋaaf fati anau di sidruwaas soola, san umaje"
+  poster_sm: "Yíneni jaat"
+  poster_md: "Asambule"
+  poster_lg: "Bukanak"
+  specimen_48: "Esosof mati furimaf ufe fujuumenumi sidruwaas sati anau kankaamn"
+  specimen_36: "Anoosan nababaj druwa ebaj fuyiifaf foola, ebaj kapooy kati faŋaaf fool a di kaano nen man amaŋumi eeno."
+  specimen_32: "An uwarut unoken di mukaanaam mati an, síndaay yati an, mba tan tati an mba nuyenten faŋaaf foola mba nukajen kajamaak koola. Luwaay epoopooy anau di waafaw búirom."
+  specimen_21: "Anoosan wuniwun, manubaj kawonoor kiiya, ejuk yiiya di buŋar biiya, súumi jaat nuŋoolene úruuŋ mba núje\'etum buŋarab biiya tíyaŋaraay nen man bucceŋum eeno.\nAnoosan nababaj druwa, ebaj kawonoor kiiya di káyiisen ko nen manumaŋumi eeno. Yoo elakomi an awarut ajaakali ebaj siwonoor soola. Naŋooleŋoolen ayab kurim mba siwonoor san aŋoolene afasiken dóo ésukool mba tíyaŋ."
+  specimen_16: "Anoosan tan ukinumi sensen manubajuto kayeraay yoola. Kayeraay yooyuña éjowumulojowum di sidruwaas sati fubajaf di sati tan akinumi di sati mukaanaam moola. Kayeraay yooyu an aŋoolent ábajaatiyo; moo kaane ésukoo ésuk enampoonampoor di sísuk saasu man kayeraay yooyu ekila ebajo.\nAnoosan nababaj druwa ebaj kunak kati kayoolo, kati fúraar. Waatay yati burokab ewawar erewoor ban di ebaj waati yati kayoolo ban pankucaam bukanak.\nAnoosan nababaj druwa man majoone mulako di mofool di dúniaay maje\'e bee ekaan man siluwaas sammi di kaytak uke siŋoolen sirok jak."
+}
diff --git a/lang/languages/dyo/language.textproto b/lang/languages/dyo/language.textproto
deleted file mode 100644
index 5e8a391b5..000000000
--- a/lang/languages/dyo/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "dyo"
-name: "Jola-Fonyi"
-preferred_name: ""
-autonym: "Jóola-Fóoñi"
-population: 409146
-region: "SN"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Á É Í Ñ Ó Ú Ŋ a b c d e f g h i j k l m n o p q r s t u v w x y á é í ñ ó ú ŋ"
-  auxiliary: "Z z"
-  marks: "◌́ ◌̃"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C D E F G H I J K L M N Ñ Ŋ O P Q R S T U V W X Y"
-}
diff --git a/lang/languages/dyo/sampletext.textproto b/lang/languages/dyo/sampletext.textproto
deleted file mode 100644
index 17fe9f980..000000000
--- a/lang/languages/dyo/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "dyo"
diff --git a/lang/languages/dyu.textproto b/lang/languages/dyu.textproto
new file mode 100644
index 000000000..f3ce648e3
--- /dev/null
+++ b/lang/languages/dyu.textproto
@@ -0,0 +1,25 @@
+id: "dyu"
+name: "Dyula"
+preferred_name: ""
+autonym: "Julakan"
+population: 6667328
+region: "BF"
+script: "Latin"
+exemplar_chars {
+  base: "ߐ ߏ ߎ ߍ ߌ ߋ ߊ ߙ ߘ ߗ ߖ ߕ ߔ ߓ ߡ ߟ ߞ ߝ ߜ ߛ ߚ ߒ ߦ ߥ ߤ ߣ ߢ"
+  marks: "◌߫ ◌߬ ◌߭ ◌߮ ◌߯ ◌߰ ◌߱"
+  numerals: "߀ ߁ ߂ ߃ ߄ ߅ ߆ ߇ ߈ ߉"
+}
+sample_text {
+  masthead_full: "WwÓó"
+  masthead_partial: "Ll"
+  tester: "K’à mìna à mà kó dúnya’ mànton’ bɛɛ ká kan ni bònya ye, àni kó bɛɛ"
+  poster_sm: "K’à mìna à mà"
+  poster_md: "K’à mìna à"
+  poster_lg: "Wólo’"
+  specimen_48: "K’à mìna à mà dúnya’ mùmɛ sáratikan’ ná, Dúnya’ Jàmanaw yá tɔ màntonw"
+  specimen_36: "K’à mìna à mà Dúnya’ jàmanaw kà à ŋàniya kó ù bé jɛn ní Tɔnba yé kà mɔgɔya’ hákɛyaw látànga à ɲá’ mà dúnya’ mùmɛ kɔnɔ,"
+  specimen_32: "Wólo’ lá, hádamaden’ bɛɛ ye hɔrɔn ye, bɛɛ ká kán lànbe ní hákɛyaw Mɔgɔ bɛɛ ye hákilitigi ye, bɛɛ ye hákilima ye ; ò là, ù ká kán kà ɲgɔn mína ní bádenya ye."
+  specimen_21: "O cógoya kélen mà, bɔyɔrɔ má bɔ bɔyɔrɔ la. I bɔyɔrɔ’ lànbe’ tɔw cɛ’ mà, í ya jàmana’ kɛra jàmana’ yɛrɛmahɔrɔnyanin ye, à kɛ jàmana ye mín be jàmana gbɛrɛ ya màra kɔnɔ, wálima à be à yɛrɛ bólo jàmana gbɛrɛ ya húkumu’ kɔnɔ, wólomali sí te kɛ kà lá ò kán.\nMɔgɔ’ kɛra cogo ó cogo, à ká kán ní ɲánamaya’ ye, à ká kán ní hɔrɔnya’ ye, à ká kán ní lákandali’ ye."
+  specimen_16: "Mɔgɔ sí te sé kà mìna kà í kɛ jɔn ye wálima kà í kɛ bólokɔnɔmɔgɔ ye, jɔnya’ bánna, jɔnféere’ bánna sàriya’ la.\nA mán kán mɔgɔ sí ye jàngáta, wálima kà làjába, wálima kà à ní tɔrɔ, níjuguya’ dànmátɛmɛ’ fɛ, fó kà à lèebu.\nBɛɛ ká kán ní lànbe’ ye sàriya’ lá, à kɛra yɔrɔ ó yɔrɔ ye.\nBɛɛ ká kán sàriya’ lá, àyiwa bɛɛ ká kán ní sàriya’ ya làtangali’ ye kà à sɔ à má kɛ wólomali ye. Bɛɛ ká kán ní kɔsɛmɛ ye sàriya’ là kà i yɛrɛ tànga bɔ wólomali’ súgu ó súgu mà, mín be dàntigɛlikan’ nìn sɔsɔ, àni mín be se kà nà ní à sɔsɔli’ ye.\nA be bɛn mɔgɔ bɛɛ ye cɛn yɛrɛ l, í ye í ya jàmana’ sàriyaso’ màgbɛ sàriya’ mín ɲásininin bɛ ò kóɲa’ mà, kà i lákisi kà bɔ wálew mà, minw be jàmana sàriyaw sɔsɔ."
+}
diff --git a/lang/languages/dyu/language.textproto b/lang/languages/dyu/language.textproto
deleted file mode 100644
index 2c33cb41b..000000000
--- a/lang/languages/dyu/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "dyu"
-name: "Dyula"
-preferred_name: ""
-autonym: "Julakan"
-population: 6667328
-region: "BF"
-script: "Latin"
-exemplar_chars {
-  base: "ߐ ߏ ߎ ߍ ߌ ߋ ߊ ߙ ߘ ߗ ߖ ߕ ߔ ߓ ߡ ߟ ߞ ߝ ߜ ߛ ߚ ߒ ߦ ߥ ߤ ߣ ߢ"
-  marks: "◌߫ ◌߬ ◌߭ ◌߮ ◌߯ ◌߰ ◌߱"
-  numerals: "߀ ߁ ߂ ߃ ߄ ߅ ߆ ߇ ߈ ߉"
-}
diff --git a/lang/languages/dyu/sampletext.textproto b/lang/languages/dyu/sampletext.textproto
deleted file mode 100644
index ee0c72192..000000000
--- a/lang/languages/dyu/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "dyu"
diff --git a/lang/languages/dz.textproto b/lang/languages/dz.textproto
new file mode 100644
index 000000000..10b9086b6
--- /dev/null
+++ b/lang/languages/dz.textproto
@@ -0,0 +1,29 @@
+id: "dz"
+name: "Dzongkha"
+preferred_name: ""
+autonym: "རྫོང་ཁ་"
+population: 370341
+region: "BT"
+region: "IN"
+script: "Tibetan"
+exemplar_chars {
+  base: "ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ ཊ ཋ ཌ ཎ ཥ"
+  auxiliary: "\\u0F84 ཊ ཋ ཌ ཎ \\u0F7E ཥ \\u0F80 \\u0F7B \\u0F7D \\u0F9A \\u0F9B \\u0F9C \\u0F9E \\u0FBA \\u0FBB \\u0FBC"
+  marks: "◌ི ◌ུ ◌ེ ◌ོ ◌ྵ"
+  numerals: "༠ ༡ ༢ ༣ ༤ ༥ ༦ ༧ ༨ ༩"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] ༼ ༽ § @ * / \\& # † ‡ ༄ ༅ ༆ ༈ ༉ ༊ ࿐ ࿑ ༒ ࿒ ࿓ ࿔ ༶ ྾ ྿ ༌ ། ༎ ༏ ༐ ༑ ༔ ༴"
+  index: "ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ"
+}
+sample_text {
+  masthead_full: "འགབམ"
+  masthead_partial: "ཚར"
+  tester: "དེ་ཡང་ འཛམ་གླིང་ནང་གི་ཞི་བདེ་དང་དྲང་ཁྲིམས། དེ་ལས་དལ་དབང་ཚུ་གི་གཞི་འགྱམ་གཙོ་བོ་དེ་ འགྲོ་བ་མིའི་རིགས་ག་ར་དང་མཉམ་ ལྷན་ཅིག་སྐྱེས་ཏེ་ཡོད་པའི་བརྩི་མཐོང་དང་འདྲ་མཉམ།"
+  poster_sm: "དེ་ཡང་ ག་དེམ་གཅིག་འབད་"
+  poster_md: "འཛམ་གླིང་སྤྱི་ཚོགས"
+  poster_lg: "ཤ་བཀྱག"
+  specimen_48: "འགྲོ་བ་མིའི་དབང་ཆ་གི་འཛམ་གླིང་གསལ་བསྒྲགས་འདི་ མི་དང་རྒྱལ་ཁབ་ག་ར་གིས་གནས་ཚད་གཅིག་གི་ཐོག་ལས་གྲུབ་དགོཔ་མི་གཅིག་དང་།"
+  specimen_36: "འགྲོ་བ་མི་ཚུ་ག་ར་དལ་དབང་གི་ཐོག་ལས་སྐྱེས་ཏེ་ཡོདཔ་ལས་ ག་ར་ལུ་བརྩི་མཐོང་དང་ཐོབ་དབང་འདྲ་མཉམ་སྦེ་ཡོད། མི་ཚུ་ག་ར་སྨྲ་ཤེས་དོན་གོ་བའི་མཚན་ཉིད་དང་ལྡནམ་ལས་ ག་ར་གིས་ལཱ་ག་ཅི་ར་འབད་རུང་ གཅིག་གིས་གཅིག་ལུ་སྤུན་ཆའི་འདུ་ཤེས་བསྐྱེད་ཐོག་ལས་ལཱ་འབད་དགོ།"
+  specimen_32: "ཁྲིམས་འདུན་ལུ་འགྲོ་བ་མི་ག་ར་འདྲ་མཉམ་ཨིནམ་ལས་ ག་ར་ལུ་ཁྲིམས་འདུན་ལས་ ཆགས་སྡང་ཕྱོགས་རིས་མེད་པའི་ཉེན་སྲུང་གི་ཐོབ་དབང་ཡོད། གསལ་བསྒྲགས་འདི་ལུ་ཆ་གནས་མ་འབད་བར་གཤིག་སྟེ་བྱུང་བའི་ ཉེ་རིང་དང་ཕྱོགས་རིས། དེ་བཟུམ་མའི་ཉེ་རིང་དང་ཕྱོགས་རིས་ལུ་རྒྱུད་སྐུལ་འབད་བའི་རིགས་ག་ར་ལས་སྲུང་སྐྱོབ་འབད་དགོ་པའི་ཐོབ་དབང་ཡོད།"
+  specimen_21: "རྩ་ཁྲིམས་ཆེན་མོ་དང་ ཡངན་ ཁྲིམས་གཞུང་གང་རུང་གིས་གནང་ཡོད་པའི་གཞི་རྟེན་ཐོབ་དབང་ལུ་གནོད་པའི་བྱ་སྤྱོད་རེ་བྱུང་ཚེ་ རྒྱལ་ཡོངས་ཀྱི་ལྕོགས་གྲུབ་ཅན་གྱི་ཁྲིམས་ཞིབ་ཚོགས་པའི་ཁ་ཐུག་ལས་ནུས་པ་དང་ལྡན་པའི་སེལ་ཐབས་འབད་དགོཔ་འདི་ག་ར་གི་ཐོབ་དབང་ཨིན།\nཁྲིམས་དང་མ་མཐུན་པར་འཛིན་བཟུང་འབད་ནི་དང་། དོ་དམ་འོག་ལུ་བཙུགས་ནི། ཡངན་ མཐར་བཤུད་གཏང་ནི་སོགས་ག་ལུ་ཡང་འབད་མི་ཆོག\nམི་ངོམ་གང་རུང་གི་ཐོབ་དབང་དང་འགན་འཁྲི། དེ་ལས་ དེ་ལུ་བཀལ་ཡོད་པའི་ཁྲིམས་འགལ་གྱི་ཉེས་འཛུགས་ཚུ་ དྲང་བདེན་ཐག་བཅད་འབད་ནིའི་དོན་ལུ་ རང་དབང་ཅན་དང་ཡངན་ ཉེ་རིང་ལས་འདས་པའི་ ཁྲིམས་ཞིབ་ཚོགས་པ་གཅིག་གིས་འབད་དགོ་པའི་ཐོབ་དབང་མི་ངོམ་ག་ར་ལུ་ཡོད།"
+  specimen_16: "མི་ངོམ་ག་ལུ་ར་ཨིན་རུང་ མི་ངོམ་འདི་གི་རང་དབང་དང་། བཟའ་ཚང་། ཁྱིམ་ཡངན་དེ་དང་འདྲ་བའི་གཞི་རྟེན་མཁོ་ཆས་ཚུ་ལུ་བང་བཙོང་གི་ཐོག་ལས་ཁྲིམས་འགལ་གྱི་བར་འཛུལ་འབད་མི་ཆོགཔ་མ་ཚད།མི་ངོམ་འདི་གི་མིང་དང་མིང་གཏམ་ལུ་ཡང་གནོད་པ་བཀལ་མི་ཆོག མི་ངོམ་ག་ར་ཨིན་རུང་ དེ་བཟུམ་མིའི་གནོད་པ་བཀལ་མི་ལས་ཉེན་སྲུང་གི་དོན་ལུ་ཁྲིམས་ཀྱི་ཐོབ་དབང་ཡོད།\nག་ར་ལུ་མནོ་བསམ་གཏང་ནི་དང་རྣམ་རིག་སྟོན་ནི། དེ་ལས་ཆོས་ལུགས་གདམ་ཁའི་ནང་རང་སོའི་ཐོབ་དབང་ཡོད། ཐོབ་དབང་དེ་གི་གྲངས་སུ་ ཆོས་ལུགས་ཡངན་ཡིད་ཆེས་སོར་ནི། རང་རྐྱང་ཡངན་མི་སྡེ་དང་། མི་མང་ཡངན་རང་རྐྱང་འབད་དེ་ སློབ་སྦྱོང་དང་སྦྱང་བ་འབད་ཆོག\nག་ར་ལུ་རང་སོའི་བསམ་འཆར་སླབ་ནི་དང་མནོ་ཡོད་མི་ བཤད་ནིའི་དལ་དབང་ཡོད། དལ་དབང་དེའི་གྲངས་སུ་ གཞན་གྱི་བར་འཛུལ་མེད་པར་ རང་གི་བསམ་འཆར་མ་སླབ་པར་བཞག་ཆོགཔ་དང་། ས་མཚམས་དེ་ཟེརཝ་མེད་པར་ བརྡ་བརྒྱུད་ཀྱི་ཐོག་ལས་ བརྡ་དོན་འཚོལ་ནི་དང་ལེན་ནི། དེ་ལས་སྤེལ་ནི་ཚུ་འབད་ཆོག་པའི་ དལ་དབང་ཚུ་ཚུདཔ་ཨིན།\nའགྲོ་བ་མི་རིགས་ག་ར་ མི་སྡེའི་འཐུས་མི་གཅིག་ཨིནམ་ལས་ མི་སྡེ་དང་འབྲེལ་བའི་ཉེན་སྲུང་གི་ཐོབ་དབང་ཡོདཔ་མ་ཚད་ རྒྱལ་ཡོངས་ཀྱི་འབད་བརྩོན་དང་རྒྱལ་སྤྱིའི་མཉམ་འབྲེལ་གྱི་ཐོག་ལས་ དེ་ལས་གཞན་ཡང་། ལས་ཚོགས་དང་རྒྱལ་ཁབ་ཀྱི་ཐོན་ཁུངས་ཚུ་དང་ རང་སོའི་ངོ་སོ་གོང་འཕེལ་གྱི་དོན་ལུ་མེད་ཐབས་མེད་པར་ཁག་ཆེ་བའི་དཔལ་འབྱོར་དང་ལམ་སྲོལ་གྱི་དལ་དབང་ཚུ་ཐོབ་དགོ།"
+}
diff --git a/lang/languages/dz/language.textproto b/lang/languages/dz/language.textproto
deleted file mode 100644
index 546d7bd2d..000000000
--- a/lang/languages/dz/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "dz"
-name: "Dzongkha"
-preferred_name: ""
-autonym: "རྫོང་ཁ་"
-population: 370341
-region: "BT"
-region: "IN"
-script: "Tibetan"
-exemplar_chars {
-  base: "ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ ཊ ཋ ཌ ཎ ཥ"
-  auxiliary: "\\u0F84 ཊ ཋ ཌ ཎ \\u0F7E ཥ \\u0F80 \\u0F7B \\u0F7D \\u0F9A \\u0F9B \\u0F9C \\u0F9E \\u0FBA \\u0FBB \\u0FBC"
-  marks: "◌ི ◌ུ ◌ེ ◌ོ ◌ྵ"
-  numerals: "༠ ༡ ༢ ༣ ༤ ༥ ༦ ༧ ༨ ༩"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] ༼ ༽ § @ * / \\& # † ‡ ༄ ༅ ༆ ༈ ༉ ༊ ࿐ ࿑ ༒ ࿒ ࿓ ࿔ ༶ ྾ ྿ ༌ ། ༎ ༏ ༐ ༑ ༔ ༴"
-  index: "ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ"
-}
diff --git a/lang/languages/dz/sampletext.textproto b/lang/languages/dz/sampletext.textproto
deleted file mode 100644
index c487ab846..000000000
--- a/lang/languages/dz/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "dz"
diff --git a/lang/languages/ebu/language.textproto b/lang/languages/ebu.textproto
similarity index 88%
rename from lang/languages/ebu/language.textproto
rename to lang/languages/ebu.textproto
index f23e61d35..c1578e9b2 100644
--- a/lang/languages/ebu/language.textproto
+++ b/lang/languages/ebu.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   marks: "◌̃"
   index: "A B C D E F G H I Ĩ J K L M N O P Q R S T U Ũ V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ee.textproto b/lang/languages/ee.textproto
new file mode 100644
index 000000000..b57eaac22
--- /dev/null
+++ b/lang/languages/ee.textproto
@@ -0,0 +1,29 @@
+id: "ee"
+name: "Ewe"
+preferred_name: ""
+autonym: "Èʋegbe"
+population: 4690856
+region: "GH"
+region: "TG"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E F G H I K L M N O P R S T U V W X Y Z À Á Ã È É Ì Í Ò Ó Õ Ù Ú Ĩ Ŋ Ũ Ƒ Ɔ Ɖ Ɛ Ɣ Ʋ Ẽ a b d e f g h i k l m n o p r s t u v w x y z à á ã è é ì í ò ó õ ù ú ĩ ŋ ũ ƒ ɔ ɖ ɛ ɣ ʋ ẽ"
+  auxiliary: "C J Q Â Ä Å Æ Ç Ê Ë Î Ï Ñ Ô Ö Ø Û Ü Ÿ Ā Ă Ĕ Ĭ Ŏ Œ Ŭ c j q â ä å æ ç ê ë î ï ñ ô ö ø û ü ÿ ā ă ĕ ĭ ŏ œ ŭ"
+  marks: "◌̀ ◌́ ◌̃ ◌̂ ◌̄ ◌̆ ◌̈ ◌̊ ◌̧"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\} § @ * / \\& # † ‡ ′ ″"
+  index: "A B D Ɖ E Ɛ F Ƒ G Ɣ H X I K L M N Ŋ O Ɔ P R S T U V Ʋ W Y Z"
+}
+sample_text {
+  masthead_full: "WwOo"
+  masthead_partial: "Dd"
+  tester: "Esi woɖe dzesi kɔtɛe be, amegbetɔwo katã ƒe gomekpɔkpɔ sɔsɔe, anye"
+  poster_sm: "Esi eme va"
+  poster_md: "Esi woɖo"
+  poster_lg: "Wodzi"
+  specimen_48: "Esi wohiã vevie be woado dukɔ kple dukɔwo dome kadodo ɖe ŋgɔ"
+  specimen_36: "Womatsɔ ame aɖeke awɔ kluvie alo aɖoe awɔbae o, woatsi kluvinyenye kple kluvisitsatsa nu gbidii le mɔ vovovoawo nu."
+  specimen_32: "Gomekpɔkpɔ le amesiame si le dukɔa ƒe ʋɔnudrɔ̃ƒewo hena ɖɔɖɔɖowɔwɔ siwo ku ɖe eƒe ablɔɖevinyenye ƒe kuxiwo ŋu abe alesi wole dukplɔse la me ene."
+  specimen_21: "Womalé ame aɖeke akpasesẽtɔe, azi edzi ɖe gaxɔme, alo anyae le dukɔa me ɖe adzemadze dzi o.\nGomekpɔkpɔ sɔsɔe le amesiame si ŋu wotsɔ nya ɖo hekplɔe yi dukɔa ƒe ʋɔnudrɔ̃ƒe, afisi ʋɔnudrɔ̃la adodoe siwo matso afia ŋkunɔ o la, nade to eƒe nyawo me ku ɖe eƒe gomekpɔkpɔ, eƒe dɔdeasiwo kple hlɔ̃nya ɖesiaɖe ƒomevi si woatsɔ ɖe eŋu la me nɛ."
+  specimen_16: "Ame aɖeke mekpɔ mɔ atsɔ sesẽ ade nu ame bubu ƒe adzamegbenɔnya, eƒe ƒomenya, alo aƒemegbenɔnya me o. Ame aɖeke mekpɔ mɔ ato mɔ aɖeke dzi anya nu tso ame aɖe kple ame bubuwo dome kadodonyawo ŋuti o. Nenema ke ame aɖeke mekpɔ mɔ aƒo ɖi ame bubu ŋkɔ alo agblẽ eŋu o. Se la ɖe mɔ be ame aɖe si ŋu woaɖe afɔ sia ƒomevi ɖo la, naʋli eɖokui ta faa se la ŋudɔwɔwɔ me.\nMɔnukpɔkpɔ li na amesiame si nye dziɖuɖudɔwɔla be woana gbɔɖemee to mɔkeke nanae me le xeyixi tɔxɛ aɖewo dzi gake woaxe fetu dedi nɛ. Womaɖe ga aɖeke le eƒe fetu la me ɖe xeyixi siwo me menɔ dɔ me la ta o."
+}
diff --git a/lang/languages/ee/language.textproto b/lang/languages/ee/language.textproto
deleted file mode 100644
index 2f67bc62c..000000000
--- a/lang/languages/ee/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "ee"
-name: "Ewe"
-preferred_name: ""
-autonym: "Èʋegbe"
-population: 4690856
-region: "TG"
-region: "GH"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E F G H I K L M N O P R S T U V W X Y Z À Á Ã È É Ì Í Ò Ó Õ Ù Ú Ĩ Ŋ Ũ Ƒ Ɔ Ɖ Ɛ Ɣ Ʋ Ẽ a b d e f g h i k l m n o p r s t u v w x y z à á ã è é ì í ò ó õ ù ú ĩ ŋ ũ ƒ ɔ ɖ ɛ ɣ ʋ ẽ"
-  auxiliary: "C J Q Â Ä Å Æ Ç Ê Ë Î Ï Ñ Ô Ö Ø Û Ü Ÿ Ā Ă Ĕ Ĭ Ŏ Œ Ŭ c j q â ä å æ ç ê ë î ï ñ ô ö ø û ü ÿ ā ă ĕ ĭ ŏ œ ŭ"
-  marks: "◌̀ ◌́ ◌̃ ◌̂ ◌̄ ◌̆ ◌̈ ◌̊ ◌̧"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\} § @ * / \\& # † ‡ ′ ″"
-  index: "A B D Ɖ E Ɛ F Ƒ G Ɣ H X I K L M N Ŋ O Ɔ P R S T U V Ʋ W Y Z"
-}
diff --git a/lang/languages/ee/sampletext.textproto b/lang/languages/ee/sampletext.textproto
deleted file mode 100644
index 9ca57a92e..000000000
--- a/lang/languages/ee/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ee"
diff --git a/lang/languages/efi/language.textproto b/lang/languages/efi.textproto
similarity index 74%
rename from lang/languages/efi/language.textproto
rename to lang/languages/efi.textproto
index 9e7bdae74..0aece49f0 100644
--- a/lang/languages/efi/language.textproto
+++ b/lang/languages/efi.textproto
@@ -7,3 +7,6 @@ region: "NG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/egl/language.textproto b/lang/languages/egl.textproto
similarity index 74%
rename from lang/languages/egl/language.textproto
rename to lang/languages/egl.textproto
index 960b4e6fc..50d9d07c8 100644
--- a/lang/languages/egl/language.textproto
+++ b/lang/languages/egl.textproto
@@ -7,3 +7,6 @@ region: "IT"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/el/language.textproto b/lang/languages/el.textproto
similarity index 95%
rename from lang/languages/el/language.textproto
rename to lang/languages/el.textproto
index de7e43df4..6385bb923 100644
--- a/lang/languages/el/language.textproto
+++ b/lang/languages/el.textproto
@@ -3,16 +3,16 @@ name: "Greek"
 preferred_name: "Modern Greek"
 autonym: "Ελληνικά"
 population: 12384861
-region: "UA"
-region: "GR"
-region: "CY"
-region: "TR"
-region: "GB"
-region: "RO"
-region: "IT"
 region: "AL"
-region: "EG"
+region: "CY"
 region: "DE"
+region: "EG"
+region: "GB"
+region: "GR"
+region: "IT"
+region: "RO"
+region: "TR"
+region: "UA"
 script: "Greek"
 exemplar_chars {
   base: "Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω Ά Έ Ή Ί Ό Ύ Ώ Ϊ Ϋ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ ς σ τ υ φ χ ψ ω ά έ ή ί ό ύ ώ ϊ ϋ ΐ ΰ"
@@ -22,3 +22,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! . … \" « » ( ) \\[ \\] § @ * / \\\\ \\&"
   index: "Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω"
 }
+sample_text {
+  fallback_language: "el"
+}
diff --git a/lang/languages/en/language.textproto b/lang/languages/en.textproto
similarity index 58%
rename from lang/languages/en/language.textproto
rename to lang/languages/en.textproto
index c51d0cab3..6dc2447e9 100644
--- a/lang/languages/en/language.textproto
+++ b/lang/languages/en.textproto
@@ -3,154 +3,154 @@ name: "English"
 preferred_name: ""
 autonym: "English"
 population: 1636848718
-region: "SL"
-region: "TC"
-region: "AE"
-region: "NU"
-region: "AT"
-region: "SS"
-region: "MA"
-region: "SH"
-region: "ZA"
-region: "PW"
-region: "CN"
-region: "IE"
-region: "TK"
-region: "DM"
-region: "BZ"
-region: "CL"
-region: "ER"
-region: "ZW"
-region: "RW"
-region: "CM"
-region: "BR"
-region: "IQ"
-region: "BT"
-region: "IN"
-region: "KN"
-region: "SZ"
-region: "WS"
-region: "BI"
-region: "DO"
-region: "BS"
-region: "AU"
-region: "CX"
-region: "PA"
-region: "TA"
-region: "JE"
-region: "HU"
-region: "US"
-region: "LK"
-region: "NR"
-region: "KZ"
 region: "AC"
+region: "AE"
 region: "AG"
-region: "MW"
-region: "HR"
-region: "CK"
-region: "PT"
-region: "BM"
-region: "FK"
-region: "GY"
-region: "KE"
-region: "TR"
-region: "VG"
-region: "SI"
-region: "NL"
-region: "LC"
-region: "FI"
-region: "NZ"
-region: "LS"
 region: "AI"
-region: "DZ"
-region: "PL"
-region: "AW"
-region: "TV"
-region: "EE"
-region: "NF"
-region: "PM"
-region: "GG"
-region: "SG"
-region: "GB"
-region: "MP"
-region: "MX"
-region: "DK"
-region: "PK"
-region: "GI"
-region: "MO"
-region: "VU"
-region: "GM"
-region: "HN"
-region: "JM"
-region: "MS"
-region: "TH"
-region: "TT"
-region: "CY"
-region: "GH"
-region: "CH"
-region: "VC"
-region: "BB"
-region: "UG"
-region: "NP"
-region: "MY"
-region: "GR"
-region: "GD"
-region: "CC"
-region: "KI"
-region: "IL"
-region: "NG"
-region: "PN"
-region: "BA"
-region: "ET"
-region: "TZ"
-region: "AS"
-region: "TO"
-region: "RO"
-region: "SC"
-region: "PG"
 region: "AR"
-region: "VI"
-region: "IM"
-region: "HK"
-region: "LT"
-region: "YE"
-region: "BN"
-region: "MH"
-region: "MT"
-region: "ZM"
-region: "SB"
-region: "FR"
-region: "LU"
-region: "PH"
-region: "ES"
-region: "JO"
-region: "CZ"
-region: "MU"
-region: "KY"
-region: "DG"
-region: "LB"
-region: "NA"
-region: "SK"
-region: "UM"
-region: "BE"
-region: "CA"
-region: "SD"
-region: "LV"
-region: "LR"
-region: "IT"
-region: "BW"
-region: "EG"
+region: "AS"
+region: "AT"
+region: "AU"
+region: "AW"
+region: "BA"
+region: "BB"
 region: "BD"
-region: "FJ"
-region: "FM"
-region: "IO"
-region: "PR"
-region: "SX"
+region: "BE"
 region: "BG"
-region: "GU"
-region: "SE"
-region: "MG"
+region: "BI"
+region: "BM"
+region: "BN"
+region: "BR"
+region: "BS"
+region: "BT"
+region: "BW"
+region: "BZ"
+region: "CA"
+region: "CC"
+region: "CH"
+region: "CK"
+region: "CL"
+region: "CM"
+region: "CN"
+region: "CX"
+region: "CY"
+region: "CZ"
 region: "DE"
+region: "DG"
+region: "DK"
+region: "DM"
+region: "DO"
+region: "DZ"
+region: "EE"
+region: "EG"
+region: "ER"
+region: "ES"
+region: "ET"
+region: "FI"
+region: "FJ"
+region: "FK"
+region: "FM"
+region: "FR"
+region: "GB"
+region: "GD"
+region: "GG"
+region: "GH"
+region: "GI"
+region: "GM"
+region: "GR"
+region: "GU"
+region: "GY"
+region: "HK"
+region: "HN"
+region: "HR"
+region: "HU"
+region: "IE"
+region: "IL"
+region: "IM"
+region: "IN"
+region: "IO"
+region: "IQ"
+region: "IT"
+region: "JE"
+region: "JM"
+region: "JO"
+region: "KE"
+region: "KI"
+region: "KN"
+region: "KY"
+region: "KZ"
+region: "LB"
+region: "LC"
+region: "LK"
+region: "LR"
+region: "LS"
+region: "LT"
+region: "LU"
+region: "LV"
+region: "MA"
+region: "MG"
+region: "MH"
+region: "MO"
+region: "MP"
+region: "MS"
+region: "MT"
+region: "MU"
+region: "MW"
+region: "MX"
+region: "MY"
+region: "NA"
+region: "NF"
+region: "NG"
+region: "NL"
+region: "NP"
+region: "NR"
+region: "NU"
+region: "NZ"
+region: "PA"
+region: "PG"
+region: "PH"
+region: "PK"
+region: "PL"
+region: "PM"
+region: "PN"
+region: "PR"
+region: "PT"
+region: "PW"
+region: "RO"
+region: "RW"
+region: "SB"
+region: "SC"
+region: "SD"
+region: "SE"
+region: "SG"
+region: "SH"
+region: "SI"
+region: "SK"
+region: "SL"
+region: "SS"
+region: "SX"
+region: "SZ"
+region: "TA"
+region: "TC"
+region: "TH"
+region: "TK"
+region: "TO"
+region: "TR"
+region: "TT"
+region: "TV"
+region: "TZ"
+region: "UG"
+region: "UM"
+region: "US"
+region: "VC"
+region: "VG"
+region: "VI"
+region: "VU"
+region: "WS"
+region: "YE"
+region: "ZA"
+region: "ZM"
+region: "ZW"
 script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Œ a b c d e f g h i j k l m n o p q r s t u v w x y z æ œ"
@@ -160,3 +160,16 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Hh"
+  tester: "Whereas recognition of the inherent dignity and of the equal"
+  poster_sm: "Whereas it"
+  poster_md: "Whereas the"
+  poster_lg: "All"
+  specimen_48: "Whereas a common understanding of these rights and freedoms is"
+  specimen_36: "No one shall be held in slavery or servitude; slavery and the slave trade shall be prohibited in all their forms."
+  specimen_32: "Everyone has the right to an effective remedy by the competent national tribunals for acts violating the fundamental rights granted him by the constitution or by law."
+  specimen_21: "No one shall be subjected to arbitrary arrest, detention or exile.\nEveryone is entitled in full equality to a fair and public hearing by an independent and impartial tribunal, in the determination of his rights and obligations and of any criminal charge against him.\nNo one shall be subjected to arbitrary interference with his privacy, family, home or correspondence, nor to attacks upon his honour and reputation. Everyone has the right to the protection of the law against such interference or attacks."
+  specimen_16: "Everyone has the right to freedom of thought, conscience and religion; this right includes freedom to change his religion or belief, and freedom, either alone or in community with others and in public or private, to manifest his religion or belief in teaching, practice, worship and observance.\nEveryone has the right to freedom of opinion and expression; this right includes freedom to hold opinions without interference and to seek, receive and impart information and ideas through any media and regardless of frontiers.\nEveryone has the right to rest and leisure, including reasonable limitation of working hours and periodic holidays with pay."
+}
diff --git a/lang/languages/en/sampletext.textproto b/lang/languages/en/sampletext.textproto
deleted file mode 100644
index cbb677d62..000000000
--- a/lang/languages/en/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "en"
diff --git a/lang/languages/eo.textproto b/lang/languages/eo.textproto
new file mode 100644
index 000000000..221ee9294
--- /dev/null
+++ b/lang/languages/eo.textproto
@@ -0,0 +1,28 @@
+id: "eo"
+name: "Esperanto"
+preferred_name: ""
+autonym: "Esperanto"
+population: 301
+region: "SM"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ a b c d e f g h i j k l m n o p q r s t u v w x y z ĉ ĝ ĥ ĵ ŝ ŭ"
+  auxiliary: "q w x y"
+  marks: "◌̂ ◌̆"
+  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\} /"
+  index: "A B C Ĉ D E F G Ĝ H Ĥ I J Ĵ K L M N O P R S Ŝ T U Ŭ V Z"
+}
+sample_text {
+  masthead_full: "ĈĉIi"
+  masthead_partial: "Uu"
+  tester: "Pro tio, ke agnosko de la esenca digno kaj de la egalaj kaj nefordoneblaj"
+  poster_sm: "Pro tio, ke"
+  poster_md: "La Ĝenerala"
+  poster_lg: "Ĉiuj"
+  specimen_48: "Proklamas tiun ĉi Universalan Deklaracion de Homaj Rajtoj kiel"
+  specimen_36: "Neniu estu tenata en sklaveco aŭ servuteco; sklaveco kaj sklavkomerco estu malpermesitaj en ĉiuj siaj formoj."
+  specimen_32: "Ĉiu rajtas ricevi de la kompetentaj naciaj tribunaloj efikan riparon pro agoj, kiuj kontraŭas la fundamentajn rajtojn, kiujn li havas laŭ la konstitucio aŭ la leĝoj."
+  specimen_21: "Neniu suferu arbitrajn areston, malliberigon aŭ ekzilon.\nĈiu en plena egaleco rajtas je justa kaj publika proceso antaŭ sendependa kaj senpartia tribunalo, por prijuĝo de liaj rajtoj kaj devoj kaj de kiu ajn kriminala akuzo kontraŭ li.\nNeniu suferu arbitrajn intervenojn en sian privatecon, familion, hejmon aŭ korespondadon, nek atakojn kontraŭ sia honoro aŭ reputacio. Ĉiu rajtas ricevi juran protekton kontraŭ tiaj intervenoj aŭ atakoj."
+  specimen_16: "Ĉiu havas la rajton je libereco de penso, konscienco kaj religio; tiu ĉi rajto inkluzivas la liberecon ŝanĝi sian religion aŭ kredon, kaj liberecon manifesti, ĉu sola ĉu kune kun aliaj, ĉu publike ĉu private, sian religion aŭ kredon per instruado, praktikado, adorado kaj observado.\nĈiu havas la rajton je libereco de opinio kaj esprimado; ĉi tiu rajto inkluzivas la liberecon havi opiniojn sen intervenoj de aliaj, kaj la rajton peti, ricevi kaj havigi informojn kaj ideojn per kiu ajn rimedo kaj senkonsidere pri la landlimoj.\nĈiu havas rajton je ripozo kaj libertempo, inkluzive racian limigon de la laborhoroj kaj periodajn feriojn kun salajro."
+}
diff --git a/lang/languages/eo/language.textproto b/lang/languages/eo/language.textproto
deleted file mode 100644
index 870fe033c..000000000
--- a/lang/languages/eo/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "eo"
-name: "Esperanto"
-preferred_name: ""
-autonym: "Esperanto"
-population: 301
-region: "SM"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ a b c d e f g h i j k l m n o p q r s t u v w x y z ĉ ĝ ĥ ĵ ŝ ŭ"
-  auxiliary: "q w x y"
-  marks: "◌̂ ◌̆"
-  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\} /"
-  index: "A B C Ĉ D E F G Ĝ H Ĥ I J Ĵ K L M N O P R S Ŝ T U Ŭ V Z"
-}
diff --git a/lang/languages/eo/sampletext.textproto b/lang/languages/eo/sampletext.textproto
deleted file mode 100644
index eb38f76ce..000000000
--- a/lang/languages/eo/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "eo"
diff --git a/lang/languages/es.textproto b/lang/languages/es.textproto
new file mode 100644
index 000000000..cecc46508
--- /dev/null
+++ b/lang/languages/es.textproto
@@ -0,0 +1,64 @@
+id: "es"
+name: "Spanish"
+preferred_name: ""
+autonym: "Español"
+population: 487664084
+region: "AD"
+region: "AR"
+region: "BO"
+region: "BR"
+region: "BZ"
+region: "CL"
+region: "CO"
+region: "CR"
+region: "CU"
+region: "CW"
+region: "DE"
+region: "DO"
+region: "EA"
+region: "EC"
+region: "ES"
+region: "FR"
+region: "GI"
+region: "GQ"
+region: "GT"
+region: "HN"
+region: "IC"
+region: "MA"
+region: "MX"
+region: "NI"
+region: "PA"
+region: "PE"
+region: "PH"
+region: "PR"
+region: "PT"
+region: "PY"
+region: "RO"
+region: "SV"
+region: "SX"
+region: "TT"
+region: "US"
+region: "UY"
+region: "VE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ñ Ó Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ñ ó ú ü ¡ ¿"
+  auxiliary: "ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī º ò ŏ ô ö ø ō œ ù ŭ û ū ý ÿ"
+  marks: "◌́ ◌̃ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? ¿ . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\\\ \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Dd"
+  tester: "Considerando que la libertad, la justicia y la paz en el mundo"
+  poster_sm: "Considerando"
+  poster_md: "La Asamblea"
+  poster_lg: "Todos"
+  specimen_48: "Proclama la presente Declaración Universal de Derechos Humanos"
+  specimen_36: "Considerando también esencial promover el desarrollo de relaciones amistosas entre las naciones,\nLa Asamblea General"
+  specimen_32: "Considerando que una concepción común de estos derechos y libertades es de la mayor importancia para el pleno cumplimiento de dicho compromiso,"
+  specimen_21: "Considerando que la libertad, la justicia y la paz en el mundo tienen por base el reconocimiento de la dignidad intrínseca y de los derechos iguales e inalienables de todos los miembros de la familia humana,\nConsiderando esencial que los derechos humanos sean protegidos por un régimen de Derecho, a fin de que el hombre no se vea compelido al supremo recurso de la rebelión contra la tiranía y la opresión,"
+  specimen_16: "Considerando que la libertad, la justicia y la paz en el mundo tienen por base el reconocimiento de la dignidad intrínseca y de los derechos iguales e inalienables de todos los miembros de la familia humana,\nConsiderando que el desconocimiento y el menosprecio de los derechos humanos han originado actos de barbarie ultrajantes para la conciencia de la humanidad; y que se ha proclamado, como la aspiración más elevada del hombre, el advenimiento de un mundo en que los seres humanos, liberados del temor y de la miseria, disfruten de la libertad de palabra y de la libertad de creencias,"
+}
diff --git a/lang/languages/es/language.textproto b/lang/languages/es/language.textproto
deleted file mode 100644
index 3d2b97233..000000000
--- a/lang/languages/es/language.textproto
+++ /dev/null
@@ -1,51 +0,0 @@
-id: "es"
-name: "Spanish"
-preferred_name: ""
-autonym: "Español"
-population: 487664084
-region: "GQ"
-region: "SV"
-region: "US"
-region: "MX"
-region: "RO"
-region: "AR"
-region: "GI"
-region: "MA"
-region: "EA"
-region: "EC"
-region: "BZ"
-region: "UY"
-region: "HN"
-region: "CL"
-region: "PE"
-region: "PT"
-region: "CR"
-region: "BR"
-region: "FR"
-region: "PH"
-region: "GT"
-region: "ES"
-region: "VE"
-region: "TT"
-region: "CW"
-region: "IC"
-region: "DO"
-region: "PY"
-region: "BO"
-region: "NI"
-region: "PR"
-region: "PA"
-region: "SX"
-region: "CO"
-region: "CU"
-region: "AD"
-region: "DE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ñ Ó Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ñ ó ú ü ¡ ¿"
-  auxiliary: "ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī º ò ŏ ô ö ø ō œ ù ŭ û ū ý ÿ"
-  marks: "◌́ ◌̃ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? ¿ . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\\\ \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/es/sampletext.textproto b/lang/languages/es/sampletext.textproto
deleted file mode 100644
index cbcd9e74c..000000000
--- a/lang/languages/es/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "es"
diff --git a/lang/languages/esu/language.textproto b/lang/languages/esu.textproto
similarity index 87%
rename from lang/languages/esu/language.textproto
rename to lang/languages/esu.textproto
index b6546391a..5264eeeaf 100644
--- a/lang/languages/esu/language.textproto
+++ b/lang/languages/esu.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A C G I K L M N P Q R S T U V W Y Ń Ə Ḿ a c g i k l m n p q r s t u v w y ń ə ḿ u͡g u͡r ʼ"
   marks: "◌́ ◌͡"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/et.textproto b/lang/languages/et.textproto
new file mode 100644
index 000000000..810310cd1
--- /dev/null
+++ b/lang/languages/et.textproto
@@ -0,0 +1,29 @@
+id: "et"
+name: "Estonian"
+preferred_name: ""
+autonym: "Eesti"
+population: 878449
+region: "EE"
+region: "FI"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Õ Ö Ü Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä õ ö ü š ž"
+  auxiliary: "á à â å ã ā æ ç é è ê ë ē í ì î ï ī ñ ó ò ŏ ô ø ō œ ú ù û ū"
+  marks: "◌̃ ◌̈ ◌̌"
+  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ – , ; \\: ! ? . “ „ ( ) \\[ \\] \\{ \\} @"
+  index: "A B C D E F G H I J K L M N O P Q R S Š Z Ž T U V W Õ Ä Ö Ü X Y"
+}
+sample_text {
+  masthead_full: "KkÕõ"
+  masthead_partial: "Ii"
+  tester: "Pidades silmas, et inimkonna kõigi liikmete väärikuse, nende võrdsuse"
+  poster_sm: "pidades silmas,"
+  poster_md: "kuulutab"
+  poster_lg: "Kõik"
+  specimen_48: "käesolevaga Inimõiguste ülddeklaratsiooni kui ülesande, mida peavad"
+  specimen_36: "Kedagi ei või pidada orjuses või õigusteta seisundis; orjus ja orjakaubandus ükskõik millisel kujul on keelatud."
+  specimen_32: "Igal inimesel on temale konstitutsiooniga või seadusega tagatud põhiõiguste rikkumise korral õigus efektiivsele õiguste ennistamisele kompetentsete rahvuskohtute kaudu."
+  specimen_21: "Kedagi ei või meelevaldselt vahistada, kinni pidada või pagendada.\nIgal inimesel on tema õiguste ja kohustuste määratlemiseks ja temale esitatud kriminaalsüüdistuste põhjendatuse kindlakstegemiseks täieliku võrdsuse alusel õigus sellele, et tema asi vaadataks avalikult ja kõiki õigluse nõudeid järgides läbi sõltumatu ja erapooletu kohtu poolt."
+  specimen_16: "Kellegi isiklikku ja perekonnaellu ei või meelevaldselt vahele segada, kellegi korteripuutumatust, kirjavahetuse saladust või au ja reputatsiooni ei tohi meelevaldselt määrida. Igal inimesel on õigus seaduse kaitsele selliste vahelesegamiste ja rikkumiste eest.\nIgal inimesel on õigus mõtte-, südametunnistuse ja usuvabadusele; see õigus kätkeb vabadust oma usku või veendumusi muuta, samuti vabadust vabalt kuulutuada oma usku või veendumusi nii üksikult kui ka koos teistega avalikult või eraviisiliselt õpetuse, jumalateenistuse ja religioossete ning rituaalsete kombetalituste kaudu."
+}
diff --git a/lang/languages/et/language.textproto b/lang/languages/et/language.textproto
deleted file mode 100644
index 72e6e8160..000000000
--- a/lang/languages/et/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "et"
-name: "Estonian"
-preferred_name: ""
-autonym: "Eesti"
-population: 878449
-region: "EE"
-region: "FI"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Õ Ö Ü Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä õ ö ü š ž"
-  auxiliary: "á à â å ã ā æ ç é è ê ë ē í ì î ï ī ñ ó ò ŏ ô ø ō œ ú ù û ū"
-  marks: "◌̃ ◌̈ ◌̌"
-  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ – , ; \\: ! ? . “ „ ( ) \\[ \\] \\{ \\} @"
-  index: "A B C D E F G H I J K L M N O P Q R S Š Z Ž T U V W Õ Ä Ö Ü X Y"
-}
diff --git a/lang/languages/et/sampletext.textproto b/lang/languages/et/sampletext.textproto
deleted file mode 100644
index a7fc62270..000000000
--- a/lang/languages/et/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "et"
diff --git a/lang/languages/eu.textproto b/lang/languages/eu.textproto
new file mode 100644
index 000000000..2504d8eb0
--- /dev/null
+++ b/lang/languages/eu.textproto
@@ -0,0 +1,29 @@
+id: "eu"
+name: "Basque"
+preferred_name: ""
+autonym: "Euskara"
+population: 1088518
+region: "ES"
+region: "FR"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ñ ü"
+  auxiliary: "á à ă â å ä ã ā æ é è ĕ ê ë ē í ì ĭ î ï ī ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ"
+  marks: "◌̃ ◌̈"
+  numerals: ", . % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "GgIi"
+  masthead_partial: "Zz"
+  tester: "Kontuan izanik munduko askatasuna, justizia eta bakea giza familiako"
+  poster_sm: "Kontuan izanik"
+  poster_md: "UNIBERTSAL"
+  poster_lg: "guztiak"
+  specimen_48: "Herri eta nazio guztiek izan beharreko jomuga legez, bai norbanakoek"
+  specimen_36: "Inor ez da izango besteren esklabu edo uztarpeko; debekatuta dago esklabutza eta esklabuen salerosketa oro."
+  specimen_32: "Pertsona orori dagozkio atsedenerako eskubidea, aisiarakoa, lanaldiaren iraupen mugatua izatekoa eta aldian-aldian ordaindutako oporrak izatekoa."
+  specimen_21: "Pertsona guztiei dagokien eskubidea da, Aldarrikapen honetan azaldutako eskubide eta askatasunak era eraginkorrean garatuko dituen gizarte mailako eta nazioarteko ordena ezar dadin.\nAldarrikapen honetan jasotako ezertan ezingo da ulertu Estatuari edo talde edo norbanakoren bati Aldarrikapen honetan bertan adierazitako edozein eskubide eta askatasun deuseztatzeko ekintzak edo ihardunak burutzeko eskubidea ematen zaionik."
+  specimen_16: "Kontuan izanik munduko askatasuna, justizia eta bakea giza familiako kide guztien berezko duintasunean eta eskubide berdin eta ukaezinetan oinarritzen direla;\nKontuan izanik giza eskubideak ez ezagutzearen eta gutxiestearen ondorioz, giza kontzientziari irain egiten dioten basakeriak gertatu izan direla; eta gizon-emakumeek, beldur eta gabezia orotik aske, hitz egiteko askatasuna eta sinesmen-askatasuna izango dituzten munduaren etorrera aldarrikatu dela gizakiaren helburu nagusi;\nKontuan izanik ezinbestekoa dela giza eskubideak zuzenbidezko erregimen batek babestea, gizakia-tirania eta zapalkuntzaren aurkako azken irtenbidea den matxinadara jo beharrean aurkitu ez dadin;"
+}
diff --git a/lang/languages/eu/language.textproto b/lang/languages/eu/language.textproto
deleted file mode 100644
index 10b4fea96..000000000
--- a/lang/languages/eu/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "eu"
-name: "Basque"
-preferred_name: ""
-autonym: "Euskara"
-population: 1088518
-region: "FR"
-region: "ES"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ñ ü"
-  auxiliary: "á à ă â å ä ã ā æ é è ĕ ê ë ē í ì ĭ î ï ī ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ"
-  marks: "◌̃ ◌̈"
-  numerals: ", . % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/eu/sampletext.textproto b/lang/languages/eu/sampletext.textproto
deleted file mode 100644
index a73da7008..000000000
--- a/lang/languages/eu/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "eu"
diff --git a/lang/languages/ewo/language.textproto b/lang/languages/ewo.textproto
similarity index 93%
rename from lang/languages/ewo/language.textproto
rename to lang/languages/ewo.textproto
index 71d2f0b0c..09d14d40e 100644
--- a/lang/languages/ewo/language.textproto
+++ b/lang/languages/ewo.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B D E Ə Ɛ F G H I K L M N Ŋ O Ɔ P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ext/language.textproto b/lang/languages/ext.textproto
similarity index 75%
rename from lang/languages/ext/language.textproto
rename to lang/languages/ext.textproto
index 96b4ac4d1..562b464ca 100644
--- a/lang/languages/ext/language.textproto
+++ b/lang/languages/ext.textproto
@@ -7,3 +7,6 @@ region: "ES"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/fa.textproto b/lang/languages/fa.textproto
new file mode 100644
index 000000000..0d911d869
--- /dev/null
+++ b/lang/languages/fa.textproto
@@ -0,0 +1,35 @@
+id: "fa"
+name: "Persian"
+preferred_name: ""
+autonym: "فارسی"
+population: 84465446
+region: "AE"
+region: "AF"
+region: "IQ"
+region: "IR"
+region: "OM"
+region: "PK"
+region: "QA"
+region: "TJ"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "ء أ ؤ ئ ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ل م ن ه و پ چ ژ ک گ ی"
+  auxiliary: "ـ\\u200C\\u200D\\u200E\\u200F \\u064E \\u0650 \\u064F \\u0652 \\u0656 \\u0670 إ ك ى ي"
+  marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٔ ◌ٰ"
+  numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ ، ٫ ٬ ؛ \\: ! ؟ . … ‹ › « » ( ) \\[ \\] * / \\\\"
+  index: "آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ه ی"
+}
+sample_text {
+  masthead_full: "تماف"
+  masthead_partial: "رد"
+  tester: "از آنجا که شناسائی حیثیت ذاتی کلیهٔ اعضای خانواده بشری و حقوق"
+  poster_sm: "از آنجا که"
+  poster_md: "مجمع عمومی"
+  poster_lg: "تمام"
+  specimen_48: "تمام افراد بشر آزاد بدنیا میایند و از لحاظ حیثیت و حقوق با هم"
+  specimen_36: "احدی را نمیتوان تحت شکنجه یا مجازات یا رفتاری قرار داد که ظالمانه و یا بر خلاف انسانیت و شئون بشری یا موهن باشد."
+  specimen_32: "در برابر اعمالی که حقوق اساسی فرد را مورد تجاوز قرار بدهد و آن حقوق بوسیله قانون اساسی یا قانون دیگری برای او شناخته‌شده باشد، هر کس حق رجوع مؤثر بمحاکم ملیِ صالحه دارد."
+  specimen_21: "احدی نمیتواند خودسرانه توقیف ‐ حبس یا تبعید بشود.\nهر کس با مساوات کامل حق دارد که دعوایش بوسیله دادگاه مستقل و بی‌طرفی، منصفانه و علناً رسیدگی بشود و چنین دادگاهی درباره حقوق و الزامات او یا هر اتهام جزائی که باو توجه پیدا کرده باشد إتخاذ تصمیم بنماید.\nاحدی در زندگی خصوصی، امور خانوادگی، اقامتگاه یا مکاتبات خود، نباید مورد مداخله‌های خودسرانه واقع شود و شرافت و اسم و رسمش نباید مورد حمله قرار گیرد. هر کس حق دارد که در مقابل اینگونه مداخلات و حملات مورد حمایت قانون قرار گیرد."
+  specimen_16: "هر کس حق دارد که از آزادی فکر، وجدان و مذهب بهره‌مند شود. این حق متضمن آزادی تغییر مذهب یا عقیده و همچنین متضمن آزادی اظهار عقیده و ایمان میباشد و نیز شامل تعلیمات مذهبی و اجرای مراسم دینی است. هر کس میتواند از این حقوق منفرداً یا مجتمعاً بطور خصوصی یا بطور عمومی برخوردار باشد.\nهر کس حق آزادی عقیده و بیان دارد و حق مزبور شامل آنست که از داشتن عقاید خود بیم و اضطرابی نداشته باشد و در کسب اطلاعات و افکار و در اخذ و انتشار آن بتمام وسائل ممکن و بدون ملاحظات مرزی آزاد باشد.\nهر کس بعنوان عضو اجتماع حق امنیت اجتماعی دارد و مجاز است بوسیله مساعی ملی و همکاری بین‌المللی حقوق اقتصادی و اجتماعی و فرهنگی خود را که لازمهٔ مقام و نمود آزادانه شخصیت او است با رعایت تشکیلات و منابع هر کشور بدست آورد."
+}
diff --git a/lang/languages/fa/language.textproto b/lang/languages/fa/language.textproto
deleted file mode 100644
index 2bb053799..000000000
--- a/lang/languages/fa/language.textproto
+++ /dev/null
@@ -1,22 +0,0 @@
-id: "fa"
-name: "Persian"
-preferred_name: ""
-autonym: "فارسی"
-population: 84465446
-region: "AF"
-region: "OM"
-region: "AE"
-region: "PK"
-region: "QA"
-region: "IQ"
-region: "IR"
-region: "TJ"
-script: "Perso-Arabic"
-exemplar_chars {
-  base: "ء أ ؤ ئ ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ل م ن ه و پ چ ژ ک گ ی"
-  auxiliary: "ـ\\u200C\\u200D\\u200E\\u200F \\u064E \\u0650 \\u064F \\u0652 \\u0656 \\u0670 إ ك ى ي"
-  marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٔ ◌ٰ"
-  numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ ، ٫ ٬ ؛ \\: ! ؟ . … ‹ › « » ( ) \\[ \\] * / \\\\"
-  index: "آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ه ی"
-}
diff --git a/lang/languages/fa/sampletext.textproto b/lang/languages/fa/sampletext.textproto
deleted file mode 100644
index 3e8219368..000000000
--- a/lang/languages/fa/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "fa"
diff --git a/lang/languages/fan/language.textproto b/lang/languages/fan.textproto
similarity index 74%
rename from lang/languages/fan/language.textproto
rename to lang/languages/fan.textproto
index 355a3b26b..af5a7214b 100644
--- a/lang/languages/fan/language.textproto
+++ b/lang/languages/fan.textproto
@@ -7,3 +7,6 @@ region: "GQ"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/fbl/language.textproto b/lang/languages/fbl.textproto
similarity index 86%
rename from lang/languages/fbl/language.textproto
rename to lang/languages/fbl.textproto
index ce20f888e..f889d255e 100644
--- a/lang/languages/fbl/language.textproto
+++ b/lang/languages/fbl.textproto
@@ -8,3 +8,6 @@ exemplar_chars {
   base: "A B D G H I K L M N O P R S T U W Y a b d g h i k l m n o p r s t u w y"
   auxiliary: "C E F J Q V X Z c e f j q v x z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ff/language.textproto b/lang/languages/ff.textproto
similarity index 93%
rename from lang/languages/ff/language.textproto
rename to lang/languages/ff.textproto
index 82aac5230..704a57d33 100644
--- a/lang/languages/ff/language.textproto
+++ b/lang/languages/ff.textproto
@@ -3,18 +3,18 @@ name: "Fulah"
 preferred_name: ""
 autonym: "Futa Tooro"
 population: 7788902
-region: "SL"
-region: "GM"
 region: "BF"
-region: "NE"
-region: "GH"
-region: "SN"
-region: "GN"
-region: "MR"
 region: "CM"
+region: "GH"
+region: "GM"
+region: "GN"
 region: "GW"
 region: "LR"
+region: "MR"
+region: "NE"
 region: "NG"
+region: "SL"
+region: "SN"
 script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P R S T U W Y X Ñ Ŋ Ƴ Ɓ Ɗ a b c d e f g h i j k l m n o p r s t u w y x ñ ŋ ƴ ɓ ɗ"
@@ -23,3 +23,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B Ɓ C D Ɗ E F G H I J K L M N Ñ Ŋ O P R S T U W Y Ƴ"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ff_Adlm/language.textproto b/lang/languages/ff_Adlm.textproto
similarity index 93%
rename from lang/languages/ff_Adlm/language.textproto
rename to lang/languages/ff_Adlm.textproto
index eadd66c75..7d975066a 100644
--- a/lang/languages/ff_Adlm/language.textproto
+++ b/lang/languages/ff_Adlm.textproto
@@ -3,18 +3,18 @@ name: "Fulah (Adlam)"
 preferred_name: ""
 autonym: ""
 population: 1
-region: "SL"
-region: "GM"
 region: "BF"
-region: "NE"
-region: "GH"
-region: "SN"
-region: "GN"
-region: "MR"
 region: "CM"
+region: "GH"
+region: "GM"
+region: "GN"
 region: "GW"
 region: "LR"
+region: "MR"
+region: "NE"
 region: "NG"
+region: "SL"
+region: "SN"
 script: "Latin"
 exemplar_chars {
   base: "\\U0001E944\\U0001E945\\U0001E946 𞤢 𞤣 𞤤 𞤥 𞤦 𞤧 𞤨 𞤩 𞤪 𞤫 𞤬 𞤭 𞤮 𞤯 𞤰 𞤱 𞤲 𞤳 𞤴 𞤵 𞤶 𞤷 𞤸 𞤹 𞤺 𞤻 𞤼 𞤽 𞥋"
@@ -23,3 +23,6 @@ exemplar_chars {
   punctuation: "\\- ‑ 𞥞 𞥟 . % ‰"
   index: "𞤀 𞤛"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ffm/language.textproto b/lang/languages/ffm.textproto
similarity index 86%
rename from lang/languages/ffm/language.textproto
rename to lang/languages/ffm.textproto
index 866b3c732..54446cac1 100644
--- a/lang/languages/ffm/language.textproto
+++ b/lang/languages/ffm.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P R S T U W Y X Ŋ Ƴ Ɓ Ɗ Ɲ a b c d e f g h i j k l m n o p r s t u w y x ŋ ƴ ɓ ɗ ɲ"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/fi.textproto b/lang/languages/fi.textproto
new file mode 100644
index 000000000..8206484d1
--- /dev/null
+++ b/lang/languages/fi.textproto
@@ -0,0 +1,31 @@
+id: "fi"
+name: "Finnish"
+preferred_name: ""
+autonym: "Suomi"
+population: 5736841
+region: "EE"
+region: "FI"
+region: "RU"
+region: "SE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Å a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö å"
+  auxiliary: "Æ Õ Ø Ü Š Ž æ õ ø ü š ž"
+  marks: "◌̈ ◌̊ ◌̃ ◌̌"
+  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … ’ ” » ( ) \\[ \\] § @ * / \\\\ \\& #"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö"
+}
+sample_text {
+  masthead_full: "KkAa"
+  masthead_partial: "Ii"
+  tester: "Kun ihmiskunnan kaikkien jäsenten luonnollisen arvon ja heidän"
+  poster_sm: "kun yhteinen"
+  poster_md: "Niin sen"
+  poster_lg: "Kaikki"
+  specimen_48: "antaa TÄMÄN IHMISOIKEUKSIEN YLEISMAAILMALLISEN JULISTUKSEN kaikkien"
+  specimen_36: "Jokaisella on oikeus lepoon ja vapaa-aikaan, työajan järkevään rajoittamiseen sekä määräaikaisiin palkallisiin lomiin."
+  specimen_32: "Jokaisella on oikeus sellaiseen yhteiskunnalliseen ja kansainväliseen järjestykseen, jonka puitteissa tässä julistuksessa esitetyt oikeudet ja velvollisuudet voivat täysin toteutua."
+  specimen_21: "Mitään tässä julistuksessa ei saa tulkita niin, että valtio, ryhmä tai yksityinen henkilö voi sen perusteella katsoa oikeudekseen tehdä sellaista, mikä voisi hävittää tässä määriteltyjä oikeuksia ja vapauksia.\nKun ihmiskunnan kaikkien jäsenten luonnollisen arvon ja heidän yhtäläisten ja luovuttamattomien oikeuksiensa tunnustaminen on vapauden, oikeudenmukaisuuden ja rauhan perustana maailmassa,"
+  specimen_16: "Kun ihmiskunnan kaikkien jäsenten luonnollisen arvon ja heidän yhtäläisten ja luovuttamattomien oikeuksiensa tunnustaminen on vapauden, oikeudenmukaisuuden ja rauhan perustana maailmassa,\nkun ihmisoikeuksia on väheksytty tai ne on jätetty huomiota vaille, on tapahtunut raakalaistekoja, jotka ovat järkyttäneet ihmiskunnan omaatuntoa, ja kun kansojen korkeimmaksi päämääräksi on julistettu sellaisen maailman luominen, missä ihmiset voivat vapaasti nauttia sanan ja uskon vapautta sekä elää vapaina pelosta ja puutteesta,\nkun on välttämätöntä, että ihmisoikeudet turvataan oikeusjärjestyksellä, jotta ihmisten ei olisi pakko viimeisenä keinona nousta kapinaan pakkovaltaa ja sortoa vastaan,"
+}
diff --git a/lang/languages/fi/language.textproto b/lang/languages/fi/language.textproto
deleted file mode 100644
index b14d043c7..000000000
--- a/lang/languages/fi/language.textproto
+++ /dev/null
@@ -1,18 +0,0 @@
-id: "fi"
-name: "Finnish"
-preferred_name: ""
-autonym: "Suomi"
-population: 5736841
-region: "EE"
-region: "RU"
-region: "SE"
-region: "FI"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Å a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö å"
-  auxiliary: "Æ Õ Ø Ü Š Ž æ õ ø ü š ž"
-  marks: "◌̈ ◌̊ ◌̃ ◌̌"
-  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … ’ ” » ( ) \\[ \\] § @ * / \\\\ \\& #"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö"
-}
diff --git a/lang/languages/fi/sampletext.textproto b/lang/languages/fi/sampletext.textproto
deleted file mode 100644
index 474f7d873..000000000
--- a/lang/languages/fi/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "fi"
diff --git a/lang/languages/fia/language.textproto b/lang/languages/fia.textproto
similarity index 85%
rename from lang/languages/fia/language.textproto
rename to lang/languages/fia.textproto
index 4bfacd150..10c97271a 100644
--- a/lang/languages/fia/language.textproto
+++ b/lang/languages/fia.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P R S T U W Y Z a b c d e f g h i j k l m n o p r s t u w y z"
   marks: "◌̄ ◌̈"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/fil/language.textproto b/lang/languages/fil.textproto
similarity index 93%
rename from lang/languages/fil/language.textproto
rename to lang/languages/fil.textproto
index 86e921f1a..1e866e558 100644
--- a/lang/languages/fil/language.textproto
+++ b/lang/languages/fil.textproto
@@ -14,3 +14,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § * / \\& # ′ ″"
   index: "A B C D E F G H I J K L M N Ñ {Ng} O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/fit/language.textproto b/lang/languages/fit.textproto
similarity index 76%
rename from lang/languages/fit/language.textproto
rename to lang/languages/fit.textproto
index 22689d529..f66c85119 100644
--- a/lang/languages/fit/language.textproto
+++ b/lang/languages/fit.textproto
@@ -7,3 +7,6 @@ region: "SE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/fj.textproto b/lang/languages/fj.textproto
new file mode 100644
index 000000000..d8820e759
--- /dev/null
+++ b/lang/languages/fj.textproto
@@ -0,0 +1,23 @@
+id: "fj"
+name: "Fijian"
+preferred_name: ""
+autonym: "Vakaviti"
+population: 365029
+region: "FJ"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "EeRr"
+  masthead_partial: "Aa"
+  tester: "Ni yavu ni galala, lewa dodonu kei na sautu ena vuravura na noda"
+  poster_sm: "Ni na tubu"
+  poster_md: "vakawaleni"
+  poster_lg: "Era"
+  specimen_48: "Ni dodonu me taqomaki vinaka ena lawa na dodonu ni lewenivanua,"
+  specimen_36: "Ni rui bibi me matata vinaka vei keda kece na dodonu kei na galala oqo me vakayacori rawa kina na vosa ni yalayala oqo,"
+  specimen_32: "E dodonu ni tamata kece me lewe ni itikotiko e tuvanaki maqosa ena nona vanua se vanua tani me muri kina vakavinaka na dodonu kei na galala e virikotori ena Lawa oqo."
+  specimen_21: "Me kua ni vakadewa e dua na ka ena Lawa Raraba oqo me nanuma kina e dua na Matanitu, ilawalawa, se tamata ni solia na dodonu me vakaitavi se cakava e dua na ka me vakaleqa kina na dodonu kei na galala era virikotori e ke.\nNi yavu ni galala, lewa dodonu kei na sautu ena vuravura na noda vakadinata ni dodonu mera dokai mera raici tale ga vakatautauvata na lewe kece ga ni vuvale kawatamata,"
+  specimen_16: "Ni yavu ni galala, lewa dodonu kei na sautu ena vuravura na noda vakadinata ni dodonu mera dokai mera raici tale ga vakatautauvata na lewe kece ga ni vuvale kawatamata,\nNi na tubu na itovo vakadomobula e sokanu kina na lewaeloma ni kawatamata ke\nvakawaleni qai beci na dodonu ni kawatamata kei na kena vakatakilai ni ka levu duadua era nuitaka tu na lewenivanua na vuravura era na marautaka kina na tamata yadua na galala ni vosa kei na galala ni vakabauta vaka kina na galala mai na rere kei na leqa,\nNi dodonu me taqomaki vinaka ena lawa na dodonu ni lewenivanua, me kua kina ni vakasaurarataki na tamata ena nodra vaqara bula mera saqata na veiliutaki e voravora qai ca,"
+}
diff --git a/lang/languages/fj/language.textproto b/lang/languages/fj/language.textproto
deleted file mode 100644
index 42580c6cd..000000000
--- a/lang/languages/fj/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "fj"
-name: "Fijian"
-preferred_name: ""
-autonym: "Vakaviti"
-population: 365029
-region: "FJ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/fj/sampletext.textproto b/lang/languages/fj/sampletext.textproto
deleted file mode 100644
index 02bd7ce1c..000000000
--- a/lang/languages/fj/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "fj"
diff --git a/lang/languages/fo.textproto b/lang/languages/fo.textproto
new file mode 100644
index 000000000..0be7fc003
--- /dev/null
+++ b/lang/languages/fo.textproto
@@ -0,0 +1,29 @@
+id: "fo"
+name: "Faroese"
+preferred_name: ""
+autonym: "Føroyskt"
+population: 71350
+region: "DK"
+region: "FO"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Å Æ Í Ð Ó Ø Ú Ý a b c d e f g h i j k l m n o p q r s t u v w x y z á å æ í ð ó ø ú ý"
+  auxiliary: "c q w x z"
+  marks: "◌́ ◌̊"
+  numerals: ", . % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ′ ″"
+  index: "A Á B C D Ð E F G H I Í J K L M N O Ó P Q R S T U Ú V W X Y Ý Z Æ Ø"
+}
+sample_text {
+  masthead_full: "ØøLl"
+  masthead_partial: "Mm"
+  tester: "Tað verður at viðurkenna, at menniskjuni er virðing íborin, og"
+  poster_sm: "Tað varðar"
+  poster_md: "Í sáttmáala"
+  poster_lg: "Øll"
+  specimen_48: "Limaríkini hava skyldubundið seg til, í samvinnu við Sameindu"
+  specimen_36: "Tað at allir partar skilja hesi rættindi og frælsi er fremsta treytin fyri, at henda skylda verður framd út í æsur."
+  specimen_32: "Tað varðar almikið um, mannarættindi verða vard við lógum, um fólk ikki skal verða noytt til sum evstu ráð at taka til uppreistur móti harðræði og kúgan."
+  specimen_21: "Tað verður at viðurkenna, at menniskjuni er virðing íborin, og at allir limir mannaættarinnar eiga somu ómissiligu rættindi, og hetta er støðið undir frælsi, rættvísi og friði í heiminum.\nHar sum mannarættindini hava verið fyri vanbýti og vanvirðing, hevur tað havt við sær ræðuligar gerðir, sum hava skakað samvitsku mannaættarinnar, og ein heimskipan, har sum fólk nýtur talu- og trúarfrælsi og frælsi frá ótta og neyð, hevur verið boðað sum menniskjunar hægsta mið og mál."
+  specimen_16: "Tað verður at viðurkenna, at menniskjuni er virðing íborin, og at allir limir mannaættarinnar eiga somu ómissiligu rættindi, og hetta er støðið undir frælsi, rættvísi og friði í heiminum.\nHar sum mannarættindini hava verið fyri vanbýti og vanvirðing, hevur tað havt við sær ræðuligar gerðir, sum hava skakað samvitsku mannaættarinnar, og ein heimskipan, har sum fólk nýtur talu- og trúarfrælsi og frælsi frá ótta og neyð, hevur verið boðað sum menniskjunar hægsta mið og mál.\nTað varðar almikið um, mannarættindi verða vard við lógum, um fólk ikki skal verða noytt til sum evstu ráð at taka til uppreistur móti harðræði og kúgan."
+}
diff --git a/lang/languages/fo/language.textproto b/lang/languages/fo/language.textproto
deleted file mode 100644
index 50292e5e4..000000000
--- a/lang/languages/fo/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "fo"
-name: "Faroese"
-preferred_name: ""
-autonym: "Føroyskt"
-population: 71350
-region: "FO"
-region: "DK"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Å Æ Í Ð Ó Ø Ú Ý a b c d e f g h i j k l m n o p q r s t u v w x y z á å æ í ð ó ø ú ý"
-  auxiliary: "c q w x z"
-  marks: "◌́ ◌̊"
-  numerals: ", . % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ′ ″"
-  index: "A Á B C D Ð E F G H I Í J K L M N O Ó P Q R S T U Ú V W X Y Ý Z Æ Ø"
-}
diff --git a/lang/languages/fo/sampletext.textproto b/lang/languages/fo/sampletext.textproto
deleted file mode 100644
index cca8be846..000000000
--- a/lang/languages/fo/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "fo"
diff --git a/lang/languages/fon.textproto b/lang/languages/fon.textproto
new file mode 100644
index 000000000..f65b39031
--- /dev/null
+++ b/lang/languages/fon.textproto
@@ -0,0 +1,24 @@
+id: "fon"
+name: "Fon"
+preferred_name: ""
+autonym: "fɔ̀ngbè"
+population: 3216150
+region: "BJ"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G I J K L M N O P R S T U V W X Y Z Ɖ Ɛ Ɔ À Á È É Ì Í Ò Ó Ù Ú a b c d e f g i j k l m n o p r s t u v w x y z ɖ ɛ ɔ à á è é ì í ò ó ù ú"
+  marks: "◌̀ ◌́"
+}
+sample_text {
+  masthead_full: "AaCc"
+  masthead_partial: "Ɛɛ"
+  tester: "Ee nyi ɖɔ hɛnnu ɖokpo mɛ ɔ, mɛ ɖokpoɖokpo ka do susu tɔn, bɔ acɛ"
+  poster_sm: "Ee nyi ɖɔ é"
+  poster_md: "Ee nyi ɖɔ,"
+  poster_lg: "Acɛ,"
+  specimen_48: "Ee nyi ɖɔ to ɖokpoɖokpo yi gbe bo na ɖo sisi nu acɛ e gbɛtɔ lɛ"
+  specimen_36: "Enyi mɛɖe mɔ ɖɔ e yi acɛ e nyi etɔn bɔ sɛn dodo ee ɖoɔ nu do to tɔn nu ɔ n\'ɛ ɔ, e hɛn ɔ e na ylɔ hwɛ ɖo to tɔn mɛ."
+  specimen_32: "Gbɛtɔ bǐ ɖo acɛ bo na ɖo gbɔjɛhwe nu kpodo ayiɖeɖ\'ayi sin hwenu kpan Ganxuxo nabiɖe wɛ é ɖó na wa azɔ na. E ɖo na yi azɔgbɔjɛ hwɛhwɛ bɔ gbɔjɛ enɛ mɛ ɔ, e ka ɖo na nɔ sun akwɛ ɛ."
+  specimen_21: "Gbɛtɔ bǐ ɖo na ba tuto gbɔn nukɔnyiyi hɛnnu e mɛ ɖe e kpodo gbɛ ɔ bǐ kpan sin alinu bonu acɛ, sisi kpo jlokokonunɔ e xó e ɖɔ ɖɔ wema elɔ mɛ ɔ ni nɔ xwiji.\nYoɖè, kplekpleɖè, gbɛtɔ goɖokponɔɖè na yi huzu nu e ɖɔ do wema elɔ mɛ e ɖo alɔ tɔn ji bo na mɔ̀ tɛn bo ɖe walɔɖe alo ayiɖe tɔn ee na zɔn bɔ e na mɔ tɛn bo do kpo acɛ, sisi kpodo jlokokɔnunɔ ee xo e ɖɔ ɖo fi e bo hɛn gba ǎ."
+  specimen_16: "Ee nyi ɖɔ hɛnnu ɖokpo mɛ ɔ, mɛ ɖokpoɖokpo ka do susu tɔn, bɔ acɛ ɖokpo ɔ wɛ mɛbi ɖo bo e ma sixu kan fɛn kpon é ɖi mɛɖesusi jijɛ, hwɛjijɔzinzan, kpodo fifa ni tiin nu wɛkɛ ɔ bi e ɔ,\nEe nyi ɖɔ nukumamɔ jɛ numɛ kpodo wangbɛnu sɛn ɖeɖee na zɔn bɔ gbɛtɔ na do tiin nyi lɛ wɛ nɔ dɔn alannuwiwa ɖee nɔ zɔn bɔ gbɛtɔ nɔ fɔn gu e, lo bɔ nu taji ɖee hudo gbɛtɔ ɔ wɛ nyi ɖɔ gbɛ e mɛ gbɛtɔ lɛ ma na nɔ mɛkannu ɖo xoɖiɖɔ sin alinu kpodo nuɖiɖi lo bo na tɔn sin adohuhu kpodo ya kpo mɛ é ɔ,\nEe nyi ɖɔ dandanmɛ wɛ e ɖo na jɛ hun do sɛn ɖee na zɔn bɔ gbɛtɔ na do tiin nyi le gbɔn acɛɖiɖo sin alinu se na zɔn bɔ gbɛtɔ ma na lin ɖɔ emi ɖo na ɖe emiɖee sin mɛkannu kpo yadonumɛ kpo e ɔ,"
+}
diff --git a/lang/languages/fon/language.textproto b/lang/languages/fon/language.textproto
deleted file mode 100644
index 682a120cb..000000000
--- a/lang/languages/fon/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "fon"
-name: "Fon"
-preferred_name: ""
-autonym: "fɔ̀ngbè"
-population: 3216150
-region: "BJ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G I J K L M N O P R S T U V W X Y Z Ɖ Ɛ Ɔ À Á È É Ì Í Ò Ó Ù Ú a b c d e f g i j k l m n o p r s t u v w x y z ɖ ɛ ɔ à á è é ì í ò ó ù ú"
-  marks: "◌̀ ◌́"
-}
diff --git a/lang/languages/fon/sampletext.textproto b/lang/languages/fon/sampletext.textproto
deleted file mode 100644
index 169b6e409..000000000
--- a/lang/languages/fon/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "fon"
diff --git a/lang/languages/fr.textproto b/lang/languages/fr.textproto
new file mode 100644
index 000000000..2d005beed
--- /dev/null
+++ b/lang/languages/fr.textproto
@@ -0,0 +1,89 @@
+id: "fr"
+name: "French"
+preferred_name: ""
+autonym: "Français"
+population: 272965534
+region: "AD"
+region: "AT"
+region: "BE"
+region: "BF"
+region: "BI"
+region: "BJ"
+region: "BL"
+region: "CA"
+region: "CD"
+region: "CF"
+region: "CG"
+region: "CH"
+region: "CI"
+region: "CM"
+region: "CY"
+region: "DE"
+region: "DJ"
+region: "DZ"
+region: "FR"
+region: "GA"
+region: "GB"
+region: "GF"
+region: "GN"
+region: "GP"
+region: "GQ"
+region: "GR"
+region: "HT"
+region: "HU"
+region: "IE"
+region: "IT"
+region: "KM"
+region: "LB"
+region: "LU"
+region: "MA"
+region: "MC"
+region: "MF"
+region: "MG"
+region: "ML"
+region: "MQ"
+region: "MR"
+region: "MT"
+region: "MU"
+region: "NC"
+region: "NE"
+region: "NL"
+region: "PF"
+region: "PM"
+region: "PT"
+region: "RE"
+region: "RO"
+region: "RW"
+region: "SC"
+region: "SN"
+region: "SY"
+region: "TD"
+region: "TF"
+region: "TG"
+region: "TN"
+region: "US"
+region: "VU"
+region: "WF"
+region: "YT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Â Æ Ç È É Ê Ë Î Ï Ô Ù Û Ü Ÿ Œ a b c d e f g h i j k l m n o p q r s t u v w x y z à â æ ç è é ê ë î ï ô ù û ü ÿ œ"
+  auxiliary: "á å ä ã ā ć ē í ì ī ij ñ ó ò ö õ ø ř š ſ ß ú ǔ"
+  marks: "◌̀ ◌́ ◌̂ ◌̈ ◌̧"
+  numerals: "  \\- ‑ , . % ‰ + − 0 1 2 ² 3 ³ 4 5 6 7 8 9 ᵈ ᵉ ʳ ˢ"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … ’ \" “ ” « » ( ) \\[ \\] § @ * / \\& # † ‡"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Uu"
+  tester: "Considérant que la reconnaissance de la dignité inhérente à tous"
+  poster_sm: "Considérant"
+  poster_md: "L’Assemblée"
+  poster_lg: "Tous"
+  specimen_48: "Proclame la présente Déclaration universelle des droits de l’homme"
+  specimen_36: "Considérant qu’il est essentiel d’encourager le développement de relations amicales entre nations,\nL’Assemblée générale"
+  specimen_32: "Toute personne a droit au repos et aux loisirs et notamment à une limitation raisonnable de la durée du travail et à des congés payés périodiques."
+  specimen_21: "Considérant que la reconnaissance de la dignité inhérente à tous les membres de la famille humaine et de leurs droits égaux et inaliénables constitue le fondement de la liberté, de la justice et de la paix dans le monde,\nConsidérant qu’il est essentiel que les droits de l’homme soient protégés par un régime de droit pour que l’homme ne soit pas contraint, en suprême recours, à la révolte contre la tyrannie et l’oppression,"
+  specimen_16: "Considérant que la reconnaissance de la dignité inhérente à tous les membres de la famille humaine et de leurs droits égaux et inaliénables constitue le fondement de la liberté, de la justice et de la paix dans le monde,\nConsidérant que la méconnaissance et le mépris des droits de l’homme ont conduit à des actes de barbarie qui révoltent la conscience de l’humanité et que l’avènement d’un monde où les êtres humains seront libres de parler et de croire, libérés de la terreur et de la misère, a été proclamé comme la plus haute aspiration de l’homme,\nConsidérant qu’il est essentiel que les droits de l’homme soient protégés par un régime de droit pour que l’homme ne soit pas contraint, en suprême recours, à la révolte contre la tyrannie et l’oppression,"
+}
diff --git a/lang/languages/fr/language.textproto b/lang/languages/fr/language.textproto
deleted file mode 100644
index 431ebca28..000000000
--- a/lang/languages/fr/language.textproto
+++ /dev/null
@@ -1,76 +0,0 @@
-id: "fr"
-name: "French"
-preferred_name: ""
-autonym: "Français"
-population: 272965534
-region: "HU"
-region: "CF"
-region: "GQ"
-region: "BF"
-region: "US"
-region: "NE"
-region: "PM"
-region: "GB"
-region: "TN"
-region: "RO"
-region: "WF"
-region: "SC"
-region: "AT"
-region: "CI"
-region: "MA"
-region: "VU"
-region: "MC"
-region: "GP"
-region: "IE"
-region: "MT"
-region: "RE"
-region: "RW"
-region: "BJ"
-region: "PT"
-region: "CM"
-region: "GF"
-region: "DJ"
-region: "FR"
-region: "LU"
-region: "PF"
-region: "MF"
-region: "MU"
-region: "CG"
-region: "LB"
-region: "BL"
-region: "BI"
-region: "CY"
-region: "NC"
-region: "BE"
-region: "CA"
-region: "KM"
-region: "YT"
-region: "NL"
-region: "CH"
-region: "IT"
-region: "MQ"
-region: "ML"
-region: "GR"
-region: "TG"
-region: "DZ"
-region: "GA"
-region: "SN"
-region: "GN"
-region: "MR"
-region: "SY"
-region: "HT"
-region: "MG"
-region: "AD"
-region: "TF"
-region: "TD"
-region: "DE"
-region: "CD"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Â Æ Ç È É Ê Ë Î Ï Ô Ù Û Ü Ÿ Œ a b c d e f g h i j k l m n o p q r s t u v w x y z à â æ ç è é ê ë î ï ô ù û ü ÿ œ"
-  auxiliary: "á å ä ã ā ć ē í ì ī ij ñ ó ò ö õ ø ř š ſ ß ú ǔ"
-  marks: "◌̀ ◌́ ◌̂ ◌̈ ◌̧"
-  numerals: "  \\- ‑ , . % ‰ + − 0 1 2 ² 3 ³ 4 5 6 7 8 9 ᵈ ᵉ ʳ ˢ"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … ’ \" “ ” « » ( ) \\[ \\] § @ * / \\& # † ‡"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/fr/sampletext.textproto b/lang/languages/fr/sampletext.textproto
deleted file mode 100644
index f701ad9f8..000000000
--- a/lang/languages/fr/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "fr"
diff --git a/lang/languages/frc/language.textproto b/lang/languages/frc.textproto
similarity index 75%
rename from lang/languages/frc/language.textproto
rename to lang/languages/frc.textproto
index 1973b5c45..a4c48c539 100644
--- a/lang/languages/frc/language.textproto
+++ b/lang/languages/frc.textproto
@@ -7,3 +7,6 @@ region: "US"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/frp/language.textproto b/lang/languages/frp.textproto
similarity index 74%
rename from lang/languages/frp/language.textproto
rename to lang/languages/frp.textproto
index 1f56dbf65..4f051aaee 100644
--- a/lang/languages/frp/language.textproto
+++ b/lang/languages/frp.textproto
@@ -7,3 +7,6 @@ region: "FR"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/frr/language.textproto b/lang/languages/frr.textproto
similarity index 75%
rename from lang/languages/frr/language.textproto
rename to lang/languages/frr.textproto
index 94f54793d..4b259b554 100644
--- a/lang/languages/frr/language.textproto
+++ b/lang/languages/frr.textproto
@@ -7,3 +7,6 @@ region: "DE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/frs/language.textproto b/lang/languages/frs.textproto
similarity index 75%
rename from lang/languages/frs/language.textproto
rename to lang/languages/frs.textproto
index 23b899a28..d35e8f89a 100644
--- a/lang/languages/frs/language.textproto
+++ b/lang/languages/frs.textproto
@@ -7,3 +7,6 @@ region: "DE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/fud/language.textproto b/lang/languages/fud.textproto
similarity index 75%
rename from lang/languages/fud/language.textproto
rename to lang/languages/fud.textproto
index def7f2033..84cec8d2d 100644
--- a/lang/languages/fud/language.textproto
+++ b/lang/languages/fud.textproto
@@ -7,3 +7,6 @@ region: "WF"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/fuq/language.textproto b/lang/languages/fuq.textproto
similarity index 86%
rename from lang/languages/fuq/language.textproto
rename to lang/languages/fuq.textproto
index 07bf020c7..ceab832d9 100644
--- a/lang/languages/fuq/language.textproto
+++ b/lang/languages/fuq.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P R S T U W Y X Ŋ Ƴ Ɓ Ɗ a b c d e f g h i j k l m n o p r s t u w y x ŋ ƴ ɓ ɗ"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/fur.textproto b/lang/languages/fur.textproto
new file mode 100644
index 000000000..9d9345105
--- /dev/null
+++ b/lang/languages/fur.textproto
@@ -0,0 +1,27 @@
+id: "fur"
+name: "Friulian"
+preferred_name: ""
+autonym: "Furlan"
+population: 37441
+region: "IT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç Â Ê Î Ô Û À È Ì Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z ç â ê î ô û à è ì ò ù"
+  auxiliary: "å č é ë ğ ï ñ ó š ü"
+  marks: "◌̀ ◌̂ ◌̧"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C Ç D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "DdUu"
+  masthead_partial: "Cc"
+  tester: "Tignût cont che il ricognossi la dignitât di ducj i membris de"
+  poster_sm: "Tignût cont"
+  poster_md: "la Samblee"
+  poster_lg: "Ducj"
+  specimen_48: "e proclame cheste Declarazion Universâl dai Derits dal Om come"
+  specimen_36: "No si pò torturâ nissun, ni doprâ par nissune persone trataments o punizions barbars, disumans o vergognôs."
+  specimen_32: "Ogni individui al à derit di cjatâsi a vivi tun sistem sociâl e internazionâl dulà che i derits e lis libertâts proclamadis in cheste Declarazion a sein metûts in pratiche dal dut."
+  specimen_21: "Nissun Stât, grop o persone a puedin cjapâ alc di cheste Declarazion par campâ derits di meti sù trafics o combinâ vôris ch’a cirin di dineâ cualchi derit o libertât ch’e je stade metude in clâr culì.\nTignût cont che il ricognossi la dignitât di ducj i membris de gjernazie umane, i lôr derits, compagns e inalienabii, e je la fonde de libertât, de justizie e de pâs tal mont;"
+  specimen_16: "Tignût cont che il ricognossi la dignitât di ducj i membris de gjernazie umane, i lôr derits, compagns e inalienabii, e je la fonde de libertât, de justizie e de pâs tal mont;\nTignût cont che il dineâ e il spreseâ i derits dal om a an puartât a barbaretâts ch’a ufindin la cussience de umanitât e che al è stât proclamât che il divignì di un mont dulà che i oms a gjoldin la libertât di peraule e di fede e la liberazion de pôre e de miserie e je la plui grande braure dal om;\nTignût cont che i derits dal om bisugne ch’a sein garantîts des leçs, se si intint di fâ in mût che l’om, come ultin ricors, nol scugni voltâsi cu la fuarce cuintri la tiranìe e la sclavitût;"
+}
diff --git a/lang/languages/fur/language.textproto b/lang/languages/fur/language.textproto
deleted file mode 100644
index 6d0b3c69a..000000000
--- a/lang/languages/fur/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "fur"
-name: "Friulian"
-preferred_name: ""
-autonym: "Furlan"
-population: 37441
-region: "IT"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç Â Ê Î Ô Û À È Ì Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z ç â ê î ô û à è ì ò ù"
-  auxiliary: "å č é ë ğ ï ñ ó š ü"
-  marks: "◌̀ ◌̂ ◌̧"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C Ç D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/fur/sampletext.textproto b/lang/languages/fur/sampletext.textproto
deleted file mode 100644
index 162d51264..000000000
--- a/lang/languages/fur/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "fur"
diff --git a/lang/languages/fuv.textproto b/lang/languages/fuv.textproto
new file mode 100644
index 000000000..e95710edc
--- /dev/null
+++ b/lang/languages/fuv.textproto
@@ -0,0 +1,23 @@
+id: "fuv"
+name: "Nigerian Fulfulde"
+preferred_name: ""
+autonym: ""
+population: 14339876
+region: "NG"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P R S T U W Y X Ɓ Ɗ a b c d e f g h i j k l m n o p r s t u w y x ɓ ɗ"
+}
+sample_text {
+  masthead_full: "ƁɓIi"
+  masthead_partial: "Aa"
+  tester: "Nde laati tabitinki manngu e fotuki hakke neɗɗaaku ngu wosintaako"
+  poster_sm: "Ɓi-aadama fuu"
+  poster_md: "Ɓii-aadama"
+  poster_lg: "Ɓi-aadama"
+  specimen_48: "Ɓesdaari dow ɗu’m, walaa feerootirki waɗetee ngam mangu siyaasa,"
+  specimen_36: "Walaa koomoye wuurinte nder maccungaaku maa bo kuuɗe torra, resuki macuɓe e coggu maccuɓe e horɓe koo iri nguye haɗaama"
+  specimen_32: "Ɓii-aadama fuu fotay yeeso sari’a, nden boo woodi baawɗe walaa yawaare, o woodi deenal potoowal ngal sari’a. Moye fuu woodi deenal potoowal ngam yawaare e nyaakeeki neɗɗaaku."
+  specimen_21: "Koomoye woodi baawɗe e hakke maagooje naftirooje hukuumaaje ɗe nder lesdi ngam sari’aaji torrooje hakke ɓii-aadama ɗi siri laamu tabitanimo ma abo sarii’a.\nWalaa ɓii-aadama gooto nanngetee, haɓɓee maa bo riiwee diga lesdi muuɗum dow giɗaaɗi ɓernde goɗɗo feere.\nKoomoye woodi baawɗe naneeki no wooɗi yeeso ummaatoore no haani yeeso alkaaliijo daraniiɗo goonga e darnuki hake maako e wosinki ko o takkana fuu."
+  specimen_16: "Walaa neɗɗe gooto gaɗanteeɗo naatalmaaku nder lamaruuji maako, iyaalu maako,ɓaade maako be defte e ɗereeji maakonon nyaamki neɗaaku maako e mangu maako. Koomoye woodi baawɗe e neɗɗaaku deeneteeɗi be kiita dow naatalmaku ngun e torruki mo.\nKoomoye woodi baawɗe yaaki endimaaku e miillo maako, llamiiri maako, diina maako; bauɗe ɗe’e hawtuub e ndimaaku waylutuki diina maako, goongɗinki maako bee ndimaaku, feere maako maa bo nder ummaatoore bee woɓɓe bee kuuɓnol maa bo coondol, nden holla diina maako maa bo goongɗinki maako e janginki, huutirki, ibaada, e reentaaki."
+}
diff --git a/lang/languages/fuv/language.textproto b/lang/languages/fuv/language.textproto
deleted file mode 100644
index 5125085fb..000000000
--- a/lang/languages/fuv/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "fuv"
-name: "Nigerian Fulfulde"
-preferred_name: ""
-autonym: ""
-population: 14339876
-region: "NG"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P R S T U W Y X Ɓ Ɗ a b c d e f g h i j k l m n o p r s t u w y x ɓ ɗ"
-}
diff --git a/lang/languages/fuv/sampletext.textproto b/lang/languages/fuv/sampletext.textproto
deleted file mode 100644
index f71315558..000000000
--- a/lang/languages/fuv/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "fuv"
diff --git a/lang/languages/fvr/language.textproto b/lang/languages/fvr.textproto
similarity index 74%
rename from lang/languages/fvr/language.textproto
rename to lang/languages/fvr.textproto
index b75ca2940..dff0fcb2f 100644
--- a/lang/languages/fvr/language.textproto
+++ b/lang/languages/fvr.textproto
@@ -7,3 +7,6 @@ region: "SD"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/fy.textproto b/lang/languages/fy.textproto
new file mode 100644
index 000000000..3c1302235
--- /dev/null
+++ b/lang/languages/fy.textproto
@@ -0,0 +1,28 @@
+id: "fy"
+name: "Western Frisian"
+preferred_name: ""
+autonym: "Frysk"
+population: 743057
+region: "NL"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Ä É Ê Ë Ï Ô Ö Ú Û Ü a b c d e f g h i j k l m n o p q r s t u v w x y z â ä é ê ë ï ô ö ú û ü"
+  auxiliary: "æ ò ù"
+  marks: "◌́ ◌̂ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N O P R S T U V W X Z"
+}
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Ee"
+  tester: "Yn betinken nommen dat it erkennen fan de ynherinte weardichheid"
+  poster_sm: "Yn betinken"
+  poster_md: "Alle minsken"
+  poster_lg: "Alle"
+  specimen_48: "Elk hat oanspraak op alle rjochten en frijheden yn dizze Ferklearring"
+  specimen_36: "Nimmen sil yn slavemij of hearrigens hâlden wurde. Slavernij en slavehannel yn elke foarm binne ferbean."
+  specimen_32: "Elk hat rjocht op doeltreffende rjochtshelp fan foechhawwende nasjonale rjochtlike ynstânsjes tsjin hanlingen dy\'t yn striid binne mei de grûnrjochten him takend by grûnwet of wet."
+  specimen_21: "Nimmen sil ûnderwurpen wurde oan eigenwillige arrestaasje, detinsje of ferbanning.\nElk foar oar hat rjocht op in earlike en iepenbiere behanling fan syn saak troch in ûnôfhinklike en ûnpartidige rjochtlike ynstânsje by it fêststellen fan syn rjochten en ferplichtings en by it bepalen fan it grûndearre wêzen fan in tsjin him ynstelde strafferfolging."
+  specimen_16: "Nimmen sil ûnderwurpen wurde oan oarmans eigenwillich ynmingen yn syn persoanlike oangelegenheden, yn syn húshâlding, syn thús of syn briefwiksel, noch ien of oare oantaasting fan syn eare of goede namme. Elk hat rjocht op beskerming troch de wet tsjin sok ymningen of oantaasten.\nElk hat rjocht op frijheid fan tinken, gewisse en godstsjinst; dat rjocht hâldt teffens de frijheid yn om fan godstsjinst of oertsjûging te feroarjen, en de frijheid om òf allinne òf yn \'e mande mei oaren sawol yn it iepenbier as yn it partikuliere libben, foar syn godstsjinst of oertsjûging út te kommen troch dy te ûnderwizen, troch it praktysk tapassen, troch earetsjinst en it ûnderhâlden fan geboaden en foarskriften."
+}
diff --git a/lang/languages/fy/language.textproto b/lang/languages/fy/language.textproto
deleted file mode 100644
index fe595184d..000000000
--- a/lang/languages/fy/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "fy"
-name: "Western Frisian"
-preferred_name: ""
-autonym: "Frysk"
-population: 743057
-region: "NL"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Ä É Ê Ë Ï Ô Ö Ú Û Ü a b c d e f g h i j k l m n o p q r s t u v w x y z â ä é ê ë ï ô ö ú û ü"
-  auxiliary: "æ ò ù"
-  marks: "◌́ ◌̂ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N O P R S T U V W X Z"
-}
diff --git a/lang/languages/fy/sampletext.textproto b/lang/languages/fy/sampletext.textproto
deleted file mode 100644
index da9075c33..000000000
--- a/lang/languages/fy/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "fy"
diff --git a/lang/languages/ga.textproto b/lang/languages/ga.textproto
new file mode 100644
index 000000000..bebf0c349
--- /dev/null
+++ b/lang/languages/ga.textproto
@@ -0,0 +1,29 @@
+id: "ga"
+name: "Irish"
+preferred_name: ""
+autonym: "Gaeilge"
+population: 1155943
+region: "GB"
+region: "IE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ó Ú a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ó ú"
+  auxiliary: "å ḃ ċ ḋ ḟ ġ j k ṁ ṗ q ṡ ṫ v w x y z"
+  marks: "◌́"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "SsAa"
+  masthead_partial: "Oo"
+  tester: "De Bhrí gurb é aithint dínte dúchais agus chearta comhionanna"
+  poster_sm: "De Bhrí gur"
+  poster_md: "De Bhrí go"
+  poster_lg: "daoine"
+  specimen_48: "De Bhrí gur ghabhadar na Stát-Chomhaltaí faoi chuing ghealltanais"
+  specimen_36: "Ní coimeádfar aon duine faoi mhoghsaine ná faoi dhaoirse; toirmeasctar gach gné den mhoghsaine agus de thrádáil na mogha."
+  specimen_32: "Tá ag gach uile dhuine an ceart chun sosa agus scíthe, agus go háirithe chun teora réasúnach lena uaireannta oibre agus chun saoirse le páigh d\'fháil ó thráth go chéile."
+  specimen_21: "Is dligh do gach uile dhuine go mbéadh eagras sóisialach agus e adarnáisiúnta i réim a bhéarfadh go bhféadfaí na cearta agus na saoirsí atá leagtha amach sa Dearbhú seo a chur i gerích go hiomlán.\nNí cead aon ní sa Dearbhú seo a leiriú mar ní a bheir dón Stát grúpa nó duine ceart ar bith chun páirt a ghlacadh in aon ghníomhacht ná aon ghníomh a dhéanamh d\'fhonn aon cheart nó saoirse dá luaitear anseo a dhíthiú."
+  specimen_16: "De Bhrí gurb é aithint dínte dúchais agus chearta comhionanna do-shannta an uile dhuine den chine daonna is foras don tsaorise, don cheartas agus don tsíocháin sa domhan,\nDe Bhrí gur thionscain a neamhaird agus an mí-mheas ar chearta an duine gníomhartha barbartha a chuir uafás ar choinsias an chine daonna, agus go bhfuil forógartha gurb é meanmarc is uaisle ag an gcoitiantacht saol a thabhairt i réim a bhéarfas don duine saoirse chainte agus chreidimh agus saoirse ó eagla agus ó amhgar,\nDe Bhrí gur ghabhadar na Stát-Chomhaltaí faoi chuing ghealltanais go ndéanfaid, i gcomhar leis na Náisiúin Aontaithe, urraim uile-choiteann éifeachtach d\'áirithiú do chearta agus do shaoirsí bunúsacha an duine."
+}
diff --git a/lang/languages/ga/language.textproto b/lang/languages/ga/language.textproto
deleted file mode 100644
index b6429f16b..000000000
--- a/lang/languages/ga/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "ga"
-name: "Irish"
-preferred_name: ""
-autonym: "Gaeilge"
-population: 1155943
-region: "IE"
-region: "GB"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ó Ú a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ó ú"
-  auxiliary: "å ḃ ċ ḋ ḟ ġ j k ṁ ṗ q ṡ ṫ v w x y z"
-  marks: "◌́"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/ga/sampletext.textproto b/lang/languages/ga/sampletext.textproto
deleted file mode 100644
index e0dead337..000000000
--- a/lang/languages/ga/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ga"
diff --git a/lang/languages/gaa.textproto b/lang/languages/gaa.textproto
new file mode 100644
index 000000000..a8ea76167
--- /dev/null
+++ b/lang/languages/gaa.textproto
@@ -0,0 +1,24 @@
+id: "gaa"
+name: "Ga"
+preferred_name: ""
+autonym: "Gã"
+population: 821525
+region: "GH"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E Ɛ F G H I J K L M N Ŋ O Ɔ P R S T U V W Y Z Ã Ẽ Ĩ Õ Ũ a b d e ɛ f g h i j k l m n ŋ o ɔ p r s t u v w y z ã ẽ ĩ õ ũ"
+  marks: "◌̃"
+}
+sample_text {
+  masthead_full: "AaFf"
+  masthead_partial: "Ɔɔ"
+  tester: "Akɛni aŋɔɔ nɔ akɛ afɔ gbɔmɛi adesai fɛɛ akɛ mɛi ni yeɔ egbɔ kɛ"
+  poster_sm: "Akɛni bu ni"
+  poster_md: "Akɛni suɔmɔ"
+  poster_lg: "Afɔ"
+  specimen_48: "Akɛni mɛi ni yɔɔ Jeŋmaji Ekomefeemɔ Ku lɛ mli lɛ ema amɛhemɔkɛyeli"
+  specimen_36: "Akɛni shishinumɔ ni aaana yɛ hegbɛi kɛ heyeli nɛɛ ahe baafee nɔ oti ni abaadamɔ nɔ koni shiwoo nɛɛ aye omanye hewɔ lɛ,"
+  specimen_32: "Afɔ gbɔmɔ fɛɛ gbɔmɔ yɛ agbojee mli, kɛ hegbɛ ko ni damɔ ŋɛlɛ koome nɔ. Gbɔmɛi fɛɛ yɛ jwɛŋmɔ kɛ henilee, ni no hewɔ lɛ esa akɛ amɛhe ahi shi yɛ nyɛmi suɔmɔ mli."
+  specimen_21: "Mɔ fɛɛ mɔ yɛ hegbɛ akɛ eyeɔ hegbɛi ni yɔɔ kpaŋmɔ nɛɛ mli lɛ amli ŋɔɔmɔ lɛ eko, bɔ ni naatsii ko kwraa bɛ yɛ jaku mli ni ajɛ, hewolo su ni ahiɛ, nuu loo yoo ni aji, wiemɔ ni awieɔ, jamɔ mli ni ayɔɔ, maŋsaneyeli shidaamɔ mli aloo susumɔ ni ayɔɔ yɛ nɔ ko he, maŋ nɔ ni ajɛ, nii ni ayɔɔ, weku mli ni ajɛ aloo gbɛnaa ko ni ahiɛ hewɔ."
+  specimen_16: "Asaŋ akwɛ koni akajie niiaŋ bɔ ni akɛ mɔ ko maŋ ni ejɛ lɛ agbojee miitsu nii yɛ hegbɛi nɛɛ agbɛfaŋ, kɛji maŋ lɛ ena heyeli jio, aajɛ maŋ kroko nɔ aakwɛ esaji anɔ jio, enako heyeli jio, aloo ehɔ nɔyeli ko shishi fã kɛ fã.\nMɔ fɛɛ mɔ yɛ hegbɛ akɛ ehiɔ wala nɛɛ mli, akɛ ena heyeli, koni akwɛ ni efee shweshweeshwe hu.\nEsaaa akɛ ayeɔ mɔ ko nyɔŋ, aloo ahaa esɔ̃mɔɔ mɔ ko bɔ ni ejaaa gbɛ; aahi nyɔŋyeli kɛ gbɔmɔhɔɔmɔ gbɛjianɔtoi srɔtoi fɛɛ.\nEsaaa akɛ akɛ yiwalɛ nyɔtɔ̃ɔ mɔ ko, aloo akɛ ehiɛ tsumɔɔ shikpɔŋ, aloo afeɔ lɛ anisenii kɛgbalaa etoi.\nMlanaa lɛ mɔ fɛɛ mɔ yɛ hegbɛ akɛ akɛ woo haa lɛ akɛ gbɔmɔ adesa."
+}
diff --git a/lang/languages/gaa/language.textproto b/lang/languages/gaa/language.textproto
deleted file mode 100644
index 461500177..000000000
--- a/lang/languages/gaa/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "gaa"
-name: "Ga"
-preferred_name: ""
-autonym: "Gã"
-population: 821525
-region: "GH"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E Ɛ F G H I J K L M N Ŋ O Ɔ P R S T U V W Y Z Ã Ẽ Ĩ Õ Ũ a b d e ɛ f g h i j k l m n ŋ o ɔ p r s t u v w y z ã ẽ ĩ õ ũ"
-  marks: "◌̃"
-}
diff --git a/lang/languages/gaa/sampletext.textproto b/lang/languages/gaa/sampletext.textproto
deleted file mode 100644
index 416dda4c3..000000000
--- a/lang/languages/gaa/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "gaa"
diff --git a/lang/languages/gag.textproto b/lang/languages/gag.textproto
new file mode 100644
index 000000000..eb2e166c5
--- /dev/null
+++ b/lang/languages/gag.textproto
@@ -0,0 +1,24 @@
+id: "gag"
+name: "Gagauz"
+preferred_name: ""
+autonym: ""
+population: 111028
+region: "MD"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ç Ê Ö Ü Ğ Ş Ţ Ș Ț a b c d e f g h i j k l m n o p q r s t u v w x y z ä ç ê ö ü ğ İ ı ş ţ ș ț"
+  marks: "◌̂ ◌̆ ◌̇ ◌̈ ◌̦ ◌̧"
+}
+sample_text {
+  masthead_full: "IiNn"
+  masthead_partial: "Ss"
+  tester: "ESABA ALARAK, ani insan aylesi azaların kişilik saygılıı, onnarın"
+  poster_sm: "ESABA ALARAK,"
+  poster_md: "bildirer"
+  poster_lg: "Insannar"
+  specimen_48: "Insannar hepsi duuêrlar serbest hem birtakım kendi kıymetindä"
+  specimen_36: "Kimsey diil lääzım tutulsun esirliktä ya serbestsiz durumda; esirlik hem esir satılması hiçbirtürlü kabledilmeer."
+  specimen_32: "Herbir msanııı hakı var legal millet daavalarından haklarını efekivli geeri almaa, eer kostituţiya ya kanon tarafından ona verilän haklar korunmazsalar."
+  specimen_21: "Kimsey yok nasıl zakonsuz zorlan kapansın, tutulsun yada erindän kaldırılsın.\nHerbir insanın haklarını hem borçlarını belirtmäk için hem ona çıkarılan kabaatlamanın sebepli olup-olmadıını göstermäk için var hakı, cümlä birtakımnık temelindä, ıstemäa onun daavası bakılsın açık hem dooruluk kurallarına uygun olarak baalı olmayan hem tarafsız olan sudta."
+  specimen_16: "Kimseyin yok nasıl kanonsuz karışılsın kendi kişi hem aylä yaşamasına, kanonsuz dokunulsun onun eviııä, onun Yazışma saklılıına yada onun kıymetinä hem adına. Herbir insanın var hakı kanonnan korunmalı olmaa bölä karışmalardan eki bölä dokunmalardan.\nHerbir msanın var serbestli düşünmäk, üz hem din hakı; bu haka girer serbestlik diiştirmää kendi diııini ya inandıklarını hem tutmaa kendi dinini ya inandıklarını tek başına ekİ başkasınnan birliktä, halka açık üürenmää, duva etmää hem din ritual adetlerini kullanmaa.\nHerbir insanın var hakı dinnenmä hem boş vakıda, bu arada çalışma günün akıllıca sınırlanmasına hem periodik ödekli izinina (otpuskaya)."
+}
diff --git a/lang/languages/gag/language.textproto b/lang/languages/gag/language.textproto
deleted file mode 100644
index b9d229a03..000000000
--- a/lang/languages/gag/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "gag"
-name: "Gagauz"
-preferred_name: ""
-autonym: ""
-population: 111028
-region: "MD"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ç Ê Ö Ü Ğ Ş Ţ Ș Ț a b c d e f g h i j k l m n o p q r s t u v w x y z ä ç ê ö ü ğ İ ı ş ţ ș ț"
-  marks: "◌̂ ◌̆ ◌̇ ◌̈ ◌̦ ◌̧"
-}
diff --git a/lang/languages/gag/sampletext.textproto b/lang/languages/gag/sampletext.textproto
deleted file mode 100644
index 9f0196487..000000000
--- a/lang/languages/gag/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "gag"
diff --git a/lang/languages/gan.textproto b/lang/languages/gan.textproto
new file mode 100644
index 000000000..2b1439c3f
--- /dev/null
+++ b/lang/languages/gan.textproto
@@ -0,0 +1,25 @@
+id: "gan"
+name: "Gan Chinese"
+preferred_name: "Gan"
+autonym: "赣语 / 江西话"
+population: 23698340
+region: "CN"
+script: "Simplified Han"
+exemplar_chars {
+  base: "B P M F D T L Z C S J Q X G K H I U Y A E O N b p m f d t l z c s j q x g k h i u y a e o n"
+  auxiliary: "乒 乓 仂 仓 伞 侣 傈 傣 僳 冥 凉 刨 匕 卑 卞 厘 厦 厨 吕 呣 唇 啤 啮 喱 嗅 噘 噢 坝 堤 墟 奎 妆 婴 媚 宅 寺 尬 尴 屑 屿 巽 巾 弓 彗 惊 戟 扔 扰 扳 抛 挂 捂 摇 撅 撤 杆 杖 柜 柱 栗 栽 桶 棍 棕 棺 楔 楠 榈 槟 橙 洒 浆 涌 淇 滕 滚 滩 灾 烛 烟 焰 煎 犬 猫 瑚 瓢 甫 皱 盆 盔 盲 眨 眯 瞌 矿 碑 祈 祭 祷 禄 稻 竿 笼 筒 篷 粟 粮 纠 纬 缆 缎 耸 脚 舔 舵 艇 艮 芽 苜 苞 菇 菱 葫 葵 蒸 蓿 蔽 薯 蘑 蚂 蛛 蜗 蜘 蜡 蝎 蝴 螃 裹 谍 谬 豚 账 跤 踪 躬 轴 辐 迹 郁 鄙 酢 钉 钥 钮 钯 铂 铅 铛 锄 锑 锚 锤 镑 闺 阱 隧 雕 霾 靴 靶 鞠 颠 馏 驼 骆 髦 魁 鲤 鲸 鳄 鸽"
+  numerals: "% + - . 0 1 2 3 4 5 6 7 8 9 ‰ 〇"
+}
+sample_text {
+  masthead_full: "人生而自"
+  masthead_partial: "由在"
+  tester: "鉴于对人权个无视跟耻笑已发展为野蛮暴行，讲样个暴行玷污了人类个良心，而一个人人享有言论跟信仰自由并冒有恐惧跟匮乏个世界个来临"
+  poster_sm: "人人有权享有生命、自由跟人身安全"
+  poster_md: "任何人都不许加以酷刑"
+  poster_lg: "人人生而自由"
+  specimen_48: "法律之前人人平等，并有权享受法律个平等保护，不受任何歧视。人人有权享受平等保护，以避开昧到本布告个任何歧视行为以及煽动讲样个歧视个任何行为之害"
+  specimen_36: "鉴于对人类家庭所有成员个固有志向及其平等个跟不移个权利个承认，乃是世界头上自由、正义跟和平个基础，\n鉴于为使人类不致迫不得已铤而走险对暴政跟压迫进行反叛，有必要使人权受法治个保护，\n鉴于有必要促进各国间知己关系个发展，"
+  specimen_32: "鉴于对人类家庭所有成员个固有志向及其平等个跟不移个权利个承认，乃是世界头上自由、正义跟和平个基础，\n鉴于对人权个无视跟耻笑已发展为野蛮暴行，讲样个暴行玷污了人类个良心，而一个人人享有言论跟信仰自由并冒有恐惧跟匮乏个世界个来临，已被宣布为普通人民个最高愿望，\n鉴于为使人类不致迫不得已铤而走险对暴政跟压迫进行反叛，有必要使人权受法治个保护，"
+  specimen_21: "鉴于对人类家庭所有成员个固有志向及其平等个跟不移个权利个承认，乃是世界头上自由、正义跟和平个基础，\n鉴于对人权个无视跟耻笑已发展为野蛮暴行，讲样个暴行玷污了人类个良心，而一个人人享有言论跟信仰自由并冒有恐惧跟匮乏个世界个来临，已被宣布为普通人民个最高愿望，\n鉴于为使人类不致迫不得已铤而走险对暴政跟压迫进行反叛，有必要使人权受法治个保护，\n鉴于有必要促进各国间知己关系个发展，\n鉴于各联合国国家个人民已在联合国宪章理头重申渠们对基本人权、人格志向跟价值以及男女平等权利个信念，并决心促成较大自由中个社会进步跟生活水平个改善，\n鉴于各会员国业已誓愿同联合国合作以促进对人权跟基本自由个普遍尊重跟遵行，\n鉴于对讲样个权利跟自由个普遍知根知底对于箇誓愿个充分舞正具有蛮大个重要性，"
+  specimen_16: "鉴于对人类家庭所有成员个固有志向及其平等个跟不移个权利个承认，乃是世界头上自由、正义跟和平个基础，\n鉴于对人权个无视跟耻笑已发展为野蛮暴行，讲样个暴行玷污了人类个良心，而一个人人享有言论跟信仰自由并冒有恐惧跟匮乏个世界个来临，已被宣布为普通人民个最高愿望，\n鉴于为使人类不致迫不得已铤而走险对暴政跟压迫进行反叛，有必要使人权受法治个保护，\n鉴于有必要促进各国间知己关系个发展，\n鉴于各联合国国家个人民已在联合国宪章理头重申渠们对基本人权、人格志向跟价值以及男女平等权利个信念，并决心促成较大自由中个社会进步跟生活水平个改善，\n鉴于各会员国业已誓愿同联合国合作以促进对人权跟基本自由个普遍尊重跟遵行，\n鉴于对讲样个权利跟自由个普遍知根知底对于箇誓愿个充分舞正具有蛮大个重要性，\n因此箇时间，\n大会，\n发布箇世界人权布告，作为所有人民跟所有国家努力舞正个共同标准，指望每一个人跟社会机构经常记到本布告，努力通过教诲跟教育促进对权利跟自由个尊重，并通过国家个跟国际个渐进措施，使讲样个权利跟自由在各会员国本身人民及在其管辖下领土个人民中得到普遍跟有效个承认跟遵行；\n人人生而自由，在志向跟权利上一律平等。渠们赋有理性跟良心，并理当以弟兄义气相对待。\n人人有资格享有本布告所载个一切权利跟自由，不分种族、肤色、性别、语言、宗教、政治或其他见解、国籍或社会出身、财产、出生或其他身分等任何区别。"
+}
diff --git a/lang/languages/gan/language.textproto b/lang/languages/gan/language.textproto
deleted file mode 100644
index 6c9454562..000000000
--- a/lang/languages/gan/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "gan"
-name: "Gan Chinese"
-preferred_name: "Gan"
-autonym: "赣语 / 江西话"
-population: 23698340
-region: "CN"
-script: "Simplified Han"
-exemplar_chars {
-  base: "B P M F D T L Z C S J Q X G K H I U Y A E O N b p m f d t l z c s j q x g k h i u y a e o n"
-  auxiliary: "乒 乓 仂 仓 伞 侣 傈 傣 僳 冥 凉 刨 匕 卑 卞 厘 厦 厨 吕 呣 唇 啤 啮 喱 嗅 噘 噢 坝 堤 墟 奎 妆 婴 媚 宅 寺 尬 尴 屑 屿 巽 巾 弓 彗 惊 戟 扔 扰 扳 抛 挂 捂 摇 撅 撤 杆 杖 柜 柱 栗 栽 桶 棍 棕 棺 楔 楠 榈 槟 橙 洒 浆 涌 淇 滕 滚 滩 灾 烛 烟 焰 煎 犬 猫 瑚 瓢 甫 皱 盆 盔 盲 眨 眯 瞌 矿 碑 祈 祭 祷 禄 稻 竿 笼 筒 篷 粟 粮 纠 纬 缆 缎 耸 脚 舔 舵 艇 艮 芽 苜 苞 菇 菱 葫 葵 蒸 蓿 蔽 薯 蘑 蚂 蛛 蜗 蜘 蜡 蝎 蝴 螃 裹 谍 谬 豚 账 跤 踪 躬 轴 辐 迹 郁 鄙 酢 钉 钥 钮 钯 铂 铅 铛 锄 锑 锚 锤 镑 闺 阱 隧 雕 霾 靴 靶 鞠 颠 馏 驼 骆 髦 魁 鲤 鲸 鳄 鸽"
-  numerals: "% + - . 0 1 2 3 4 5 6 7 8 9 ‰ 〇"
-}
diff --git a/lang/languages/gan/sampletext.textproto b/lang/languages/gan/sampletext.textproto
deleted file mode 100644
index d0eee32b2..000000000
--- a/lang/languages/gan/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "gan"
diff --git a/lang/languages/gay/language.textproto b/lang/languages/gay.textproto
similarity index 74%
rename from lang/languages/gay/language.textproto
rename to lang/languages/gay.textproto
index 9181840f4..a82f64eac 100644
--- a/lang/languages/gay/language.textproto
+++ b/lang/languages/gay.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/gbm/language.textproto b/lang/languages/gbm.textproto
similarity index 75%
rename from lang/languages/gbm/language.textproto
rename to lang/languages/gbm.textproto
index 788c59637..3a0f24494 100644
--- a/lang/languages/gbm/language.textproto
+++ b/lang/languages/gbm.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/gbz/language.textproto b/lang/languages/gbz.textproto
similarity index 76%
rename from lang/languages/gbz/language.textproto
rename to lang/languages/gbz.textproto
index 64d3be158..5b9cdb022 100644
--- a/lang/languages/gbz/language.textproto
+++ b/lang/languages/gbz.textproto
@@ -7,3 +7,6 @@ region: "IR"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/gcr/language.textproto b/lang/languages/gcr.textproto
similarity index 76%
rename from lang/languages/gcr/language.textproto
rename to lang/languages/gcr.textproto
index a00e6cc5e..9778638a4 100644
--- a/lang/languages/gcr/language.textproto
+++ b/lang/languages/gcr.textproto
@@ -7,3 +7,6 @@ region: "GF"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/gd.textproto b/lang/languages/gd.textproto
new file mode 100644
index 000000000..8496d6537
--- /dev/null
+++ b/lang/languages/gd.textproto
@@ -0,0 +1,28 @@
+id: "gd"
+name: "Scottish Gaelic"
+preferred_name: ""
+autonym: "Gàidhlig"
+population: 65103
+region: "GB"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À È É Ì Ò Ó Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à è é ì ò ó ù"
+  auxiliary: "á ă â å ä ã ā æ ċ ç ḋ é ĕ ê ë ē ḟ ġ í ĭ î ï ī ı j k ł ṁ ñ ó ŏ ô ö ø ō œ ṗ q ṡ ş ș ṫ ú ŭ û ü ū v w x y ÿ z"
+  marks: "◌̀ ◌́"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? . … · \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\} § ¶ @ * / \\& ⁊ # % † ‡ ‧ ° © ® ™"
+  index: "A B C D E F G H I L M N O P R S T U"
+}
+sample_text {
+  masthead_full: "TtHh"
+  masthead_partial: "Aa"
+  tester: "Do bhrìgh \'s gu bheil e air aideachadh gu bheil dualchas nàdarra"
+  poster_sm: "Do bhrìgh \'s"
+  poster_md: "Do bhrìgh"
+  poster_lg: "Tha"
+  specimen_48: "Do bhrìgh \'s gu bheil e do-sheachanta feumail cleamhnasan càirdeil"
+  specimen_36: "Do bhrìgh \'s gu bheil e do-sheachanta feumail cleamhnasan càirdeil a stèidheachadh eadar dùthchannan,\nMar sin, a nis,"
+  specimen_32: "Do bhrìgh \'s gu bheil e air aideachadh gu bheil dualchas nàdarra agus còirichean neo-sgaraichte uile bhuill a\' chinne-daonna na stèidh airson saorsa, ceartas agus sìth an t-saoghail,"
+  specimen_21: "Do bhrìgh \'s gu bheil e air aideachadh gu bheil dualchas nàdarra agus còirichean neo-sgaraichte uile bhuill a\' chinne-daonna na stèidh airson saorsa, ceartas agus sìth an t-saoghail,\nDo bhrìgh \'s gun do dh\' adhbharaich a bhith a\' cur còirichean dhaoine ann an suarachas gnìomhan borba a shàraich cogaisean, a bhith air an cleachdadh, agus gum bheil an latha air teachd anns am bi saor-labhartas, saor chreideamh agus saorsa bho eagal agus dìth air a ghairm mar àrd-mhiann an t-sluaigh choitcheann,"
+  specimen_16: "Do bhrìgh \'s gu bheil e air aideachadh gu bheil dualchas nàdarra agus còirichean neo-sgaraichte uile bhuill a\' chinne-daonna na stèidh airson saorsa, ceartas agus sìth an t-saoghail,\nDo bhrìgh \'s gun do dh\' adhbharaich a bhith a\' cur còirichean dhaoine ann an suarachas gnìomhan borba a shàraich cogaisean, a bhith air an cleachdadh, agus gum bheil an latha air teachd anns am bi saor-labhartas, saor chreideamh agus saorsa bho eagal agus dìth air a ghairm mar àrd-mhiann an t-sluaigh choitcheann,\nDo bhrìgh \'s gu bheil e uile do-sheachanta feumail - mas e nach bi an duine air a cho-èigneachadh mu dheireadh gu ceannairc a dhèanamh an aghaidh ain-tighearnas agus fòirneart gum bi còirichean an duine air an dìon tro riaghladh an lagha,"
+}
diff --git a/lang/languages/gd/language.textproto b/lang/languages/gd/language.textproto
deleted file mode 100644
index 9f714937c..000000000
--- a/lang/languages/gd/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "gd"
-name: "Scottish Gaelic"
-preferred_name: ""
-autonym: "Gàidhlig"
-population: 65103
-region: "GB"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À È É Ì Ò Ó Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à è é ì ò ó ù"
-  auxiliary: "á ă â å ä ã ā æ ċ ç ḋ é ĕ ê ë ē ḟ ġ í ĭ î ï ī ı j k ł ṁ ñ ó ŏ ô ö ø ō œ ṗ q ṡ ş ș ṫ ú ŭ û ü ū v w x y ÿ z"
-  marks: "◌̀ ◌́"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? . … · \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\} § ¶ @ * / \\& ⁊ # % † ‡ ‧ ° © ® ™"
-  index: "A B C D E F G H I L M N O P R S T U"
-}
diff --git a/lang/languages/gd/sampletext.textproto b/lang/languages/gd/sampletext.textproto
deleted file mode 100644
index a7d82697c..000000000
--- a/lang/languages/gd/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "gd"
diff --git a/lang/languages/gil/language.textproto b/lang/languages/gil.textproto
similarity index 82%
rename from lang/languages/gil/language.textproto
rename to lang/languages/gil.textproto
index 379f99399..a7f417f8f 100644
--- a/lang/languages/gil/language.textproto
+++ b/lang/languages/gil.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 exemplar_chars {
   base: "A B E I K M N G O R T U W a b e i k m n g o r t u w"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/gjk/language.textproto b/lang/languages/gjk.textproto
similarity index 76%
rename from lang/languages/gjk/language.textproto
rename to lang/languages/gjk.textproto
index 24025f94e..e5493ea67 100644
--- a/lang/languages/gjk/language.textproto
+++ b/lang/languages/gjk.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/gju/language.textproto b/lang/languages/gju.textproto
similarity index 75%
rename from lang/languages/gju/language.textproto
rename to lang/languages/gju.textproto
index dbf9e08fd..23c29c254 100644
--- a/lang/languages/gju/language.textproto
+++ b/lang/languages/gju.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/gl.textproto b/lang/languages/gl.textproto
new file mode 100644
index 000000000..6a142304e
--- /dev/null
+++ b/lang/languages/gl.textproto
@@ -0,0 +1,29 @@
+id: "gl"
+name: "Galician"
+preferred_name: ""
+autonym: "Galego"
+population: 3515529
+region: "ES"
+region: "PT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ñ Ó Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ñ ó ú ü"
+  auxiliary: "ª à ă â å ä ã ā æ ɑ ç è ĕ ê ë ē ì ĭ î ī º ò ŏ ô ö õ ø ō œ ù ŭ û ū"
+  marks: "◌́ ◌̃ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? ¿ . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\\\ \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtÓó"
+  masthead_partial: "Dd"
+  tester: "A liberdade, a xustiza e a paz no mundo teñen por base o recoñecemento"
+  poster_sm: "Esencial que"
+  poster_md: "Os pobos"
+  poster_lg: "Tódolos"
+  specimen_48: "Os estados membros comprometíronse a asegurar, en cooperación"
+  specimen_36: "Unha concepción común destes dereitos e liberdades ó da maior importancia para o pleno cumprimento de dito compromiso;"
+  specimen_32: "Tódolos seres humanos nacen libres e iguais en dignidade e dereitos e, dotados como están de razón e conciencia, díbense comportar fraternalmente uns cos outros."
+  specimen_21: "Toda persoa ten os dereitos e liberdades proclamados nesta Declaración, sen distinción ningunha de raza, cor, sexo, idioma, relixión, opinión política ou de calquera outra índole, orixe nacional ou social, posición económica, nacemento ou calquera outra condición.\nTodo individuo ten dereito á vida, á liberdade e á seguridade da súa persoa."
+  specimen_16: "Ninguín estará sometido á escravitude nin a servidume; a escravitude e a trata de escravos está prohibida en tódalas súas maneiras.\nNinguín será sometido a torturas nin a penas ou tratos crueis, inhumanos e aldraxantes.\nTodo ser humano ten dereito, en tódalas partes, ó reconecemento da súa persoalidade.\nTodos son iguais perante a lei e teñen, sen distincin, dereito á igual protección da lei. Todos teñen dereito á igual protección contra todo acto discriminatorio que infrinxa esta Declaración e contra toda provocación a tal acto.\nToda persoa ten dereito a un recurso efectivo, perante os tribunais nacionais competentes, que a ampare contra os actos que violen os seus dereitos fundamentais recoñecidos pola constitución ou pola lei."
+}
diff --git a/lang/languages/gl/language.textproto b/lang/languages/gl/language.textproto
deleted file mode 100644
index e3bc0d4f5..000000000
--- a/lang/languages/gl/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "gl"
-name: "Galician"
-preferred_name: ""
-autonym: "Galego"
-population: 3515529
-region: "PT"
-region: "ES"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ñ Ó Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ñ ó ú ü"
-  auxiliary: "ª à ă â å ä ã ā æ ɑ ç è ĕ ê ë ē ì ĭ î ī º ò ŏ ô ö õ ø ō œ ù ŭ û ū"
-  marks: "◌́ ◌̃ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ¡ ? ¿ . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\\\ \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/gl/sampletext.textproto b/lang/languages/gl/sampletext.textproto
deleted file mode 100644
index 943c01590..000000000
--- a/lang/languages/gl/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "gl"
diff --git a/lang/languages/glk/language.textproto b/lang/languages/glk.textproto
similarity index 75%
rename from lang/languages/glk/language.textproto
rename to lang/languages/glk.textproto
index 23958e1f5..da95ecc47 100644
--- a/lang/languages/glk/language.textproto
+++ b/lang/languages/glk.textproto
@@ -7,3 +7,6 @@ region: "IR"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/gn.textproto b/lang/languages/gn.textproto
new file mode 100644
index 000000000..b7746ad33
--- /dev/null
+++ b/lang/languages/gn.textproto
@@ -0,0 +1,26 @@
+id: "gn"
+name: "Guarani"
+preferred_name: ""
+autonym: "Avañe\'ẽ"
+population: 5827106
+region: "AR"
+region: "BO"
+region: "PY"
+script: "Latin"
+exemplar_chars {
+  base: "A Ã C E Ẽ G G̃ H I Ĩ J K L M N Ñ O Õ P R S T U Ũ V Y Ỹ a ã c e ẽ g g̃ h i ĩ j k l m n ñ o õ p r s t u ũ v y ỹ ʼ"
+  marks: "◌̃"
+}
+sample_text {
+  masthead_full: "MmAa"
+  masthead_partial: "Yy"
+  tester: "Mayma yvypóra ou ko yvy ári iñapytlʼyre ha eteĩcha dignidad ha"
+  poster_sm: "Mayma yuypóra"
+  poster_md: "Maymavaite:"
+  poster_lg: "Mayma"
+  specimen_48: "Mayma yvypóra oguereko derecho oñangarekóvo hese hekoitépe tribunal"
+  specimen_36: "Mayma yvypóra oguereko derecho ojehechakuaávo ichupe opaite handárupi haʼeha peteĩ máva leiduéra renondépe."
+  specimen_32: "Mbaʼeveichagua jeporavo avei ndoiók vaʼerã oñemañanguévo hetã situación rehe, legalmentepa mbaʼéicha oĩ, haʼépa isãsopyre, oguatáva ojeheguiete, térãpa oĩ ambue tetã ndiv térã ipoguype."
+  specimen_21: "(preamble missing)\nMayma yvypóra ou ko yvy ári iñapytlʼyre ha eteĩcha dignidad ha derecho jeguerekópe; ha ikatu rupi oikuaa añetéva ha añeteʼyva, iporãva ha ivaíva, tekotevẽ pehenguéicha oiko oñondivekuéra.\nMayma yuypóra oguereko derecho ha libertad kuéra ko Declaraciónpe oĩva, oñemañaʼyre mbaʼeichaguapa i-ráza, ipire color; kiñápa terãpa kuimbaʼe, iñeʼẽ, i-religión, iñopinión política, hetã, haʼépa mbaʼ rerekoha, oĩpa yvate terãpa nahániri sociedad ryepype, hambaʼe."
+  specimen_16: "(preamble missing)\nMayma yvypóra ou ko yvy ári iñapytlʼyre ha eteĩcha dignidad ha derecho jeguerekópe; ha ikatu rupi oikuaa añetéva ha añeteʼyva, iporãva ha ivaíva, tekotevẽ pehenguéicha oiko oñondivekuéra.\nMayma yuypóra oguereko derecho ha libertad kuéra ko Declaraciónpe oĩva, oñemañaʼyre mbaʼeichaguapa i-ráza, ipire color; kiñápa terãpa kuimbaʼe, iñeʼẽ, i-religión, iñopinión política, hetã, haʼépa mbaʼ rerekoha, oĩpa yvate terãpa nahániri sociedad ryepype, hambaʼe.\nMbaʼeveichagua jeporavo avei ndoiók vaʼerã oñemañanguévo hetã situación rehe, legalmentepa mbaʼéicha oĩ, haʼépa isãsopyre, oguatáva ojeheguiete, térãpa oĩ ambue tetã ndiv térã ipoguype."
+}
diff --git a/lang/languages/gn/language.textproto b/lang/languages/gn/language.textproto
deleted file mode 100644
index d6a9ee23c..000000000
--- a/lang/languages/gn/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "gn"
-name: "Guarani"
-preferred_name: ""
-autonym: "Avañe\'ẽ"
-population: 5827106
-region: "PY"
-region: "BO"
-region: "AR"
-script: "Latin"
-exemplar_chars {
-  base: "A Ã C E Ẽ G G̃ H I Ĩ J K L M N Ñ O Õ P R S T U Ũ V Y Ỹ a ã c e ẽ g g̃ h i ĩ j k l m n ñ o õ p r s t u ũ v y ỹ ʼ"
-  marks: "◌̃"
-}
diff --git a/lang/languages/gn/sampletext.textproto b/lang/languages/gn/sampletext.textproto
deleted file mode 100644
index a1c44fe5f..000000000
--- a/lang/languages/gn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "gn"
diff --git a/lang/languages/gom/language.textproto b/lang/languages/gom.textproto
similarity index 91%
rename from lang/languages/gom/language.textproto
rename to lang/languages/gom.textproto
index 6ec3489cf..cbf8a3aa6 100644
--- a/lang/languages/gom/language.textproto
+++ b/lang/languages/gom.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
   punctuation: "। ॥ ॰"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/gon/language.textproto b/lang/languages/gon.textproto
similarity index 77%
rename from lang/languages/gon/language.textproto
rename to lang/languages/gon.textproto
index 3ca0d7b28..9f4c622f2 100644
--- a/lang/languages/gon/language.textproto
+++ b/lang/languages/gon.textproto
@@ -8,3 +8,6 @@ script: "Devanagari"
 script: "Telugu"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "gon"
+}
diff --git a/lang/languages/gor/language.textproto b/lang/languages/gor.textproto
similarity index 75%
rename from lang/languages/gor/language.textproto
rename to lang/languages/gor.textproto
index f469b69de..376f9e671 100644
--- a/lang/languages/gor/language.textproto
+++ b/lang/languages/gor.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/gos/language.textproto b/lang/languages/gos.textproto
similarity index 74%
rename from lang/languages/gos/language.textproto
rename to lang/languages/gos.textproto
index eac9942fc..64c5334cc 100644
--- a/lang/languages/gos/language.textproto
+++ b/lang/languages/gos.textproto
@@ -7,3 +7,6 @@ region: "NL"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/grt/language.textproto b/lang/languages/grt.textproto
similarity index 76%
rename from lang/languages/grt/language.textproto
rename to lang/languages/grt.textproto
index aa328342b..9976e7fe2 100644
--- a/lang/languages/grt/language.textproto
+++ b/lang/languages/grt.textproto
@@ -8,3 +8,6 @@ region: "IN"
 script: "Bangla"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "bn"
+}
diff --git a/lang/languages/gsw.textproto b/lang/languages/gsw.textproto
new file mode 100644
index 000000000..b1d7d6f70
--- /dev/null
+++ b/lang/languages/gsw.textproto
@@ -0,0 +1,30 @@
+id: "gsw"
+name: "Swiss German"
+preferred_name: ""
+autonym: "Schwyzerdütsch"
+population: 7956951
+region: "CH"
+region: "DE"
+region: "FR"
+region: "LI"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö ü"
+  auxiliary: "á à ă â å ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ø ō œ ú ù ŭ û ū ÿ"
+  marks: "◌̈"
+  numerals: ". ’ % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "ÀàLl"
+  masthead_partial: "Ii"
+  tester: "Wil d’Fréiheit, d’Gerachtichkeit ùn de Frìdde ùff de Walt sich ùff"
+  poster_sm: "Wil ’s do, wo"
+  poster_md: "Wil d’Stààte,"
+  poster_lg: "Àlli"
+  specimen_48: "Wil e gemeinsàmi Ùfffàssùng ìwwer dìe Rachte ùn Fréiheite vìehmaßi"
+  specimen_36: "Mr derf nìemes ìn Sklàveréi odder ìn Knachtschàft hàlte; d’Sklàveréi ùn de Sklàvehàndel sìnn ìn àlle ìhre Forme verbotte."
+  specimen_32: "E jeder Mensch het s Racht, àss eso-n-e soziàli ùn ìnternàtionàli Ordnùng herrscht, wo d’Rachte ùn d’Fréiheite, wie ìn dëre Erklärùng ùffgezehlt wùrre sìnn, vollstandi kénne wìrike."
+  specimen_21: "Gàr ke Bstìmmùng vùn dëre Erklärùng derf eso üssgelëjt ware, wie wànn’s ìme Stààt, ìnere Grùppe odder ìnere Parson egàl wells Racht tat gann, ebbs ze triwe odder Tàte ze begehn, wovùn s Zìel ìsch, d’Rachte ùn d’Fréiheite, wie do genannt sìnn, ze vernìchte.\nWil d’Fréiheit, d’Gerachtichkeit ùn de Frìdde ùff de Walt sich ùff d’Ànerkannùng vùn de Wìrde stìtze, wie ìn àlle Litt vùn de Menschefàmìli zükùmmt, sowie ùff ìhri gliche ùn ùnverüsserliche Rachte,"
+  specimen_16: "Wil d’Fréiheit, d’Gerachtichkeit ùn de Frìdde ùff de Walt sich ùff d’Ànerkannùng vùn de Wìrde stìtze, wie ìn àlle Litt vùn de Menschefàmìli zükùmmt, sowie ùff ìhri gliche ùn ùnverüsserliche Rachte,\nWil ’s do, wo mr d’Menscherachte nìt gekannt ùn nìt reschpektìert het, zü ùnmenschliche Tàte gebroocht het, wie s Gewìsse vùn de gànze Menschheit revoltìere, ùn wil ’s proklàmìert wùrre ìsch, àss de Mensch vor àllem ùff e néji Walt blàngt, wo d’Litt fréi sìnn, ze redde ùn ze gloewe wie se welle, ùn wo se vùn Schrecke ùn Not befréit sìnn,\nWil ’s notwandich ìsch, àss d’Menscherachte dùrich e Rachtssyschtem gschìtzt ware, fer àss de Mensch nìt gezwùnge wùrd, sich àls letschter Üsswaj gejje d’Tyrànnéi ùn d’Ùnterdrìckùng ze revoltìere,"
+}
diff --git a/lang/languages/gsw/language.textproto b/lang/languages/gsw/language.textproto
deleted file mode 100644
index 33439f089..000000000
--- a/lang/languages/gsw/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "gsw"
-name: "Swiss German"
-preferred_name: ""
-autonym: "Schwyzerdütsch"
-population: 7956951
-region: "FR"
-region: "LI"
-region: "DE"
-region: "CH"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö ü"
-  auxiliary: "á à ă â å ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ø ō œ ú ù ŭ û ū ÿ"
-  marks: "◌̈"
-  numerals: ". ’ % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/gsw/sampletext.textproto b/lang/languages/gsw/sampletext.textproto
deleted file mode 100644
index c0ed599fc..000000000
--- a/lang/languages/gsw/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "gsw"
diff --git a/lang/languages/gu.textproto b/lang/languages/gu.textproto
new file mode 100644
index 000000000..f7f7bbd0c
--- /dev/null
+++ b/lang/languages/gu.textproto
@@ -0,0 +1,29 @@
+id: "gu"
+name: "Gujarati"
+preferred_name: ""
+autonym: "ગુજરાતી"
+population: 59679028
+region: "IN"
+region: "KE"
+script: "Gujarati"
+exemplar_chars {
+  base: "અ આ ઇ ઈ ઉ ઊ ઋ પ એ ઐ ઓ ઔ ક ખ ગ ઘ ઙ ચ છ જ ઝ ઞ ટ ઠ ડ ઢ ણ ત થ દ ધ ન ફ બ ભ મ ય ર લ વ શ ષ સ હ ળ"
+  auxiliary: "ॐ"
+  marks: "◌ં ◌ઃ ◌ા ◌િ ◌ી ◌ુ ◌ૂ ◌ૃ ◌ે ◌ૈ ◌ો ◌ૌ ◌્"
+  numerals: "૦ ૧ ૨ ૩ ૪ ૫ ૬ ૭ ૮ ૯ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "। ॥ ॰"
+  index: "અ {અ\\u0A82} {અઃ} આ ઇ ઈ ઉ ઊ ઋ ઍ એ ઐ ઑ ઓ ઔ ક {ક\\u0ACDષ} ખ ગ ઘ ઙ ચ છ જ {જ\\u0ACDઞ} ઝ ઞ ટ ઠ ડ ઢ ણ ત {ત\\u0ACDર} થ દ ધ ન પ ફ બ ભ મ ય ર લ વ શ ષ સ હ ળ"
+}
+sample_text {
+  masthead_full: "પરતષ"
+  masthead_partial: "ઠઅ"
+  tester: "કેમ કે માનવકુટુંબના દરેક સભ્યની પરંપરા-પ્રાપ્ત પ્રતિષ્ઠાને અને સમાન અને અસંકામ્ય અધિકારોને માન્યતા"
+  poster_sm: "કેમ કે માનવ અધિકારોની"
+  poster_md: "કેમ કે જો માણસને"
+  poster_lg: "પ્રતિષ્ઠા"
+  specimen_48: "કેમ કે સંયુકત રાષ્ટ્રોના લોકોએ ખતપત્રમાં મૂળભૂત માનવ અધિકારોમાં માનવીની પ્રતિષ્ઠા અને મૂલ્યમાં"
+  specimen_36: "કેમ કે સભ્ય રાજ્યોએ સંયુકત રાષ્ટ્રોના સહકારમાં માનવ અધિકારોના અને મૂળભૂત સ્વતંત્રતાઓના વિશ્વવ્યાપી માનમાં વૃદ્ધિ કરવાની અને તેનું પાલન કરવાની પ્રતિજ્ઞા લીધી છે,"
+  specimen_32: "દરેક વ્યક્તિને જાતિ, રંગ, લિંગ, ભાષા, ધર્મે, રાજકીય અથવા બીજા અભિપ્રાય, રાષ્ટ્રીય અથવા સામાજિક ઉદ્ભવસ્થાન, મિલકત, જન્મ અથવા મોભા જેવા કોઇપણ જાતના ભેદભાવ વગર આ ધોષણામાં રજૂ કરવામાં આવેલા સધળા અધિકારો અને સ્વતંત્રતા ભોગવવાનો હક્ક છે."
+  specimen_21: "વધુમાં કોઇપણ વ્યક્તિ તે સ્વતંત્ર, ટ્રસ્ટ હેઠળના સ્વશાસન હેઠળ ન હોય તેવા અથવા સાર્વભામત્વની બીજી કોઇપણ મર્યાદા હેઠળ આવેલા દેશ અથવા પ્રદેશની હોય તો પણ રાજકીય, હફમવવિષયક અથવા આંતરરાષ્ટ્રીય મોભાના ધોરણે તેની સાથે કોઇપણ ભેદભાવ રાખવામાં આવશે નહિ.\nદરેક વ્યક્તિને જીવવાનો, સ્વતંત્રતાનો અને સ્વરક્ષણનો અધિકાર છે.\nકોઇને પણ ગુલામી અથવા પરાધીન દશામાં રાખવામાં આવશે નહિ; દરેક પ્રકારની ગુલામી અને ગુલામોના વેપાર પર પ્રતિબંધ મૃકવામાં આવશે.\nકોઇપણ વ્યક્તિની ઉપર જુલમ ગુજારવામાં આવશે નહિ અથવા તેની સાથે ધાતકી, અમાનુષી અથવા હલકા પ્રકારનો વર્તાવ રાખવામાં આવશે નહિ અથવા તેવા પ્રકારની શિક્ષા કરવામાં આવશે નહિ."
+  specimen_16: "દરેક વ્યક્તિને દરેક હેકાણે કાયદાની સમક્ષ માનવ તરીકે સ્વીકાર કરાવવાનો અધિકાર છે.\nકાયદા સમક્ષ સર્વ માણસો સમાન છે અને કોઇપણ જાતના ભેદભાવ વગર કાયદાનું રક્ષણ સમાન ધોરણે મેળવવાને હક્કદાર છે. આ ધોષણાનો ભંગકરીને કોઇપણ જાતના ભેદભાવ સામે અને આવા ભેદભાવ જગાવવામાં, કોઇપણ જાતની ઉશ્કેરણી કરવા સામે સમાન રક્ષણ મેળવવાનો સર્વને હક્ક છે.\nદરેક વ્યક્તિને સંવિધાન અથવા કાયદા દ્વારા તેને મળેલા મૂળભૂત અધિકારોનો ભંગ કરતા કૃત્યો માટે સક્ષમ રાષ્ટ્રીય ન્યાયાધિકરણ દ્વારા અસરકારક ઉપાયો લેવાનો હક્ક છે.\nકોઇપણ વ્યક્તિને આપખુદ રીતે ગિરફતાર કરવામાં, અટકઃયતમાં રાખવામાં અથવા દેશનિકાલ કરવામાં આવશે નહિ.\nદરેક વ્યક્તિને પોતાના અધિકારો અને બંધનોના અને તેની વિરુદ્ધ કોઇપણ ફોજદારી આરોપના નિર્ણયમાં કોઇ સ્વતંત્ર અને નિષ્પક્ષ ન્યાયાધિકરણ દ્વારા વ્યાજબી અને જાહેર સુનાવણી કરાવવાનો સંપૂર્ણ સમાન ધોરણે અધિકાર છે.\nકોઇપણ વ્યક્તિના એકાન્ત, કુટુંબ, ઘર અથવા પત્રવ્યવહારમાં આપખુદીપણે દખલગીરી કરવામાં આવશે નહિ તેમજ તેના માન અને પ્રતિષ્ઠા પર આક્રમણ કરવા દેવામાં આવશે નહિ. આવી દખલગીરી અથવા આક્રમણ સામે કાયદાનું રક્ષણ માગવાનો દરેકને અધિકાર છે."
+}
diff --git a/lang/languages/gu/language.textproto b/lang/languages/gu/language.textproto
deleted file mode 100644
index 16ab84880..000000000
--- a/lang/languages/gu/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "gu"
-name: "Gujarati"
-preferred_name: ""
-autonym: "ગુજરાતી"
-population: 59679028
-region: "KE"
-region: "IN"
-script: "Gujarati"
-exemplar_chars {
-  base: "અ આ ઇ ઈ ઉ ઊ ઋ પ એ ઐ ઓ ઔ ક ખ ગ ઘ ઙ ચ છ જ ઝ ઞ ટ ઠ ડ ઢ ણ ત થ દ ધ ન ફ બ ભ મ ય ર લ વ શ ષ સ હ ળ"
-  auxiliary: "ॐ"
-  marks: "◌ં ◌ઃ ◌ા ◌િ ◌ી ◌ુ ◌ૂ ◌ૃ ◌ે ◌ૈ ◌ો ◌ૌ ◌્"
-  numerals: "૦ ૧ ૨ ૩ ૪ ૫ ૬ ૭ ૮ ૯ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "। ॥ ॰"
-  index: "અ {અ\\u0A82} {અઃ} આ ઇ ઈ ઉ ઊ ઋ ઍ એ ઐ ઑ ઓ ઔ ક {ક\\u0ACDષ} ખ ગ ઘ ઙ ચ છ જ {જ\\u0ACDઞ} ઝ ઞ ટ ઠ ડ ઢ ણ ત {ત\\u0ACDર} થ દ ધ ન પ ફ બ ભ મ ય ર લ વ શ ષ સ હ ળ"
-}
diff --git a/lang/languages/gu/sampletext.textproto b/lang/languages/gu/sampletext.textproto
deleted file mode 100644
index 9d14c87d8..000000000
--- a/lang/languages/gu/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "gu"
diff --git a/lang/languages/gub/language.textproto b/lang/languages/gub.textproto
similarity index 75%
rename from lang/languages/gub/language.textproto
rename to lang/languages/gub.textproto
index 3e6c7ed48..16d6cf380 100644
--- a/lang/languages/gub/language.textproto
+++ b/lang/languages/gub.textproto
@@ -7,3 +7,6 @@ region: "BR"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/guc.textproto b/lang/languages/guc.textproto
new file mode 100644
index 000000000..3856176f4
--- /dev/null
+++ b/lang/languages/guc.textproto
@@ -0,0 +1,24 @@
+id: "guc"
+name: "Wayuu"
+preferred_name: ""
+autonym: "Wayuunaiki"
+population: 132528
+region: "CO"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ñ ü"
+  marks: "◌̃ ◌̈"
+}
+sample_text {
+  masthead_full: "NnAa"
+  masthead_partial: "Ww"
+  tester: "JÜLÜJÜINJATÜ A\'IN taashi, kasalajana, kamaneejirawaa, sa\'u tüü mmakat"
+  poster_sm: "JÜLÜJÜINJATÜ"
+  poster_md: "KOTTIRAWAA"
+  poster_lg: "Naa"
+  specimen_48: "TÜÜWAALAI SÜCHIKIMAAJATÜKA SÜJUTU WAYUU SA\'U TÜÜ MMAKAT, isakat"
+  specimen_36: "Nojolüinjachi aapünüin wane wayuu süpüla achepchia,apülajünüitpa kasa müsüaka tüya sülu\'u sükua\'ipa süpüshuaya."
+  specimen_32: "Wanawashi napüshua naa wayuukana so\'upala tüü sülaulaka a\'inmajia, anaaka naya joolu\'u a\'inmajünüin wanawa. Nojolüinjana letüin süulia tüü akua\'ipa sülu\'uwataka tüü pütchi karalo\'utalüka."
+  specimen_21: "Naa wayuukana eeshi süpüla asakajaa süchirua nakua\'ipa laulapialu\'upüna maaka shiinnule amüin tüü akua\'ipa aapüshika namüin sülu\'u tüü Konstitusionka.\nNoojolüinjachi ata\'unüin wane wayuu masalajanoule.\nNaa wayuukana eeshisüpüla wanawain nakua\'ipa sünain aapajuna anuiki, o\'upala sütuma tüü e\'itatka süsalajana kasa süpüla shiitaanüinjatüin süsalajana nañajala sülu\'u anakat akua\'ipa."
+  specimen_16: "Nnojolüinjana eke\'ejünüin a\'in naa wayuukana sa\'uje nakua\'ipa nepialu\'u, süma napüshi jee müsüya sa\'uje tüü karalo\'uta antakaa namüin a\'inmajünüinjatü tüü nakua\'ipa süulia jamajüin naya atuma.\nNaa wayuukana eeshi süpüla taashi akua\'ipa süpüleerua ano\'uja, otta müsüya e\'itana na\'in sünain kasa anakat napüleerua.\nNaa wayuukanairua eeshi süpüla taashi akua\'ipa sünain yootoo süchiki tüü kasa nekiiru\'ukana nnojolüinjana süsalajanain aashajawaa süma aapajana wane kasa achiki süpüla nülu\'uwata\'in shia süpüla saapajünüin epünaweere shia nülu\'uwata\'in achiki.\nNayataale naa wayuukana eeshi süpüla neemerain so\'u wane ka\'i, otta müsüya ayawatünüinjatü sukalia nayatain sapünapa namüin tüü eemerawaaka wala\'injana suma\'iru."
+}
diff --git a/lang/languages/guc/language.textproto b/lang/languages/guc/language.textproto
deleted file mode 100644
index c28da8eb9..000000000
--- a/lang/languages/guc/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "guc"
-name: "Wayuu"
-preferred_name: ""
-autonym: "Wayuunaiki"
-population: 132528
-region: "CO"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ñ ü"
-  marks: "◌̃ ◌̈"
-}
diff --git a/lang/languages/guc/sampletext.textproto b/lang/languages/guc/sampletext.textproto
deleted file mode 100644
index 6c23192a4..000000000
--- a/lang/languages/guc/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "guc"
diff --git a/lang/languages/gur/language.textproto b/lang/languages/gur.textproto
similarity index 74%
rename from lang/languages/gur/language.textproto
rename to lang/languages/gur.textproto
index 3efff6459..e328c00c5 100644
--- a/lang/languages/gur/language.textproto
+++ b/lang/languages/gur.textproto
@@ -7,3 +7,6 @@ region: "GH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/guz/language.textproto b/lang/languages/guz.textproto
similarity index 88%
rename from lang/languages/guz/language.textproto
rename to lang/languages/guz.textproto
index 6b7082ed3..f0756b669 100644
--- a/lang/languages/guz/language.textproto
+++ b/lang/languages/guz.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "Q X q x"
   index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/gv.textproto b/lang/languages/gv.textproto
new file mode 100644
index 000000000..ca8ccb40d
--- /dev/null
+++ b/lang/languages/gv.textproto
@@ -0,0 +1,26 @@
+id: "gv"
+name: "Manx"
+preferred_name: ""
+autonym: "Gaelg"
+population: 1719
+region: "IM"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç a b c d e f g h i j k l m n o p q r s t u v w x y z ç"
+  marks: "◌̧"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtAa"
+  masthead_partial: "Dd"
+  tester: "Fakin dy nee cur enney er ooashley beayn dy chooilley oltey jeh"
+  poster_sm: "Fakin dy vel"
+  poster_md: "Fakin dy"
+  poster_lg: "ruggit"
+  specimen_48: "Fakin dy vel eh ymmyrchagh dy chur kianglaghyn dy chaarjys eddyr"
+  specimen_36: "Cha bee unnane erbee er ny horchaghey ny surranse dellal ny kerraghey erbee dewil, neughooie ny oltooanagh."
+  specimen_32: "Ta cairys ec dy chooilley unnane gys fea as soccar, goaill stiagh lhiettalyn resoonagh er ooryn obbree as laghyn seyrey veih traa dy traa lesh eeck."
+  specimen_21: "Ta cairys ec dy chooilley unnane gys order sheshoil as eddyr-ashoonagh ayn oddys ny cairyssyn as ny seyrsnyssyn ta soit magh ’syn Ockley-magh shoh bishaghey dy slane.\nCha vod red erbee ’syn Ockley-magh shoh ve smooinit dy chur cairys erbee da State, sheshaght ny persoon erbee dy yannoo nhee erbee ta kiarit dy chur mow veg jeh ny cairyssyn as ny seyrsnyssyn ta soit magh ayns shoh."
+  specimen_16: "Fakin dy nee cur enney er ooashley beayn dy chooilley oltey jeh kynney sheelnaue as er nyn gairyssyn corrym nagh vod y ve goit ersooyl undin seyrsnys, cairys as shee ayns y theihll,\nFakin dy vel mee-ooashley da cairyssyn deiney as craid jeu er leeideil gys drogh-yannoo barbaragh t’er chur sneih er cooinsheanse sheelnaue, as dy vel toshiaght seihll raad ghoys deiney soylley jeh seyrsnys loayrt as credjue as seyrsnys veih aggle as egin er ve focklit magh myr yeearree syrjey yn phobble chadjin,\nFakin dy vel eh erskyn ooilley ymmyrchagh, mannagh bee dooinney eginit dy hyndaa, ec y jerrey, gys irree-magh noi tranlaase as eiyrtys, cairyssyn deiney dy v’er nyn goadey liorish reill y leigh,"
+}
diff --git a/lang/languages/gv/language.textproto b/lang/languages/gv/language.textproto
deleted file mode 100644
index 775e05807..000000000
--- a/lang/languages/gv/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "gv"
-name: "Manx"
-preferred_name: ""
-autonym: "Gaelg"
-population: 1719
-region: "IM"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç a b c d e f g h i j k l m n o p q r s t u v w x y z ç"
-  marks: "◌̧"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/gv/sampletext.textproto b/lang/languages/gv/sampletext.textproto
deleted file mode 100644
index 85d7bb721..000000000
--- a/lang/languages/gv/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "gv"
diff --git a/lang/languages/gvr/language.textproto b/lang/languages/gvr.textproto
similarity index 75%
rename from lang/languages/gvr/language.textproto
rename to lang/languages/gvr.textproto
index 711a5bd48..8db6e7d57 100644
--- a/lang/languages/gvr/language.textproto
+++ b/lang/languages/gvr.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/gwi/language.textproto b/lang/languages/gwi.textproto
similarity index 89%
rename from lang/languages/gwi/language.textproto
rename to lang/languages/gwi.textproto
index a9122d53d..b138f987f 100644
--- a/lang/languages/gwi/language.textproto
+++ b/lang/languages/gwi.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Ą È É Ę Ì Í Ò Ó Ǫ Ù Ú Ł a b c d e f g h i j k l m n o p q r s t u v w x y z à ą è é ę ì í ò ó ǫ ’ ù ú ł"
   marks: "◌̀ ◌́ ◌̨"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ha/language.textproto b/lang/languages/ha.textproto
similarity index 93%
rename from lang/languages/ha/language.textproto
rename to lang/languages/ha.textproto
index 102a95922..c4cf625ff 100644
--- a/lang/languages/ha/language.textproto
+++ b/lang/languages/ha.textproto
@@ -3,11 +3,11 @@ name: "Hausa"
 preferred_name: ""
 autonym: "Hausa"
 population: 37412649
-region: "NG"
-region: "NE"
 region: "GH"
-script: "Perso-Arabic"
+region: "NE"
+region: "NG"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O R S T U W Y Z Ƙ Ƴ Ɓ Ɗ R̃ a b c d e f g h i j k l m n o r s t u w y z ƙ ƴ ɓ ɗ r̃ ʼ"
   auxiliary: "P Q V X À Á Â È É Ê Ì Í Î Ò Ó Ô Ù Ú Û p q v x à á â è é ê ì í î ò ó ô ù ú û"
@@ -15,3 +15,6 @@ exemplar_chars {
   punctuation: "\\- ‑ , ; \\: ! ? . \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\} ′ ″"
   index: "A B Ɓ C D Ɗ E F G H I J K Ƙ L M N O R S T U W Y Ƴ Z"
 }
+sample_text {
+  fallback_language: "ha"
+}
diff --git a/lang/languages/ha_Arab/language.textproto b/lang/languages/ha_Arab.textproto
similarity index 81%
rename from lang/languages/ha_Arab/language.textproto
rename to lang/languages/ha_Arab.textproto
index 0138b4219..8d1cfd86a 100644
--- a/lang/languages/ha_Arab/language.textproto
+++ b/lang/languages/ha_Arab.textproto
@@ -3,10 +3,13 @@ name: "Hausa (Arabic)"
 preferred_name: ""
 autonym: ""
 population: 2999231
-region: "SD"
 region: "CM"
 region: "NG"
-script: "Perso-Arabic"
+region: "SD"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ha"
+}
diff --git a/lang/languages/hak.textproto b/lang/languages/hak.textproto
new file mode 100644
index 000000000..e5023d79b
--- /dev/null
+++ b/lang/languages/hak.textproto
@@ -0,0 +1,26 @@
+id: "hak"
+name: "Hakka Chinese"
+preferred_name: ""
+autonym: "客家话 / 客家話"
+population: 32062459
+region: "CN"
+script: "Simplified Han"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U W X Y Z a b c d e f g h i j k l m n o p q r s t u w x y z ü ê ā ē ī ō ū ǖ Ā Ē Ī Ō Ū Ǖ á é í ó ú ǘ Á É Í Ó Ú Ǘ ǎ ě ǐ ǒ ǔ ǚ Ǎ Ě Ǐ Ǒ Ǔ Ǚ à è ì ò ù ǜ À È Ì Ò Ù Ǜ"
+  auxiliary: "乒 乓 仂 仓 伞 侣 傈 傣 僳 冥 凉 刨 匕 卑 卞 厘 厦 厨 吕 呣 唇 啤 啮 喱 嗅 噘 噢 坝 堤 墟 奎 妆 婴 媚 宅 寺 尬 尴 屑 屿 巽 巾 弓 彗 惊 戟 扔 扰 扳 抛 挂 捂 摇 撅 撤 杆 杖 柜 柱 栗 栽 桶 棍 棕 棺 楔 楠 榈 槟 橙 洒 浆 涌 淇 滕 滚 滩 灾 烛 烟 焰 煎 犬 猫 瑚 瓢 甫 皱 盆 盔 盲 眨 眯 瞌 矿 碑 祈 祭 祷 禄 稻 竿 笼 筒 篷 粟 粮 纠 纬 缆 缎 耸 脚 舔 舵 艇 艮 芽 苜 苞 菇 菱 葫 葵 蒸 蓿 蔽 薯 蘑 蚂 蛛 蜗 蜘 蜡 蝎 蝴 螃 裹 谍 谬 豚 账 跤 踪 躬 轴 辐 迹 郁 鄙 酢 钉 钥 钮 钯 铂 铅 铛 锄 锑 锚 锤 镑 闺 阱 隧 雕 霾 靴 靶 鞠 颠 馏 驼 骆 髦 魁 鲤 鲸 鳄 鸽"
+  marks: "◌̀ ◌́ ◌̂ ◌̄ ◌̈ ◌̌"
+  numerals: "% + - . 0 1 2 3 4 5 6 7 8 9 ‰ 〇"
+}
+sample_text {
+  masthead_full: "人生而自"
+  masthead_partial: "由在"
+  tester: "鉴于对人权个唔知同欺负已发展为刺蛮暴行，这些暴行玷污了人类个好心田，而一个人人享有言论同信仰自由并免予恐惧同匮乏个世界个来临"
+  poster_sm: "发布这一世界人权宣言"
+  poster_md: "人人有权享有生命"
+  poster_lg: "人人生而自由"
+  specimen_48: "法律之前人人平等，并有权享受法律个平等保护，唔受脉个歧视。人人有权享受平等保护，以免受违反本宣言个脉个歧视行为同煽动这种歧视个脉个行为之害"
+  specimen_36: "鉴于对人类家庭所有成员个自然尊严及其平等个同唔移个权利个承认，系世界自由、正义同和平个墙脚，\n鉴于对人权个唔知同欺负已发展为刺蛮暴行，这些暴行玷污了人类个好心田，而一个人人享有言论同信仰自由并免予恐惧同匮乏个世界个来临，已被宣布为普通人民个最高意思，"
+  specimen_32: "鉴于对人类家庭所有成员个自然尊严及其平等个同唔移个权利个承认，系世界自由、正义同和平个墙脚，\n鉴于对人权个唔知同欺负已发展为刺蛮暴行，这些暴行玷污了人类个好心田，而一个人人享有言论同信仰自由并免予恐惧同匮乏个世界个来临，已被宣布为普通人民个最高意思，\n鉴于为使人类唔至到唔好唔铤而走险对暴政同欺负进行反叛，爱使人权受法治个保护，"
+  specimen_21: "鉴于对人类家庭所有成员个自然尊严及其平等个同唔移个权利个承认，系世界自由、正义同和平个墙脚，\n鉴于对人权个唔知同欺负已发展为刺蛮暴行，这些暴行玷污了人类个好心田，而一个人人享有言论同信仰自由并免予恐惧同匮乏个世界个来临，已被宣布为普通人民个最高意思，\n鉴于为使人类唔至到唔好唔铤而走险对暴政同欺负进行反叛，爱使人权受法治个保护，\n鉴于爱促进各国之间知己关系个发展，\n鉴于各联合国国家个人民已在联合国宪章之内重申佢丁人对基本人权、人格尊严同价值以及男女平等权利个信念，并决心促成较大自由之内个社会进步同生活水平个改善，\n鉴于各会员国业已誓愿同联合国合作以促进对人权同基本自由个普遍尊重同遵行，\n鉴于对这些权利同自由个知头知尾对于这个誓愿个充分实现具有死大个重要性，"
+  specimen_16: "鉴于对人类家庭所有成员个自然尊严及其平等个同唔移个权利个承认，系世界自由、正义同和平个墙脚，\n鉴于对人权个唔知同欺负已发展为刺蛮暴行，这些暴行玷污了人类个好心田，而一个人人享有言论同信仰自由并免予恐惧同匮乏个世界个来临，已被宣布为普通人民个最高意思，\n鉴于为使人类唔至到唔好唔铤而走险对暴政同欺负进行反叛，爱使人权受法治个保护，\n鉴于爱促进各国之间知己关系个发展，\n鉴于各联合国国家个人民已在联合国宪章之内重申佢丁人对基本人权、人格尊严同价值以及男女平等权利个信念，并决心促成较大自由之内个社会进步同生活水平个改善，\n鉴于各会员国业已誓愿同联合国合作以促进对人权同基本自由个普遍尊重同遵行，\n鉴于对这些权利同自由个知头知尾对于这个誓愿个充分实现具有死大个重要性，\n因此现在，\n大会，\n发布这一世界人权宣言，作为所有人民同所有国家努力实现个共同标准，指望每一个人同社会机构时不时记等来本宣言，努力利用教诲同教育促进对权利同自由个尊重，并利用国家个同国际个渐进措施，使这些权利同自由在各会员国本身人民及在其管辖下领土个人民之内得到普遍同有效个承认同遵行；\n人人生而自由，在尊严同权利上一律平等。佢丁人赋有理性同好心田，并应以兄弟关系个精神相对待。\n人人有资格享有本宣言所记录个一切权利同自由，唔分种族、肤色、性别、语言、宗教、政治或其他见解、国籍或社会出身、财产、出生或其他身分等脉个区别。"
+}
diff --git a/lang/languages/hak/language.textproto b/lang/languages/hak/language.textproto
deleted file mode 100644
index dc2f46cbe..000000000
--- a/lang/languages/hak/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "hak"
-name: "Hakka Chinese"
-preferred_name: ""
-autonym: "客家话 / 客家話"
-population: 32062459
-region: "CN"
-script: "Simplified Han"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U W X Y Z a b c d e f g h i j k l m n o p q r s t u w x y z ü ê ā ē ī ō ū ǖ Ā Ē Ī Ō Ū Ǖ á é í ó ú ǘ Á É Í Ó Ú Ǘ ǎ ě ǐ ǒ ǔ ǚ Ǎ Ě Ǐ Ǒ Ǔ Ǚ à è ì ò ù ǜ À È Ì Ò Ù Ǜ"
-  auxiliary: "乒 乓 仂 仓 伞 侣 傈 傣 僳 冥 凉 刨 匕 卑 卞 厘 厦 厨 吕 呣 唇 啤 啮 喱 嗅 噘 噢 坝 堤 墟 奎 妆 婴 媚 宅 寺 尬 尴 屑 屿 巽 巾 弓 彗 惊 戟 扔 扰 扳 抛 挂 捂 摇 撅 撤 杆 杖 柜 柱 栗 栽 桶 棍 棕 棺 楔 楠 榈 槟 橙 洒 浆 涌 淇 滕 滚 滩 灾 烛 烟 焰 煎 犬 猫 瑚 瓢 甫 皱 盆 盔 盲 眨 眯 瞌 矿 碑 祈 祭 祷 禄 稻 竿 笼 筒 篷 粟 粮 纠 纬 缆 缎 耸 脚 舔 舵 艇 艮 芽 苜 苞 菇 菱 葫 葵 蒸 蓿 蔽 薯 蘑 蚂 蛛 蜗 蜘 蜡 蝎 蝴 螃 裹 谍 谬 豚 账 跤 踪 躬 轴 辐 迹 郁 鄙 酢 钉 钥 钮 钯 铂 铅 铛 锄 锑 锚 锤 镑 闺 阱 隧 雕 霾 靴 靶 鞠 颠 馏 驼 骆 髦 魁 鲤 鲸 鳄 鸽"
-  marks: "◌̀ ◌́ ◌̂ ◌̄ ◌̈ ◌̌"
-  numerals: "% + - . 0 1 2 3 4 5 6 7 8 9 ‰ 〇"
-}
diff --git a/lang/languages/hak/sampletext.textproto b/lang/languages/hak/sampletext.textproto
deleted file mode 100644
index b0723e97b..000000000
--- a/lang/languages/hak/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "hak"
diff --git a/lang/languages/haw.textproto b/lang/languages/haw.textproto
new file mode 100644
index 000000000..a1bfbee44
--- /dev/null
+++ b/lang/languages/haw.textproto
@@ -0,0 +1,27 @@
+id: "haw"
+name: "Hawaiian"
+preferred_name: ""
+autonym: "’Olelo Hawai’i"
+population: 29604
+region: "US"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū ’"
+  auxiliary: "b c d f g j q r s t v x y z"
+  marks: "◌̄"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A E I O U B C D F G H J K L M N P Q R S T V W ʻ X Y Z"
+}
+sample_text {
+  masthead_full: "HhĀā"
+  masthead_partial: "Nn"
+  tester: "‘Oiai, ‘o ka ho’omaopop ‘ana i ka hanohano, a me nā pono kīvila i kau"
+  poster_sm: "‘Oiai, he mea"
+  poster_md: "‘Oiai, ‘o ka"
+  poster_lg: "Hānau"
+  specimen_48: "No laila, ke KUAHAUA nei KA ‘AHA ‘ŌLELO, ‘o ka HŌ’IKE I NĀ PONO KĪVILA"
+  specimen_36: "‘A’ole e noho kauā kaupa’a ke kanaka; ua pāpā ‘ia ka noho kauā kuapa’a, a me ka ho’okuapa’a ‘ana ma nā ‘ano apau loa."
+  specimen_32: "Ua noa i nā kānaka apau ka ho’oponopono ‘ia ‘ana e ka ‘aha lunakānāwai mākaukau o ke aupuni, o nā hana a ‘a’e ana i kona pono kīvila i hō’ike ‘ia ma ke kumukānāwai."
+  specimen_21: "‘A’ole e hopu, ho’opa’ahao, a ho’okuewa wale ‘ia ke kanaka me ke kumu ‘ole.\nUa noa i nā kānaka apau e ho’okolokolo pono ‘ia i mua o ka lehulehu e ka ‘aha lunakānāwai kū’oko’a a kaulike ho’i, no ka ho’oholo ‘ana i ka pono kīvila a me ke kuleana, a me nā mea i ho’opi’i ‘ia iā ia.\n‘A ‘ole e ‘āke’ake’a kumu ‘ole ‘ia nā mea pilikino, ka ‘ohana, ka home, a me ka ho’olaha ‘ike o ke kanaka, ‘a’ole ho’i e ho’āhewa wale ‘ia kona hanohano a me kona kūlana. Ua noa i nā kānaka apau ka palekana o ke kānāwai i ke ‘āke’ake’a a me ka ho’āhewa wale ‘ia."
+  specimen_16: "Ua noa i nā kānaka apau ke kū’oko’a o ka mana’o, ka luna’ikehala, a me ka ho’omana; ua noa nō ho’i ka ho’ololi ‘ana i kona ho’omana a i ‘ole kona mana’o, a ua noa ho’i i ke kanaka ho’okahi, a i ‘ole nā kānaka he nui ka hō’ike ‘ana i ka paulele i ka ho’omana, i mua o ka lehulehu a i ‘ole ma kahi ka’awale, ma o ke a’o a me ka haipule ‘ana i kona akua.\nUa noa i nā kānaka apau ke kū’oko’a o ka mana’o a me ka hō’ike ‘ana i ka mana’o; ‘a’ole ho’i e ho’opilikia ‘ia, a ua noa ho’i ka ‘imi, ka loa’a, a me ka ho’olaha ‘ana aku i ka ‘ike ma nā ‘ano apau, a i ‘ō aku ho’i o nā palena ‘āina apau.\nUa noa i nā kānaka apau ka ho’omaha a me ka luana ‘ana, a me nā hola hana i kaupalena pono ‘ia, a e uku ‘ia o ia no kekahi mau lā nui o ka makahiki."
+}
diff --git a/lang/languages/haw/language.textproto b/lang/languages/haw/language.textproto
deleted file mode 100644
index c7928f2ba..000000000
--- a/lang/languages/haw/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "haw"
-name: "Hawaiian"
-preferred_name: ""
-autonym: "’Olelo Hawai’i"
-population: 29604
-region: "US"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū ’"
-  auxiliary: "b c d f g j q r s t v x y z"
-  marks: "◌̄"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A E I O U B C D F G H J K L M N P Q R S T V W ʻ X Y Z"
-}
diff --git a/lang/languages/haw/sampletext.textproto b/lang/languages/haw/sampletext.textproto
deleted file mode 100644
index fafebac97..000000000
--- a/lang/languages/haw/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "haw"
diff --git a/lang/languages/haz/language.textproto b/lang/languages/haz.textproto
similarity index 89%
rename from lang/languages/haz/language.textproto
rename to lang/languages/haz.textproto
index c1e7b3018..a49e55d29 100644
--- a/lang/languages/haz/language.textproto
+++ b/lang/languages/haz.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٔ ◌ٰ"
   numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/he.textproto b/lang/languages/he.textproto
new file mode 100644
index 000000000..6e10f4939
--- /dev/null
+++ b/lang/languages/he.textproto
@@ -0,0 +1,28 @@
+id: "he"
+name: "Hebrew"
+preferred_name: ""
+autonym: "עברית"
+population: 8675480
+region: "IL"
+script: "Hebrew"
+exemplar_chars {
+  base: "שׁ שׂ בּ תּ כּ ךּ פּ ףּ א ב ג ד ה ו ז ח ט י כ ך ל מ ם נ ן ס ע פ ף צ ץ ק ר ש ת"
+  auxiliary: "״ ׳ ־ ׃ ׆"
+  marks: "◌ְ ◌ֱ ◌ֲ ◌ֳ ◌ִ ◌ֵ ◌ֶ ◌ַ ◌ָ ◌ֹ ◌ֻ ◌ּ ◌ׁ ◌ׂ"
+  numerals: "\\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . ׳ \' \" ( ) \\[ \\] / ״ ־"
+  index: "א ב ג ד ה ו ז ח ט י כ ל מ נ ס ע פ צ ק ר ש ת"
+}
+sample_text {
+  masthead_full: "כלבנ"
+  masthead_partial: "יא"
+  tester: "כל בני אדם נולדו בני חורין ושווים בערכם ובזכויותיהם. כולם חוננו"
+  poster_sm: "כל אדם זכאי"
+  poster_md: "גדולה מזו,"
+  poster_lg: "בני"
+  specimen_48: "לא יהיה אדם נתון לעינויים, ולא ליחס או לעונש אכזריים, בלתי אנושיים"
+  specimen_36: "כל אחד זכאי לתקנה יעילה מטעם בחי הדין הלאומיים המוסמכים נגד מעשים המפירים את זכויות היסוד שניתנו לו על פי החוקה והחוקים."
+  specimen_32: "כל אדם זכאי, מתוך שויון גמור עם זולתו, למשפט הוגן ופומבי של בית-דין כלתי תלוי וללא משוא פנים בשעה שבאים לקבוע זכויותיו וחובותיו ולברר כל אשמה פלילית שהובאה נגדו."
+  specimen_21: "לא יהא אדם נתון להתערבות שרירותית בחייו הפרטיים, במשפחתו, במעונו, בחליפת מכתבים שלו ולא לפגיעה בכבודו או בשמו הפוב. כל אדם זכאי להגנת החוק בפני התערבות או פגיעה באלה.\nכל אדם זכאי לחירות המחשבה, המצפון והדת; חירות זו כוללת את הזכות להמיר את דתו או את אמונתו ולתת בטוי לדתו או לאמונתו, לבדו או כציבור, ברשות היחיד או ברשות הרבים, דרך הוראה, נוהג, פולחן ושמירת מצוות."
+  specimen_16: "כל אדם זכאי לחירות הדעה והבטוי, לרבות החירות להחיק בדעות ללא כל הפרעה, ולבקש ידיעות ודעות, ולקבלן ולמסרן בכל הדרכים וללא סייגי גבולות.\nכל אדם, כחבר החברה, זכאי לבטחון סוציאלי וזכאי לתבוע שהזכויות הכלכליות הסוציאליות והתרבותיות, שהן חיוניות לכבודו כאדם ולהתפתחות החופשית של אישיותו, יובטחו במשמץ לאומי ובשיתוף פעולה בינלאומי בהתאם לארגונה ולאוצרותיה של המדינה.\nכל אדם זכאי למנוחה ולפנאי, ובכלל זש הגבלת שעות העבודה במידה המתקבלת על הדעת וחופשה בשכר לעיתים מזומנות.\nכל אדם זכאי למשטר סוציאלי ובינלאומי, שבו אפשר יהיה לקיים במלואן את הזכויות והחרויות אשר נקבעו בהכזש זו."
+}
diff --git a/lang/languages/he/language.textproto b/lang/languages/he/language.textproto
deleted file mode 100644
index 18bcf39a7..000000000
--- a/lang/languages/he/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "he"
-name: "Hebrew"
-preferred_name: ""
-autonym: "עברית"
-population: 8675480
-region: "IL"
-script: "Hebrew"
-exemplar_chars {
-  base: "שׁ שׂ בּ תּ כּ ךּ פּ ףּ א ב ג ד ה ו ז ח ט י כ ך ל מ ם נ ן ס ע פ ף צ ץ ק ר ש ת"
-  auxiliary: "״ ׳ ־ ׃ ׆"
-  marks: "◌ְ ◌ֱ ◌ֲ ◌ֳ ◌ִ ◌ֵ ◌ֶ ◌ַ ◌ָ ◌ֹ ◌ֻ ◌ּ ◌ׁ ◌ׂ"
-  numerals: "\\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . ׳ \' \" ( ) \\[ \\] / ״ ־"
-  index: "א ב ג ד ה ו ז ח ט י כ ל מ נ ס ע פ צ ק ר ש ת"
-}
diff --git a/lang/languages/he/sampletext.textproto b/lang/languages/he/sampletext.textproto
deleted file mode 100644
index 974ef2ff8..000000000
--- a/lang/languages/he/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "he"
diff --git a/lang/languages/hi.textproto b/lang/languages/hi.textproto
new file mode 100644
index 000000000..9a7f56252
--- /dev/null
+++ b/lang/languages/hi.textproto
@@ -0,0 +1,32 @@
+id: "hi"
+name: "Hindi"
+preferred_name: ""
+autonym: "हिन्दी"
+population: 545367583
+region: "FJ"
+region: "IN"
+region: "NP"
+region: "UG"
+region: "ZA"
+script: "Devanagari"
+exemplar_chars {
+  base: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ‌ ‍"
+  auxiliary: "ॐ"
+  marks: "◌ँ ◌ं ◌ः ◌़ ◌ा ◌ि ◌ी ◌ु ◌ू ◌ृ ◌े ◌ै ◌ो ◌ौ ◌्"
+  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "। ॥ ॰"
+  index: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह"
+}
+sample_text {
+  masthead_full: "सभमन"
+  masthead_partial: "षय"
+  tester: "चूंकि मानव परिवार के सभी सदस्यों के जन्मजात गौरव और समान तथा अविच्छिन्न अधिकार की स्वीकृति"
+  poster_sm: "चूंकि मानव अधिकारों"
+  poster_md: "चूंकि राष्ट्रों के"
+  poster_lg: "मनुष्यों"
+  specimen_48: "चूंकि संयुक्त राष्ट्रों के सदस्य देशों की जनताओं ने बुनियादी मानव अधिकारों में, मानव व्यक्तित्व के"
+  specimen_36: "सभी को संविधान या क़ानून द्वारा प्राप्त बुनियादी अधिकारों का अतिक्रमण करने वाले कार्यों के विरुद्ध समुचित राष्ट्रीय अदालतों की कारगर सहायता पाने का हक़ है ।"
+  specimen_32: "सभी को पूर्णतः समान रूप से हक़ है कि उनके अधिकारों और कर्तव्यों के निश्चय करने के मामले में और उन पर आरोपित फौज़दारी के किसी मामले में उनकी सुनवाई न्यायोचित और सार्वजनिक रूप से निरपेक्ष एवं निष्पक्ष अदालत द्वारा हो ।"
+  specimen_21: "किसी व्यक्ति की एकान्तता, परिवार, घर या पत्रव्यवहार के प्रति कोई मनमाना हस्तक्षेप न किया जाएगा, न किसी के सम्मान और ख्याति पर कोई आक्षेप हो सकेगा । ऐसे हस्तक्षेप या आधेपों के विरुद्ध प्रत्येक को क़ानूनी रक्षा का अधिकार प्राप्त है ।\nप्रत्येक व्यक्ति को विचार, अन्तरात्मा और धर्म की आज़ादी का अधिकार है । इस अधिकार के अन्तर्गत अपना धर्म या विश्वास बदलने और अकेले या दूसरों के साथ मिलकर तथा सार्वजनिक रूप में अथवा निजी तोर पर अपने धर्म या विश्वास को शिक्षा, क्रिया, उपासना, तथा व्यवहार के द्वारा प्रकट करने की स्वतन्त्रता है ।"
+  specimen_16: "प्रत्येक व्यक्ति को विचार और उसकी अभिव्यक्ति की स्वतन्त्रता का अधिकार है । इसके अन्तर्गत बिना हस्तक्षेप के कोई राय रखना और किसी भी माध्यम के ज़रिए से तथा सीमाओं की परवाह न कर के किसी की मूचना और धारणा का अन्वेषण, प्रहण तथा प्रदान सम्मिलित है ।\nसमाज के एक सदस्य के रूप में प्रत्येक व्यक्ति को सामाजिक सुरक्षा का अधिकार है और प्रत्येक व्यक्ति को अपने व्यक्तित्व के उस स्वतन्त्र विकास तथा गोरव के लिए—जो राष्ट्रीय प्रयत्न या अन्तर्राष्ट्रीय सहयोग तथा प्रत्येक राज्य के संगठन एवं साधनों के अनुकूल हो—अनिकार्यतः आवश्यक आर्थिक, सामाजिक, और सांस्कृतिक अधिकारों की प्राप्ति का हक़ है ।\nप्रत्येक व्यक्ति को विश्राम और अवकाश का अधिकार है । इसके अन्तर्गत काम के घंटों की उचित हदबन्दी और समय-समय पर मज़दूरी सहित छुट्टियां सम्मिलित है ।\nप्रत्येक व्यक्ति को ऐसी सामाजिक और अन्तर्राष्ट्रीय व्यवस्था की प्राप्ति का अधिकार है जिसमें इस घोषणा में उल्लिखित अधिकारों और स्वतन्त्रताओं को पूर्णतः प्राप्त किया जा सके ।"
+}
diff --git a/lang/languages/hi/language.textproto b/lang/languages/hi/language.textproto
deleted file mode 100644
index 25c0d4022..000000000
--- a/lang/languages/hi/language.textproto
+++ /dev/null
@@ -1,19 +0,0 @@
-id: "hi"
-name: "Hindi"
-preferred_name: ""
-autonym: "हिन्दी"
-population: 545367583
-region: "UG"
-region: "NP"
-region: "FJ"
-region: "ZA"
-region: "IN"
-script: "Devanagari"
-exemplar_chars {
-  base: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ‌ ‍"
-  auxiliary: "ॐ"
-  marks: "◌ँ ◌ं ◌ः ◌़ ◌ा ◌ि ◌ी ◌ु ◌ू ◌ृ ◌े ◌ै ◌ो ◌ौ ◌्"
-  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "। ॥ ॰"
-  index: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह"
-}
diff --git a/lang/languages/hi/sampletext.textproto b/lang/languages/hi/sampletext.textproto
deleted file mode 100644
index 2008ad2c7..000000000
--- a/lang/languages/hi/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "hi"
diff --git a/lang/languages/hi_Latn/language.textproto b/lang/languages/hi_Latn.textproto
similarity index 76%
rename from lang/languages/hi_Latn/language.textproto
rename to lang/languages/hi_Latn.textproto
index 3c47bcbdf..f2302343a 100644
--- a/lang/languages/hi_Latn/language.textproto
+++ b/lang/languages/hi_Latn.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/hif/language.textproto b/lang/languages/hif.textproto
similarity index 77%
rename from lang/languages/hif/language.textproto
rename to lang/languages/hif.textproto
index ae782eb95..55a04a695 100644
--- a/lang/languages/hif/language.textproto
+++ b/lang/languages/hif.textproto
@@ -8,3 +8,6 @@ script: "Devanagari"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hif"
+}
diff --git a/lang/languages/hil.textproto b/lang/languages/hil.textproto
new file mode 100644
index 000000000..f0915f115
--- /dev/null
+++ b/lang/languages/hil.textproto
@@ -0,0 +1,23 @@
+id: "hil"
+name: "Hiligaynon"
+preferred_name: ""
+autonym: "Ilonggo"
+population: 9171204
+region: "PH"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "AaNn"
+  masthead_partial: "Gg"
+  tester: "Tungod kay ang pagkilala sang duna nga dungog kag ang alalangay"
+  poster_sm: "Tungod kay"
+  poster_md: "Tungod sini,"
+  poster_lg: "Ang"
+  specimen_48: "Ang tanan nga tao ginbun-ag nga hilway kag may pag-alalangay sa"
+  specimen_36: "Sa tangsa ka tao may katarungan nga kilalahon sa bisan diin, bilang isa ka tao sa atubangan sang kasuguan."
+  specimen_32: "Ang tagsa tagsa may katarungan nga magpahuway kag maglingaw, lakip ang makatarungan nga takda sa oras sang trabaho kag panahon sang mga pista opisyal nga may suweldo."
+  specimen_21: "Ang tagsa tagsa may katarungan sa kaayuhan sang pangkatilingban kag pangkalibutan nga ang mga katarungan kag kahilwayan nga gintakda sa Pahayag nga ini dapat lubos nga maangkon.\nWala sing ano man nga bahin sa Pahayag nga ini nga mahimo kabigon nga nagpakahulugan sa ano man nga Estado, grupo ukon tao, sang katarungan nga magpakigbahin sa ano man nga hilikuton ukon hulag nga nagahandum sa pagguba sang ano man nga katarungan kag kahilwayan nga gintakda diri sini."
+  specimen_16: "Tungod kay ang pagkilala sang duna nga dungog kag ang alalangay kag di madula nga mga katarungan sang tanan nga lahi sang tao amo ang pundasyon sang kahilwayan, katarungan kag kalinong sang kalibutan.\nTungod kay ang pagpabaya kag paghamak sa mga katarungang pangkataohan ngabunga sang mga kalapastangan nga labag sa konsyensya sang kataohan, kag ang pag-abot sang isa ka kalibutan nga maangkon sang mga tao ang kahilwayan sa paghambal kag pagsalig kag ang kaluwasan sa kahadlok kag kabudlayan nga ginpahayag ang pinakamataas nga handum sang kinaandan nga tao."
+}
diff --git a/lang/languages/hil/language.textproto b/lang/languages/hil/language.textproto
deleted file mode 100644
index 8df2431d6..000000000
--- a/lang/languages/hil/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "hil"
-name: "Hiligaynon"
-preferred_name: ""
-autonym: "Ilonggo"
-population: 9171204
-region: "PH"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/hil/sampletext.textproto b/lang/languages/hil/sampletext.textproto
deleted file mode 100644
index adc0cdf2e..000000000
--- a/lang/languages/hil/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "hil"
diff --git a/lang/languages/hnd/language.textproto b/lang/languages/hnd.textproto
similarity index 76%
rename from lang/languages/hnd/language.textproto
rename to lang/languages/hnd.textproto
index f16c6bc03..9527edd58 100644
--- a/lang/languages/hnd/language.textproto
+++ b/lang/languages/hnd.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/hne/language.textproto b/lang/languages/hne.textproto
similarity index 76%
rename from lang/languages/hne/language.textproto
rename to lang/languages/hne.textproto
index 5072841b6..a60133a80 100644
--- a/lang/languages/hne/language.textproto
+++ b/lang/languages/hne.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/hnn/language.textproto b/lang/languages/hnn.textproto
similarity index 86%
rename from lang/languages/hnn/language.textproto
rename to lang/languages/hnn.textproto
index 807e36ca8..b1bfbcc3a 100644
--- a/lang/languages/hnn/language.textproto
+++ b/lang/languages/hnn.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   marks: "◌ᜲ ◌ᜳ ◌᜴"
   punctuation: "᜵ ᜶"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/hno/language.textproto b/lang/languages/hno.textproto
similarity index 76%
rename from lang/languages/hno/language.textproto
rename to lang/languages/hno.textproto
index b3a1154e4..98e0135fb 100644
--- a/lang/languages/hno/language.textproto
+++ b/lang/languages/hno.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/ho/language.textproto b/lang/languages/ho.textproto
similarity index 74%
rename from lang/languages/ho/language.textproto
rename to lang/languages/ho.textproto
index 487c9c463..52a44eea4 100644
--- a/lang/languages/ho/language.textproto
+++ b/lang/languages/ho.textproto
@@ -7,3 +7,6 @@ region: "PG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/hoc/language.textproto b/lang/languages/hoc.textproto
similarity index 74%
rename from lang/languages/hoc/language.textproto
rename to lang/languages/hoc.textproto
index cf91b46c6..bda220695 100644
--- a/lang/languages/hoc/language.textproto
+++ b/lang/languages/hoc.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/hoj/language.textproto b/lang/languages/hoj.textproto
similarity index 75%
rename from lang/languages/hoj/language.textproto
rename to lang/languages/hoj.textproto
index ec74abd0a..3b0eb0173 100644
--- a/lang/languages/hoj/language.textproto
+++ b/lang/languages/hoj.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/hr.textproto b/lang/languages/hr.textproto
new file mode 100644
index 000000000..5b9a5b994
--- /dev/null
+++ b/lang/languages/hr.textproto
@@ -0,0 +1,35 @@
+id: "hr"
+name: "Croatian"
+preferred_name: ""
+autonym: "Hrvatski"
+population: 6767930
+region: "AT"
+region: "BA"
+region: "DE"
+region: "HR"
+region: "HU"
+region: "IT"
+region: "RS"
+region: "SI"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ć Č Đ Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ć č đ š ž"
+  auxiliary: "q w x y"
+  marks: "◌́ ◌̌"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "‐ – — , ; \\: ! ? . … \' ‘ ’ ‚ \" “ ” „ ( ) \\[ \\] @ * / ′ ″"
+  index: "A B C Č Ć D {DŽ} Đ E F G H I J K L {LJ} M N {NJ} O P Q R S Š T U V W X Y Z Ž"
+}
+sample_text {
+  masthead_full: "SsVv"
+  masthead_partial: "Aa"
+  tester: "Budući da su priznavanje urođenog dostojanstva i jednakih i neotuđivih"
+  poster_sm: "Budući da su"
+  poster_md: "Budući da"
+  poster_lg: "Sva"
+  specimen_48: "Budući da je bitno da se unapređuje razvoj prijateljskih odnosa"
+  specimen_36: "Budući da je zajedničko razumijevanje tih prava i sloboda od najveće važnosti za puno ostvarenje te obveze,"
+  specimen_32: "Sva ljudska bića rađaju se slobodna i jednaka u dostojanstvu i pravima. Ona su obdarena razumom i sviješću i treba da jedno prema drugome postupaju u duhu bratstva."
+  specimen_21: "Svakome su dostupna sva prava i slobode navedene u ovoj Deklaraciji bez razlike bilo koje vrste, kao što su rasa, boja, spol, jezik, vjera, političko ili drugo mišljenje, nacionalno ili društveno porijeklo, imovina, rođenje ili drugi pravni položaj.\nSvatko ima pravo na život, slobodu i osobnu sigurnost.\nNitko ne smije biti držan u ropstvu ili ropskom odnosu; ropstvo i trgovina robljem zabranjuju se u svim svojim oblicima."
+  specimen_16: "Nitko ne smije biti podvrgnut mučenju ili okrutnom, nečovječnom ili ponižavajućem postupku ili kažnjavanju.\nSvatko ima pravo da se svagdje pred zakonom priznaje kao osoba.\nSvi su pred zakonom jednaki i imaju pravo, bez ikakve diskriminacije, na jednaku zaštitu zakona. Svi imaju pravo na jednaku zaštitu protiv bilo kakve diskrimininacije kojom se krši ova Deklaracija i protiv svakog poticanja na takvu diskriminaciju.\nSvatko ima pravo na djelotvorna pravna sredstva putem nadležnih nacionalnih sudova zbog djela kojima se krše osnovna prava koja mu pripadaju temeljem ustava i zakona."
+}
diff --git a/lang/languages/hr/language.textproto b/lang/languages/hr/language.textproto
deleted file mode 100644
index b593c2e1f..000000000
--- a/lang/languages/hr/language.textproto
+++ /dev/null
@@ -1,22 +0,0 @@
-id: "hr"
-name: "Croatian"
-preferred_name: ""
-autonym: "Hrvatski"
-population: 6767930
-region: "HU"
-region: "HR"
-region: "BA"
-region: "SI"
-region: "AT"
-region: "IT"
-region: "RS"
-region: "DE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ć Č Đ Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ć č đ š ž"
-  auxiliary: "q w x y"
-  marks: "◌́ ◌̌"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "‐ – — , ; \\: ! ? . … \' ‘ ’ ‚ \" “ ” „ ( ) \\[ \\] @ * / ′ ″"
-  index: "A B C Č Ć D {DŽ} Đ E F G H I J K L {LJ} M N {NJ} O P Q R S Š T U V W X Y Z Ž"
-}
diff --git a/lang/languages/hr/sampletext.textproto b/lang/languages/hr/sampletext.textproto
deleted file mode 100644
index c643400c1..000000000
--- a/lang/languages/hr/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "hr"
diff --git a/lang/languages/hsb.textproto b/lang/languages/hsb.textproto
new file mode 100644
index 000000000..0ae3bd3fc
--- /dev/null
+++ b/lang/languages/hsb.textproto
@@ -0,0 +1,28 @@
+id: "hsb"
+name: "Upper Sorbian"
+preferred_name: ""
+autonym: "Hornjoserbšćina"
+population: 12825
+region: "DE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ó Ć Č Ě Ł Ń Ř Ś Š Ź Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ó ć č ě ł ń ř ś š ź ž"
+  auxiliary: "á à ă â å ä ã ą ā æ ç ď đ é è ĕ ê ë ė ę ē ğ í ì ĭ î ï İ ī ı ĺ ľ ň ñ ò ŏ ô ö ő ø ō œ ŕ ś ş ß ť ú ù ŭ û ů ü ű ū ý ÿ ż ź"
+  marks: "◌́ ◌̌"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
+  index: "A B C Č Ć D {DŹ} E F G H {CH} I J K Ł L M N O P Q R S Š T U V W X Y Z Ž"
+}
+sample_text {
+  masthead_full: "WwŠš"
+  masthead_partial: "Ii"
+  tester: "Dokelž twori płipóznaće wšěm čłonam čłowjeskeje swójby płisłušaceje"
+  poster_sm: "dokelž stej"
+  poster_md: "dokelž je"
+  poster_lg: "Wšitcy"
+  specimen_48: "dokelž su ludy Zjednoćenych narodow we wustawkach znowa swoju"
+  specimen_36: "dokelž je zhromadne měnjenje wo tutych prawach a swobodach płewšo wažne za połne spjelnjenje tutoho zawjazka,"
+  specimen_32: "Wšitcy čłowjekojo su wot naroda swobodni a su jenacy po dostojnosći a prawach. Woni su z rozumom a swědomjom wobdarjeni a maja mjezsobu w duchu bratrowstwa wobchadźeć."
+  specimen_21: "Kóždy je woprawnjeny, w tutym wozjewjenju proklamowane prawa a swobody wužiwać, a to bjez kóždehožkuli rozeznawanja, kaž po rasy, barbje, splahu, rěči, religiji, politiskim abo druhim płeswědčenju, narodnym abo socialnym pochadźe, po zamóženju, narodźe abo druhim statusu .\nKóždy ma prawo na žiwjenje, swobodu a wěstotu wosohy."
+  specimen_16: "Nichtó njesmě so w njewólnistwje abo roboćanstwje dźeržeć; njewólnistwo a wikowanje z njewólnikami stej we wšěch swojich formach zakazanej.\nNichtó njesmě so podćisnyć ćwělowanju abo surowemu, nječłowjeskemu abo ponižowacemu wobchadźenju abo chłostanju.\nKóždy ma prawo, wšudźe jako prawakmany płipóznaty hyć.\nWšitcy čłowjekojo su płed zakonjom runi a maja b jez diskriminaeije prawo na jenaki škit płez zakoń. Wšitey maja pawo na jenaki škit płećiwo kóždej diskriminaciji, kotraž by płedležace wozjewjen je zraniła, a płećiwo pozbudźen ju k tajkej diskriminaciji."
+}
diff --git a/lang/languages/hsb/language.textproto b/lang/languages/hsb/language.textproto
deleted file mode 100644
index cb6f12a23..000000000
--- a/lang/languages/hsb/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "hsb"
-name: "Upper Sorbian"
-preferred_name: ""
-autonym: "Hornjoserbšćina"
-population: 12825
-region: "DE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ó Ć Č Ě Ł Ń Ř Ś Š Ź Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ó ć č ě ł ń ř ś š ź ž"
-  auxiliary: "á à ă â å ä ã ą ā æ ç ď đ é è ĕ ê ë ė ę ē ğ í ì ĭ î ï İ ī ı ĺ ľ ň ñ ò ŏ ô ö ő ø ō œ ŕ ś ş ß ť ú ù ŭ û ů ü ű ū ý ÿ ż ź"
-  marks: "◌́ ◌̌"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
-  index: "A B C Č Ć D {DŹ} E F G H {CH} I J K Ł L M N O P Q R S Š T U V W X Y Z Ž"
-}
diff --git a/lang/languages/hsb/sampletext.textproto b/lang/languages/hsb/sampletext.textproto
deleted file mode 100644
index ff54aa599..000000000
--- a/lang/languages/hsb/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "hsb"
diff --git a/lang/languages/hsn/language.textproto b/lang/languages/hsn.textproto
similarity index 77%
rename from lang/languages/hsn/language.textproto
rename to lang/languages/hsn.textproto
index ee7281d6f..98c12db87 100644
--- a/lang/languages/hsn/language.textproto
+++ b/lang/languages/hsn.textproto
@@ -7,3 +7,6 @@ region: "CN"
 script: "Simplified Han"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "zh"
+}
diff --git a/lang/languages/ht.textproto b/lang/languages/ht.textproto
new file mode 100644
index 000000000..035a4664b
--- /dev/null
+++ b/lang/languages/ht.textproto
@@ -0,0 +1,25 @@
+id: "ht"
+name: "Haitian Creole"
+preferred_name: ""
+autonym: "Kreyòl Ayisyen"
+population: 8964918
+region: "HT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z È Ò a b c d e f g h i j k l m n o p r s t u v w y z è ò"
+  auxiliary: "Q X À Á É Ó q x à á é ó"
+  marks: "◌̀ ◌́"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Uu"
+  tester: "Lè nou sonje ke desizyon rekonèt valè chak moun genyen nan li"
+  poster_sm: "Lè nou sonje"
+  poster_md: "Deklarasyon"
+  poster_lg: "Tout"
+  specimen_48: "Tout moun sou tè a fèt tou lib. Tout gen menm valè (nan je lasosyete),"
+  specimen_36: "Yo pa gen dwa rete konsa pou yo arete yon moun, ni pou yo fèmen li nan prizon ni pou yo ekzile li san kòz."
+  specimen_32: "Tout moun gen dwa pran repo epi jwenn tan pou li anmize li. Se dwa moun nan pou li pa travay depase limit epi pou li gen peryòd konje peye si li se yon anplwaye."
+  specimen_21: "Se dwa chak moun pou li fè presyon sou lasosyete, ni nan peyi li, ni nan lòt peyi, pou lasosyete ranje zafè yo yon fason, dekwa pou dwa ak libète y ap pale non Deklarasyon Dwa Moun sa a, ka reyalize tout bon vre.\nPa gen youn nan dispozisyon ki nan Deklarasyon sa a, yo ka bay yon sans ki pou ta otorize yon nasyon, yon gwoup moun, oswa yon endividi mennen yon aktivite oswa komèt yon zak k ap chache detwi dwa ak libète ki nan Deklarasyon sila a."
+  specimen_16: "Lè nou sonje ke desizyon rekonèt valè chak moun genyen nan li menm-menm kòm moun, desizyon rekonèt tout moun gen menm dwa egalego, dwa pèsonn pa ka wete nan men yo, desizyon sa a se veritab baz libète, veritab baz lajistis ak lapè sou tè a.\nLè nou sonje ke inyorans ak mepri dwa moun, konn lakòz divès move zak sovaj, zak ki revolte konsyans mezi moun sou tè a, san nou pa bliye ke, pi gwo espwa nou kòm moun, sèke yon jou va rive lè chak kretyen-vivan va gen libète lapawòl, libète pou li gen konviksyon pèsonel li, yon jou lè tout moun va santi yo debarase ak lapèrèz ak lamizè sou tè a."
+}
diff --git a/lang/languages/ht/language.textproto b/lang/languages/ht/language.textproto
deleted file mode 100644
index 2fc3aeecd..000000000
--- a/lang/languages/ht/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "ht"
-name: "Haitian Creole"
-preferred_name: ""
-autonym: "Kreyòl Ayisyen"
-population: 8964918
-region: "HT"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z È Ò a b c d e f g h i j k l m n o p r s t u v w y z è ò"
-  auxiliary: "Q X À Á É Ó q x à á é ó"
-  marks: "◌̀ ◌́"
-}
diff --git a/lang/languages/ht/sampletext.textproto b/lang/languages/ht/sampletext.textproto
deleted file mode 100644
index a5cfbc4e3..000000000
--- a/lang/languages/ht/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ht"
diff --git a/lang/languages/hu.textproto b/lang/languages/hu.textproto
new file mode 100644
index 000000000..192c57ccf
--- /dev/null
+++ b/lang/languages/hu.textproto
@@ -0,0 +1,35 @@
+id: "hu"
+name: "Hungarian"
+preferred_name: ""
+autonym: "Magyar"
+population: 12394427
+region: "AT"
+region: "HU"
+region: "IL"
+region: "RO"
+region: "RS"
+region: "SI"
+region: "SK"
+region: "UA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ó Ö Ú Ü Ő Ű a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ó ö ú ü ő ű"
+  auxiliary: "à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò ŏ ô ø ō œ q ù ŭ û ū w x y ÿ"
+  marks: "◌́ ◌̈ ◌̋"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ – , ; \\: ! ? . … \' ’ \" ” „ « » ( ) \\[ \\] \\{ \\} ⟨ ⟩ § @ * / \\& # ~ ⁒"
+  index: "A Á B C {CS} D {DZ} {DZS} E É F G {GY} H I Í J K L {LY} M N {NY} O Ó Ö Ő P Q R S {SZ} T {TY} U Ú Ü Ű V W X Y Z {ZS}"
+}
+sample_text {
+  masthead_full: "MmIi"
+  masthead_partial: "Nn"
+  tester: "Tekintettel arra, hogy az emberiség családja minden egyes tagja"
+  poster_sm: "Tekintettel"
+  poster_md: "a közgyűlés"
+  poster_lg: "Minden."
+  specimen_48: "mint azt a közös eszményt, amelynek elérésére minden népnek és"
+  specimen_36: "Senkit sem lehet rabszolgaságban, vagy szolgaságban tartani, a rabszolgaság és a rabszolgakereskedés minden alakja tilos."
+  specimen_32: "Minden személynek joga van az alkotmányban vagy a törvényben részére biztosított alapvető jogokat sértő eljárások ellen a hazai bíróságokhoz tényleges jogorvoslatért folyamodni."
+  specimen_21: "Senkit sem lehet önkényesen letartóztatni, őrizetbe venni vagy száműzni.\nMinden személynek teljesen egyenlő joga van arra, hogy ügyét független és pártatlan bíróság méltányosan és nyilvánosan tárgyalja, s ez határozzon egyrészt jogai és kőtelezettségei felől, másrészt minden ellene emelt bűnügyi vád megalapozottsága felől."
+  specimen_16: "Senkinek magánéletébe, családi ügyeibe, lakóhelye megválasztásába vagy levelezésébe nem szabad önkényesen beavatkozni, sem pedig becsületében vagy jó hírnevében megsérteni. Minden személynek joga van az ilyen beavatkozásokkal vagy sértésekkel szemben a törvény védelméhez.\nMinden személynek joga van a gondolat, a lelkiismeret és a vallás szabadságához, ez a jog magában foglalja a vallás és a meggyőződés megváltoztatásának szabadságát, valamint a vallásnak vagy a meggyőződésnek mind egyénileg, mind együttesen, mind a nyilvánosság előtt, mind a magánéletben oktatás, gyakorlás és szertartások végzése útján való kifejezésre juttatásának jogát."
+}
diff --git a/lang/languages/hu/language.textproto b/lang/languages/hu/language.textproto
deleted file mode 100644
index 37747b262..000000000
--- a/lang/languages/hu/language.textproto
+++ /dev/null
@@ -1,22 +0,0 @@
-id: "hu"
-name: "Hungarian"
-preferred_name: ""
-autonym: "Magyar"
-population: 12394427
-region: "HU"
-region: "SK"
-region: "RO"
-region: "SI"
-region: "AT"
-region: "UA"
-region: "RS"
-region: "IL"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á É Í Ó Ö Ú Ü Ő Ű a b c d e f g h i j k l m n o p q r s t u v w x y z á é í ó ö ú ü ő ű"
-  auxiliary: "à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò ŏ ô ø ō œ q ù ŭ û ū w x y ÿ"
-  marks: "◌́ ◌̈ ◌̋"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ – , ; \\: ! ? . … \' ’ \" ” „ « » ( ) \\[ \\] \\{ \\} ⟨ ⟩ § @ * / \\& # ~ ⁒"
-  index: "A Á B C {CS} D {DZ} {DZS} E É F G {GY} H I Í J K L {LY} M N {NY} O Ó Ö Ő P Q R S {SZ} T {TY} U Ú Ü Ű V W X Y Z {ZS}"
-}
diff --git a/lang/languages/hu/sampletext.textproto b/lang/languages/hu/sampletext.textproto
deleted file mode 100644
index 4d243e001..000000000
--- a/lang/languages/hu/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "hu"
diff --git a/lang/languages/hy.textproto b/lang/languages/hy.textproto
new file mode 100644
index 000000000..0cddf0386
--- /dev/null
+++ b/lang/languages/hy.textproto
@@ -0,0 +1,34 @@
+id: "hy"
+name: "Armenian"
+preferred_name: "Eastern Armenian"
+autonym: "Հայերեն"
+population: 5317271
+region: "AM"
+region: "CY"
+region: "GE"
+region: "IR"
+region: "LB"
+region: "RU"
+region: "SY"
+region: "TR"
+script: "Armenian"
+exemplar_chars {
+  base: "Ա Բ Գ Դ Ե Զ Է Ը Թ Ժ Ի Լ Խ Ծ Կ Հ Ձ Ղ Ճ Մ Յ Ն Շ Ո Չ Պ Ջ Ռ Ս Վ Տ Ր Ց Ւ Փ Ք Օ Ֆ ա բ գ դ ե զ է ը թ ժ ի լ խ ծ կ հ ձ ղ ճ մ յ ն շ ո չ պ ջ ռ ս վ տ ր ց ւ փ ք օ ֆ և"
+  auxiliary: "և"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "՛ ՜ ՝ ՞ ։"
+  index: "Ա Բ Գ Դ Ե Զ Է Ը Թ Ժ Ի Լ Խ Ծ Կ Հ Ձ Ղ Ճ Մ Յ Ն Շ Ո Չ Պ Ջ Ռ Ս Վ Տ Ր Ց Ւ Փ Ք Օ Ֆ"
+}
+sample_text {
+  masthead_full: "ԲբՈո"
+  masthead_partial: "Լլ"
+  tester: "Քանզի մարդկային ընտանիքի բոլոր անդամներին ներհատուկ արժանապատվությունը"
+  poster_sm: "Քանզի մարդու"
+  poster_md: "Քանզի անդամ"
+  poster_lg: "Բոլոր"
+  specimen_48: "Քանզի այս իրավունքների ու ազատությունների համընդհանուր ըմբռնումը"
+  specimen_36: "Ոչ ոք չպետք է լինի ստրկության կամ անազատ վիճակում․ պետք է արգելվեն ստրկատիրության ու ստրուկների առուծախի բոլոր ձևերը։"
+  specimen_32: "Ամեն ոք ունի ազգային լիազոր դատարանների միջոցով իր իրավունքների արդյունավետ վերականգնման իրավունք, եթե խախտվում են սահմանադրությամբ կամ օրենքով սահմանված նրա հիմնական իրավունքները։"
+  specimen_21: "Ոչ ոք չի կարող ենթարկվել կամայական կալանքի, բանտարկության կամ արտաքսման։\nԱմեն ոք իր իրավունքների ու պարտականությունների սահմանման համար և իր դեմ ցանկացած քրեական մեղադրանքի դեպքում, լիակատար հավասարության հիման վրա, իրավունք ունի, որ իր գործը արդարացի ու հրապարակայնորեն լսվի անկախ ու անկողմնապահ դատարանի կողմից։"
+  specimen_16: "Ոչ ոք չի կարող ենթարկվել կամայական միջամտության իր անձնական ու ընտանեկան կյանքի նկատմամբ, իր տան, թղթակցության և կամ իր պատվի ու համբավի դեմ կամայական ոտնձգության։ Ամեն ոք ունի օրենքով պաշտպանվելու իրավունք ընդդեմ նման միջամտության կամ ոտնձգության։\nՅուրաքանչյուր ոք ունի մտքի, խղճի ու դավանանքի ազատության իրավունք․ այս իրավունքը ներառնում է իր դավանանքը կամ համոզմունքները փոխելու ազատություն և իր դավանանքին կամհամոզմունքներին հետևելու ազատություն, մենակ կամ ուրիշների հետ համատեղ, հրապարակայնորեն կամ գաղտնի՝ քարոզի, ժամերգության, կրոնական ու ծիսական արարողությունների ձևով։"
+}
diff --git a/lang/languages/hy/language.textproto b/lang/languages/hy/language.textproto
deleted file mode 100644
index d1dadc58f..000000000
--- a/lang/languages/hy/language.textproto
+++ /dev/null
@@ -1,21 +0,0 @@
-id: "hy"
-name: "Armenian"
-preferred_name: "Eastern Armenian"
-autonym: "Հայերեն"
-population: 5317271
-region: "LB"
-region: "GE"
-region: "RU"
-region: "CY"
-region: "TR"
-region: "SY"
-region: "AM"
-region: "IR"
-script: "Armenian"
-exemplar_chars {
-  base: "Ա Բ Գ Դ Ե Զ Է Ը Թ Ժ Ի Լ Խ Ծ Կ Հ Ձ Ղ Ճ Մ Յ Ն Շ Ո Չ Պ Ջ Ռ Ս Վ Տ Ր Ց Ւ Փ Ք Օ Ֆ ա բ գ դ ե զ է ը թ ժ ի լ խ ծ կ հ ձ ղ ճ մ յ ն շ ո չ պ ջ ռ ս վ տ ր ց ւ փ ք օ ֆ և"
-  auxiliary: "և"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "՛ ՜ ՝ ՞ ։"
-  index: "Ա Բ Գ Դ Ե Զ Է Ը Թ Ժ Ի Լ Խ Ծ Կ Հ Ձ Ղ Ճ Մ Յ Ն Շ Ո Չ Պ Ջ Ռ Ս Վ Տ Ր Ց Ւ Փ Ք Օ Ֆ"
-}
diff --git a/lang/languages/hy/sampletext.textproto b/lang/languages/hy/sampletext.textproto
deleted file mode 100644
index 83b53cb8e..000000000
--- a/lang/languages/hy/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "hy"
diff --git a/lang/languages/hz/language.textproto b/lang/languages/hz.textproto
similarity index 74%
rename from lang/languages/hz/language.textproto
rename to lang/languages/hz.textproto
index b895f31d7..a6f1a99c9 100644
--- a/lang/languages/hz/language.textproto
+++ b/lang/languages/hz.textproto
@@ -7,3 +7,6 @@ region: "NA"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ia.textproto b/lang/languages/ia.textproto
new file mode 100644
index 000000000..d5d72cfa5
--- /dev/null
+++ b/lang/languages/ia.textproto
@@ -0,0 +1,25 @@
+id: "ia"
+name: "Interlingua"
+preferred_name: "Interlingua"
+autonym: "Interlingua"
+population: 135
+region: "FR"
+region: "SE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Ee"
+  tester: "Considerante que le recognoscentia del dignitate inherente a"
+  poster_sm: "Considerante"
+  poster_md: "Le Assemblea"
+  poster_lg: "Tote"
+  specimen_48: "Proclama le presente Declaration Universal del Derectos Human"
+  specimen_36: "Necuno essera submittite a sclavitude o servitude; le sclavitude e le traffico de sclavos es interdicte in tote su formas."
+  specimen_32: "Tote persona ha le derecto al establimento de un ordine social e international in le qual le derectos e libertates proclamate in iste Declaration pote esser plenmente realisate."
+  specimen_21: "Nulle disposition del presente Declaration pote esser interpretate como implicante pro un stato, pro un gruppamento o pro un individuo un qualcunque derecto de livrar se a activitates e de realisar actos visante al destruction del derectos e libertates proclamate in iste Declaration.\nConsiderante que le recognoscentia del dignitate inherente a tote le membros del familia human e de lor derectos equal e inalienabile constitue le fundamento del libertate, del justitia e del pace in le mundo,"
+  specimen_16: "Considerante que le recognoscentia del dignitate inherente a tote le membros del familia human e de lor derectos equal e inalienabile constitue le fundamento del libertate, del justitia e del pace in le mundo,\nConsiderante que le ignorantia e le disprecio del derectos human ha resultate in actos de barbaria que ultragia le conscientia del humanitate, e que le advenimento de un mundo in le qual le esseres human essera libere de parlar e de creder, liberate del terror e del miseria, ha essite proclamate como le plus alte aspiration del homine,\nConsiderante que il es essential que le derectos human es protegite per medio de un regime de derecto, a fin que le homine non es compellite al ultime recurso del rebellion contra le tyrannia e le oppression,"
+}
diff --git a/lang/languages/ia/language.textproto b/lang/languages/ia/language.textproto
deleted file mode 100644
index f409bc29e..000000000
--- a/lang/languages/ia/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "ia"
-name: "Interlingua"
-preferred_name: "Interlingua"
-autonym: "Interlingua"
-population: 135
-region: "FR"
-region: "SE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/ia/sampletext.textproto b/lang/languages/ia/sampletext.textproto
deleted file mode 100644
index fccb9805f..000000000
--- a/lang/languages/ia/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ia"
diff --git a/lang/languages/iba/language.textproto b/lang/languages/iba.textproto
similarity index 74%
rename from lang/languages/iba/language.textproto
rename to lang/languages/iba.textproto
index 2e87791a1..bdccb8b0b 100644
--- a/lang/languages/iba/language.textproto
+++ b/lang/languages/iba.textproto
@@ -7,3 +7,6 @@ region: "MY"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ibb.textproto b/lang/languages/ibb.textproto
new file mode 100644
index 000000000..dfc0a00a8
--- /dev/null
+++ b/lang/languages/ibb.textproto
@@ -0,0 +1,24 @@
+id: "ibb"
+name: "Ibibio"
+preferred_name: ""
+autonym: ""
+population: 2996392
+region: "NG"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E F G H I Ị K M N Ñ O Ọ P R S T U Ʌ W Y a b d e f g h i ị k m n ñ o ọ p r s t u ʌ w y"
+  marks: "◌̃ ◌̣"
+}
+sample_text {
+  masthead_full: "KkPp"
+  masthead_partial: "Uu"
+  tester: "Kpukpuru owo emana ye ukemukem ye asana asana unen ye ndamana"
+  poster_sm: "Mboho Edidiana"
+  poster_md: "Mme unen"
+  poster_lg: "Kpukpuru"
+  specimen_48: "Mbufo emehe ye mme mbet ye mme unen emi enyun enwam ndisuan etop"
+  specimen_36: "Koro kpupuru owo ndidiono mme unen ye mme usuñ uboho-ufin edi ata akpan nkpo ndida nam enwono emi oworo usun,"
+  specimen_32: "Owo inyeneke ndisin owo ndomokiet ke idak ndutuho ye ibak. Nko owo inyeneke ndino owo ufen emi midotke ndino owo, mme ufen emi edide nkpo but ye esuene."
+  specimen_21: "Kpupuru owo enyene unen ndiworo nda ke ebiet kiet ekededi nte owo emi enyende unen ke iso mbet.\nKpukpuru owo, owo isoho owo eto, edi ukem ukem ke iso mbet enyung eyene unen ndibo ukem ukpeme otode ke mbet. Kpupuru owo enyene unen ndibo ukpeme, edieke owo esinde asari emi ekemede ndibiat mme mbet emi edude ke nwed Edisuan Etop Mbana Mme Unen Mme Owo emi, mme ndinam nkpo emi ekemeke ndida oruk asari oro ndi."
+  specimen_16: "Kpukpuru owo enyene unen ndiyom ukpan mme unen nto mme esop ndunhode emi edude ndise mbana mme edinam emi ekemede ndibiat mme ndamana unen emi enode owo otode ke akwa nwed mbet, ye mme mbet eken.\nOwo inyenke unen ndimum owo ndomokiet ke ini akpan ntak miduhe, mme ndikobi, mme ndibin owo nsio ke obio esie.\nKpukpuru owo enyene unen ndida ke iso ikpe nyung ntin iko idem mmo anwa anwa ke iso asana asana esop ubiereikpe emi minamke asari, ke ndiyom mme unen ye mme isoutom mmo, ye ndiyom unen mbana mme idiok ikpe ekededi emi owo enyende.\nOwo ekededi enyene unen ndiduok odudu mme ndibo inem uwem, ndiyun nyene akpan ini emi enye anamde utom emi minionke ikaha, ndiyung mbo ukpe ke ini utom, kpa ye ini nduokodudu."
+}
diff --git a/lang/languages/ibb/language.textproto b/lang/languages/ibb/language.textproto
deleted file mode 100644
index be45ae591..000000000
--- a/lang/languages/ibb/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "ibb"
-name: "Ibibio"
-preferred_name: ""
-autonym: ""
-population: 2996392
-region: "NG"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E F G H I Ị K M N Ñ O Ọ P R S T U Ʌ W Y a b d e f g h i ị k m n ñ o ọ p r s t u ʌ w y"
-  marks: "◌̃ ◌̣"
-}
diff --git a/lang/languages/ibb/sampletext.textproto b/lang/languages/ibb/sampletext.textproto
deleted file mode 100644
index 2dcfd97cf..000000000
--- a/lang/languages/ibb/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ibb"
diff --git a/lang/languages/id.textproto b/lang/languages/id.textproto
new file mode 100644
index 000000000..9c1ef503a
--- /dev/null
+++ b/lang/languages/id.textproto
@@ -0,0 +1,28 @@
+id: "id"
+name: "Indonesian"
+preferred_name: ""
+autonym: "Indonesia"
+population: 171207687
+region: "ID"
+region: "NL"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+  auxiliary: "å"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "SsEe"
+  masthead_partial: "Mm"
+  tester: "Menimbang bahwa pengakuan atas martabat alamiah dan hak-hak yang"
+  poster_sm: "Menimbang bahwa"
+  poster_md: "Menimbang"
+  poster_lg: "Semua"
+  specimen_48: "Menimbang bahwa pembangunan hubungan persahabatan antara negara-negara"
+  specimen_36: "Menimbang bahwa pengakuan atas martabat alamiah dan hak-hak yang sama dan mutlak dari semua anggota keluarga"
+  specimen_32: "Menimbang bahwa pengakuan atas martabat alamiah dan hak-hak yang sama dan mutlak dari semua anggota keluarga manusia adalah dasar kemerdekaan, keadilan dan perdamaian di dunia,"
+  specimen_21: "Menimbang bahwa pengakuan atas martabat alamiah dan hak-hak yang sama dan mutlak dari semua anggota keluarga manusia adalah dasar kemerdekaan, keadilan dan perdamaian di dunia,\nMenimbang bahwa hak-hak asasi manusia perlu dilindungi oleh peraturan hukum supaya orang tidak akan terpaksa memilih pemberontakan sebagai usaha terakhir guna menentang kelaliman dan penindasan,"
+  specimen_16: "Menimbang bahwa pengakuan atas martabat alamiah dan hak-hak yang sama dan mutlak dari semua anggota keluarga manusia adalah dasar kemerdekaan, keadilan dan perdamaian di dunia,\nMenimbang bahwa mengabaikan dan memandang rendah hak-hak asasi manusia telah mengakibatkan perbuatan-perbuatan bengis yang menimbulkan rasa kemarahan hati nurani umat manusia, dan terbentuknya suatu dunia tempat manusia akan mengecap kenikmatan kebebasan berbicara dan beragama serta kebebasan dari ketakutan dan kekurangan telah dinyatakan sebagai cita-cita tertinggi dari rakyat biasa,"
+}
diff --git a/lang/languages/id/language.textproto b/lang/languages/id/language.textproto
deleted file mode 100644
index ec2478f87..000000000
--- a/lang/languages/id/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "id"
-name: "Indonesian"
-preferred_name: ""
-autonym: "Indonesia"
-population: 171207687
-region: "ID"
-region: "NL"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-  auxiliary: "å"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/id/sampletext.textproto b/lang/languages/id/sampletext.textproto
deleted file mode 100644
index 94d24bca0..000000000
--- a/lang/languages/id/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "id"
diff --git a/lang/languages/ife/language.textproto b/lang/languages/ife.textproto
similarity index 74%
rename from lang/languages/ife/language.textproto
rename to lang/languages/ife.textproto
index 22a128710..bb527e69a 100644
--- a/lang/languages/ife/language.textproto
+++ b/lang/languages/ife.textproto
@@ -7,3 +7,6 @@ region: "TG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ig.textproto b/lang/languages/ig.textproto
new file mode 100644
index 000000000..32019e9bd
--- /dev/null
+++ b/lang/languages/ig.textproto
@@ -0,0 +1,27 @@
+id: "ig"
+name: "Igbo"
+preferred_name: ""
+autonym: "Igbo"
+population: 27823640
+region: "NG"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á È É Ì Í Ò Ó Ù Ú Ā Ē Ī Ń Ō Ū Ị Ọ Ụ Ṅ Ẹ a b c d e f g h i j k l m n o p q r s t u v w x y z à á è é ì í ò ó ù ú ā ē ī ń ō ū ị ọ ụ ṅ ẹ"
+  auxiliary: "á à ā c é è ē í ì ī {ị\\u0301} {ị\\u0300} ḿ {m\\u0300} ń ǹ ó ò ō {ọ\\u0301} {ọ\\u0300} q ú ù ū {ụ\\u0301} {ụ\\u0300} x"
+  marks: "◌̀ ◌́ ◌̄ ◌̇ ◌̣"
+  punctuation: "\\- ‑ , ; \\: ! ? . ‘ ’ “ ” ( ) \\[ \\] \\{ \\}"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "AaMm"
+  masthead_partial: "Ụụ"
+  tester: "Ebe ọ bụ na nghọta ugwu ekere uwa na ikike nha anya a pụghị ịnapụ"
+  poster_sm: "Ebe nleghara"
+  poster_md: "Ebe ọ dị"
+  poster_lg: "mụrụ"
+  specimen_48: "Ebe ọ dị mkpa ịkwalite ọganihu mmekọrịta enyi na enyi n\'etiti"
+  specimen_36: "Ebe nghọta onye ọ bụla banyere ikike na ohere ndi a kachasị dịrị mkpa maka imejupụta nkwekọrịta nke a."
+  specimen_32: "A mụrụ mmadụ nile n\'ohere nakwa nha anya ugwu na ikike. E nyere ha uche na mmụọ ime ihe ziri ezi nke na ha kwesiri ịkpaso ibe ha agwa n\'obi nwanne na nwanne."
+  specimen_21: "Onye ọ bụla tozuru iwe ikike na ohere nile e wepụtara na Nkwuwapụta nke a , n\'enweghi ịkpa oke ọ bụla dị ka nke agbụrụ; ụcha akpụkpọ ahụ, ịbụ nwoke ma ọ bụ nwanyị, asụsụ, okpukpe chi, echiche banyere ọchịchị ma ọ bụ ihe ọzọ, obodo ma ọ bụ ọ n\'obodo akụ, ọnọdụ ọmụmụ ma ọ bụ ọnọdụ ọzọ.\nOnye ọ bụla nwere ikike inwe ndụ, ohere na nchedo nke onwe ya."
+  specimen_16: "Ọ dịghị onye a ga‐ejigide n\'ọnọdu ohu ma ọ bụ odibọ a ga‐amachi ịkpa ma ọ bụ ire ohu n\'ụdị ọ bụla.\nỌ dịghị onye a ga‐akwagide n\'oke ntaramahụhụ, ma ọ bụ na mmeso omume na ntaramahụhụ obi ọjọọ, obi tara mmiri ma ọ bụ nke naz‐ewetu ugwu mmadụ.\nOnye ọ bụla nwere ikike nkwanyere ugwu dị ka mmadụ ebe ọ bụla n\'usoro iwu.\nMadụ nile ha otu n\'usoro iwu, tozukwa oke n\'enweghi ịkpa oke ọ bụla inweta nchedo nha anya n\'usoro iwu. Madụ nile tozukwara oke nchedo nha anya megide ụdị ịkpa oke ọ bụla mebiri Nkwuwapụta nke a ma megidekwa ikwanye mmadụ ọ bụla n\'ụdị ikpa oke a.\nOnye ọ bụla nwere ikike ikpe mmezi ga‐enwe nkawado ọha na eze nke ndi ụlọ ikpe tozuru etozu nke obodo ma e nwee omume ndi megidere ikike ntọala nke e nyegasịrị ya site n\'usoro ọchịchị ma ọbụ iwu."
+}
diff --git a/lang/languages/ig/language.textproto b/lang/languages/ig/language.textproto
deleted file mode 100644
index f00070395..000000000
--- a/lang/languages/ig/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "ig"
-name: "Igbo"
-preferred_name: ""
-autonym: "Igbo"
-population: 27823640
-region: "NG"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á È É Ì Í Ò Ó Ù Ú Ā Ē Ī Ń Ō Ū Ị Ọ Ụ Ṅ Ẹ a b c d e f g h i j k l m n o p q r s t u v w x y z à á è é ì í ò ó ù ú ā ē ī ń ō ū ị ọ ụ ṅ ẹ"
-  auxiliary: "á à ā c é è ē í ì ī {ị\\u0301} {ị\\u0300} ḿ {m\\u0300} ń ǹ ó ò ō {ọ\\u0301} {ọ\\u0300} q ú ù ū {ụ\\u0301} {ụ\\u0300} x"
-  marks: "◌̀ ◌́ ◌̄ ◌̇ ◌̣"
-  punctuation: "\\- ‑ , ; \\: ! ? . ‘ ’ “ ” ( ) \\[ \\] \\{ \\}"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/ig/sampletext.textproto b/lang/languages/ig/sampletext.textproto
deleted file mode 100644
index 22507d27d..000000000
--- a/lang/languages/ig/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ig"
diff --git a/lang/languages/ii/language.textproto b/lang/languages/ii.textproto
similarity index 54%
rename from lang/languages/ii/language.textproto
rename to lang/languages/ii.textproto
index abcfb2e6d..ca7850286 100644
--- a/lang/languages/ii/language.textproto
+++ b/lang/languages/ii.textproto
@@ -10,3 +10,16 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "ꀀ ꀋ ꀗ ꀣ ꀯ ꀺ ꁆ ꁒ ꁞ ꁩ ꁵ ꂁ ꂍ ꂘ ꂤ ꂰ ꂼ ꃇ ꃓ ꃟ ꃫ ꃶ ꄂ ꄎ ꄚ ꄥ ꄱ ꄽ ꅉ ꅔ ꅠ ꅬ ꅸ ꆃ ꆏ ꆛ ꆧ ꆳ ꆾ ꇊ ꇖ ꇢ ꇭ ꇹ ꈅ ꈑ ꈜ ꈨ ꈴ ꉀ ꉋ ꉗ ꉣ ꉯ ꉺ ꊆ ꊒ ꊞ ꊩ ꊵ ꋁ ꋍ ꋘ ꋤ ꋰ ꋼ ꌇ ꌓ ꌟ ꌫ ꌷ ꍂ ꍎ ꍚ ꍦ ꍱ ꍽ ꎉ ꎕ ꎠ ꎬ ꎸ ꏄ ꏏ ꏛ ꏧ ꏳ ꏾ ꐊ ꐖ ꐢ ꐭ ꐹ ꑅ ꑑ ꑜ ꑨ ꑴ ꒀ ꒋ"
 }
+sample_text {
+  masthead_full: "ꊿꂷꃅꄿ"
+  masthead_partial: "ꐨꐥ"
+  tester: "ꊽꋩꅍꏭꉜꀋꒉꌠꌋꆀꉜꄸꑠꆹꅢꎆꌊꆀꍀꆿꃅꇏꅊꀐ，ꃅꇏꋋꈨꆹꃰꊿꂄꉌꇬꍍꄀꌠꉬ，ꊿꂷꈀꐥꃅꐥꋭꅇꉉꈋꍣꌋꆀꑇꌠꄿꐨꐥ，ꄷꀋꁨꐬꀋꆠꃅꐥꌠꌋꆀꇮꃪꃅꑟꇁꌠꋧꃅꂶꌠꆹ"
+  poster_sm: "ꊿꂷꃅꄿꐨꐥ，ꌅꅍꀂꏽꐯꒈꃅꐥꌐ"
+  poster_md: "ꏦꃤꂴꆽꐯꒈꃅꐥ"
+  poster_lg: "ꊿꂷꃅꄿꐨꐥ"
+  specimen_48: "ꊿꑞꂷꉬꅉꂿ，ꋍꐥꐨ、ꑱꈐ、ꀀꅉꌋꆀꅇꈴꋍꑠꈀꏾꃅꇬꏢꇋꀋꉆ，ꋍꂒꅉꌋꆀꂒꉻꑠꏯꑌꁒꐀꀋꉆ，ꊿꂷꇬꐥꆏꏦꃤꇬꀧꌋꃅꌠꌅꐨꐥ，ꇬꏢꇋꇬꁒꐀꀋꉆ"
+  specimen_36: "ꊿꂷꈀꐥꌠꋌꐧꋦꇬꊿꂷꉬꆏ，ꐧꋦꀧꏢꃅꐥꋭꌠꌅꅍꐥ，ꄷꀋꁨꋌꋍꊨꏦꐥꐨꐤꏦꌋꆀꋍꄿꐨ ꅢꎆꌠꇬꀋꈁꀋꉆꌠꎆꏣ，ꐧꋦꌋꆀꌧꇐꃆꂮꋍꑠꋍꑵꇬꋯꐨꑠꃅꇬꅜꌠꌅꅍꐥ，ꋌꆹꇩꏤꊋꇤꌠꌋꆀꇩꏤꏓꐯꇯꄉꇩꏤꋋꈨꎀꍹꌋꆀꅐꇐꃆꂮꇬꈴꄉꃅꇬꅜꌠ。"
+  specimen_32: "ꌅꅍꌋꆀꄿꐨꋋꈨꊿꃅꇫꅉꐚꌠꆹ，ꃅꐮꏤꒃꋋꏢꇬꃅꇬꑟꌠꆹꀋꉬꀋꉆꌠꉬ，ꑠꅹꃆꃀꀉꒉꋋꂷ，ꋧꃅꊽꌅꅍꋋꏢꌌꄜꋊ，ꉹꁌꏓꂱꈀꐥꌠꌋꆀꇩꏤꈀꐥꃅꊋꇤꄉꃅꇫꑟꂿꄷꌠꇬꎕꏦꏢꉬ，ꊾꂷꇫꐥꌠꌋꆀꐧꋦꏲꉻꈀꐥꌠꃅꅉꅉꃅꇬꎺꄉꌶ，ꊋꇤꃅꉙꂘꌠꇬꈴꄉꌅꅍꌋꆀꄿꐨꁌꒉꌠꊥꎆ，ꉈꑴꇩꏤꌋꆀꇩꏤꇢꊭꇬꈴꏁꁈꄉ，ꌅꅍꌋꆀꋋꈨꁳꉻꏑꇩꏤꈧ ꌠꉹꁌꏓꂱꊨꏦꏲꄸ，ꊿꃅꇬꏚꍆꇬꈴꄉꃅꏢꅊꎻ。"
+  specimen_21: "ꃰꊿꑱꈐꊿꂷꃅꐥꋭꐯꒈꃅꐥꌠꌋꆀꌅꅍꏚꍆꌠꆹ，ꋧꃅꄿꐨ，ꑗꉬꌋꆀꄮꐽꃅꐥꌠꅉꃀꉬ。\nꊽꋩꅍꏭꉜꀋꒉꌠꌋꆀꉜꄸꑠꆹꅢꎆꌊꆀꍀꆿꃅꇏꅊꀐ，ꃅꇏꋋꈨꆹꃰꊿꂄꉌꇬꍍꄀꌠꉬ，ꊿꂷꈀꐥꃅꐥꋭꅇꉉꈋꍣꌋꆀꑇꌠꄿꐨꐥ，ꄷꀋꁨꐬꀋꆠꃅꐥꌠꌋꆀꇮꃪꃅꑟꇁꌠꋧꃅꂶꌠꆹ，ꈍꄮꅉꆐꉹꁌꏓꂱꀊꂤꉌꉪꅉꉬꄷꄜꇬꄀꄉꀐ。\nꃰꊿꇬꐥꀋꄐꄉꊾꍅꊿꅷꌠꐤꁏꑠꆹ，ꏦꃤꇬꄉꀧꋭꌠꌅꅍꉬ。\nꇩꏤꈀꐥꌠꇢꊭꇬꐮꄮꃅꐥꃆꂮꀻꎆꌠꊥꎆꄻꅐ。\nꉻꏑꇩꏤꏓꂱꐥꇯꌠꏦꃤꁢꊧꇬꊿꊇꌅꅍꊿꑌꇐꁌꐨꌋꆀꅪꃰꐥꒈꃅꐥꌠꌅꅍꑠꉈꑴꌌꉉꄜꋊ，ꄷꀋꁨꀋꎪꃅꄿꐨꊼꇅꀉꒉꃅꐥꌠꐧꋦꀒꁨꆹꌠꌋꆀꐥꐨꄺꅐꌠꀻꎆꆹꎻ。\nꄚꐊꌠꇩꏤꆹꀋꎪꃅꉻꏑꇩꏤꌋꆀꐯꇯꊽꌅꅍꌋꅿꄿꐨꇬꁌꒉꄷꀋꁨꇫꍬꌬꇫꊥꎆꏤꄉꀐ。"
+  specimen_16: "ꃰꊿꑱꈐꊿꂷꃅꐥꋭꐯꒈꃅꐥꌠꌋꆀꌅꅍꏚꍆꌠꆹ，ꋧꃅꄿꐨ，ꑗꉬꌋꆀꄮꐽꃅꐥꌠꅉꃀꉬ。\nꊽꋩꅍꏭꉜꀋꒉꌠꌋꆀꉜꄸꑠꆹꅢꎆꌊꆀꍀꆿꃅꇏꅊꀐ，ꃅꇏꋋꈨꆹꃰꊿꂄꉌꇬꍍꄀꌠꉬ，ꊿꂷꈀꐥꃅꐥꋭꅇꉉꈋꍣꌋꆀꑇꌠꄿꐨꐥ，ꄷꀋꁨꐬꀋꆠꃅꐥꌠꌋꆀꇮꃪꃅꑟꇁꌠꋧꃅꂶꌠꆹ，ꈍꄮꅉꆐꉹꁌꏓꂱꀊꂤꉌꉪꅉꉬꄷꄜꇬꄀꄉꀐ。\nꃰꊿꇬꐥꀋꄐꄉꊾꍅꊿꅷꌠꐤꁏꑠꆹ，ꏦꃤꇬꄉꀧꋭꌠꌅꅍꉬ。\nꇩꏤꈀꐥꌠꇢꊭꇬꐮꄮꃅꐥꃆꂮꀻꎆꌠꊥꎆꄻꅐ。\nꉻꏑꇩꏤꏓꂱꐥꇯꌠꏦꃤꁢꊧꇬꊿꊇꌅꅍꊿꑌꇐꁌꐨꌋꆀꅪꃰꐥꒈꃅꐥꌠꌅꅍꑠꉈꑴꌌꉉꄜꋊ，ꄷꀋꁨꀋꎪꃅꄿꐨꊼꇅꀉꒉꃅꐥꌠꐧꋦꀒꁨꆹꌠꌋꆀꐥꐨꄺꅐꌠꀻꎆꆹꎻ。\nꄚꐊꌠꇩꏤꆹꀋꎪꃅꉻꏑꇩꏤꌋꆀꐯꇯꊽꌅꅍꌋꅿꄿꐨꇬꁌꒉꄷꀋꁨꇫꍬꌬꇫꊥꎆꏤꄉꀐ。\nꌅꅍꌋꆀꄿꐨꋋꈨꊿꃅꇫꅉꐚꌠꆹ，ꃅꐮꏤꒃꋋꏢꇬꃅꇬꑟꌠꆹꀋꉬꀋꉆꌠꉬ，ꑠꅹꃆꃀꀉꒉꋋꂷ，ꋧꃅꊽꌅꅍꋋꏢꌌꄜꋊ，ꉹꁌꏓꂱꈀꐥꌠꌋꆀꇩꏤꈀꐥꃅꊋꇤꄉꃅꇫꑟꂿꄷꌠꇬꎕꏦꏢꉬ，ꊾꂷꇫꐥꌠꌋꆀꐧꋦꏲꉻꈀꐥꌠꃅꅉꅉꃅꇬꎺꄉꌶ，ꊋꇤꃅꉙꂘꌠꇬꈴꄉꌅꅍꌋꆀꄿꐨꁌꒉꌠꊥꎆ，ꉈꑴꇩꏤꌋꆀꇩꏤꇢꊭꇬꈴꏁꁈꄉ，ꌅꅍꌋꆀꋋꈨꁳꉻꏑꇩꏤꈧ ꌠꉹꁌꏓꂱꊨꏦꏲꄸ，ꊿꃅꇬꏚꍆꇬꈴꄉꃅꏢꅊꎻ。\nꊿꂷꃅꄿꐨꐥ，ꌅꅍꀂꏽꐯꒈꃅꐥꌐ。ꊿꊇꉪꍆꌋꆀꁨꉌꑌꐥ，ꄷꀋꁨꂛꊨꅫꃀꃅꐥꄡꑟ。\nꊾꂷꈀꐥꌠꃅꄜꋊꄯꒉꇬꅑꌠꌅꅍꌋꆀꄿꐨꆹ，ꊿꋅ、ꊾꐎꊾꆈ、ꌋꅪꌺꃰ、ꅇꂷ、ꑞꑇꌠ、ꍔꍞꌋꆀꀉꁁꑞꉜꐨ、ꑞꇩꏤ、ꐧꋦꊾꏥ、ꁨꇐ、ꒆꊿꀋꉬꀐꇬꀉꁁꊿꑞꉬꅉꂿꇬꐥꋭꌠꉬ。"
+}
diff --git a/lang/languages/ii/sampletext.textproto b/lang/languages/ii/sampletext.textproto
deleted file mode 100644
index f43f8db4d..000000000
--- a/lang/languages/ii/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ii"
diff --git a/lang/languages/ik/language.textproto b/lang/languages/ik.textproto
similarity index 74%
rename from lang/languages/ik/language.textproto
rename to lang/languages/ik.textproto
index ac7f5f48d..051fbea8b 100644
--- a/lang/languages/ik/language.textproto
+++ b/lang/languages/ik.textproto
@@ -7,3 +7,6 @@ region: "US"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ikt/language.textproto b/lang/languages/ikt.textproto
similarity index 75%
rename from lang/languages/ikt/language.textproto
rename to lang/languages/ikt.textproto
index 64d309076..a8c33ff3d 100644
--- a/lang/languages/ikt/language.textproto
+++ b/lang/languages/ikt.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ilo.textproto b/lang/languages/ilo.textproto
new file mode 100644
index 000000000..fcdf5c972
--- /dev/null
+++ b/lang/languages/ilo.textproto
@@ -0,0 +1,24 @@
+id: "ilo"
+name: "Iloko"
+preferred_name: ""
+autonym: "Ilokano"
+population: 10481376
+region: "PH"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z ñ"
+  marks: "◌̃"
+}
+sample_text {
+  masthead_full: "AaMm"
+  masthead_partial: "Ii"
+  tester: "Idinto ta bigbigen iti naisigsigud a dayaw ken panagpapada ken"
+  poster_sm: "Idinto ta iti"
+  poster_md: "Idinto ta"
+  poster_lg: "Amin"
+  specimen_48: "Idinto ta deytoy ti kangrunaan tapno maiwanwan ti panag-giginnayem"
+  specimen_36: "Awan ti siasinoman a mangparigat iti nalabes wenno mangranggas nga saan nga makatao wenno pananglalais wenno dusa."
+  specimen_32: "Kalintegan iti tunggal maysa ti aginana ken agliwliwa agraman ti nainkalintegan a naikeddeng nga oras ti panagtrabaho ken adda bayad dagiti aldaw ti piesta."
+  specimen_21: "Tunggal meysa ket maikari iti maysa nga gimong ken ti nailubongan a kinatalna nga isu dagiti kalintegan ken wayawaya nga nailanad iti deytoy a Pakdaar nga nasken a maamiris a naan-anay.\nAwan iti deytoy nga Pakdaar ti mabalin a naipatarus a kas ti pangilaw-lawag ti siasinoman nga Estado, grupo, tao, aniaman a kalintegan iti aniaman nga aramiden wenno panangiwayat iti aniaman nga pangpanggepen a mangdadael ti aniaman kadagiti kalintegan ken wayawaya a naituyang iti deytoy."
+  specimen_16: "Idinto ta bigbigen iti naisigsigud a dayaw ken panagpapada ken ti di maipaidam nga kalintegan dagiti amin a puli tao nga batayan ti wayawaya, hustisya ken ikakapya ti lubong.\nIdinto ta iti saan nga panangi-kan-kano ken lalaisen dagiti kalinteganti tao nga nagbanag iti panagsupiat a maibusor iti konsensya ti sangkataw-an, ken iti idadateng iti meysa nga lubong a laklak-amen dagiti tao ti wayawaya a panagsao ken pammati ken awanen ti panagamak ken panagrigrigat nga inda nga inar-arapa-ap nga impakdaar dagiti kadawyan a tao.\nIdinto ta deytoy ti kangrunaan, tapno saan a mapilitan ti tao nga mangriribok a maibusor ti kinaulpit ken pannakaidadanes, masapul nga masalakniban babaen kadagiti annuroten ti linteg."
+}
diff --git a/lang/languages/ilo/language.textproto b/lang/languages/ilo/language.textproto
deleted file mode 100644
index 62245c7e7..000000000
--- a/lang/languages/ilo/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "ilo"
-name: "Iloko"
-preferred_name: ""
-autonym: "Ilokano"
-population: 10481376
-region: "PH"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z ñ"
-  marks: "◌̃"
-}
diff --git a/lang/languages/ilo/sampletext.textproto b/lang/languages/ilo/sampletext.textproto
deleted file mode 100644
index 64825d199..000000000
--- a/lang/languages/ilo/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ilo"
diff --git a/lang/languages/inh/language.textproto b/lang/languages/inh.textproto
similarity index 90%
rename from lang/languages/inh/language.textproto
rename to lang/languages/inh.textproto
index cbe15c252..42ea24a62 100644
--- a/lang/languages/inh/language.textproto
+++ b/lang/languages/inh.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӏ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӏ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/is.textproto b/lang/languages/is.textproto
new file mode 100644
index 000000000..3624159db
--- /dev/null
+++ b/lang/languages/is.textproto
@@ -0,0 +1,28 @@
+id: "is"
+name: "Icelandic"
+preferred_name: ""
+autonym: "Íslenska"
+population: 350734
+region: "IS"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Æ É Í Ð Ó Ö Ú Ý Þ a b c d e f g h i j k l m n o p q r s t u v w x y z á æ é í ð ó ö ú ý þ"
+  auxiliary: "Ǽ Ǫ Œ ǽ ǫ œ"
+  marks: "◌́ ◌̈ ◌̨"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A Á B C D Ð E É F G H I Í J K L M N O Ó P Q R S T U Ú V W X Y Ý Z Þ Æ Ö"
+}
+sample_text {
+  masthead_full: "HhVv"
+  masthead_partial: "Ee"
+  tester: "Það ber að viðurkenna, að hver maður sé jafnborinn til virðingar"
+  poster_sm: "Mannréttindi"
+  poster_md: "Í stofnskrá"
+  poster_lg: "Hver"
+  specimen_48: "Aðildarríkin hafa bundizt samtökum um að efla almenna virðingu"
+  specimen_36: "Engan mann skal hneppa í þrældóm né nauðungarvinnu. Þrælahald og þrælaverzlun, hverju nafni sem nefnist, skulu bönnuð."
+  specimen_32: "Hverjum manni ber réttur til þess þjóðfélags- og milliþjóðaskipulags, er virði og framkvæmi að fullu mannréttindi þau, sem í yfirlýsingu þessari eru upp talin."
+  specimen_21: "Ekkert atriði þessarar yfirlýsingar má túlka á þann veg, að nokkru ríki, flokki manna eða einstaklingi sé heimilt að aðhafast nokkuð það, er stefni að því að gera að engu nokkur þeirra mannréttinda, sem hér hafa verið upp talin.\nÞað ber að viðurkenna, að hver maður sé jafnborinn til virðingar og réttinda, er eigi verði af honum tekin, og er þetta undirstaða frelsis, réttlætis og friðar i heiminum."
+  specimen_16: "Það ber að viðurkenna, að hver maður sé jafnborinn til virðingar og réttinda, er eigi verði af honum tekin, og er þetta undirstaða frelsis, réttlætis og friðar i heiminum.\nHafi mannréttindi verið fyrir borð borin og lítilsvirt, hefur slíkt haft í för með sér siðlausar athafnir, er ofboðið hafa samvizku mannkynsins, enda hefur því verið yfir lýst, að æðsta markmið almennings um heim allan sé að skapa veröld, þar sem menn fái notið málfrelsis , trúfrelsis og óttaleysis um einkalíf afkomu.\nMannréttindi á að vernda með lögum. Að öðrum kosti hljóta menn að grípa til þess örþrifaráðs að rísa upp gegn kúgun og ofbeldi."
+}
diff --git a/lang/languages/is/language.textproto b/lang/languages/is/language.textproto
deleted file mode 100644
index 283c121ac..000000000
--- a/lang/languages/is/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "is"
-name: "Icelandic"
-preferred_name: ""
-autonym: "Íslenska"
-population: 350734
-region: "IS"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Æ É Í Ð Ó Ö Ú Ý Þ a b c d e f g h i j k l m n o p q r s t u v w x y z á æ é í ð ó ö ú ý þ"
-  auxiliary: "Ǽ Ǫ Œ ǽ ǫ œ"
-  marks: "◌́ ◌̈ ◌̨"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A Á B C D Ð E É F G H I Í J K L M N O Ó P Q R S T U Ú V W X Y Ý Z Þ Æ Ö"
-}
diff --git a/lang/languages/is/sampletext.textproto b/lang/languages/is/sampletext.textproto
deleted file mode 100644
index 6cc72ae68..000000000
--- a/lang/languages/is/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "is"
diff --git a/lang/languages/it.textproto b/lang/languages/it.textproto
new file mode 100644
index 000000000..4d25ee939
--- /dev/null
+++ b/lang/languages/it.textproto
@@ -0,0 +1,42 @@
+id: "it"
+name: "Italian"
+preferred_name: ""
+autonym: "Italiano"
+population: 70743415
+region: "AT"
+region: "AU"
+region: "BR"
+region: "CA"
+region: "CH"
+region: "DE"
+region: "FR"
+region: "GB"
+region: "HR"
+region: "IT"
+region: "MT"
+region: "SI"
+region: "SM"
+region: "US"
+region: "VA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I L M N O P Q R S T U V Z À Á È É Ì Í Ò Ó Ù Ú a b c d e f g h i l m n o p q r s t u v z à á è é ì í ò ó ù ú"
+  auxiliary: "J K W X Y Î Ï j k w x y î ï"
+  marks: "◌̀ ◌́ ◌̂ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ — , ; \\: ! ? . … \' ’ \" “ ” « » ( ) \\[ \\] \\{ \\} @ /"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtUu"
+  masthead_partial: "Ii"
+  tester: "Considerato che il riconoscimento della dignità inerente a tutti"
+  poster_sm: "Considerato"
+  poster_md: "L\'ASSEMBLEA"
+  poster_lg: "Tutti"
+  specimen_48: "la presente dichiarazione universale dei diritti umani come ideale"
+  specimen_36: "Nessun individuo potrà essere sottoposto a tortura o a trattamento o a punizione crudeli, inumani o degradanti."
+  specimen_32: "Ogni individuo ha diritto al riposo ed allo svago, comprendendo in ciò una ragionevole limitazione delle ore di lavoro e ferie periodiche retribuite."
+  specimen_21: "Ogni individuo ha diritto ad un ordine sociale e internazionale nel quale i diritti e le libertà enunciati in questa Dichiarazione possano essere pienamente realizzati.\nNulla nella presente Dichiarazione può essere interpretato nel senso di implicare un diritto di un qualsiasi Stato, gruppo o persona di esercitare un\'attività o di compiere un atto mirante alla distruzione di alcuno dei diritti e delle libertà in essa enunciati."
+  specimen_16: "Considerato che il riconoscimento della dignità inerente a tutti i membri della famiglia umana e dei loro diritti, uguali ed inalienabili, costituisce il fondamento della libertà, della giustizia e della pace nel mondo;\nConsiderato che il disconoscimento e il disprezzo dei diritti umani hanno portato ad atti di barbarie che offendono la coscienza dell\'umanità, e che l\'avvento di un mondo in cui gli esseri umani godano della libertà di parola e di credo e della libertà dal timore e dal bisogno è stato proclamato come la più alta aspirazione dell\'uomo;\nConsiderato che è indispensabile promuovere lo sviluppo di rapporti amichevoli tra le Nazioni;"
+}
diff --git a/lang/languages/it/language.textproto b/lang/languages/it/language.textproto
deleted file mode 100644
index 47ac7ec48..000000000
--- a/lang/languages/it/language.textproto
+++ /dev/null
@@ -1,29 +0,0 @@
-id: "it"
-name: "Italian"
-preferred_name: ""
-autonym: "Italiano"
-population: 70743415
-region: "IT"
-region: "HR"
-region: "SM"
-region: "MT"
-region: "US"
-region: "CA"
-region: "GB"
-region: "SI"
-region: "BR"
-region: "AT"
-region: "CH"
-region: "AU"
-region: "FR"
-region: "VA"
-region: "DE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I L M N O P Q R S T U V Z À Á È É Ì Í Ò Ó Ù Ú a b c d e f g h i l m n o p q r s t u v z à á è é ì í ò ó ù ú"
-  auxiliary: "J K W X Y Î Ï j k w x y î ï"
-  marks: "◌̀ ◌́ ◌̂ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ — , ; \\: ! ? . … \' ’ \" “ ” « » ( ) \\[ \\] \\{ \\} @ /"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/it/sampletext.textproto b/lang/languages/it/sampletext.textproto
deleted file mode 100644
index 185c58408..000000000
--- a/lang/languages/it/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "it"
diff --git a/lang/languages/iu.textproto b/lang/languages/iu.textproto
new file mode 100644
index 000000000..c84981e29
--- /dev/null
+++ b/lang/languages/iu.textproto
@@ -0,0 +1,24 @@
+id: "iu"
+name: "Inuktitut"
+preferred_name: ""
+autonym: "ᐃᓄᒃᑎᑐᑦ"
+population: 15831
+region: "CA"
+script: "Latin"
+script: "UCAS"
+exemplar_chars {
+  base: "ᐃ ᐄ ᐅ ᐆ ᐊ ᐋ ᐦ ᐱ ᐲ ᐳ ᐴ ᐸ ᐹ ᑉ ᑎ ᑏ ᑐ ᑑ ᑕ ᑖ ᑦ ᑭ ᑮ ᑯ ᑰ ᑲ ᑳ ᒃ ᒋ ᒌ ᒍ ᒎ ᒐ ᒑ ᒡ ᒥ ᒦ ᒧ ᒨ ᒪ ᒫ ᒻ ᓂ ᓃ ᓄ ᓅ ᓇ ᓈ ᓐ ᓯ ᓰ ᓱ ᓲ ᓴ ᓵ ᔅ ᓕ ᓖ ᓗ ᓘ ᓚ ᓛ ᓪ ᔨ ᔩ ᔪ ᔫ ᔭ ᔮ ᔾ ᕕ ᕖ ᕗ ᕘ ᕙ ᕚ ᕝ ᕆ ᕇ ᕈ ᕉ ᕋ ᕌ ᕐ ᕿ ᖀ ᖁ ᖂ ᖃ ᖄ ᖅ ᖏ ᖐ ᖑ ᖒ ᖓ ᖔ ᖕ ᖠ ᖡ ᖢ ᖣ ᖤ ᖥ ᖦ"
+}
+sample_text {
+  masthead_full: "ᐃᓅᔪᓕ"
+  masthead_partial: "ᒫᑦ"
+  tester: "ᐃᒪᐃᒻᒪᑦ ᐃᓕᑕᖅᓯᒪᐅᑎᖃᑦᒪᑦ ᓯᕗᓕᕐᓂᓴᑐᖃᕐᓂᒃ ᓂᕐᓱᐃᓂᑦᒥᒃ ᐊᒻᒪᓗ ᐊᔾᔨᒌᒃᑎᑦᑎᓂᕐᒥᒃ ᐊᒻᒪᓗ"
+  poster_sm: "ᐃᒪᐃᒻᒪᑦ ᓱᖁᑎᒋᓇᒍ"
+  poster_md: "ᐃᒪᐃᒻᒪᑦ ᓲᖃᐃᒻᒪ,"
+  poster_lg: "ᐃᓅᔪᓕᒫᑦ"
+  specimen_48: "ᐃᒪᐃᒻᒪᑦ ᑭᓇᒃᑯᑐᐃᓐᓇᐃᑦ ᓯᓚᕐᔪᐊᕐᒥᐅᓂᒃ ᓴᐳᔾᔨᔨᑦ ᔫᓇᐃᑕᓐ ᓇᐃᓴᖕᒍᓂᕋᕐᑕᐅᔪᑦ ᐱᖁᔭᓕᐅᕐᓯᒪᕗᑦ"
+  specimen_36: "ᐃᒪᐃᒻᒪᑦ ᐃᓕᑕᖅᓯᒪᐅᑎᖃᑦᒪᑦ ᓯᕗᓕᕐᓂᓴᑐᖃᕐᓂᒃ ᓂᕐᓱᐃᓂᑦᒥᒃ ᐊᒻᒪᓗ ᐊᔾᔨᒌᒃᑎᑦᑎᓂᕐᒥᒃ ᐊᒻᒪᓗ ᐊᔪᙱᔾᔪᑕᐅᔪᓐᓇᖅᑐᓄᑦ ᐱᔪᓐᓇᐅᑎᓂᒃ ᑕᒪᐃᓐᓄᓕᒫᑦᑎᐊᖅ ᐃᓚᒋᔭᐅᔪᓄᑦ"
+  specimen_32: "ᐃᒪᐃᒻᒪᑦ ᓲᖃᐃᒻᒪ, ᑭᓇᒃᑯᑐᐃᓐᓇᓕᒫᑦ ᐃᒃᓯᓐᓇᑯᑕᖃᖅᓯᒪᒃᐸᑦ ᐃᑲᔪᖅᑐᐃᐱᖃᖅᑎᑕᐅᓇᓂ, ᐱᕕᑐᐊᑦᑎᐊᕆᓕᕐᓗᒍ, ᐊᑭᒪᓇᓱᐊᕐᓗᓂ ᐊᑭᕋᕐᑐᕐᓂᕐᒥᒍᑦ ᐊᒻᒪᓗ ᐅᖁᒪᐃᓪᓕᐅᖅᓂᖁᑦ, ᑕᒪᓐᓇ ᐃᓅᔪᓄᑦ ᐱᔪᓐᓇᐅᖅᑎᖕᒋᑦ ᓴᐳᒻᒥᔭᒃᑕᐅᔪᒃᓴᐅᕗᑦ ᒪᓕᒐᖕᒐᒍᑦ ᐱᖁᔭᓕᐊᖕᒍᓯᒪᔪᖁᑦ,"
+  specimen_21: "ᐃᒪᐃᒻᒪᑦ ᐃᓕᑕᖅᓯᒪᐅᑎᖃᑦᒪᑦ ᓯᕗᓕᕐᓂᓴᑐᖃᕐᓂᒃ ᓂᕐᓱᐃᓂᑦᒥᒃ ᐊᒻᒪᓗ ᐊᔾᔨᒌᒃᑎᑦᑎᓂᕐᒥᒃ ᐊᒻᒪᓗ ᐊᔪᙱᔾᔪᑕᐅᔪᓐᓇᖅᑐᓄᑦ ᐱᔪᓐᓇᐅᑎᓂᒃ ᑕᒪᐃᓐᓄᓕᒫᑦᑎᐊᖅ ᐃᓚᒋᔭᐅᔪᓄᑦ ᑕᒪᒃᑯᐊ ᐃᓈᔪᑦ ᐃᓚᒌᒍᓯᖕᒋᑎᒍᑦ ᑐᙵᕕᐅᓪᓚᕆᖕᒪᑦ ᐃᓱᒪᖅᓱᕐᓂᖅ, ᖃᓄᖕᒐᓴᖅᑕᐅᖕᒋᓐᓂᖅ ᐊᒻᒪᓗ ᓴᐃᓕᒪᓂᖃᕐᓂᖅ ᓯᓚᕐᔪᐊᕐᒥ,\nᐃᒪᐃᒻᒪᑦ ᓲᖃᐃᒻᒪ, ᑭᓇᒃᑯᑐᐃᓐᓇᓕᒫᑦ ᐃᒃᓯᓐᓇᑯᑕᖃᖅᓯᒪᒃᐸᑦ ᐃᑲᔪᖅᑐᐃᐱᖃᖅᑎᑕᐅᓇᓂ, ᐱᕕᑐᐊᑦᑎᐊᕆᓕᕐᓗᒍ, ᐊᑭᒪᓇᓱᐊᕐᓗᓂ ᐊᑭᕋᕐᑐᕐᓂᕐᒥᒍᑦ ᐊᒻᒪᓗ ᐅᖁᒪᐃᓪᓕᐅᖅᓂᖁᑦ, ᑕᒪᓐᓇ ᐃᓅᔪᓄᑦ ᐱᔪᓐᓇᐅᖅᑎᖕᒋᑦ ᓴᐳᒻᒥᔭᒃᑕᐅᔪᒃᓴᐅᕗᑦ ᒪᓕᒐᖕᒐᒍᑦ ᐱᖁᔭᓕᐊᖕᒍᓯᒪᔪᖁᑦ,"
+  specimen_16: "ᐃᒪᐃᒻᒪᑦ ᐃᓕᑕᖅᓯᒪᐅᑎᖃᑦᒪᑦ ᓯᕗᓕᕐᓂᓴᑐᖃᕐᓂᒃ ᓂᕐᓱᐃᓂᑦᒥᒃ ᐊᒻᒪᓗ ᐊᔾᔨᒌᒃᑎᑦᑎᓂᕐᒥᒃ ᐊᒻᒪᓗ ᐊᔪᙱᔾᔪᑕᐅᔪᓐᓇᖅᑐᓄᑦ ᐱᔪᓐᓇᐅᑎᓂᒃ ᑕᒪᐃᓐᓄᓕᒫᑦᑎᐊᖅ ᐃᓚᒋᔭᐅᔪᓄᑦ ᑕᒪᒃᑯᐊ ᐃᓈᔪᑦ ᐃᓚᒌᒍᓯᖕᒋᑎᒍᑦ ᑐᙵᕕᐅᓪᓚᕆᖕᒪᑦ ᐃᓱᒪᖅᓱᕐᓂᖅ, ᖃᓄᖕᒐᓴᖅᑕᐅᖕᒋᓐᓂᖅ ᐊᒻᒪᓗ ᓴᐃᓕᒪᓂᖃᕐᓂᖅ ᓯᓚᕐᔪᐊᕐᒥ,\nᐃᒪᐃᒻᒪᑦ ᓱᖁᑎᒋᓇᒍ ᐊᒻᒪᓗ ᓈᓚᖕᓂᕐᓗᖕᓂᖅ ᐃᓅᔪᒧᑦ ᐃᔪᓐᓇᐅᑎᓄᑦ ᖃᐅᔨᓇᖅᓯᐅᑎᓯᒪᔪᖅ ᓇᕐᕈᓇᕐᓂᕐᐹᑎᑐᑦ ᐊᐅᓪᓚᓯᖃᑦᓂᖕᒋᑦ ᓂᙵᒃᓵᕆᔾᔪᑎᖃᕐᐸᒃᑐᑦ ᐃᓄᓪᓚᕆᐅᔫᒐᓗᐊᓂᒃ, ᐊᒻᒪᓗ ᓯᕗᓕᐅᕆᓪᓚᑎᒃ ᓯᓚᕐᔪᐊᕐᒥᒃ ᑕᒪᒃᑯᐊ ᐊᓂᖅᑎᕆᔪᑦ ᐃᓅᔪᑦ ᖁᕕᐊᓲᑎᖃᕐᓯᒪᑎᓪᓗᒋᑦ ᐃᓱᒪᖅᓱᕐᖢᑎᒃ ᐅᖃᐅᓯᕐᒥᒃᑎᒍᑦ ᐊᒻᒪᓗ ᐅᖃᐅᓯᕐᒥᒃᑎᒍᑦ ᐊᒻᒪᓗ ᐃᓱᒪᖅᓱᕈᓐᓇᕐᓂᒃᑯᑦ ᑲᑦᐱᐊᓱᐊᓂᕐᒧᑦ ᐊᒻᒪᓗ ᓇᒧᑐᐃᓐᓇᖅ ᑐᓴᖅᑎᑦᑎᐅᑎᒋᓪᓗᒍ ᐱᔪᒪᓯᒪᖕᒪᑕ ᓲᕐᓗᓕ ᖁᑦᑎᖕᓂᖅᐸᐅᓪᓗᑎᒃ ᐊᔾᔪᒥᒋᔭᒥᒃᑎᒍᑦ ᐃᓄᑐᐃᓐᓇᐅᒐᓗᐊᕆᓪᓗᑎᒃ ᑭᓇᒃᑯᑐᐃᓐᓇᕐᑎᑐᑦ,\nᐃᒪᐃᒻᒪᑦ ᓲᖃᐃᒻᒪ, ᑭᓇᒃᑯᑐᐃᓐᓇᓕᒫᑦ ᐃᒃᓯᓐᓇᑯᑕᖃᖅᓯᒪᒃᐸᑦ ᐃᑲᔪᖅᑐᐃᐱᖃᖅᑎᑕᐅᓇᓂ, ᐱᕕᑐᐊᑦᑎᐊᕆᓕᕐᓗᒍ, ᐊᑭᒪᓇᓱᐊᕐᓗᓂ ᐊᑭᕋᕐᑐᕐᓂᕐᒥᒍᑦ ᐊᒻᒪᓗ ᐅᖁᒪᐃᓪᓕᐅᖅᓂᖁᑦ, ᑕᒪᓐᓇ ᐃᓅᔪᓄᑦ ᐱᔪᓐᓇᐅᖅᑎᖕᒋᑦ ᓴᐳᒻᒥᔭᒃᑕᐅᔪᒃᓴᐅᕗᑦ ᒪᓕᒐᖕᒐᒍᑦ ᐱᖁᔭᓕᐊᖕᒍᓯᒪᔪᖁᑦ,"
+}
diff --git a/lang/languages/iu/language.textproto b/lang/languages/iu/language.textproto
deleted file mode 100644
index a67138cb2..000000000
--- a/lang/languages/iu/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "iu"
-name: "Inuktitut"
-preferred_name: ""
-autonym: "ᐃᓄᒃᑎᑐᑦ"
-population: 15831
-region: "CA"
-script: "UCAS"
-script: "Latin"
-exemplar_chars {
-  base: "ᐃ ᐄ ᐅ ᐆ ᐊ ᐋ ᐦ ᐱ ᐲ ᐳ ᐴ ᐸ ᐹ ᑉ ᑎ ᑏ ᑐ ᑑ ᑕ ᑖ ᑦ ᑭ ᑮ ᑯ ᑰ ᑲ ᑳ ᒃ ᒋ ᒌ ᒍ ᒎ ᒐ ᒑ ᒡ ᒥ ᒦ ᒧ ᒨ ᒪ ᒫ ᒻ ᓂ ᓃ ᓄ ᓅ ᓇ ᓈ ᓐ ᓯ ᓰ ᓱ ᓲ ᓴ ᓵ ᔅ ᓕ ᓖ ᓗ ᓘ ᓚ ᓛ ᓪ ᔨ ᔩ ᔪ ᔫ ᔭ ᔮ ᔾ ᕕ ᕖ ᕗ ᕘ ᕙ ᕚ ᕝ ᕆ ᕇ ᕈ ᕉ ᕋ ᕌ ᕐ ᕿ ᖀ ᖁ ᖂ ᖃ ᖄ ᖅ ᖏ ᖐ ᖑ ᖒ ᖓ ᖔ ᖕ ᖠ ᖡ ᖢ ᖣ ᖤ ᖥ ᖦ"
-}
diff --git a/lang/languages/iu/sampletext.textproto b/lang/languages/iu/sampletext.textproto
deleted file mode 100644
index 2b4a2e6c1..000000000
--- a/lang/languages/iu/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "iu"
diff --git a/lang/languages/iu_Latn/language.textproto b/lang/languages/iu_Latn.textproto
similarity index 78%
rename from lang/languages/iu_Latn/language.textproto
rename to lang/languages/iu_Latn.textproto
index cedea2f7f..3af6ccae5 100644
--- a/lang/languages/iu_Latn/language.textproto
+++ b/lang/languages/iu_Latn.textproto
@@ -4,7 +4,10 @@ preferred_name: ""
 autonym: ""
 population: 15831
 region: "CA"
-script: "UCAS"
 script: "Latin"
+script: "UCAS"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "cr"
+}
diff --git a/lang/languages/izh/language.textproto b/lang/languages/izh.textproto
similarity index 74%
rename from lang/languages/izh/language.textproto
rename to lang/languages/izh.textproto
index c4c0a5ae3..ce3e50054 100644
--- a/lang/languages/izh/language.textproto
+++ b/lang/languages/izh.textproto
@@ -7,3 +7,6 @@ region: "RU"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ja/language.textproto b/lang/languages/ja.textproto
similarity index 95%
rename from lang/languages/ja/language.textproto
rename to lang/languages/ja.textproto
index e5dcc31b1..22d60c358 100644
--- a/lang/languages/ja/language.textproto
+++ b/lang/languages/ja.textproto
@@ -3,8 +3,8 @@ name: "Japanese"
 preferred_name: ""
 autonym: "日本語"
 population: 119676253
-region: "JP"
 region: "BR"
+region: "JP"
 script: "Japanese"
 exemplar_chars {
   base: "A B D E F G H I J K L M N O P R S T U V W Y Z Ā Ē Ī Ō Ū a b d e f g h i j k l m n o p r s t u v w y z ā ē ī ō ū"
@@ -14,3 +14,6 @@ exemplar_chars {
   punctuation: "! \" # % & ( ) * - . / : ; ? @ [ \\ ] _ § ¶ ‐ — ― ‖ ‘ ’ “ ” † ‡ ‥ … ‰ ′ ″ ※ ‾ 、 。 〃 〈 〉 《 》 「 」 『 』 【 】 〔 〕 〜 ・ ！ ＂ ＃ ％ ＆ ＇ （ ） ＊ ， － ． ／ ： ； ？ ＠ ［ ＼ ］ ＿ ｛ ｝ ｡ ｢ ｣ ､ ･"
   index: "あ か さ た な は ま や ら わ"
 }
+sample_text {
+  fallback_language: "ja"
+}
diff --git a/lang/languages/jam/language.textproto b/lang/languages/jam.textproto
similarity index 86%
rename from lang/languages/jam/language.textproto
rename to lang/languages/jam.textproto
index bda1b0d22..7b6694ce0 100644
--- a/lang/languages/jam/language.textproto
+++ b/lang/languages/jam.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/jgo/language.textproto b/lang/languages/jgo.textproto
similarity index 93%
rename from lang/languages/jgo/language.textproto
rename to lang/languages/jgo.textproto
index cd9fc6bca..896affec3 100644
--- a/lang/languages/jgo/language.textproto
+++ b/lang/languages/jgo.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: "\\- ‑ , ; \\: ! ? . ‹ › « »"
   index: "A B C D Ɛ F G H I J K L M N Ŋ Ɔ P {Pf} S {Sh} T {Ts} U Ʉ {Ʉ\\u0308} V W Ẅ Y Z Ꞌ"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/jmc/language.textproto b/lang/languages/jmc.textproto
similarity index 86%
rename from lang/languages/jmc/language.textproto
rename to lang/languages/jmc.textproto
index 6f67fe547..b020bf012 100644
--- a/lang/languages/jmc/language.textproto
+++ b/lang/languages/jmc.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "q x"
   index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/jml/language.textproto b/lang/languages/jml.textproto
similarity index 75%
rename from lang/languages/jml/language.textproto
rename to lang/languages/jml.textproto
index 4cb25ea12..208416454 100644
--- a/lang/languages/jml/language.textproto
+++ b/lang/languages/jml.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/jut/language.textproto b/lang/languages/jut.textproto
similarity index 73%
rename from lang/languages/jut/language.textproto
rename to lang/languages/jut.textproto
index 82e9dfd5e..e109160bb 100644
--- a/lang/languages/jut/language.textproto
+++ b/lang/languages/jut.textproto
@@ -7,3 +7,6 @@ region: "DK"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/jv.textproto b/lang/languages/jv.textproto
new file mode 100644
index 000000000..aa8860262
--- /dev/null
+++ b/lang/languages/jv.textproto
@@ -0,0 +1,29 @@
+id: "jv"
+name: "Javanese"
+preferred_name: ""
+autonym: "Jawa"
+population: 91180665
+region: "ID"
+region: "MY"
+script: "Latin"
+exemplar_chars {
+  base: "ꦄ ꦅ ꦆ ꦇ ꦈ ꦉ ꦊ ꦋ ꦌ ꦍ ꦎ ꦏ ꦐ ꦒ ꦓ ꦔ ꦕ ꦗ ꦚ ꦛ ꦝ ꦞ ꦟ ꦠ ꦢ ꦣ ꦤ ꦥ ꦦ ꦧ ꦨ ꦩ ꦪ ꦫ ꦭ ꦮ ꦯ ꦱ ꦲ"
+  auxiliary: "ꦑ ꦖ ꦘ ꦙ ꦜ ꦡ ꦬ ꦰ"
+  marks: "◌ꦀ ◌ꦁ ◌ꦂ ◌ꦃ ◌꦳ ◌ꦴ ◌ꦵ ◌ꦶ ◌ꦷ ◌ꦸ ◌ꦹ ◌ꦺ ◌ꦻ ◌ꦼ ◌ꦽ ◌ꦾ ◌ꦿ ◌꧀"
+  numerals: "꧐ ꧑ ꧒ ꧓ ꧔ ꧕ ꧖ ꧗ ꧘ ꧙ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "ꧏ ꧞ ꧟ ꧁ ꧂ ꧃ ꧄ ꧅ ꧆ ꧇ ꧈ ꧉ ꧊ ꧋ ꧌ ꧍"
+  index: "A Â Å B C D E É È Ê G H I Ì J K L M N O Ò P R S T U Ù W Y"
+}
+sample_text {
+  masthead_full: "SsAa"
+  masthead_partial: "Bb"
+  tester: "MANIMBANG manowo ngakoni marang martabat alamiah sarta hak-hak"
+  poster_sm: "PRANYATAN UMUM"
+  poster_md: "minangka"
+  poster_lg: "Saben"
+  specimen_48: "Saben uwong kalairake kanthi mardika lan darbe martabat lan hak-hak"
+  specimen_36: "MANIMBANG manowo ngakoni marang martabat alamiah sarta hak-hak kang padha lan pinasthi ing saben warganing"
+  specimen_32: "MANIMBANG manawa mekaring pamerdi panggulowenthahing sambung pamitran ing antaraning para bangsa saben negara perlu lan wigati dirembakakake."
+  specimen_21: "MANIMBANG manowo ngakoni marang martabat alamiah sarta hak-hak kang padha lan pinasthi ing saben warganing kulawarga umat manungsa, mujudake landhesaning kamardikan, kaadilan sarta bedhamening donya.\nMANIMBANG manawa hak-hak umat manungsa perlu antuk pangayoman kanthi pranatan lan tatanan angger-angger (undang-undang), amrih saben uwong ora kepeksa milih nglawan (mbrontak) minangka kupiyo kang pungkasan anggone ngrekodaya kanggo nglawan marang tindak daksiya lan panjajahan."
+  specimen_16: "MANIMBANG manowo ngakoni marang martabat alamiah sarta hak-hak kang padha lan pinasthi ing saben warganing kulawarga umat manungsa, mujudake landhesaning kamardikan, kaadilan sarta bedhamening donya.\nMANIMBANG menawa nyingkur lan nganggep remeh hak-hak umat manungsa bisa njalari tandang tanduk kasar lan wengis kang nuwuhake rasa runtik atine umat manungsa, lan kabangune donya dadi papaning umat manungsa bisa ngrasakake lan ngalami nikmating bebas medhar panemu lan bebas ngrasuk agama sarta kalis saka rasa wedi lan was-sumelang sarta urip kacingkrangan, kapratelakake dadi pranyatan minangka dadi gegayuhan luhur sakabehing umat manungsa lumrah (kawula alit)."
+}
diff --git a/lang/languages/jv/language.textproto b/lang/languages/jv/language.textproto
deleted file mode 100644
index 1aa4fa505..000000000
--- a/lang/languages/jv/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "jv"
-name: "Javanese"
-preferred_name: ""
-autonym: "Jawa"
-population: 91180665
-region: "ID"
-region: "MY"
-script: "Latin"
-exemplar_chars {
-  base: "ꦄ ꦅ ꦆ ꦇ ꦈ ꦉ ꦊ ꦋ ꦌ ꦍ ꦎ ꦏ ꦐ ꦒ ꦓ ꦔ ꦕ ꦗ ꦚ ꦛ ꦝ ꦞ ꦟ ꦠ ꦢ ꦣ ꦤ ꦥ ꦦ ꦧ ꦨ ꦩ ꦪ ꦫ ꦭ ꦮ ꦯ ꦱ ꦲ"
-  auxiliary: "ꦑ ꦖ ꦘ ꦙ ꦜ ꦡ ꦬ ꦰ"
-  marks: "◌ꦀ ◌ꦁ ◌ꦂ ◌ꦃ ◌꦳ ◌ꦴ ◌ꦵ ◌ꦶ ◌ꦷ ◌ꦸ ◌ꦹ ◌ꦺ ◌ꦻ ◌ꦼ ◌ꦽ ◌ꦾ ◌ꦿ ◌꧀"
-  numerals: "꧐ ꧑ ꧒ ꧓ ꧔ ꧕ ꧖ ꧗ ꧘ ꧙ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "ꧏ ꧞ ꧟ ꧁ ꧂ ꧃ ꧄ ꧅ ꧆ ꧇ ꧈ ꧉ ꧊ ꧋ ꧌ ꧍"
-  index: "A Â Å B C D E É È Ê G H I Ì J K L M N O Ò P R S T U Ù W Y"
-}
diff --git a/lang/languages/jv/sampletext.textproto b/lang/languages/jv/sampletext.textproto
deleted file mode 100644
index 1aa1d4d14..000000000
--- a/lang/languages/jv/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "jv"
diff --git a/lang/languages/ka.textproto b/lang/languages/ka.textproto
new file mode 100644
index 000000000..2509174e7
--- /dev/null
+++ b/lang/languages/ka.textproto
@@ -0,0 +1,29 @@
+id: "ka"
+name: "Georgian"
+preferred_name: ""
+autonym: "ქართული"
+population: 3543645
+region: "GE"
+region: "IR"
+region: "TR"
+script: "Georgian"
+exemplar_chars {
+  base: "ⴀ ⴁ ⴂ ⴃ ⴄ ⴅ ⴆ ⴇ ⴈ ⴉ ⴊ ⴋ ⴌ ⴍ ⴎ ⴏ ⴐ ⴑ ⴒ ⴓ ⴔ ⴕ ⴖ ⴗ ⴘ ⴙ ⴚ ⴛ ⴜ ⴝ ⴞ ⴟ ⴠ ⴡ ⴢ ⴣ ⴤ ⴥ"
+  auxiliary: "ⴀ ⴁ ⴂ ⴃ ⴄ ⴅ ⴆ ჱ ⴡ ⴇ ⴈ ⴉ ⴊ ⴋ ⴌ ჲ ⴢ ⴍ ⴎ ⴏ ⴐ ⴑ ⴒ ჳ ⴣ ⴓ ⴔ ⴕ ⴖ ⴗ ⴘ ⴙ ⴚ ⴛ ⴜ ⴝ ⴞ ჴ ⴤ ⴟ ⴠ ჵ ⴥ ჶ ჷ ჸ ჹ ჺ"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … ჻ \' ‘ ‚ “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& # † ‡ ′ ″ №"
+  index: "ა ბ გ დ ე ვ ზ თ ი კ ლ მ ნ ო პ ჟ რ ს ტ უ ფ ქ ღ ყ შ ჩ ც ძ წ ჭ ხ ჯ ჰ"
+}
+sample_text {
+  masthead_full: "ყოვე"
+  masthead_partial: "ლი"
+  tester: "ვინაიდან ადამიანთა ოჯახის ყველა წევრისათვის დამახასიათებელი ღირსების"
+  poster_sm: "ვინაიდან, წევრმა"
+  poster_md: "ვინაიდან,"
+  poster_lg: "ყოველი"
+  specimen_48: "ამ ადამიანის უფლებათა საყოველთაო დეკლარაციას ისეთ ამოცანად, რომლის"
+  specimen_36: "ყოველ ადამიანს, სადაც არ უნდა იმყოფებოდეს იგი, უფლება აქვს, რომ აღიარებულ იქნეს მისი სამართალსუბიექტობა."
+  specimen_32: "ყველას ვისაც დაერღვა კონსტიტუციით ან კანონით მინიჭებული ძირითადი უფლებები, უნდა ჰქონდეს სამართლებრივი დაცვის ეფექტიანი საშუალება კომპეტენტური ეროვნული სასამართლოებისაგან."
+  specimen_21: "არავინ შეიძლება დაექვემდებაროს თვითნებურ დაკავებას, დაპატიმრებას ან გაძევებას.\nყოველ ადამიანს, მის უფლება-მოვალეობათა და მისთვის წაყენებული სისხლის სამართლებრივი ბრალდებათა საფუძვლიანობის განსაზღვროსათვის , სრული თანასწორობის საფუძველზე, უფლება აქვს, მისი საქმე საჯაროდ და სამართლიანობის ყველა მოთხოვნის დაცვით განიხილოს დამოუკიდებელმა და მიუკერძოებელმა სასამართლომ."
+  specimen_16: "არავის მიმართ არ შეიძლება თვითნებური ჩარევა მის პირადსა და ოჯახურ ცხოვრებაში, თვითნებური ხელყოფა მისი საცხოვრებელი ბინის ხელშეუხებლობის, მისი კორესპონდენციის საიდუმლოების ანდა მისი პატივისა და რეპუტაციისა. ყოველ ადამიანს აქვს უფლება დაცული იყოს კანონის მიერ ასეთი ჩარევისა თუ ხელყოფისაგან.\nყველა ადამიანს აქვს უფლება აზრის, სინდისისა და რელიგიის თავისუფლებისა; ეს უფლება მოიცავს საკუთარი რელიგიის ან რწმენის შეცვლის, საკუთარი რელიგიის ან აღმსარებლობის, როგორც ინდივიდუალურად, ასევე სხვებთან ერთად, საჯაროდ ან კერძოდ, მოძღვრების, ღვთისმსახურების და რელიგიურ ან რიტუალურ წეს-ჩვეულებათა შესრულების თავისუფლებას."
+}
diff --git a/lang/languages/ka/language.textproto b/lang/languages/ka/language.textproto
deleted file mode 100644
index 148857f25..000000000
--- a/lang/languages/ka/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "ka"
-name: "Georgian"
-preferred_name: ""
-autonym: "ქართული"
-population: 3543645
-region: "TR"
-region: "IR"
-region: "GE"
-script: "Georgian"
-exemplar_chars {
-  base: "ⴀ ⴁ ⴂ ⴃ ⴄ ⴅ ⴆ ⴇ ⴈ ⴉ ⴊ ⴋ ⴌ ⴍ ⴎ ⴏ ⴐ ⴑ ⴒ ⴓ ⴔ ⴕ ⴖ ⴗ ⴘ ⴙ ⴚ ⴛ ⴜ ⴝ ⴞ ⴟ ⴠ ⴡ ⴢ ⴣ ⴤ ⴥ"
-  auxiliary: "ⴀ ⴁ ⴂ ⴃ ⴄ ⴅ ⴆ ჱ ⴡ ⴇ ⴈ ⴉ ⴊ ⴋ ⴌ ჲ ⴢ ⴍ ⴎ ⴏ ⴐ ⴑ ⴒ ჳ ⴣ ⴓ ⴔ ⴕ ⴖ ⴗ ⴘ ⴙ ⴚ ⴛ ⴜ ⴝ ⴞ ჴ ⴤ ⴟ ⴠ ჵ ⴥ ჶ ჷ ჸ ჹ ჺ"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … ჻ \' ‘ ‚ “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& # † ‡ ′ ″ №"
-  index: "ა ბ გ დ ე ვ ზ თ ი კ ლ მ ნ ო პ ჟ რ ს ტ უ ფ ქ ღ ყ შ ჩ ც ძ წ ჭ ხ ჯ ჰ"
-}
diff --git a/lang/languages/ka/sampletext.textproto b/lang/languages/ka/sampletext.textproto
deleted file mode 100644
index 9b96c8e9c..000000000
--- a/lang/languages/ka/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ka"
diff --git a/lang/languages/kaa/language.textproto b/lang/languages/kaa.textproto
similarity index 88%
rename from lang/languages/kaa/language.textproto
rename to lang/languages/kaa.textproto
index f7d466ae2..13c3c693f 100644
--- a/lang/languages/kaa/language.textproto
+++ b/lang/languages/kaa.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Ǵ Ń Ú a b c d e f g h i j k l m n o p q r s t u v w x y z á İ ı ǵ ń ú"
   marks: "◌́ ◌̇"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/kab/language.textproto b/lang/languages/kab.textproto
similarity index 93%
rename from lang/languages/kab/language.textproto
rename to lang/languages/kab.textproto
index a563fed39..10d94aaf7 100644
--- a/lang/languages/kab/language.textproto
+++ b/lang/languages/kab.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "A B C Č D Ḍ E Ɛ F G Ǧ Ɣ H Ḥ I J K L M N P Q R Ṛ S Ṣ T Ṭ U W X Y Z Ẓ"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kac/language.textproto b/lang/languages/kac.textproto
similarity index 74%
rename from lang/languages/kac/language.textproto
rename to lang/languages/kac.textproto
index 676e8a316..5ad477544 100644
--- a/lang/languages/kac/language.textproto
+++ b/lang/languages/kac.textproto
@@ -7,3 +7,6 @@ region: "MM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kaj/language.textproto b/lang/languages/kaj.textproto
similarity index 74%
rename from lang/languages/kaj/language.textproto
rename to lang/languages/kaj.textproto
index 785a6b4ec..80c748b51 100644
--- a/lang/languages/kaj/language.textproto
+++ b/lang/languages/kaj.textproto
@@ -7,3 +7,6 @@ region: "NG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kam/language.textproto b/lang/languages/kam.textproto
similarity index 88%
rename from lang/languages/kam/language.textproto
rename to lang/languages/kam.textproto
index 7c4c7e709..118e27fc6 100644
--- a/lang/languages/kam/language.textproto
+++ b/lang/languages/kam.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   marks: "◌̃"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kao/language.textproto b/lang/languages/kao.textproto
similarity index 75%
rename from lang/languages/kao/language.textproto
rename to lang/languages/kao.textproto
index 4a93075d2..8d628e94c 100644
--- a/lang/languages/kao/language.textproto
+++ b/lang/languages/kao.textproto
@@ -7,3 +7,6 @@ region: "ML"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kbd.textproto b/lang/languages/kbd.textproto
new file mode 100644
index 000000000..d1548c892
--- /dev/null
+++ b/lang/languages/kbd.textproto
@@ -0,0 +1,25 @@
+id: "kbd"
+name: "Kabardian"
+preferred_name: ""
+autonym: "Адыгэбзэ"
+population: 1070872
+region: "RU"
+region: "TR"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӏ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӏ"
+  marks: "◌̆ ◌̈"
+}
+sample_text {
+  masthead_full: "ЦцӀӏ"
+  masthead_partial: "Ыы"
+  tester: "Цӏыху псори щхьэхуиту, я щӏыхьымрэ я хуэфащэхэмрэкӏэ зэхуэдэу"
+  poster_sm: "Дэтхэнэ зы"
+  poster_md: "Къинэмыщӏауэ,"
+  poster_lg: "Цӏыху"
+  specimen_48: "Хэти пщылӏыу плъытэ е пщӏылӏыпӏэ ибгъэт хъунукъым, сыт хуэдэ щӏыкӏэуи"
+  specimen_36: "Псэуныр, щхьэхуитыныр, шынагъуэншагъэр хэти и хуэфащэщ.\nХэти хуэфащэщ дэнэ щӏыпӏи цӏыхуу, юридическэ лицоуэ къыщалъытэну."
+  specimen_32: "Цӏыху псори щхьэхуиту, я щӏыхьымрэ я хуэфащэхэмрэкӏэ зэхуэдэу къалъхур. Акъылрэ зэхэщӏыкӏ гъуазэрэ яӏэщи, зыр зым зэкъуэш зэхащІэ яку дэлъу зэхущытын хуейхэщ."
+  specimen_21: "Цӏыху псори щхьэхуиту, я щӏыхьымрэ я хуэфащэхэмрэкӏэ зэхуэдэу къалъхур. Акъылрэ зэхэщӏыкӏ гъуазэрэ яӏэщи, зыр зым зэкъуэш зэхащІэ яку дэлъу зэхущытын хуейхэщ.\nДэтхэнэ зы цӏыхури зэхуэдэу хуитщ мы джэпсалъэм хэт цІыху хуэфащэхэмрэ хуитыныгъэхэмрэ зыхуигъэщхьэпэну, зыщыщ расэм, и фэм, цӏыхубз-цӏыхухъуу зэрыщытым, и бзэм, иӏыгъ диным, политичнэ е нэгъуэщӏ еплъыкӏэу иӏэм, лъэпкъыу е цӏыху гупу къызыхэкӏам, мылъкуу иӏэм, къыщалъхуа-къыздалъхуам емылъытауэ зэхэгъэжыншэу, хуэгъэкӏуэтэныгъэншэу."
+  specimen_16: "Цӏыху псори щхьэхуиту, я щӏыхьымрэ я хуэфащэхэмрэкӏэ зэхуэдэу къалъхур. Акъылрэ зэхэщӏыкӏ гъуазэрэ яӏэщи, зыр зым зэкъуэш зэхащІэ яку дэлъу зэхущытын хуейхэщ.\nДэтхэнэ зы цӏыхури зэхуэдэу хуитщ мы джэпсалъэм хэт цІыху хуэфащэхэмрэ хуитыныгъэхэмрэ зыхуигъэщхьэпэну, зыщыщ расэм, и фэм, цӏыхубз-цӏыхухъуу зэрыщытым, и бзэм, иӏыгъ диным, политичнэ е нэгъуэщӏ еплъыкӏэу иӏэм, лъэпкъыу е цӏыху гупу къызыхэкӏам, мылъкуу иӏэм, къыщалъхуа-къыздалъхуам емылъытауэ зэхэгъэжыншэу, хуэгъэкӏуэтэныгъэншэу.\nПсэуныр, щхьэхуитыныр, шынагъуэншагъэр хэти и хуэфащэщ.\nХэти пщылӏыу плъытэ е пщӏылӏыпӏэ ибгъэт хъунукъым, сыт хуэдэ щӏыкӏэуи пщылӏыгъэр, пщылӏ щэн-къэщэхуныр зыми хуэбдэ мыхъуну къуэдыщ."
+}
diff --git a/lang/languages/kbd/language.textproto b/lang/languages/kbd/language.textproto
deleted file mode 100644
index a7badf642..000000000
--- a/lang/languages/kbd/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "kbd"
-name: "Kabardian"
-preferred_name: ""
-autonym: "Адыгэбзэ"
-population: 1070872
-region: "RU"
-region: "TR"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӏ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӏ"
-  marks: "◌̆ ◌̈"
-}
diff --git a/lang/languages/kbd/sampletext.textproto b/lang/languages/kbd/sampletext.textproto
deleted file mode 100644
index c7a997ff2..000000000
--- a/lang/languages/kbd/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kbd"
diff --git a/lang/languages/kcg/language.textproto b/lang/languages/kcg.textproto
similarity index 74%
rename from lang/languages/kcg/language.textproto
rename to lang/languages/kcg.textproto
index 3ef3ff426..af02a2070 100644
--- a/lang/languages/kcg/language.textproto
+++ b/lang/languages/kcg.textproto
@@ -7,3 +7,6 @@ region: "NG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kck/language.textproto b/lang/languages/kck.textproto
similarity index 74%
rename from lang/languages/kck/language.textproto
rename to lang/languages/kck.textproto
index 6b11ccce3..2ed76bf40 100644
--- a/lang/languages/kck/language.textproto
+++ b/lang/languages/kck.textproto
@@ -7,3 +7,6 @@ region: "ZW"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kde.textproto b/lang/languages/kde.textproto
new file mode 100644
index 000000000..ca9646b95
--- /dev/null
+++ b/lang/languages/kde.textproto
@@ -0,0 +1,24 @@
+id: "kde"
+name: "Makonde"
+preferred_name: ""
+autonym: "Chimakonde"
+population: 1463820
+region: "TZ"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "VvAa"
+  masthead_partial: "Nn"
+  tester: "Lisiku lya 10 Disemba 1948, Lukumbi Lukulu lwa Umoja wa Vilambo"
+  poster_sm: "Ili kuhinikiha"
+  poster_md: "Kila munu"
+  poster_lg: "Vanu"
+  specimen_48: "Kila munu alembelewa kwikala pachilambo alitukutwile na wunu"
+  specimen_36: "Vitukutuku vyohevyohe vin’nimbidya munu ulitukutula kama chilembelewa n’katiba au n’shelia, vilonjelewe n’ding’umbi dya shelia."
+  specimen_32: "Munu avele na wasa wa kuwuniwa na a’chilambo mwave, na vanu vohevohe vatumbame kukumilana na vilambo vinji kulunda vitukutuku vyohevyohe vilembelewa na umi wa kila munu."
+  specimen_21: "Munu ave na wasa wa mbone wa kupumulila na chipindi chimaikana cha madengo. Wasa wapumulila van’tomolele (van’nipe).\nMunu atungumane n’kaya, mulongo, n’nitawa n’chilambo na n’milambo mwohemwohe, utungumana kulandana na lilove alino.\nChinapawe chohechohe n’nilove alino chionekana na chilambo chohecho, vanu au munu wohewo upokonyola wasa uhauliwidye."
+  specimen_16: "Lisiku lya 10 Disemba 1948, Lukumbi Lukulu lwa Umoja wa Vilambo lunihaula na kuhumya lilove lya vilambo lya wasa wa vanu. Lilove alino lihumile baada ya chilambo chohechohe kupanyana ding’ondo ding’ulu dimbili. Lukumbi anelwo lulembedile kila chilambo chihumye lilove alino livahwikile vanu vake kwa kulangudya, kusomesa, kusomela, kuhaula n’disule na n’disehemu dinji kuvele na ilimu.\nIli kuhinikiha kuchidono wasa wa vanu unawuniwa, na Tansania inaunila wasa anewo, lilove alino lihumile M’chimakonde ili valembela usoma vavike wasa wene mun’tima mwavo vene na vanu vanji. Koka chive chihinde cha kukonyelela kuwuniwa kwa wasa wene m’manu na lyene lipanda."
+}
diff --git a/lang/languages/kde/language.textproto b/lang/languages/kde/language.textproto
deleted file mode 100644
index 66a747665..000000000
--- a/lang/languages/kde/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "kde"
-name: "Makonde"
-preferred_name: ""
-autonym: "Chimakonde"
-population: 1463820
-region: "TZ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/kde/sampletext.textproto b/lang/languages/kde/sampletext.textproto
deleted file mode 100644
index 84bf9f404..000000000
--- a/lang/languages/kde/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kde"
diff --git a/lang/languages/kdt/language.textproto b/lang/languages/kdt.textproto
similarity index 77%
rename from lang/languages/kdt/language.textproto
rename to lang/languages/kdt.textproto
index 1285d684e..00c1865d4 100644
--- a/lang/languages/kdt/language.textproto
+++ b/lang/languages/kdt.textproto
@@ -4,8 +4,11 @@ preferred_name: ""
 autonym: ""
 population: 421206
 region: "KH"
-region: "TH"
 region: "LA"
+region: "TH"
 script: "Thai"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "th"
+}
diff --git a/lang/languages/kea.textproto b/lang/languages/kea.textproto
new file mode 100644
index 000000000..c79f4456b
--- /dev/null
+++ b/lang/languages/kea.textproto
@@ -0,0 +1,28 @@
+id: "kea"
+name: "Kabuverdianu"
+preferred_name: ""
+autonym: "Kabuverdianu"
+population: 530762
+region: "CV"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â Ã Ç È É Ê Í Ò Ó Ô Õ Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à á â ã ç è é ê í ò ó ô õ ú ü"
+  auxiliary: "ª á à ă â å ä ã ā æ c ç é è ĕ ê ë ẽ ē í ì ĭ î ï ĩ ī {n\\u0308} º ó ò ŏ ô ö õ ø ō œ q {rr} ú ù ŭ û ü ũ ū w ÿ"
+  marks: "◌̀ ◌́ ◌̂ ◌̃ ◌̈ ◌̧"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\& # † ‡"
+  index: "A B D E F G H I J K L M N O P R S T U V X Z"
+}
+sample_text {
+  masthead_full: "TtUu"
+  masthead_partial: "Dd"
+  tester: "Nu ta considrâ qui, riconhecimento di dignidadi qui ta fazê parti"
+  poster_sm: "Nu ta considrâ"
+  poster_md: "Assembleia"
+  poster_lg: "Tudo"
+  specimen_48: "Tudo ser humano na ês mundo nacê libri e igual na sê dignidade"
+  specimen_36: "Ninguêm al podê ficâ scrabo ô na catibêro; ficâ scrabo ô tráto di scrabo ê ca pirmitido, di calquer manêra qui bem ta ser."
+  specimen_32: "Ninguêm podê, di calquer manêra, bai sêr lebádo pa prison, ô ficâ na prison, ô ser mandado di castigo pa longe di sê téra. (Es cusa li ê ta tchomado di \"exílio\")."
+  specimen_21: "Tudo péssoa tem drêto, por igual, qui sê causa bem ta ser judiciado na igualdade e publicamenti julgado num tribunal indipendenti e justo qui ta bem dicidi di sês drêto e di sês obrigaçon ô di razon di calquer acusaçon na assunto di tribunal qui ês bem pô contra el.\nTudo péssoa tem drêto pâ discansa e pa sê lazer e, naturalmente, ê tem limitaçon qui nu ta cêta, qui ê quel di duraçon di trabadjo e di féria, qui ês tem obrigaçon di pagano."
+  specimen_16: "Tudo péssoa tem drêto pâ bem pô, na plano social e na plano internacional, um órdi qui podê ser capaz di tornâ completamente efectivo tudo drêto e liberdadi qui nu cabà di flâ nês Declaraçon li.\nNingum disposiçon di êss Declaraçon li, podê bem ta ser intendido di um manêra qui podê bem involvê pa calquer Estado, grupo di guente ô um sô péssoa, quel drêto di bem fazê calquer actividade ô di particâ algum cusa qui podê bem destroncâ drêto e liberdadi qui nu sa tâ cabâ di flâ.\nNu ta considrâ qui, riconhecimento di dignidadi qui ta fazê parti di tudo membro di família humano e di sês drêto qui ê igual e qui nu ca podê squecê, nem ficâ separado di el, ê fundamento di liberdadi, di justiça e di paz di riba di ês mundo;"
+}
diff --git a/lang/languages/kea/language.textproto b/lang/languages/kea/language.textproto
deleted file mode 100644
index 2da6a6347..000000000
--- a/lang/languages/kea/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "kea"
-name: "Kabuverdianu"
-preferred_name: ""
-autonym: "Kabuverdianu"
-population: 530762
-region: "CV"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â Ã Ç È É Ê Í Ò Ó Ô Õ Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à á â ã ç è é ê í ò ó ô õ ú ü"
-  auxiliary: "ª á à ă â å ä ã ā æ c ç é è ĕ ê ë ẽ ē í ì ĭ î ï ĩ ī {n\\u0308} º ó ò ŏ ô ö õ ø ō œ q {rr} ú ù ŭ û ü ũ ū w ÿ"
-  marks: "◌̀ ◌́ ◌̂ ◌̃ ◌̈ ◌̧"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\& # † ‡"
-  index: "A B D E F G H I J K L M N O P R S T U V X Z"
-}
diff --git a/lang/languages/kea/sampletext.textproto b/lang/languages/kea/sampletext.textproto
deleted file mode 100644
index 4400d06d6..000000000
--- a/lang/languages/kea/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kea"
diff --git a/lang/languages/kfo/language.textproto b/lang/languages/kfo.textproto
similarity index 74%
rename from lang/languages/kfo/language.textproto
rename to lang/languages/kfo.textproto
index e70e73e20..9373aecc4 100644
--- a/lang/languages/kfo/language.textproto
+++ b/lang/languages/kfo.textproto
@@ -7,3 +7,6 @@ region: "CI"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kfr/language.textproto b/lang/languages/kfr.textproto
similarity index 92%
rename from lang/languages/kfr/language.textproto
rename to lang/languages/kfr.textproto
index 7bd071daa..0b8399f2c 100644
--- a/lang/languages/kfr/language.textproto
+++ b/lang/languages/kfr.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "૦ ૧ ૨ ૩ ૪ ૫ ૬ ૭ ૮ ૯ 0 1 2 3 4 5 6 7 8 9"
   punctuation: "। ॥ ॰"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/kfy/language.textproto b/lang/languages/kfy.textproto
similarity index 75%
rename from lang/languages/kfy/language.textproto
rename to lang/languages/kfy.textproto
index 4d3740d31..c9fa0ecf6 100644
--- a/lang/languages/kfy/language.textproto
+++ b/lang/languages/kfy.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/kg.textproto b/lang/languages/kg.textproto
new file mode 100644
index 000000000..6138d3ff0
--- /dev/null
+++ b/lang/languages/kg.textproto
@@ -0,0 +1,23 @@
+id: "kg"
+name: "Kongo"
+preferred_name: ""
+autonym: "Kikongo"
+population: 1526700
+region: "CD"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Nn"
+  tester: "Nakutalaka ti kutambula ngenda ya binama nyonso ya dikanda na"
+  poster_sm: "Nakutalaka"
+  poster_md: "Lukutakanu"
+  poster_lg: "Bantu"
+  specimen_48: "Luzayisu yayi ya baluve ya muntu na yinza Mutindu dikani ya kintwadi"
+  specimen_36: "Konso muntu ke na luve ya kuzinga, ya kuvwanda na kimpwanza mpe ya kuvwanda na kizunu ya bumumtu ya yandi."
+  specimen_32: "Konso muntu ke na luve ya kuvundisa nzutu mpe kukiyangidika, mingi kisalu fwana kuzingila na bangunga kulutila ve, mpe bilumbu ya mvwandulu fwana kufutwa."
+  specimen_21: "Konso muntu fwana kusalati, ata ya vwanda na kitini ya mabuta to na kitini ya yinza muvimba, baluve mpe kimpwanza yina metangama na luzayisu yayi kusalama na mutindu mefwanakama.\nAta musiku mosi ya luzayisu yayi lenda kubangulwa bonso luve ni luve ya kusala kisalu ti dyambu lenda kunata mbebosolo ya baluve mpe ya bimpwanza yina metangama na mukanda yayi, yayi metadila muvimba, kimvuka to muntu."
+  specimen_16: "Nakutalaka ti kutambula ngenda ya binama nyonso ya dikanda na ya baluve ya bawu a kudedakana mpe yina balenda kuyimina bawu ve ke lufulu ya kimpwanza, ya budedede mpe ya ngemba na kati ya yinza muvimba.\nNakutalaka ti bunzimbu mpe mvwezolo baluve ya muntu metumia kusala mavanga ya bunyama, yina ke dasukisaka bantu mpe na kutalaka dyaka ti nkwizulu ya yinza, sika bantu kevwandaka na kimpwanza ya kuzonza mpe ya kukwikila, sika bantu kekuluka na boma mpe na bumputu ya kulutila zababakana mutindu dikani mosi yanene ya muntu.\nNakutalaka ti ya ke mfumu samu ti baluve ya muntu fwana kukengidilwa na luyalu yina kezitisaka misiku samu na kusala ti muntu fwana kutombuka ve ntangu nyonso na luyalu yina kezitisaka ve misiku."
+}
diff --git a/lang/languages/kg/language.textproto b/lang/languages/kg/language.textproto
deleted file mode 100644
index 1de7cb410..000000000
--- a/lang/languages/kg/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "kg"
-name: "Kongo"
-preferred_name: ""
-autonym: "Kikongo"
-population: 1526700
-region: "CD"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/kg/sampletext.textproto b/lang/languages/kg/sampletext.textproto
deleted file mode 100644
index 57ed777d9..000000000
--- a/lang/languages/kg/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kg"
diff --git a/lang/languages/kge/language.textproto b/lang/languages/kge.textproto
similarity index 74%
rename from lang/languages/kge/language.textproto
rename to lang/languages/kge.textproto
index b95d0ab6d..1031c99ed 100644
--- a/lang/languages/kge/language.textproto
+++ b/lang/languages/kge.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kgp/language.textproto b/lang/languages/kgp.textproto
similarity index 87%
rename from lang/languages/kgp/language.textproto
rename to lang/languages/kgp.textproto
index 7886a00f3..8ecec4e76 100644
--- a/lang/languages/kgp/language.textproto
+++ b/lang/languages/kgp.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Ã É Ó Ĩ Ỹ a b c d e f g h i j k l m n o p q r s t u v w x y z á ã é ó ĩ ỹ"
   marks: "◌́ ◌̃"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kha.textproto b/lang/languages/kha.textproto
new file mode 100644
index 000000000..cb2cf3b7f
--- /dev/null
+++ b/lang/languages/kha.textproto
@@ -0,0 +1,24 @@
+id: "kha"
+name: "Khasi"
+preferred_name: ""
+autonym: "Ka Ktien Khasi"
+population: 1060872
+region: "IN"
+script: "Latin"
+exemplar_chars {
+  base: "A B K D E G H I Ï J L M N Ñ O P R S T U W Y a b k d e g h i ï j l m n ñ o p r s t u w y"
+  marks: "◌̃ ◌̈"
+}
+sample_text {
+  masthead_full: "ÏïAa"
+  masthead_partial: "Kk"
+  tester: "Kumba ka jingithuh ïa ka kyrdan long tynrai bad ïa ki marryngkat"
+  poster_sm: "Kumba ka long"
+  poster_md: "Kumba ka"
+  poster_lg: "bynriew"
+  specimen_48: "Kumba ki briew jong ka Synjuk Ki Ri ha ka Kyrmit ki la pynskhem"
+  specimen_36: "Kumba ka long kaba donkam ban kyntiew ïa ka jingroi ka jingïadei lok para ri,\nNamarkata, Mynta,\nKa Dorbar Bah,"
+  specimen_32: "Ym don uwei ne kawei ki ban shah teh mraw ne long mraw hano hano; la khang pyrshah ïa ka jinglongmraw bad ka jingkhaïi mraw la ki dei ha kano kano ka dur ne rukom."
+  specimen_21: "Kumba ka jingithuh ïa ka kyrdan long tynrai bad ïa ki marryngkat bad bashongkhien jong baroh ki dkhot longïing u  dei ka tlong jong ka jinglaitluid, ka jingbishar hok, bad ka jingsuk shisnieh pyrthei,\nKumba ka long kaba donkam ba ïa u/ka briew ym dei ban pynbor ban shim ki lynti, kum ka khen khatduh, da ka jingïaleh pyrshah ïa ka jingbanbeiñ bad jingsynshar runar, ba ïa ki hok longbriew manbriew dei ban ïada da ka aiñ ka kanun,"
+  specimen_16: "Kumba ka jingithuh ïa ka kyrdan long tynrai bad ïa ki marryngkat bad bashongkhien jong baroh ki dkhot longïing u  dei ka tlong jong ka jinglaitluid, ka jingbishar hok, bad ka jingsuk shisnieh pyrthei,\nKumba ka jingibeiñ bad jingbymsuidkhai ïa ki hok longbriew manbriew la pynkha ïa ki kam riewkhlaw kiba la pynkhih win ïa ka jingïatiplem u bynriew, bad ka jingkylla ka pyrthei ha kaba u khun bynriew un leh kmen laitluid ha ka kren ka khana bad jingngeit bad jinglaitluid na ka tieng ka syier bad ka kyrduh la pynbna kum ka jingangnud ba ha khlieh tam jong u luk u lak,"
+}
diff --git a/lang/languages/kha/language.textproto b/lang/languages/kha/language.textproto
deleted file mode 100644
index 95e0c7659..000000000
--- a/lang/languages/kha/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "kha"
-name: "Khasi"
-preferred_name: ""
-autonym: "Ka Ktien Khasi"
-population: 1060872
-region: "IN"
-script: "Latin"
-exemplar_chars {
-  base: "A B K D E G H I Ï J L M N Ñ O P R S T U W Y a b k d e g h i ï j l m n ñ o p r s t u w y"
-  marks: "◌̃ ◌̈"
-}
diff --git a/lang/languages/kha/sampletext.textproto b/lang/languages/kha/sampletext.textproto
deleted file mode 100644
index 71f19dbcf..000000000
--- a/lang/languages/kha/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kha"
diff --git a/lang/languages/khb/language.textproto b/lang/languages/khb.textproto
similarity index 74%
rename from lang/languages/khb/language.textproto
rename to lang/languages/khb.textproto
index f84b16354..239e8489d 100644
--- a/lang/languages/khb/language.textproto
+++ b/lang/languages/khb.textproto
@@ -7,3 +7,6 @@ region: "CN"
 script: "New Tai Lue"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "khb"
+}
diff --git a/lang/languages/khn/language.textproto b/lang/languages/khn.textproto
similarity index 75%
rename from lang/languages/khn/language.textproto
rename to lang/languages/khn.textproto
index fcc3c206c..338794cc5 100644
--- a/lang/languages/khn/language.textproto
+++ b/lang/languages/khn.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/khq/language.textproto b/lang/languages/khq.textproto
similarity index 91%
rename from lang/languages/khq/language.textproto
rename to lang/languages/khq.textproto
index ecdea6911..a63db43ee 100644
--- a/lang/languages/khq/language.textproto
+++ b/lang/languages/khq.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A Ã B C D E Ẽ F G H I J K L M N Ɲ Ŋ O Õ P Q R S Š T U W X Y Z Ž"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kht/language.textproto b/lang/languages/kht.textproto
similarity index 76%
rename from lang/languages/kht/language.textproto
rename to lang/languages/kht.textproto
index 39f340706..e9a7f060d 100644
--- a/lang/languages/kht/language.textproto
+++ b/lang/languages/kht.textproto
@@ -3,8 +3,11 @@ name: "Khamti"
 preferred_name: ""
 autonym: ""
 population: 13526
-region: "MM"
 region: "IN"
+region: "MM"
 script: "Myanmar"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "my"
+}
diff --git a/lang/languages/khw/language.textproto b/lang/languages/khw.textproto
similarity index 75%
rename from lang/languages/khw/language.textproto
rename to lang/languages/khw.textproto
index b5a4c7bba..b75c5561c 100644
--- a/lang/languages/khw/language.textproto
+++ b/lang/languages/khw.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/ki/language.textproto b/lang/languages/ki.textproto
similarity index 89%
rename from lang/languages/ki/language.textproto
rename to lang/languages/ki.textproto
index 053ce4c8a..0cde0ae75 100644
--- a/lang/languages/ki/language.textproto
+++ b/lang/languages/ki.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌̃"
   index: "A B C D E G H I J K M N O R T U W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kiu/language.textproto b/lang/languages/kiu.textproto
similarity index 88%
rename from lang/languages/kiu/language.textproto
rename to lang/languages/kiu.textproto
index acdf92b7a..05efcf72e 100644
--- a/lang/languages/kiu/language.textproto
+++ b/lang/languages/kiu.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç Ê Ǧ Î Ş Û a b c d e f g h i j k l m n o p q r s t u v w x y z ç ê ǧ î ş û"
   marks: "◌̂ ◌̌ ◌̧"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kj/language.textproto b/lang/languages/kj.textproto
similarity index 85%
rename from lang/languages/kj/language.textproto
rename to lang/languages/kj.textproto
index f6768cad5..60c939583 100644
--- a/lang/languages/kj/language.textproto
+++ b/lang/languages/kj.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kjg/language.textproto b/lang/languages/kjg.textproto
similarity index 73%
rename from lang/languages/kjg/language.textproto
rename to lang/languages/kjg.textproto
index 44a4b6c62..12caf019c 100644
--- a/lang/languages/kjg/language.textproto
+++ b/lang/languages/kjg.textproto
@@ -7,3 +7,6 @@ region: "LA"
 script: "Lao"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "lo"
+}
diff --git a/lang/languages/kk.textproto b/lang/languages/kk.textproto
new file mode 100644
index 000000000..d6841f178
--- /dev/null
+++ b/lang/languages/kk.textproto
@@ -0,0 +1,30 @@
+id: "kk"
+name: "Kazakh"
+preferred_name: ""
+autonym: "Қазақ тілі"
+population: 12219390
+region: "KZ"
+region: "TR"
+script: "Cyrillic"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё І Ғ Қ Ң Ү Ұ Һ Ә Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё і ғ қ ң ү ұ һ ә ө"
+  auxiliary: ""
+  marks: "◌̆ ◌̈"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
+  index: "А Ә Б В Г Ғ Д Е Ё Ж З И Й К Қ Л М Н Ң О Ө П Р С Т У Ұ Ү Ф Х Һ Ц Ч Ш Щ Ъ Ы І Ь Э Ю Я"
+}
+sample_text {
+  masthead_full: "БбАа"
+  masthead_partial: "Рр"
+  tester: "Адам баласы үйелменінің барлық мүшелеріне тән қадір‐қасиетін, құқықтарының"
+  poster_sm: "адам баласы"
+  poster_md: "халықтар"
+  poster_lg: "Барлық"
+  specimen_48: "БіріккенҰлттар елдері өз Жарғысында негізгі адам құқықтарына,"
+  specimen_36: "Ешкім де құлдықта немесе кіріптарлықта ұсталуы тиіс емес. Құлдық пен құл саудасына, қандай түрде болса да, тыйым салынады."
+  specimen_32: "Әр адам, конституциямен, немесе заңмен берілген негізгі құқықтары бұзылған жағдайда, құқығын құзыретті ұлттық сот арқылы тиімді түрде қалпына келтіруге құқылы."
+  specimen_21: "Ешкім де негізсіз тұтқындалуға, қамауда ұсталуға немесе қуғынға ұшыратылуға тиіс емес.\nӘр адам, өзінің құқықтары мен міндеттерін анықтап, өзіне тағылған қылмыстық айыптаудың негізділігін белгілеу үшін, ісі толық теңдік негізінде, әділеттік талаптарға сай, тәуелсіз және әділ сот арқылы ашық қаралуына құқығы бар."
+  specimen_16: "Әр адам жеке және отбасылық өміріне өзгелердің өз бетінше араласуынан, озбырлық жасап баспанасына, хат жазысып‐алысу құпиясына қол сұғуынан, ар‐намысы мен абырой беделіне нұқсан келтіруінен қорғалуға құқығы бар.\nӘр адам ой‐пікір, ар‐ождан және дін бостандығына құқығы бар; бұл құқық өз дінін немесе наным‐сенімін өзгерту еркіндігін, өз дінін, наным‐сенімін жеке өзі, немесе басқа адамдармен бірігіп тұтып, жария түрде, немесе жеке жолмен уағыздау, құдайға құлшылық ету, діни салт‐жораларын орындау бостандығын да қамтыйды.\nӘр адам тынығуға және мәдени демалуға, оның ішінде ақылға қонымды шектеулі жұмыс күніне және мерзімді ақылы демалысқа, кұқылы."
+}
diff --git a/lang/languages/kk/language.textproto b/lang/languages/kk/language.textproto
deleted file mode 100644
index 3717ae1bc..000000000
--- a/lang/languages/kk/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "kk"
-name: "Kazakh"
-preferred_name: ""
-autonym: "Қазақ тілі"
-population: 12219390
-region: "KZ"
-region: "TR"
-script: "Perso-Arabic"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё І Ғ Қ Ң Ү Ұ Һ Ә Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё і ғ қ ң ү ұ һ ә ө"
-  auxiliary: ""
-  marks: "◌̆ ◌̈"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
-  index: "А Ә Б В Г Ғ Д Е Ё Ж З И Й К Қ Л М Н Ң О Ө П Р С Т У Ұ Ү Ф Х Һ Ц Ч Ш Щ Ъ Ы І Ь Э Ю Я"
-}
diff --git a/lang/languages/kk/sampletext.textproto b/lang/languages/kk/sampletext.textproto
deleted file mode 100644
index a841f2f86..000000000
--- a/lang/languages/kk/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kk"
diff --git a/lang/languages/kk_Arab/language.textproto b/lang/languages/kk_Arab.textproto
similarity index 82%
rename from lang/languages/kk_Arab/language.textproto
rename to lang/languages/kk_Arab.textproto
index 7d0afaa4d..56479a204 100644
--- a/lang/languages/kk_Arab/language.textproto
+++ b/lang/languages/kk_Arab.textproto
@@ -4,10 +4,13 @@ preferred_name: ""
 autonym: ""
 population: 1418002
 region: "AF"
-region: "MN"
-region: "IR"
 region: "CN"
-script: "Perso-Arabic"
+region: "IR"
+region: "MN"
 script: "Cyrillic"
+script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/kkj/language.textproto b/lang/languages/kkj.textproto
similarity index 94%
rename from lang/languages/kkj/language.textproto
rename to lang/languages/kkj.textproto
index c8aa41c04..1bf515ce7 100644
--- a/lang/languages/kkj/language.textproto
+++ b/lang/languages/kkj.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: ", \\: ! ? . … ‘ ‹ › “ ” « » ( ) *"
   index: "A B Ɓ C D Ɗ {Ɗy} E Ɛ F G {Gb} {Gw} H I {I\\u0327} J K {Kp} {Kw} L M {Mb} N {Nd} Nj {Ny} Ŋ {Ŋg} {Ŋgb} {Ŋgw} O Ɔ {Ɔ\\u0327} P R S T U {U\\u0327} V W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kl.textproto b/lang/languages/kl.textproto
new file mode 100644
index 000000000..150a22ba8
--- /dev/null
+++ b/lang/languages/kl.textproto
@@ -0,0 +1,28 @@
+id: "kl"
+name: "Kalaallisut"
+preferred_name: ""
+autonym: "Kalaallisut"
+population: 55440
+region: "DK"
+region: "GL"
+script: "Latin"
+exemplar_chars {
+  base: "A E F G I J K L M N O P Q R S T U V a e f g i j k l m n o p q r s t u v"
+  auxiliary: "B C D H W X Y Z Å Æ Ø b c d h w x y z å æ ø"
+  marks: "◌̊"
+  numerals: ", . % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å"
+}
+sample_text {
+  masthead_full: "IiNn"
+  masthead_partial: "Uu"
+  tester: "Ataqqinassusermik inuup nammineq pigisaanik aammalu anooqatigiinnut"
+  poster_sm: "Naalagaaffiit"
+  poster_md: "taamaattumik"
+  poster_lg: "Inuit"
+  specimen_48: "Inuit tamarmik inunngorput nammineersinnaassuseqarlutik assigiimmillu"
+  specimen_36: "Kinaluunniit inuunermut, nammineersinnaassuseqarnissamut isumakuluuteqaranilu inuuniarnissamut pisinnaatitaavoq."
+  specimen_32: "Kinaluunniit inussiaatigineqaraniluunniit namminersorsinnaassusiiagaassanngilaq; inussiaateqarneq inussiaarniarnerlu sutigut tamatigut inerteqqutigineqassapput."
+  specimen_21: "Kinaluunniit naalliutserujussuarneqassanngilaq aammalu peqqarniitsumik, naakkittaatsumik narrunarsaataasumillu pineqassananilu pillarneqassanani.\nInuk kinaluunniit nunarsuarmi sumiluunniit eqqartuussisarnermi pisassalittut pisussaasutulluunniit isigineqarsinnaatitaanissamut pisinnaatitaavoq.\nKinaluunniit namminissarsiortumik tigusarineqassanngliq, tigummigallagassanngortitaassanani imaluunniit nunagisamit peersitaassanani."
+  specimen_16: "Kinaluunniit naligiissitaalluinnarnikkut piumasaqarsinnaatitaavoq eqqartuussivimmi aalajangersimasunut attaveqanngitsumi aammalu nakerisarsiortuunngitsumi eqqortuliortumik tamanullu ammasumik iliorfigineqarnissamik, pisinnaatitaaffimminut pisussaaffimminullu tunngasutigut aalajangiiniartoqassatillugu aammalu inatsisit tunngavigalugit pillarneqaataasinnaasumik sumilluunniit unnerluutigineqarnermini.\nKinaluunniit pisinnaatitaavoq qasuersaarnissamut sunngiffeqarnissamullu, ilanngullugu piffissamik suliffiusumik naammaginartumik killilersuineq, aammalu piffissani aalajangersimasuni akissarsiat pigiinnarlugit feriaqartarnissamut."
+}
diff --git a/lang/languages/kl/language.textproto b/lang/languages/kl/language.textproto
deleted file mode 100644
index 9ac47b088..000000000
--- a/lang/languages/kl/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "kl"
-name: "Kalaallisut"
-preferred_name: ""
-autonym: "Kalaallisut"
-population: 55440
-region: "GL"
-region: "DK"
-script: "Latin"
-exemplar_chars {
-  base: "A E F G I J K L M N O P Q R S T U V a e f g i j k l m n o p q r s t u v"
-  auxiliary: "B C D H W X Y Z Å Æ Ø b c d h w x y z å æ ø"
-  marks: "◌̊"
-  numerals: ", . % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å"
-}
diff --git a/lang/languages/kl/sampletext.textproto b/lang/languages/kl/sampletext.textproto
deleted file mode 100644
index 373421410..000000000
--- a/lang/languages/kl/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kl"
diff --git a/lang/languages/kln/language.textproto b/lang/languages/kln.textproto
similarity index 88%
rename from lang/languages/kln/language.textproto
rename to lang/languages/kln.textproto
index ca3fdee8b..03bfb1007 100644
--- a/lang/languages/kln/language.textproto
+++ b/lang/languages/kln.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "F Q V X Z f q v x z"
   index: "A B C D E G H I J K L M N O P R S T U W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/km.textproto b/lang/languages/km.textproto
new file mode 100644
index 000000000..2d2348b3b
--- /dev/null
+++ b/lang/languages/km.textproto
@@ -0,0 +1,28 @@
+id: "km"
+name: "Khmer"
+preferred_name: ""
+autonym: "ភាសាខ្មែរ"
+population: 15065030
+region: "KH"
+script: "Khmer"
+exemplar_chars {
+  base: "ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ល វ ស ហ ឡ អ ឥ ឦ ឧ ឩ ឪ ឫ ឬ ឭ ឮ ឯ ឰ ឱ ឲ ឳ"
+  auxiliary: "\\u17B4\\u17B5\\u200B \\u17CC \\u17CE \\u17CF \\u17D1 ឝ ឞ"
+  marks: "◌឴ ◌឵ ◌ា ◌ិ ◌ី ◌ឹ ◌ឺ ◌ុ ◌ូ ◌ួ ◌ើ ◌ឿ ◌ៀ ◌េ ◌ែ ◌ៃ ◌ោ ◌ៅ ◌ំ ◌ះ ◌ៈ ◌៉ ◌៊ ◌់ ◌៍ ◌័ ◌្"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ , ៖ ! ? . ។ ៕ ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\} ៙ ៚"
+  index: "ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ឫ ឬ ល ឭ ឮ វ ស ហ ឡ អ ឥ ឦ ឧ ឩ ឪ ឯ ឰ ឱ ឳ"
+}
+sample_text {
+  masthead_full: "មនសទ"
+  masthead_partial: "ងអ"
+  tester: "ដោយយល់ឃើញថា ការទទួលស្គាល់សេចក្ដីថ្លៃថ្នូរជាប់ពីកំណើត និងសិទ្ធិស្មើភាពគ្នា និងសិទ្ធិមិន អាចលក់ ដូរ ផ្ទេរ"
+  poster_sm: "ដោយយល់ឃើញថា ជាការចាំបាច់"
+  poster_md: "មនុស្សទាំងអស់"
+  poster_lg: "មនុស្សទាំងអស់"
+  specimen_48: "មនុស្សម្នាក់ៗ អាចប្រើប្រាស់សិទ្ធិនិងសេរីភាពទាំងអស់ ដែលមានចែងក្នុងសេចក្ដីប្រកាសនេះ ដោយគ្មានការប្រកាន់បែងចែកបែបណាមួយ"
+  specimen_36: "មនុស្សគ្រប់រូប មានសិទ្ធិរកដំណោះស្រាយស័ក្ដិសិទ្ធិមួយនៅចំពោះមុខសាលាជំរះក្ដីជាតិ ដែល មានសមត្ថកិច្ច ចំពោះអំពើទាំងឡាយណាដែលរំលោភសិទ្ធិមូលដ្ឋានរបស់ខ្លួន ដែលត្រូវបានទទួលស្គាល់ ដោយរដ្ឋធម្មនុញ្ញ ឬដោយច្បាប់។"
+  specimen_32: "គ្មានមនុស្សណាម្នាក់ ត្រូវរងការរំលោភជ្រៀតជ្រែកតាមអំពើចិត្ដក្នុងជីវិតឯកជន គ្រួសារ ទី លំនៅ ឬការឆ្លើយឆ្លង ឬការធ្វើឱ្យប៉ះពាល់ដល់កិត្ដិយស និងកេរ្ដិ៍ឈ្មោះរបស់ខ្លួនបានឡើយ។ ជនគ្រប់រូប មានសិទ្ធិ ទទួលការការពារពីច្បាប់ ប្រឆាំងនឹងការជ្រៀតជ្រែក ឬការប៉ះពាល់បែបនេះ។"
+  specimen_21: "ជនគ្រប់រូប មានសិទ្ធិសេរីភាពខាងការគិត សតិសម្បជញ្ញៈ និងសាសនា។ សិទ្ធិនេះ រាប់បញ្ចូល ទាំងសេរីភាពផ្លាស់ប្ដូរសាសនា ឬជំនឿ ព្រមទាំងសេរីភាពសម្ដែងសាសនា ឬជំនឿរបស់ខ្លួន តែម្នាក់ឯង ឬដោយរួមជាមួយអ្នកដទៃ ជាសាធារណៈ ឬជាឯកជន តាមការបង្ហាត់បង្រៀន ការអនុវត្ដ ការគោរព បូជា និងការប្រតិបត្ដិតាម។\nមនុស្សគ្រប់រូប មានសិទ្ធិសេរីភាពក្នុងការមានមតិ និងការសម្ដែងមតិ។ សិទ្ធិនេះ រាប់បញ្ចូល ទាំងសេរីភាពក្នុងការប្រកាន់មតិ ដោយគ្មានការជ្រៀតជ្រែក និងសេរីភាពក្នុងការស្វែងរក ការទទួល និងការផ្សព្វផ្សាយព័ត៌មាន និងគំនិតនានាដោយគ្មានព្រំដែនទឹកដី ទោះតាមរយៈមធ្យោបាយសម្ដែង មតិណាមួយក៏ដោយ។"
+  specimen_16: "ក្នុងឋានៈជាសមាជិកនៃសង្គម មនុស្សគ្រប់រូប មានសិទ្ធិទទួលបានសន្ដិសុខសង្គម និងមានបុព្វ សិទ្ធិសម្រេចបានសិទ្ធិខាងសេដ្ឋកិច្ច សង្គមកិច្ច និងវប្បធម៌ ដែលចាំបាច់សម្រាប់សេចក្ដីថ្លៃថ្នូរ និងការ រីកចំរើនដោយសេរីនៃបុគ្គលិកលក្ខណៈរបស់ខ្លួន តាមរយៈការខិតខំរបស់ជាតិ និងសហប្រតិបត្ដិការអន្ដរ ជាតិ និងដោយយោងទៅតាមការរៀបចំ និងធនធានរបស់ប្រទេសនីមួយៗ។\nមនុស្សគ្រប់រូប មានសិទ្ធិឈប់សម្រាក និងលំហែកំសាន្ដ រួមបញ្ចូលទាំងកម្រិតម៉ោងការងារ សមហេតុផល និងការឈប់សម្រាក ដោយបានប្រាក់បៀវត្សតាមពេលកំណត់ទៀងទាត់។\nមនុស្សគ្រប់រូប មានសិទ្ធិទទួលបាននូវសណ្ដាប់ធ្នាប់សង្គមនិងអន្ដរជាតិ ដែលធ្វើឱ្យសិទ្ធិ និង សេរីភាព ចែងក្នុងសេចក្ដីប្រកាសនេះ អាចសម្រេចបានដោយពេញលេញ។\nគ្មានបទបញ្ញត្ដិណាមួយនៃសេចក្ដីប្រកាសនេះ អាចត្រូវបានបកស្រាយ តម្រូវថា រដ្ឋណាមួយ ក្រុមណាមួយ ឬបុគ្គលណាម្នាក់ មានសិទ្ធិបែបណាមួយ ក្នុងការធ្វើសកម្មភាព ឬការប្រព្រឹត្ដអំពើអ្វ្វីមួយ ដែលសំដៅទៅបំផ្លិចបំផ្លាញនូវសិទ្ធិ និងសេរីភាពទាំងឡាយ ដែលមានចែងនៅក្នុងសេចក្ដីប្រកាសនេះ ឡើយ។"
+}
diff --git a/lang/languages/km/language.textproto b/lang/languages/km/language.textproto
deleted file mode 100644
index e093f7d1d..000000000
--- a/lang/languages/km/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "km"
-name: "Khmer"
-preferred_name: ""
-autonym: "ភាសាខ្មែរ"
-population: 15065030
-region: "KH"
-script: "Khmer"
-exemplar_chars {
-  base: "ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ល វ ស ហ ឡ អ ឥ ឦ ឧ ឩ ឪ ឫ ឬ ឭ ឮ ឯ ឰ ឱ ឲ ឳ"
-  auxiliary: "\\u17B4\\u17B5\\u200B \\u17CC \\u17CE \\u17CF \\u17D1 ឝ ឞ"
-  marks: "◌឴ ◌឵ ◌ា ◌ិ ◌ី ◌ឹ ◌ឺ ◌ុ ◌ូ ◌ួ ◌ើ ◌ឿ ◌ៀ ◌េ ◌ែ ◌ៃ ◌ោ ◌ៅ ◌ំ ◌ះ ◌ៈ ◌៉ ◌៊ ◌់ ◌៍ ◌័ ◌្"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ , ៖ ! ? . ។ ៕ ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\} ៙ ៚"
-  index: "ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ឫ ឬ ល ឭ ឮ វ ស ហ ឡ អ ឥ ឦ ឧ ឩ ឪ ឯ ឰ ឱ ឳ"
-}
diff --git a/lang/languages/km/sampletext.textproto b/lang/languages/km/sampletext.textproto
deleted file mode 100644
index f26b53699..000000000
--- a/lang/languages/km/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "km"
diff --git a/lang/languages/kmb.textproto b/lang/languages/kmb.textproto
new file mode 100644
index 000000000..17e758c93
--- /dev/null
+++ b/lang/languages/kmb.textproto
@@ -0,0 +1,23 @@
+id: "kmb"
+name: "Kimbundu"
+preferred_name: ""
+autonym: ""
+population: 8130575
+region: "AO"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E F H I J K L M N O P S T U V X Z a b d e f h i j k l m n o p s t u v x z"
+}
+sample_text {
+  masthead_full: "OoAa"
+  masthead_partial: "Tt"
+  tester: "Mu kutala kuma o ujitu wa kijingu wa tokala ku phunga yose ya"
+  poster_sm: "Mu kutala kuma"
+  poster_md: "Mu kutala"
+  poster_lg: "athu"
+  specimen_48: "Mu kutala kuma mu mukanda wa athu wa jixi jadisokeka atangela"
+  specimen_36: "Kana muthu ukala kumuta mu ubika nê mu kibikilu, o ubika ni o kusumbisa abika yene a ifudisa kutandi dya ifa ye yoso."
+  specimen_32: "Kanba muthu utala hadi ya kufunisa kwa ngo mu mwenyu we wa mu tokala, mu mwiji we, mu inzu ye mba mu kudibana kwe, ne kwantala o kijingu ni ungana wê."
+  specimen_21: "Kana muthu utala hadi ya kufunisa kwa ngô mu mwenyu wê wa mu tokala, mu mwiji wê, mu inzu ye mba mukudibana kwe, ne kwendala o kijingu ni ungana wê, muthu oso wala ni kutoxala o kilangelu kya kijila kudita ku ifunisu ini mba o yandelu ini.\nMuthu oso wala kutokala o kubuluka mu kubanza, kilunji ni ngeleja.\nNgamba woso wala kutokala o kubuluka dya kubalula ni dya kuzwela."
+  specimen_16: "Muthu woso, kyoso mbanji dya kisangela, wala kutokala o kikwatesu kya kisangela, mwene mwa xikama mu kutena dya kisakidila dya itokelu ya wenji, wa isangela ni ya ifwa ni ibangelu yatokala o kijingu kye ni mu folo ya kukulisa dya kijinga kye, sakidila mu jinguzu ja ixi ni o kudibana mu ngongo, mukala mukwijya o kisangela ni o jimbote dya kala ixi.\nMuthu woso wala kutokala makuhemena ni makembu ni tutanga o kisukilu kimoxi kyabhexa kya thempu kya kikalakalu ni o kuhemena kwa futa mu ithangana.\nMuthu woso wala kutokala o ke kyala, mu mbandu ya kisangelu ni mu mbandu ya ngengo, kituninu kimoxi kyene kala o itokelu ni ufolo twa tange mu kizwelu kiki atokala mwene kusanga o kitala kya wika."
+}
diff --git a/lang/languages/kmb/language.textproto b/lang/languages/kmb/language.textproto
deleted file mode 100644
index 74bfdb533..000000000
--- a/lang/languages/kmb/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "kmb"
-name: "Kimbundu"
-preferred_name: ""
-autonym: ""
-population: 8130575
-region: "AO"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E F H I J K L M N O P S T U V X Z a b d e f h i j k l m n o p s t u v x z"
-}
diff --git a/lang/languages/kmb/sampletext.textproto b/lang/languages/kmb/sampletext.textproto
deleted file mode 100644
index c4ace7706..000000000
--- a/lang/languages/kmb/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kmb"
diff --git a/lang/languages/kn.textproto b/lang/languages/kn.textproto
new file mode 100644
index 000000000..dbb4ea550
--- /dev/null
+++ b/lang/languages/kn.textproto
@@ -0,0 +1,28 @@
+id: "kn"
+name: "Kannada"
+preferred_name: ""
+autonym: "ಕನ್ನಡ"
+population: 49065330
+region: "IN"
+script: "Kannada"
+exemplar_chars {
+  base: "ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಲ ವ ಶ ಷ ಸ ಹ ಳ ಅ ಆ ಇ ಈ ಉ ಊ ಋ ೠ ಎ ಏ ಐ ಒ ಓ ಔ"
+  auxiliary: "\\u200C\\u200D ೞ"
+  marks: "◌ಂ ◌ಃ ◌ಾ ◌ಿ ◌ು ◌ೂ ◌ೃ ◌ೄ ◌ೆ ◌ೌ ◌್ ◌ೕ ◌ೖ"
+  numerals: "೧ ೨ ೩ ೪ ೫ ೬ ೭ ೮ ೯ ೦"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] @ * / \\& # ′ ″"
+  index: "ಅ ಆ ಇ ಈ ಉ ಊ ಋ ೠ ಌ ೡ ಎ ಏ ಐ ಒ ಓ ಔ ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಱ ಲ ವ ಶ ಷ ಸ ಹ ಳ ೞ"
+}
+sample_text {
+  masthead_full: "ಎಲಮನ"
+  masthead_partial: "ವರ"
+  tester: "ಎಲ್ಲಾ ಮಾನವರೂ ಸ್ವತಂತ್ರರಾಗಿಯೇ ಜನಿಸಿದ್ದಾರೆ. ಹಾಗೂ ಘನತೆ ಮತ್ತು ಹಕ್ಕುಗಳಲ್ಲಿ ಸಮಾನರಾಗಿದ್ದಾರೆ. ವಿವೇಕ ಮತ್ತು"
+  poster_sm: "ಜಾತಿ, ವರ್ಣ, ಸ್ತ್ರೀಪುರುಷ"
+  poster_md: "ಇದಲ್ಲದೆ ಒಬ್ಬ"
+  poster_lg: "ಎಲ್ಲಾ"
+  specimen_48: "ಗುಲಾಮಗಿರಿಯಲ್ಲಾಗಲಿ, ದಾಸತ್ವದಲ್ಲಾಗಲಿ ಯಾವನನ್ನೂ ಇರಿಸಲಾಗದು. ಗುಲಾಮತನ ಹಾಗೂ ವ್ಯಾಪಾರಗಳು ಅವುಗಳ ಎಲ್ಲಾ ರೂಪಗಳಲ್ಲಿಯೂ"
+  specimen_36: "ಶಾಸನದಿಂದಾಗಲಿ ಕಾನೂನಿನಿಂದಾಗಲಿ, ತನಗೆ ಕೊಡಲ್ಪಟ್ಟ ಮೂಲಹಕ್ಕುಗಳನ್ನು ಉಲ್ಲಂಘಿಸುವ ಕೃತ್ಯಗಳಿಗೆ ಯೋಗ್ಯ ರಾಷ್ಟ್ರೀಯ ನ್ಯಾಯ ಸಭೆಗಳಿಂದ ಫಲದಾಯಕವಾದ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಮಾಡಿಸುವ ಹಕ್ಕು ಪ್ರತಿಯೊಬ್ಬನಿಗೂ ಉಂಟು."
+  specimen_32: "ಯಾವನನ್ನೂ ಅವನ ರಹಸ್ಯ, ಕುಟುಂಬ, ಮನೆಯ ವ್ಯವಹಾರ ಮತ್ತು ಕೀರ್ತಿ ಗೌರವಗಳ ವಿಷಯದಲ್ಲಿ ಅನ್ಯರು ಇಚ್ಛಾನುಸಾರವಾಗಿ ಮಧ್ಯಸ್ಥಿಕೆ ವಹಿಸುವ ಸ್ಥಿತಿಗೆ ಗುರಿಪಡಿಸಲಾಗುವುದಿಲ್ಲ. ಇಂತಹ ಮಧ್ಯಸ್ಥಿಕೆಗಳಿಗೆ ಅಥವಾ ಹಲ್ಲೆಗಳಗೆ ವಿರೋಧವಾಗಿ ಕಾನೂನಿನಿಂದ ಸಂರಕ್ಷಣೆ ಹೊಂದುವ ಹಕ್ಕು ಪ್ರತಿಯೊಬ್ಬನಿಗೂ ಉಂಟು."
+  specimen_21: "ಪ್ರತಿಯೊಬ್ಬನಿಗೂ ಭಾವನೆಯ ಅಂತಃಕರಣದ ಹಾಗೂ ಮತದ ಸ್ವಾತಂತ್ರ್ಯಗಳಿಗೆ ಬಾಧ್ಯತೆಯುಂಟು. ಏಕಾಂಗಿಯಾಗಿಯೂ ಇಲ್ಲವೆ ಇತರರೊಡಗೂಡಿಯೂ ತನ್ನ ಮತವನ್ನಾಗಲಿ, ವಿಶ್ವಾಸವನ್ನಾಗಲಿ, ಬದಲಾಯಿಸುವ ಸ್ವಾತಂತ್ರ್ಯವನ್ನೂ, ಬಹಿರಂಗವಾಗಿಯೂ ಗೋಪ್ಯವಾಗಿಯೂ ತನ್ನ ಮತವನ್ನಾಗಲಿ ವಿಶ್ವಾಸವನ್ನಾಗಲಿ ಬೋಧಿಸುವ, ರೂಢಿಸುವ, ಆರಾಧಿಸುವ, ಆಚರಿಸುವ ಸ್ವಾತಂತ್ರ್ಯವನ್ನೂ ಈ ಹಕ್ಕು ಒಳಗೊಂಡಿದೆ.\nಪ್ರತಿಯೊಬ್ಬನಿಗೂ ಅಭಿಪ್ರಾಯಪಡುವ, ಉಚ್ಚಾರಣೆಗೈವ ಸ್ವಾತಂತ್ರ್ಯಗಳ ಬಾಧ್ಯತೆಯುಂಟು. ಮಧ್ಯಸ್ಥಿಕೆ ವಹಿಸದಂತೆ ಅಭಿಪ್ರಾಯಗಳನ್ನಿಟ್ಟುಕೊಳ್ಳುವ ಸ್ವಾತಂತ್ರವನ್ನೂ ಸರಹದ್ದುಗಳ ಲಕ್ಷ್ಯವಿಲ್ಲದೆಯೂ ಯಾವ ಮುಖಾಂತರವಾಗಿಯೂ ವರ್ತಮಾನವನ್ನೂ ಭಾವನೆಗಳನ್ನೂ ಅನ್ವೇಷಣಗೈವ, ಸ್ವೀಕರಿಸುವ, ತಿಳಯಪಡಿಸುವ ಸ್ವಾತಂತ್ರ್ಯವನ್ನೂ ಈ ಬಾಧ್ಯತೆ ಒಳಗೊಂಡಿದೆ."
+  specimen_16: "ಸಮಾಜದ ಸದಸ್ಯನಾದುದರಿಂದ ಸಾಮಾಜಿಕ ಭದ್ರತೆಗೆ ಪ್ರತಿಯೊಬ್ಬನಿಗೂ ಹಕ್ಕುಂಟು. ಮತ್ತು ತನ್ನ ಗೌರವಕ್ಕೂ ತನ್ನ ವ್ಯಕ್ತಿತ್ವದ ನೈಸರ್ಗಿಕಾಭಿವೃದ್ದಿಗೂ ಅತ್ಯಗತ್ಯವಾದ ಆರ್ಥಿಕ, ಸಾಮಾಜಿಕ, ಹಾಗೂ ಸಾಂಸ್ಕೃತಿಕ ಹಕ್ಕುಗಳನ್ನು ರಾಷ್ಟ್ರೀಯ ಪ್ರಯತ್ನದ ಮೂಲಕವೂ, ಅಂತರರಾಷ್ಟ್ರೀಯ ಸಹಕಾರದ ಮೂಲಕವೂ ಮತ್ತು ಪ್ರತಿರಾಷ್ಟ್ರದ ವ್ಯವಸ್ಧೆ ಮತ್ತು ಆದಾಯಗಳಿಗನುಗುಣವಾಗಿಯೂ ಆನುಭವಿಸುವ ಬಾಧ್ಯತೆ ಪ್ರತಿಯೊಬ್ಬನಿಗೂ ಉಂಟು.\nವಿರಾಮ ವಿಶ್ರಾಂತಿಗಳಿಗೂ ಉಚಿತಪರಿಮಿತಿಯುಳ್ಳ ಔದ್ಯೋಗಿಕ ಸಮಯಕ್ಕೂ ವೇತನ ಸಮೇತವಾದ ಕಾಲಕಾಲದ ರಜೆಗಳಿಗೂ ಪ್ರತಿಯೊಬ್ಬನಿಗೂ ಹಕ್ಕುಂಟು.\nಈ ಪ್ರಕಟನೆಯಲ್ಲಿ ಸೂಚಿತವಾದ ಹಕ್ಕುಗಳನ್ನು ಸ್ವಾತಂತ್ರ್ಯಗಳನ್ನೂ ಸಂಪೂರ್ಣವಾಗಿ ಅನುಭವಿಸ ಬಹುದಾದಂಥ ಸಾಮಾಜಿಕವೂ ಅಂತರರಾಷ್ಟ್ರೀಯವೂ ಆದ ವ್ಯವಸ್ಥೆಗೆ ಪ್ರತಿಯೊಬ್ಬನಿಗೂ ಬಾಧ್ಯತೆಯುಂಟು.\nಯಾವ ಪ್ರಾಂತಕ್ಕಾಗಿಯೋ ಸಂಘಕ್ಕಾಗಿಯೋ ವ್ಯಕ್ತಿಗಾಗಿಯೋ ಎಂಬುದಾಗಿಯೂ, ಯಾವುದೋ ಉದ್ಯಮದಲ್ಲಿ ತೊಡಗಿರಲೆಂಬುದಾಗಿಯೂ, ಅಥವಾ ಇದರಲ್ಲಿರುವ ಯಾವುದಾದರೂ ಹಕ್ಕುಗಳನ್ನೂ ಸ್ವಾತಂತ್ರ್ಯಗಳನ್ನೂ ನಾಶಗೊಳಿಸಲು ಉದ್ದೇಶಿಸಿರುವ ಯಾವುದೋ ಕಾರ್ಯವನ್ನು ಮಾಡಲೆಂಬುದಾಗಿಯೂ ಈ ಪ್ರಕಟನೆಯಲ್ಲಿರುವ ಯಾವ ವಿಷಯವನ್ನೂ ವ್ಯಾಖ್ಯಾನಿಸಬಾರದು.\nಎಲ್ಲಾ ಮಾನವರೂ ಸ್ವತಂತ್ರರಾಗಿಯೇ ಜನಿಸಿದ್ದಾರೆ. ಹಾಗೂ ಘನತೆ ಮತ್ತು ಹಕ್ಕುಗಳಲ್ಲಿ ಸಮಾನರಾಗಿದ್ದಾರೆ. ವಿವೇಕ ಮತ್ತು ಅಂತಃಕರಣಗಳನ್ನು ಪಡೆದವರಾದ್ದರಿಂದ ಅವರು ಪರಸ್ಪರ ಸಹೋದರ ಭಾವದಿಂದ ವರ್ತಿಸಬೇಕು."
+}
diff --git a/lang/languages/kn/language.textproto b/lang/languages/kn/language.textproto
deleted file mode 100644
index 0ef86723e..000000000
--- a/lang/languages/kn/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "kn"
-name: "Kannada"
-preferred_name: ""
-autonym: "ಕನ್ನಡ"
-population: 49065330
-region: "IN"
-script: "Kannada"
-exemplar_chars {
-  base: "ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಲ ವ ಶ ಷ ಸ ಹ ಳ ಅ ಆ ಇ ಈ ಉ ಊ ಋ ೠ ಎ ಏ ಐ ಒ ಓ ಔ"
-  auxiliary: "\\u200C\\u200D ೞ"
-  marks: "◌ಂ ◌ಃ ◌ಾ ◌ಿ ◌ು ◌ೂ ◌ೃ ◌ೄ ◌ೆ ◌ೌ ◌್ ◌ೕ ◌ೖ"
-  numerals: "೧ ೨ ೩ ೪ ೫ ೬ ೭ ೮ ೯ ೦"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] @ * / \\& # ′ ″"
-  index: "ಅ ಆ ಇ ಈ ಉ ಊ ಋ ೠ ಌ ೡ ಎ ಏ ಐ ಒ ಓ ಔ ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಱ ಲ ವ ಶ ಷ ಸ ಹ ಳ ೞ"
-}
diff --git a/lang/languages/kn/sampletext.textproto b/lang/languages/kn/sampletext.textproto
deleted file mode 100644
index 7487d1197..000000000
--- a/lang/languages/kn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kn"
diff --git a/lang/languages/knf/language.textproto b/lang/languages/knf.textproto
similarity index 74%
rename from lang/languages/knf/language.textproto
rename to lang/languages/knf.textproto
index 6cba84733..1a83fa7d3 100644
--- a/lang/languages/knf/language.textproto
+++ b/lang/languages/knf.textproto
@@ -3,7 +3,10 @@ name: "Mankanya"
 preferred_name: ""
 autonym: ""
 population: 83151
-region: "SN"
 region: "GW"
+region: "SN"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ko/language.textproto b/lang/languages/ko.textproto
similarity index 51%
rename from lang/languages/ko/language.textproto
rename to lang/languages/ko.textproto
index 36fdcc722..5d28a25e0 100644
--- a/lang/languages/ko/language.textproto
+++ b/lang/languages/ko.textproto
@@ -3,12 +3,12 @@ name: "Korean"
 preferred_name: ""
 autonym: "한국어 / 조선말"
 population: 78187423
-region: "US"
 region: "BR"
-region: "KR"
-region: "KP"
 region: "CN"
 region: "JP"
+region: "KP"
+region: "KR"
+region: "US"
 script: "Korean"
 exemplar_chars {
   base: "丘 串 乃 久 乖 九 乞 乫 乾 亂 亘 交 京 仇 今 介 件 价 企 伋 伎 伽 佳 佶 侃 來 侊 供 係 俓 俱 個 倞 倦 倨 假 偈 健 傀 傑 傾 僅 僑 價 儆 儉 儺 光 克 兢 內 公 共 其 具 兼 冀 冠 凱 刊 刮 券 刻 剋 剛 劇 劍 劒 功 加 劤 劫 勁 勍 勘 勤 勸 勻 勾 匡 匣 區 南 卦 却 卵 卷 卿 厥 去 及 口 句 叩 叫 可 各 吉 君 告 呱 呵 咎 咬 哥 哭 啓 喀 喇 喝 喫 喬 嗜 嘉 嘔 器 囊 困 固 圈 國 圭 圻 均 坎 坑 坤 坰 坵 垢 基 埼 堀 堅 堈 堪 堺 塊 塏 境 墾 壙 壞 夔 奇 奈 奎 契 奸 妓 妗 姑 姜 姦 娘 娜 嫁 嬌 孔 季 孤 宏 官 客 宮 家 寄 寇 寡 寬 尻 局 居 屆 屈 岐 岡 岬 崎 崑 崗 嵌 嵐 嶇 嶠 工 巧 巨 己 巾 干 幹 幾 庚 庫 康 廊 廐 廓 廣 建 弓 强 彊 徑 忌 急 怪 怯 恐 恝 恪 恭 悸 愆 感 愧 愷 愾 慊 慣 慤 慨 慶 慷 憩 憬 憾 懃 懇 懦 懶 懼 戈 戒 戟 戡 扱 技 抉 拉 拏 拐 拒 拘 括 拮 拱 拳 拷 拿 捏 据 捲 捺 掘 掛 控 揀 揆 揭 擊 擎 擒 據 擧 攪 攷 改 攻 故 敎 救 敢 敬 敲 斛 斤 旗 旣 昆 昑 景 晷 暇 暖 暠 暻 曠 曲 更 曷 朗 朞 期 机 杆 杞 杰 枏 果 枯 架 枸 柑 柩 柬 柯 校 根 格 桀 桂 桔 桿 梏 梗 械 梱 棄 棋 棍 棘 棨 棺 楗 楠 極 槁 構 槐 槨 槪 槻 槿 樂 橄 橋 橘 機 檄 檎 檢 櫃 欄 權 欺 款 歌 歐 歸 殼 毆 毬 氣 求 江 汨 汲 決 汽 沂 沽 洛 洸 浪 涇 淃 淇 減 渠 渴 湳 溝 溪 滑 滾 漑 潔 潰 澗 激 濫 灌 灸 炅 炚 炬 烙 烱 煖 爛 牽 犬 狂 狗 狡 狼 獗 玖 玘 珂 珏 珖 珙 珞 珪 球 琦 琨 琪 琯 琴 瑾 璂 璟 璣 璥 瓊 瓘 瓜 甄 甘 甲 男 畇 界 畸 畺 畿 疆 疥 疳 痂 痙 痼 癎 癩 癸 皆 皎 皐 盖 監 看 眷 睾 瞰 瞼 瞿 矜 矩 矯 硅 硬 碁 碣 磎 磬 磯 磵 祁 祇 祈 祛 祺 禁 禽 科 稈 稼 稽 稿 穀 究 穹 空 窘 窟 窮 窺 竅 竟 竭 競 竿 筋 筐 筠 箇 箕 箝 管 簡 粳 糠 系 糾 紀 納 紘 級 紺 絅 結 絞 給 絳 絹 絿 經 綱 綺 緊 繫 繭 繼 缺 罐 罫 羅 羈 羌 羔 群 羹 翹 考 耆 耉 耕 耭 耿 肌 肝 股 肩 肯 肱 胛 胱 脚 脛 腔 腱 膈 膏 膠 臘 臼 舅 舊 舡 艮 艱 芎 芥 芩 芹 苛 苟 苦 苽 茄 莖 菅 菊 菌 菓 菫 菰 落 葛 葵 蓋 蕎 蕨 薑 藁 藍 藿 蘭 蘿 虔 蚣 蛟 蝎 螺 蠟 蠱 街 衢 衲 衾 衿 袈 袞 袴 裙 裸 褐 襁 襟 襤 見 規 覡 覲 覺 觀 角 計 記 訣 訶 詭 誇 誡 誥 課 諫 諾 謙 講 謳 謹 譏 警 譴 谷 谿 豈 貢 貫 貴 賈 購 赳 起 跏 距 跨 踞 蹇 蹶 躬 軀 車 軌 軍 軻 較 輕 轎 轟 辜 近 迦 迲 适 逑 逕 逵 過 遣 遽 邏 那 邯 邱 郊 郎 郡 郭 酪 醵 金 鈐 鈞 鉀 鉅 鉗 鉤 銶 鋸 鋼 錡 錤 錦 錮 鍋 鍵 鎌 鎧 鏡 鑑 鑒 鑛 開 間 閘 閣 閨 闕 關 降 階 隔 隙 雇 難 鞏 鞠 鞨 鞫 頃 頸 顆 顧 飢 餃 館 饉 饋 饑 駒 駕 駱 騎 騏 騫 驅 驕 驚 驥 骨 高 鬼 魁 鮫 鯤 鯨 鱇 鳩 鵑 鵠 鷄 鷗 鸞 麒 麴 黔 鼓 龕 龜"
@@ -18,3 +18,16 @@ exemplar_chars {
   punctuation: "! \" # % & ( ) * - . / : ; ? @ [ \\ ] _ ¡ § ¶ · ¿ ‐ — ― ‘ ’ “ ” † ‡ ‥ … ‰ ′ ″ ※ ‾ 、 。 〃 〈 〉 《 》 「 」 『 』 【 】 〔 〕 〜 ・ ！ ＂ ＃ ％ ＆ ＇ （ ） ＊ ， － ． ／ ： ； ？ ＠ ［ ＼ ］ ＿ ｛ ｝"
   index: "ㄱ ㄴ ㄷ ㄹ ㅁ ㅂ ㅅ ㅇ ㅈ ㅊ ㅋ ㅌ ㅍ ㅎ"
 }
+sample_text {
+  masthead_full: "모든인간"
+  masthead_partial: "은태"
+  tester: "모든 인류 구성원의 천부의 존엄성과 동등하고 양도할 수 없는 권리를 인정하는 것이 세계의 자유, 정의 및 평화의"
+  poster_sm: "인권에 대한 무시와"
+  poster_md: "인간이 폭정과 억압에"
+  poster_lg: "인간은"
+  specimen_48: "국제연합의 모든 사람들은 그 헌장에서 기본적 인권, 인간의 존엄과 가치, 그리고 남녀의 동등한 권리에 대한 신념을"
+  specimen_36: "모든 사람은 인종, 피부색, 성, 언어, 종교, 정치적 또는 기타의 견해, 민족적 또는 사회적 출신, 재산, 출생 또는 기타의 신분과 같은 어떠한 종류의 차별이 없이, 이 선언에 규정된 모든 권리와 자유를 향유할 자격이 있다."
+  specimen_32: "모든 사람은 사상, 양심 및 종교의 자유에 대한 권리를 가진다. 이러한 권리는 종교 또는 신념을 변경할 자유와, 단독으로 또는 다른 사람과 공동으로 그리고 공적으로 또는 사적으로 선교, 행사, 예배 및 의식에 의하여 자신의 종교나 신념을 표명하는 자유를 포함한다."
+  specimen_21: "모든 사람은 의견의 자유와 표현의 자유에 대한 권리를 가진다. 이러한 권리는 간섭없이 의견을 가질 자유와 국경에 관계없이 어떠한 매체를 통해서도 정보와 사상을 추구하고, 얻으며, 전달하는 자유를 포함한다.\n모든 사람은 사회의 일원으로서 사회보장을 받을 권리를 가지며, 국가적 노력과 국제적 협력을 통하여, 그리고 각 국가의 조직과 자원에 따라서 자신의 존엄과 인격의 자유로운 발전에 불가결한 경제적, 사회적 및 문화적 권리들을 실현할 권리를 가진다.\n모든 사람은 노동시간의 합리적 제한과 정기적인 유급휴가를 포함하여 휴식과 여가의 권리를 가진다.\n모든 사람은 이 선언에 규정된 권리와 자유가 완전히 실현될 수 있도록 사회적, 국제적 질서에 대한 권리를 가진다."
+  specimen_16: "이 선언의 어떠한 규정도 어떤 국가, 집단 또는 개인에게 이 선언에 규정된 어떠한 권리와 자유를 파괴하기 위한 활동에 가담하거나 또는 행위를 할 수 있는 권리가 있는 것으로 해석되어서는 아니된다.\n모든 인류 구성원의 천부의 존엄성과 동등하고 양도할 수 없는 권리를 인정하는 것이 세계의 자유, 정의 및 평화의 기초이며,\n인권에 대한 무시와 경멸이 인류의 양심을 격분시키는 만행을 초래하였으며, 인간이 언론과 신앙의 자유, 그리고 공포와 결핍으로부터의 자유를 누릴 수 있는 세계의 도래가 모든 사람들의 지고한 열망으로서 천명되어 왔으며,\n인간이 폭정과 억압에 대항하는 마지막 수단으로서 반란을 일으키도록 강요받지 않으려면, 법에 의한 통치에 의하여 인권이 보호되어야 하는 것이 필수적이며,\n국가간에 우호관계의 발전을 증진하는 것이 필수적이며,\n국제연합의 모든 사람들은 그 헌장에서 기본적 인권, 인간의 존엄과 가치, 그리고 남녀의 동등한 권리에 대한 신념을 재확인하였으며, 보다 폭넓은 자유속에서 사회적 진보와 보다 나은 생활수준을 증진하기로 다짐하였고,\n회원국들은 국제연합과 협력하여 인권과 기본적 자유의 보편적 존중과 준수를 증진할 것을 스스로 서약하였으며,"
+}
diff --git a/lang/languages/ko/sampletext.textproto b/lang/languages/ko/sampletext.textproto
deleted file mode 100644
index 0d92e5abe..000000000
--- a/lang/languages/ko/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ko"
diff --git a/lang/languages/koi.textproto b/lang/languages/koi.textproto
new file mode 100644
index 000000000..7f307d4d3
--- /dev/null
+++ b/lang/languages/koi.textproto
@@ -0,0 +1,24 @@
+id: "koi"
+name: "Komi-Permyak"
+preferred_name: ""
+autonym: "Перем Коми"
+population: 63774
+region: "RU"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё І Ӧ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё і ӧ"
+  marks: "◌̆ ◌̈"
+}
+sample_text {
+  masthead_full: "БбЫы"
+  masthead_partial: "Дд"
+  tester: "Медбы тӧдны, что морт семьяись быд членлӧн эм аслас достоинство,"
+  poster_sm: "медбы тӧдны,"
+  poster_md: "ГЕНЕРАЛЬНӦЙ"
+  poster_lg: "Быдӧс"
+  specimen_48: "Быдӧс отирыс чужӧны вольнӧйезӧн да ӧткоддезӧн  достоинствоын"
+  specimen_36: "Некинӧс оз позь видзны рабствоын нето пӧдан сайын; раб видзӧм да раббезӧн вузасьӧм оз вермӧ вӧвны миян оланын."
+  specimen_32: "Мийӧ быдӧнным законыс одзын ӧткодьӧсь и ӧтмоза  дорйӧмӧсь. Миян быдӧннымлӧн эта Декларация сьӧрті  право дорйыны асьнымӧс быдӧс умӧльсянь, кинсянь бы сія эз лок."
+  specimen_21: "Быд мортлӧн эм право бертны аслыс ӧштӧм правоэз, кӧдна сетӧмӧсь сылӧ конституцияӧн нето законӧн, тӧдчана национальнӧй суддэзын.\nНекинӧс оз позь законтӧг арестуйтны, кутны нето вӧтлыны.\nБыд мортлӧн, кӧр сійӧ винитӧны уголовнӧй статья сьӧрті,  право тӧдны справедливӧй независимӧй судын ассис правоэз да обязанносттез и эм я мыйкӧ сэтшӧмыс, мед сійӧ винитны."
+  specimen_16: "Некин оз вермы дзугны мортлісь ассис да семейнӧй вӧрзьӧтны сылісь оланін, честь да бур ним. Быдыслӧн эм право сайӧвтны асьсӧ вӧрзьӧтлӧммезсянь законӧн.\nБыд мортыс вермӧ асмознас авйыны, совеститчыны да  ны енлӧ; эта правоыс сетӧ вежны ассит ен, мӧднеж вежӧртны олан, ӧтнатлӧ и ӧтлаын мӧдіккезкӧт донтны кӧть кытшӧм енӧс да ассиныт арт, велӧтчыны, юрбитны да чулӧтны религиознӧй да ритуальнӧй обряддэз йӧз дырни нето дзир аскӧттят.\nБыдыс вермӧ артавны асмознас и кӧть кытӧн баитны эта йылісь йӧзлӧ; эта правоыс сетӧ мортыслӧ воля овны аслас юрӧн, повтӧг кошшыны, адззыны да новйӧтны омӧн юӧ да ассис арттэз кыдз сія только кужӧ и кытшӧм бы границаэз сайын эз вӧв."
+}
diff --git a/lang/languages/koi/language.textproto b/lang/languages/koi/language.textproto
deleted file mode 100644
index 521121769..000000000
--- a/lang/languages/koi/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "koi"
-name: "Komi-Permyak"
-preferred_name: ""
-autonym: "Перем Коми"
-population: 63774
-region: "RU"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё І Ӧ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё і ӧ"
-  marks: "◌̆ ◌̈"
-}
diff --git a/lang/languages/koi/sampletext.textproto b/lang/languages/koi/sampletext.textproto
deleted file mode 100644
index 0e0fc395a..000000000
--- a/lang/languages/koi/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "koi"
diff --git a/lang/languages/kok/language.textproto b/lang/languages/kok.textproto
similarity index 96%
rename from lang/languages/kok/language.textproto
rename to lang/languages/kok.textproto
index 4348f4829..4dc49c5d3 100644
--- a/lang/languages/kok/language.textproto
+++ b/lang/languages/kok.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ळ"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/kos/language.textproto b/lang/languages/kos.textproto
similarity index 74%
rename from lang/languages/kos/language.textproto
rename to lang/languages/kos.textproto
index 5e69d076b..6d32909e7 100644
--- a/lang/languages/kos/language.textproto
+++ b/lang/languages/kos.textproto
@@ -7,3 +7,6 @@ region: "FM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kpe/language.textproto b/lang/languages/kpe.textproto
similarity index 76%
rename from lang/languages/kpe/language.textproto
rename to lang/languages/kpe.textproto
index 2cdd2314d..ee938fdf9 100644
--- a/lang/languages/kpe/language.textproto
+++ b/lang/languages/kpe.textproto
@@ -8,3 +8,6 @@ region: "LR"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/krc/language.textproto b/lang/languages/krc.textproto
similarity index 90%
rename from lang/languages/krc/language.textproto
rename to lang/languages/krc.textproto
index 1ac8431d7..c54a6a8f2 100644
--- a/lang/languages/krc/language.textproto
+++ b/lang/languages/krc.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ў а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ў"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/kri.textproto b/lang/languages/kri.textproto
new file mode 100644
index 000000000..422d62508
--- /dev/null
+++ b/lang/languages/kri.textproto
@@ -0,0 +1,23 @@
+id: "kri"
+name: "Krio"
+preferred_name: ""
+autonym: ""
+population: 6293683
+region: "SL"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E Ɛ F G H I J K L M N Ŋ O Ɔ P S T U V W Y Z a b c d e ɛ f g h i j k l m n ŋ o ɔ p s t u v w y z"
+}
+sample_text {
+  masthead_full: "ƐɛVv"
+  masthead_partial: "Rr"
+  tester: "Soso we if wi sabi ɛn gri se if ɔlman gɛt insɛf yon rɛspɛkt, i"
+  poster_sm: "Di tiŋ we di"
+  poster_md: "If man fɔ"
+  poster_lg: "ɛvribɔdi"
+  specimen_48: "Na semweso i gud fɔ lɛ kolat ɛn frɛnship de bitwin neshɔn ɛn"
+  specimen_36: "Fɔ mek dis wanwɔd ol wata ɔloba di wɔl, ɛvribɔdi fɔɔndastand wetin dɛn rayt ɛn dɛn fridɔm, jɔstis ɛn pis yaso min."
+  specimen_32: "ɛvribɔdi bɔn fri ɛn gɛt in yon rayt, nɔn wan nɔ pas in kɔmpin. Wi ɔl ebul fɔ tink ɛn fɛnɔt wetin rayt ɛn rɔŋ pantap dat wi fɔ sabi aw fɔ liv lɛk wan big famili."
+  specimen_21: "ɛvribɔdi fɔ gɛt di sem rayt ɛn fridom we dis stetmɛnt tɔk bɔt, nɔ mata wɛda in na wetman ɔ blakman, man ɔ uman, bukman ɔ yu nɔ sabi rid ɛn rayt, poman ɔ mɔniman, kristiɛn ɔ muslim.\nPantap dat, di kɔntri we di pɔsin bɔn sɛf nɔ fɔ bi baria na in we. I fɔ gɛt ikwal rayt lɛk ɛni ɔda pɔsin na di bɛst divɛlop kɔntri na di wɔl."
+  specimen_16: "Evribɔdi fɔ ebul fɔ liv in layf, fɔ fil fri ɛn fɔ fil sɛf se nɔbɔdi ɔ natin nɔ go denja in layf.\nNɔbɔdi nɔ fɔ mek in kɔmpin in slev – dis, ɔɛnitiŋ sɛf we fiba am fɔ tap.\nNɔbɔdi nɔ fɔ mek in kɔmpin sɔfa bita wikɛd pen na bɔdi ɔ shem sote i lɔs da in yon yon rɛspɛkt.\nɛvribɔdi gɛt rayt fɔ mek pipul dɛn rɛspɛkt am as mɔtalman ɛnisay na di wɔl ɛn, sɛf, fɔ mek di lɔɛp am gɛt dis rɛspɛkt.\nɛvribɔdi ikwal ɛn di lɔ fɔ ebul protɛkt ɛniwan wantɛm we ɔda pipul dɛn na trit wan du am wetin in mɔtalman rayt nɔ gri fɔɔ if bad pipul se ɔda wan agens am.\nɛvribɔdi we tink se dɛn dɔn go agens in rayt we dis stetmɛnt tɔk bɔt, fɔ ebul gɛt ɔl di ɛp we i nid frɔm ɛni kotos we gɛt pawa na in kɔntri."
+}
diff --git a/lang/languages/kri/language.textproto b/lang/languages/kri/language.textproto
deleted file mode 100644
index a3f3d3399..000000000
--- a/lang/languages/kri/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "kri"
-name: "Krio"
-preferred_name: ""
-autonym: ""
-population: 6293683
-region: "SL"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E Ɛ F G H I J K L M N Ŋ O Ɔ P S T U V W Y Z a b c d e ɛ f g h i j k l m n ŋ o ɔ p s t u v w y z"
-}
diff --git a/lang/languages/kri/sampletext.textproto b/lang/languages/kri/sampletext.textproto
deleted file mode 100644
index c3214192f..000000000
--- a/lang/languages/kri/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "kri"
diff --git a/lang/languages/krj/language.textproto b/lang/languages/krj.textproto
similarity index 75%
rename from lang/languages/krj/language.textproto
rename to lang/languages/krj.textproto
index 5c8a0b404..38408149b 100644
--- a/lang/languages/krj/language.textproto
+++ b/lang/languages/krj.textproto
@@ -7,3 +7,6 @@ region: "PH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/krl.textproto b/lang/languages/krl.textproto
new file mode 100644
index 000000000..23d63c760
--- /dev/null
+++ b/lang/languages/krl.textproto
@@ -0,0 +1,24 @@
+id: "krl"
+name: "Karelian"
+preferred_name: ""
+autonym: "Karjala"
+population: 116212
+region: "RU"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Č Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö č š ž"
+  marks: "◌̈ ◌̌"
+}
+sample_text {
+  masthead_full: "KkAa"
+  masthead_partial: "Ii"
+  tester: "Huomivoh ottajen, ku kaikile ristikanzoin pereheh kuulujile ominazen"
+  poster_sm: "sanou julgi"
+  poster_md: "Kai rahvas"
+  poster_lg: "Kai"
+  specimen_48: "Jogahizel ristikanzal pidäy olla kai täs Deklaratsies julgi sanotut"
+  specimen_36: "Nikedä ei sua pidiä orjannu libo vallanalazennu; orjien piendy da\nmyöndy ollah kielletty kaikis muodolois."
+  specimen_32: "Jogahizel ristikanzal, olgah häi hos kus, ollah oigevukset da juriidizet\nvellallizuot, häi voibi käyttiä nenii oigevuksii da täyttiä juriidizii\nvellallizuksii."
+  specimen_21: "Kai rahvas ollah taza-arvozet zakonan ies da jogahizel on oigevus,\neroloi huolimata, taza-arvozeh oigevuksen puolistamizeh. Kaikil\nrahvahil on samanlaine oigevus samanarvozeh puolistamizeh mittumastahto tädä Deklaratsiedu rikkojas diskriminatsies da kuduastahto\ntämänmoizeh diskriminatsieh kuhkutandas.\nJogahizel ristikanzal on oigevus kanzallizien toimivaldusuudoloin\neffektiivizeh oigevuksien järilleh suandah, ku konstitutsieh libo zakonah\nkirjutetut perusoigevukset olla rikottu."
+  specimen_16: "Nikedä ei sua arestuija, ottua kiini libo ajua iäres omavaldazesti.\nJogahizel ristikanzal hänen oigevuksien da vellallizuksien miärittelemizekse\nda hänele azetetun pahanruadosyyttehen perustallizuon\nselvilesuandakse on oigevus tävvellizen tazaverdazuon\nperustehel sih, ku hänen dieluo kaččos julgi da kaikkii zakonanmugazuon\nvuadimuksii täyttäjes rippumatoi da tazapuoline suudo.\nNiken ei voi jouduo alazekse, ku hänen persounallizeh da perehelaigah\nsegavuttas, omavaldazesti opittas kuovata hänen eländysija,\nkyzymätä lugiettas hänen korrespondentsiedu libo yritettäs alendua\nhänen kunnivuo da rikkuo mainehtu. Jogahizel ristikanzal oli\noigevus suaha puolistustu zakonan mugah moizes segavumizes\nlibo sen yrityksis."
+}
diff --git a/lang/languages/krl/language.textproto b/lang/languages/krl/language.textproto
deleted file mode 100644
index 4513b7597..000000000
--- a/lang/languages/krl/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "krl"
-name: "Karelian"
-preferred_name: ""
-autonym: "Karjala"
-population: 116212
-region: "RU"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Č Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö č š ž"
-  marks: "◌̈ ◌̌"
-}
diff --git a/lang/languages/krl/sampletext.textproto b/lang/languages/krl/sampletext.textproto
deleted file mode 100644
index 9b1323b7d..000000000
--- a/lang/languages/krl/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "krl"
diff --git a/lang/languages/kru/language.textproto b/lang/languages/kru.textproto
similarity index 75%
rename from lang/languages/kru/language.textproto
rename to lang/languages/kru.textproto
index fd847f5d6..c963b364d 100644
--- a/lang/languages/kru/language.textproto
+++ b/lang/languages/kru.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/ks/language.textproto b/lang/languages/ks.textproto
similarity index 92%
rename from lang/languages/ks/language.textproto
rename to lang/languages/ks.textproto
index 8359fd7ec..2bcfda554 100644
--- a/lang/languages/ks/language.textproto
+++ b/lang/languages/ks.textproto
@@ -3,13 +3,16 @@ name: "Kashmiri"
 preferred_name: ""
 autonym: ""
 population: 5723030
-region: "PK"
-region: "IN"
 region: "GB"
-script: "Perso-Arabic"
+region: "IN"
+region: "PK"
 script: "Devanagari"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "ء آ أ ٲ ؤ ا ب پ ت ث ٹ ج چ ح خ د ذ ڈ ر ز ڑ ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں ھ ہ و ۄ ۆ ی ۍ ؠ ے"
   auxiliary: "\\u200E\\u200F \\u064E \\u064F \\u0650 \\u0654 \\u0655 \\u065F \\u0656 \\u0657"
   numerals: "\\u200E \\- ‑ , . % ‰ + 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹"
 }
+sample_text {
+  fallback_language: "sd"
+}
diff --git a/lang/languages/ksb/language.textproto b/lang/languages/ksb.textproto
similarity index 88%
rename from lang/languages/ksb/language.textproto
rename to lang/languages/ksb.textproto
index fb88c286f..e35b3807f 100644
--- a/lang/languages/ksb/language.textproto
+++ b/lang/languages/ksb.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "Q R X q r x"
   index: "A B C D E F G H I J K L M N O P S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ksf/language.textproto b/lang/languages/ksf.textproto
similarity index 91%
rename from lang/languages/ksf/language.textproto
rename to lang/languages/ksf.textproto
index 2b8bb2916..1c928b08e 100644
--- a/lang/languages/ksf/language.textproto
+++ b/lang/languages/ksf.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E Ǝ Ɛ F G H I J K L M N Ŋ O Ɔ P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ksh/language.textproto b/lang/languages/ksh.textproto
similarity index 95%
rename from lang/languages/ksh/language.textproto
rename to lang/languages/ksh.textproto
index e6a2df152..29c07299e 100644
--- a/lang/languages/ksh/language.textproto
+++ b/lang/languages/ksh.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: "_ ‐ – — ⸗ , ; \\: ! ? . … \' ‘ ‚ \" “ „ ( ) \\[ \\] \\{ \\} § @ * / \\& # % † ‡ ° < = > ~"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ku.textproto b/lang/languages/ku.textproto
new file mode 100644
index 000000000..3ee1612ae
--- /dev/null
+++ b/lang/languages/ku.textproto
@@ -0,0 +1,35 @@
+id: "ku"
+name: "Kurdish"
+preferred_name: ""
+autonym: "Kurmancî"
+population: 6773773
+region: "AM"
+region: "AZ"
+region: "DE"
+region: "GE"
+region: "SY"
+region: "TM"
+region: "TR"
+script: "Cyrillic"
+script: "Latin"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ә Ж З Й К Л М Н О Ӧ П Р С Т У Ф Х Һ Ч Ш Щ Ь Э Ԛ Ԝ а б в г д е ә ж з й к л м н о ӧ п р с т у ф х һ ч ш щ ь э ԛ ԝ \'"
+  auxiliary: "Ḧ Ẍ ḧ ẍ \'"
+  marks: "◌̆ ◌̈"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C Ç D E Ê F G H I Î J K L M N O P Q R S Ş T U Û V W X Y Z"
+}
+sample_text {
+  masthead_full: "HhEe"
+  masthead_partial: "Mm"
+  tester: "Herwekî nasîna weqara pêgirê hemû endamên malbata mirovî û mafên"
+  poster_sm: "Herwekî nenasîn"
+  poster_md: "wekî îdeala"
+  poster_lg: "Hemû"
+  specimen_48: "Hemû mirov azad û di weqar û mafan de wekhev tên dinyayê. Ew xwedî"
+  specimen_36: "Ewê tukes di koletî an bindestiyê de neyê girtin; koletî û bazirganiya koleyan bi hemû teşeyên xwe ve qedexe ne."
+  specimen_32: "Herkes maf heye ku li hemberî kirinên ku mafên bingehî yên ku qanûna bingehî an qanûn jê re dinasin ihlal dikin, serî li mehkemeyên neteweyî yên selahiyetdar bixe."
+  specimen_21: "Tukes nikare bi awayekî kêfî bê girtin, hebs an sirgûn kirin.\nHerkes, di wekheviyeke temamî de, maf heye ku doza wî li ber mehkemeyeke serbixwe û bê alî bi awayekî adil û eşkere bê bihîstin ji bo diyarkirina maf û wacibên wî û ya her tawana curmî li dijî wî.\nNabe ku tukes bibe amanca têkilbûnên kêfî yên nav jiyana wî ya arizî, malbata wî, mala wî an nameyên wî, an ziyangihandina şeref û şana wî. Herkes xwediyê mafê parastina qanûn e li hemberî têkilbûn û ziyangihanên wilo."
+  specimen_16: "Herkes mafê azadiya fikr, wijdan û olê heye; azadiya ol an bawerî guhartin û azadiya ol û baweriya xwe bi tenê an bi hev re him eşkere him arizî, bi hînkirin, emel, îbadet û bicihanîna ayînan nîşandanê jî di nav vî mafî de ne.\nHerkes mafê azadiya fikr û îfade heye; mafê ji ber ramanên xwe nehatin êşandin û herweha mafê bêî nasîna tu sînoran û bi her cure navgînan li agahdariyan û fikran gerîn, wan bi dest xistin û îfade û belavkirin dikevin nav vî mafî.\nHerkes, wekî endamê civakî, mafê ewleyiya sosyal heye; Ew mafdar e ku bi riya xebata neteweyî û hevkariya navneteweyî û li gora tenzîm û hatiniyên her dewletê, doza bidestxistina mafên aborî, civakî û çandî yên ku jo bo weqara wî û geşbûna serbest a şexsiyeta wî ferz in, bike."
+}
diff --git a/lang/languages/ku/language.textproto b/lang/languages/ku/language.textproto
deleted file mode 100644
index 035e62e91..000000000
--- a/lang/languages/ku/language.textproto
+++ /dev/null
@@ -1,22 +0,0 @@
-id: "ku"
-name: "Kurdish"
-preferred_name: ""
-autonym: "Kurmancî"
-population: 6773773
-region: "GE"
-region: "TR"
-region: "AZ"
-region: "SY"
-region: "AM"
-region: "DE"
-region: "TM"
-script: "Perso-Arabic"
-script: "Cyrillic"
-script: "Latin"
-exemplar_chars {
-  base: "А Б В Г Д Е Ә Ж З Й К Л М Н О Ӧ П Р С Т У Ф Х Һ Ч Ш Щ Ь Э Ԛ Ԝ а б в г д е ә ж з й к л м н о ӧ п р с т у ф х һ ч ш щ ь э ԛ ԝ \'"
-  auxiliary: "Ḧ Ẍ ḧ ẍ \'"
-  marks: "◌̆ ◌̈"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C Ç D E Ê F G H I Î J K L M N O P Q R S Ş T U Û V W X Y Z"
-}
diff --git a/lang/languages/ku/sampletext.textproto b/lang/languages/ku/sampletext.textproto
deleted file mode 100644
index 77ae4fdad..000000000
--- a/lang/languages/ku/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ku"
diff --git a/lang/languages/ku_Arab/language.textproto b/lang/languages/ku_Arab.textproto
similarity index 80%
rename from lang/languages/ku_Arab/language.textproto
rename to lang/languages/ku_Arab.textproto
index 04d4008c9..0eadf9b9f 100644
--- a/lang/languages/ku_Arab/language.textproto
+++ b/lang/languages/ku_Arab.textproto
@@ -4,8 +4,11 @@ preferred_name: ""
 autonym: ""
 population: 92983
 region: "LB"
-script: "Perso-Arabic"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/kum/language.textproto b/lang/languages/kum.textproto
similarity index 89%
rename from lang/languages/kum/language.textproto
rename to lang/languages/kum.textproto
index 4c1039f59..2f359183f 100644
--- a/lang/languages/kum/language.textproto
+++ b/lang/languages/kum.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/kv/language.textproto b/lang/languages/kv.textproto
similarity index 89%
rename from lang/languages/kv/language.textproto
rename to lang/languages/kv.textproto
index 8b0696b11..d1a41a11f 100644
--- a/lang/languages/kv/language.textproto
+++ b/lang/languages/kv.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё І Ӧ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё і ӧ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/kvr/language.textproto b/lang/languages/kvr.textproto
similarity index 74%
rename from lang/languages/kvr/language.textproto
rename to lang/languages/kvr.textproto
index 1b0f2b759..9f8797528 100644
--- a/lang/languages/kvr/language.textproto
+++ b/lang/languages/kvr.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kvx/language.textproto b/lang/languages/kvx.textproto
similarity index 76%
rename from lang/languages/kvx/language.textproto
rename to lang/languages/kvx.textproto
index 5e430fa8d..f313426e1 100644
--- a/lang/languages/kvx/language.textproto
+++ b/lang/languages/kvx.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/kw/language.textproto b/lang/languages/kw.textproto
similarity index 89%
rename from lang/languages/kw/language.textproto
rename to lang/languages/kw.textproto
index b60ac527b..14db09457 100644
--- a/lang/languages/kw/language.textproto
+++ b/lang/languages/kw.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   marks: "◌̀ ◌̂"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/kxm/language.textproto b/lang/languages/kxm.textproto
similarity index 75%
rename from lang/languages/kxm/language.textproto
rename to lang/languages/kxm.textproto
index 240001384..5fcf18e90 100644
--- a/lang/languages/kxm/language.textproto
+++ b/lang/languages/kxm.textproto
@@ -7,3 +7,6 @@ region: "TH"
 script: "Thai"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "th"
+}
diff --git a/lang/languages/kxp/language.textproto b/lang/languages/kxp.textproto
similarity index 76%
rename from lang/languages/kxp/language.textproto
rename to lang/languages/kxp.textproto
index d9ae69ed0..2409c84ad 100644
--- a/lang/languages/kxp/language.textproto
+++ b/lang/languages/kxp.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/ky.textproto b/lang/languages/ky.textproto
new file mode 100644
index 000000000..849583eb5
--- /dev/null
+++ b/lang/languages/ky.textproto
@@ -0,0 +1,30 @@
+id: "ky"
+name: "Kyrgyz"
+preferred_name: ""
+autonym: "Кыргызча"
+population: 2863152
+region: "KG"
+script: "Cyrillic"
+script: "Latin"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ң Ү Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ң ү ө"
+  auxiliary: "в ф ц щ ь"
+  marks: "◌̆ ◌̈"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
+  index: "А Б В Г Д Е Ё Ж З И Й К Л М Н Ң О Ө П Р С Т У Ү Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я"
+}
+sample_text {
+  masthead_full: "БбАа"
+  masthead_partial: "Рр"
+  tester: "Адамзат үй‐бүлөсүнүн бардык мүчөлөрүнөтаандык болгон жогорку беделди"
+  poster_sm: "адам укуктарын"
+  poster_md: "адам акыркы"
+  poster_lg: "Бардык"
+  specimen_48: "элдердин ортосундагы достук мамилелерди өнүктүрүүгө көмөктөшүү"
+  specimen_36: "Эч ким кулчулукта же эрксиз абалда болууга тийиш эмес; кулчулук менен кул сатуучулуктун бардык түрлөрүнө тыюу салынат."
+  specimen_32: "Ар бир адам, ага конституция жана мыйзам тарабынан берилген негизги укуктары бузулган учурларда компетентүү улуттук соттор тарабынан укуктарын толук калыбына келтирүү укугуна ээ."
+  specimen_21: "Эч ким ээнбаштык менен камакка алынууга, кармалууга же куугунтукталууга тийиш эмес.\nАр бир адам өз укуктары менен милдеттенмелерин аныктоо үчүн жана ага коюлган кылмыш жоопкерчилигинин негиздү үлүгүн аныктоо үчүн толук тең диктин негизинде анын иши маалымдуу түрдө жана көз каранды эмес жана калыс сот тарабынан жана адилеттү үлүктүн бардык талаптарын сактоо менен каралышына жетишү үгөукуктуу."
+  specimen_16: "Эч ким анын жеке жана үй‐бүлөлүк турмушуна ээнбаштык менен кийлигишү үгө, анын турак жайынын кол тийбестигине, анын кат‐кабарларынын жашыруундугуна жеанын намысына жана кадыр‐баркына ээнбаштык менен кол салууга дуушар болушу мү мкү н эмес. Ар бир адам мындай кийлигишүү дөн же ушундай кол салуудан мыйзам тарабынан корголууга укуктуу.\nАр бир адам ой, ыйман, дин эркиндиктерине укуктуу; бул укук өз динин же ынанымын эркинче өзгөртүүнү жана жеке өзү, ошондой эле башкалар менен бирге каалаган динин тутуу же ынануу эркиндигин эл менен бирге же жеке өзүнчө динди үйрөнүүнү, кудайга сыйынууну жана диндик жөрөлгөлүү ырасымдарды аткарууну камтыйт."
+}
diff --git a/lang/languages/ky/language.textproto b/lang/languages/ky/language.textproto
deleted file mode 100644
index a9188cec4..000000000
--- a/lang/languages/ky/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "ky"
-name: "Kyrgyz"
-preferred_name: ""
-autonym: "Кыргызча"
-population: 2863152
-region: "KG"
-script: "Perso-Arabic"
-script: "Cyrillic"
-script: "Latin"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ң Ү Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ң ү ө"
-  auxiliary: "в ф ц щ ь"
-  marks: "◌̆ ◌̈"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
-  index: "А Б В Г Д Е Ё Ж З И Й К Л М Н Ң О Ө П Р С Т У Ү Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я"
-}
diff --git a/lang/languages/ky/sampletext.textproto b/lang/languages/ky/sampletext.textproto
deleted file mode 100644
index 7ccdbf4c1..000000000
--- a/lang/languages/ky/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ky"
diff --git a/lang/languages/ky_Arab/language.textproto b/lang/languages/ky_Arab.textproto
similarity index 80%
rename from lang/languages/ky_Arab/language.textproto
rename to lang/languages/ky_Arab.textproto
index 671ecef95..0076b9119 100644
--- a/lang/languages/ky_Arab/language.textproto
+++ b/lang/languages/ky_Arab.textproto
@@ -4,8 +4,11 @@ preferred_name: ""
 autonym: ""
 population: 473966
 region: "CN"
-script: "Perso-Arabic"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/ky_Latn/language.textproto b/lang/languages/ky_Latn.textproto
similarity index 80%
rename from lang/languages/ky_Latn/language.textproto
rename to lang/languages/ky_Latn.textproto
index ec9a01b23..2b798de26 100644
--- a/lang/languages/ky_Latn/language.textproto
+++ b/lang/languages/ky_Latn.textproto
@@ -4,8 +4,11 @@ preferred_name: ""
 autonym: ""
 population: 1148
 region: "TR"
-script: "Perso-Arabic"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/la.textproto b/lang/languages/la.textproto
new file mode 100644
index 000000000..4cec6ed35
--- /dev/null
+++ b/lang/languages/la.textproto
@@ -0,0 +1,23 @@
+id: "la"
+name: "Latin"
+preferred_name: ""
+autonym: "Latin"
+population: 820
+region: "VA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "OoMm"
+  masthead_partial: "Nn"
+  tester: "Cum dignitatis infixae omnibus humanae familiae partibus et eorum"
+  poster_sm: "Cum hominis"
+  poster_md: "Cum in Carta"
+  poster_lg: "Omnes"
+  specimen_48: "Cum sociae civitates pollicitae sint se affirmaturas esse verecundiam"
+  specimen_36: "Cum quaedam communis conceptio horum jurum et libertatum gravissima sit, ut obligatio haec plane expleatur,"
+  specimen_32: "Omnes homines liberi aequique dignitate atque juribus nascuntur. Ratione conscientiaque praediti sunt et alii erga alios cum fraternitate se gerere debent."
+  specimen_21: "Quisque potest sibi assumere libertates omnes omnesque jures in hac declaratione pronuntiatos, sine ulla distinctione gentis, coloris, sexus, linguae, religionis, politicae sententiae aut omnis generis sententiae, nationis originis aut civitatis, divitiarum aut ortus aut omnis generis situs.\nQuisque jus habet vivere, liber esse et in tuto vivere."
+  specimen_16: "Nemo servitudine tenebitur. Omnes servitudines omnibus modis prohibentur.\nNullus cruciabitur neque poenis nec tractationibus, quae humanae sunt, objicietur.\nQuisque jus habet suam juridicam personam in omnibus locis accipi.\nOmnes ante legem aequi sunt et sine ulla distinctione jus habent aequum praesidium legis habere. Omnes jus habent praesidio aequo contra omnem discrimen qui hanc Declarationem violet et contra omnem incitationem ad talem discrimen.\nOmnis jus habet recurrere pro idoneo judice gentis contra facta violantia jures suffundatos quae sibi recognescuntur a constitutione aut lege."
+}
diff --git a/lang/languages/la/language.textproto b/lang/languages/la/language.textproto
deleted file mode 100644
index 148156210..000000000
--- a/lang/languages/la/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "la"
-name: "Latin"
-preferred_name: ""
-autonym: "Latin"
-population: 820
-region: "VA"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/la/sampletext.textproto b/lang/languages/la/sampletext.textproto
deleted file mode 100644
index 2900c8185..000000000
--- a/lang/languages/la/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "la"
diff --git a/lang/languages/lad.textproto b/lang/languages/lad.textproto
new file mode 100644
index 000000000..57a18f010
--- /dev/null
+++ b/lang/languages/lad.textproto
@@ -0,0 +1,23 @@
+id: "lad"
+name: "Ladino"
+preferred_name: ""
+autonym: "djudeo-espanyol"
+population: 112781
+region: "IL"
+script: "Hebrew"
+exemplar_chars {
+  base: "א ב ׳ ג ד ה ו ז ח ט י כ ך ל מ ם נ ן ס ע פ ף צ ץ ק ר ש ת"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Dd"
+  tester: "Konsiderando ke la libertad, la djustisia i la paz en el mundo"
+  poster_sm: "Konsiderando"
+  poster_md: "La Asamblea"
+  poster_lg: "Todos"
+  specimen_48: "Proklama la prezente Deklarasion Universal de Derechos Umanos"
+  specimen_36: "Konsiderando tambien ke es esensial de favorizar la formasion de relasiones de amistad entre las nasiones,"
+  specimen_32: "Konsiderando ke una konsepsion komun de estos derechos i libertades es de la mas grande importansia para kumplir kompletamente la dicha prometa,"
+  specimen_21: "Konsiderando ke la libertad, la djustisia i la paz en el mundo tienen por baza el rekonosimiento de la dinyidad propia esensial i de los derechos iguales i no violavles de todos los miembros de la famiya umana,\nKonsiderando ke es esensial ke los derechos umanos sean protejados por un rejimen de derecho, para ke el ombre no se veyga ovligado, komo ultimo remedio, de revoltarse kontra la tirania i la opresion,"
+  specimen_16: "Konsiderando ke la libertad, la djustisia i la paz en el mundo tienen por baza el rekonosimiento de la dinyidad propia esensial i de los derechos iguales i no violavles de todos los miembros de la famiya umana,\nKonsiderando ke el deskonosimiento i el despresio de los derechos umanos tienen kavzado aktos de barbaridad ke solevantan la konsensia de la umanidad; i ke fue proklamado komo la aspirasion mas alta del ombre, la yegada de un mundo en el kual los umanos, liberados del espanto i de la mizeria, gozen de la libertad de la palavra i de la libertad de kreensias,"
+}
diff --git a/lang/languages/lad/language.textproto b/lang/languages/lad/language.textproto
deleted file mode 100644
index 8a1e0df53..000000000
--- a/lang/languages/lad/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "lad"
-name: "Ladino"
-preferred_name: ""
-autonym: "djudeo-espanyol"
-population: 112781
-region: "IL"
-script: "Hebrew"
-exemplar_chars {
-  base: "א ב ׳ ג ד ה ו ז ח ט י כ ך ל מ ם נ ן ס ע פ ף צ ץ ק ר ש ת"
-}
diff --git a/lang/languages/lad/sampletext.textproto b/lang/languages/lad/sampletext.textproto
deleted file mode 100644
index e977c21ac..000000000
--- a/lang/languages/lad/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "lad"
diff --git a/lang/languages/lag/language.textproto b/lang/languages/lag.textproto
similarity index 89%
rename from lang/languages/lag/language.textproto
rename to lang/languages/lag.textproto
index f527fd2b9..39a6edb75 100644
--- a/lang/languages/lag/language.textproto
+++ b/lang/languages/lag.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   marks: "◌́"
   index: "A B C D E F G H I Ɨ J K L M N O P Q R S T U Ʉ V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/lah.textproto b/lang/languages/lah.textproto
new file mode 100644
index 000000000..e5c25b3ff
--- /dev/null
+++ b/lang/languages/lah.textproto
@@ -0,0 +1,28 @@
+id: "lah"
+name: "Lahnda"
+preferred_name: ""
+autonym: "ਪੰਜਾਬੀ,"
+population: 93433552
+region: "IN"
+region: "PK"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ݨ ں و ه ھ ء ی ے"
+  auxiliary: "ॐ"
+  marks: "◌ؕ"
+  numerals: "੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "। ॥ ॰"
+}
+sample_text {
+  masthead_full: "سارے"
+  masthead_partial: "نآ"
+  tester: "چونکہ ہر انسان دی ذاتی عزت وقار تے ناقابل انتقال اکو جئے حقوق"
+  poster_sm: "چونکہ انسانی"
+  poster_md: "چونکہ قانون"
+  poster_lg: "سارے"
+  specimen_48: "چونکہ ساریاں قوماں دے آپس دے دوستلنہ تعلقات دا ودھنا ضروری اے"
+  specimen_36: "چونکہ ایہہ عہد پورا کرن دی خاطر ایہناں آزادیاں تے حقوق نوں سب دا چنگی طر حاں سمجھ لینا بہت ضروری اے ۔ ۔"
+  specimen_32: "کسے وی شخص نوں نہ تے کوئی جسمانی اذیت دتی جاسکدی اے نہ اوہدے نال کوئی ظالمانہ تے انسانیت سوز سلوک کیتا جاسکدا اے تے نہ ہی ایس طرحاں دی کوئی بھیڑی سزا دیتی جاسکدی اے ۔ ۔"
+  specimen_21: "ہر شخص دا ایہہ حق اے پئی قانون ہر تھاں لوہدی شخصیت نوں تسلیم کرے ۔ ۔\nقانون دی نظر وچ سب برابر نیں تے قانون کوئی فرق رکھے بغیر ہر کسے وی حفاظت کرے گا ۔ ۔ انسانی حقوق دے ایس عالمی منشور توں ہٹ کے وکھری قسم دے کسے سلوک یا وکھرے سلوک دی ترغیب توں تحفظ دا ہر کوئی حقدار اے ۔ ۔\nہر شخص نوں بااختیار قومی عدالتاں وچ قانون تے آئین دیاں اوہناں خلاف ورزیاں دے خلاف موثر چارہ جوئی دا حق حاصل اے جنہاں دے نتیجے وچ اوہدے انسانی حقوق مارے جاندے ہون ۔ ۔"
+  specimen_16: "کسے وی شخص نوں کسے دی من مرضی اُتے نہ تے گرفتار یا نظر بند کیتا جا سکدا اے تے نہ ہی وطن توں باہر کڈھیا جا سکدا اے ۔ ۔\nہر شخص نوں برابر دا حق حاصل اے پئی اوہدے حقوق تے فرائض طے کرن لئی یا ایہہ فیصلہ کرن لئی پئی اوہدے اُتے جہیڑے جرم دا الزام اے اوہ اوہنے کیتا اے کہ نہیں، کسے غیر جانبدار، آزاد تے کھلی عدالت وچ مقدمہ چلایا جائے ۔ ۔\nکسے وی شخص دی ذاتی زندگی، گھریلو زندگی، اوہدے گھر دے اندرونی معاملات تے لوہدی خط و کتابت وچ نہ تے من مرضی دا کوئی دخل دتا جا سکدا اے تے نہ ہی اوہدی عزت تے نیک نامی دل انگلی اٹھائی جا سکدی اے ۔ ۔ ہر شخص دا ایہہ حق اے پئی قانون اوہنوں ایس قسم دی دخل اندازی یا نیک نامی تے عزت دے نقصان توں محفوظ رکھے ۔ ۔"
+}
diff --git a/lang/languages/lah/language.textproto b/lang/languages/lah/language.textproto
deleted file mode 100644
index d3b8d2fb4..000000000
--- a/lang/languages/lah/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "lah"
-name: "Lahnda"
-preferred_name: ""
-autonym: "ਪੰਜਾਬੀ,"
-population: 93433552
-region: "PK"
-region: "IN"
-script: "Perso-Arabic"
-exemplar_chars {
-  base: "ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ݨ ں و ه ھ ء ی ے"
-  auxiliary: "ॐ"
-  marks: "◌ؕ"
-  numerals: "੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "। ॥ ॰"
-}
diff --git a/lang/languages/lah/sampletext.textproto b/lang/languages/lah/sampletext.textproto
deleted file mode 100644
index 58d1c2ddf..000000000
--- a/lang/languages/lah/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "lah"
diff --git a/lang/languages/laj/language.textproto b/lang/languages/laj.textproto
similarity index 75%
rename from lang/languages/laj/language.textproto
rename to lang/languages/laj.textproto
index d2e2a3adb..79ddf59c8 100644
--- a/lang/languages/laj/language.textproto
+++ b/lang/languages/laj.textproto
@@ -7,3 +7,6 @@ region: "UG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/lb.textproto b/lang/languages/lb.textproto
new file mode 100644
index 000000000..459fb9fed
--- /dev/null
+++ b/lang/languages/lb.textproto
@@ -0,0 +1,28 @@
+id: "lb"
+name: "Luxembourgish"
+preferred_name: ""
+autonym: "Lëtzebuergesch"
+population: 421015
+region: "LU"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Ä È É Ê Ë Î Ô Ö Û Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ß â ä è é ê ë î ô ö û ü"
+  auxiliary: "ẞ"
+  marks: "◌̀ ◌́ ◌̂ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Mm"
+  tester: "Well d\'Unerkennong vun der Dignitéit, déi all Mêmber vun der Mënschefamill"
+  poster_sm: "Well et do,"
+  poster_md: "Well an der"
+  poster_lg: "All"
+  specimen_48: "Well d\'Mëmberstate sech verflicht hu fir an Zesummenaarbecht mat"
+  specimen_36: "PROKLAMÉIERT D\'GENEROLVERSAMMLONG:\nAll Mësch huet Recht op d\'Liewen, op d\'Fräiheet an op d\'Secherheet vu sénger Persoun."
+  specimen_32: "Well eng an déi selwecht Opfaassong iwwer dës Rechter a Fräiheten aus der Mooss wichteg as fir dëst Engagement voll a ganz kënnen duerchzeféieren,"
+  specimen_21: "Well d\'Unerkennong vun der Dignitéit, déi all Mêmber vun der Mënschefamill gebuer as, a vu sénge gläichen an onersetzleche Rechter de Fëllement vun der Fräiheet, der Gerechtegkeet an dem Fridden an der Welt as,\nWell et haaptsächlech drëm geet fir duerch e Rechtssystem Hand iwwer d\'Mënscherechter ze halen an datt de Mënsch doduerch nët forcéiert gët fir säi leschten Auswee an der Revolt géint d\'Tyrannei an d\'Ënnerdrécktgin ze sichen,"
+  specimen_16: "Well d\'Unerkennong vun der Dignitéit, déi all Mêmber vun der Mënschefamill gebuer as, a vu sénge gläichen an onersetzleche Rechter de Fëllement vun der Fräiheet, der Gerechtegkeet an dem Fridden an der Welt as,\nWell et do, wou d\'Mënscherechter nët unerkannt an nët respektéiert gin, zu barbareschen Akte koum, déi d\'Gewësse vun der ganzer Mënschheet revoltéieren a well d\'Schafe vun enger Welt, an deer d\'Mënschen d\'Fräiheet vum Wuert a vum Glaf hun, an deer se fräi si vu Fuurcht an Nout, als dem Mënsch säin héchst Striewe proklaméiert gouf,\nWell et haaptsächlech drëm geet fir duerch e Rechtssystem Hand iwwer d\'Mënscherechter ze halen an datt de Mënsch doduerch nët forcéiert gët fir säi leschten Auswee an der Revolt géint d\'Tyrannei an d\'Ënnerdrécktgin ze sichen,"
+}
diff --git a/lang/languages/lb/language.textproto b/lang/languages/lb/language.textproto
deleted file mode 100644
index 192408501..000000000
--- a/lang/languages/lb/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "lb"
-name: "Luxembourgish"
-preferred_name: ""
-autonym: "Lëtzebuergesch"
-population: 421015
-region: "LU"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Ä È É Ê Ë Î Ô Ö Û Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ß â ä è é ê ë î ô ö û ü"
-  auxiliary: "ẞ"
-  marks: "◌̀ ◌́ ◌̂ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/lb/sampletext.textproto b/lang/languages/lb/sampletext.textproto
deleted file mode 100644
index abdae84d3..000000000
--- a/lang/languages/lb/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "lb"
diff --git a/lang/languages/lbe/language.textproto b/lang/languages/lbe.textproto
similarity index 89%
rename from lang/languages/lbe/language.textproto
rename to lang/languages/lbe.textproto
index 6c466814c..ef220ec33 100644
--- a/lang/languages/lbe/language.textproto
+++ b/lang/languages/lbe.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӏ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӏ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/lbw/language.textproto b/lang/languages/lbw.textproto
similarity index 74%
rename from lang/languages/lbw/language.textproto
rename to lang/languages/lbw.textproto
index f29ae6f9f..d830e5b6e 100644
--- a/lang/languages/lbw/language.textproto
+++ b/lang/languages/lbw.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/lcp/language.textproto b/lang/languages/lcp.textproto
similarity index 76%
rename from lang/languages/lcp/language.textproto
rename to lang/languages/lcp.textproto
index ac7b4b7ba..b52f2e1f6 100644
--- a/lang/languages/lcp/language.textproto
+++ b/lang/languages/lcp.textproto
@@ -3,8 +3,11 @@ name: "Western Lawa"
 preferred_name: ""
 autonym: ""
 population: 87750
-region: "TH"
 region: "CN"
+region: "TH"
 script: "Thai"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "th"
+}
diff --git a/lang/languages/lep/language.textproto b/lang/languages/lep.textproto
similarity index 77%
rename from lang/languages/lep/language.textproto
rename to lang/languages/lep.textproto
index f5f4fc40f..5c2a4687a 100644
--- a/lang/languages/lep/language.textproto
+++ b/lang/languages/lep.textproto
@@ -3,9 +3,12 @@ name: "Lepcha"
 preferred_name: ""
 autonym: ""
 population: 79744
-region: "NP"
 region: "BT"
 region: "IN"
+region: "NP"
 script: "Lepcha"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "lep"
+}
diff --git a/lang/languages/lez/language.textproto b/lang/languages/lez.textproto
similarity index 89%
rename from lang/languages/lez/language.textproto
rename to lang/languages/lez.textproto
index 31f7d39bc..5e379f281 100644
--- a/lang/languages/lez/language.textproto
+++ b/lang/languages/lez.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӏ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӏ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/lg.textproto b/lang/languages/lg.textproto
new file mode 100644
index 000000000..9a70349c0
--- /dev/null
+++ b/lang/languages/lg.textproto
@@ -0,0 +1,25 @@
+id: "lg"
+name: "Ganda"
+preferred_name: ""
+autonym: "Luganda"
+population: 5622890
+region: "UG"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G I J K L M N O P R S T U V W Y Z Ŋ a b c d e f g i j k l m n o p r s t u v w y z ŋ"
+  auxiliary: "H Q X h q x"
+  index: "A B C D E F G I J K L M N Ŋ O P R S T U V W Y Z"
+}
+sample_text {
+  masthead_full: "AaBb"
+  masthead_partial: "Nn"
+  tester: "Ekitiibwa ky\'omuntu eky\'obutonde; okwenkanankana, wamu n\'obuyinza"
+  poster_sm: "Obanga abantu"
+  poster_md: "Ekibiina"
+  poster_lg: "Abantu"
+  specimen_48: "Amawanga g\'amemba geeyamye okukolaganira awamu n\'ekibiina ky\'Amawanga"
+  specimen_36: "Okutegeera obulungi obuyinza (rughts) n\'eddembe ly\'obuntu kikulu nnyo mu kutuukiriza obweyamo obwo mubujjuvu."
+  specimen_32: "Buli muntu ateekwa okukkirizibwa okutwala ensonga ze mu mbuga entuufu ez\'eggwanga zikolebweko singa nga eddembe lyerimuweebwa mu Constitution ne mu mateeka liba lijolongeddwa."
+  specimen_21: "Tewali muntu anakwatibwanga oba okusibibwanga oba okusibibwa oba okuwangangusibwa mu ngeri etegoberera mateeka.\nBuli muntu awatali kusosola, ateekwa okuwozesebwa mu lwatu ate mu bwenkanya mu kooti eyeemala era eterina kyekubira, bwabanga annonya okukakasa onuyinza obumuweebwa mu mateeka singa waliwo omusango ogumenya amateeka ogumuvunaanibwa."
+  specimen_16: "Eddembe ly\'omuntu yenna eyo gyabera amaka ge era n\'ebbaluwa ze tebitaataganyizzibwe nga oba okwazibwa mu ngeri etegoberera mateeka, so n\'erinnya lye teriweebuulwenga oba okulebulwa. Buli muntu ateekwa okukuumibwa amateeka aleme kutaataaganyizibwa oba okulumbibwa mu ngeri eyo.\nBuli muntu alina eddembe ery\'okwerowooleza okwawula ekirungi n\'ekibi n\'okulondawo eddini gyanasoma. Eddembe lino lizingiramu obuyinza okukyusa eddini oba enzikiriza ye, n\'obuyinza obubwe ku lulwe oba wamu n\'abantu abalala, mu lwatu oba mu kyama, okwolesa eddini oba enzikiriza ye, ngayigiriza oba ngateeka mu nkola eddini ye byemulagira, nga asinza oba ngakuuma byemugamba."
+}
diff --git a/lang/languages/lg/language.textproto b/lang/languages/lg/language.textproto
deleted file mode 100644
index ec521ca5b..000000000
--- a/lang/languages/lg/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "lg"
-name: "Ganda"
-preferred_name: ""
-autonym: "Luganda"
-population: 5622890
-region: "UG"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G I J K L M N O P R S T U V W Y Z Ŋ a b c d e f g i j k l m n o p r s t u v w y z ŋ"
-  auxiliary: "H Q X h q x"
-  index: "A B C D E F G I J K L M N Ŋ O P R S T U V W Y Z"
-}
diff --git a/lang/languages/lg/sampletext.textproto b/lang/languages/lg/sampletext.textproto
deleted file mode 100644
index 2424d3c79..000000000
--- a/lang/languages/lg/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "lg"
diff --git a/lang/languages/li/language.textproto b/lang/languages/li.textproto
similarity index 75%
rename from lang/languages/li/language.textproto
rename to lang/languages/li.textproto
index e3081f200..0101d4965 100644
--- a/lang/languages/li/language.textproto
+++ b/lang/languages/li.textproto
@@ -7,3 +7,6 @@ region: "NL"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/lif/language.textproto b/lang/languages/lif.textproto
similarity index 78%
rename from lang/languages/lif/language.textproto
rename to lang/languages/lif.textproto
index aa0630a1e..934147e4b 100644
--- a/lang/languages/lif/language.textproto
+++ b/lang/languages/lif.textproto
@@ -3,9 +3,12 @@ name: "Limbu"
 preferred_name: ""
 autonym: ""
 population: 368085
-region: "NP"
 region: "IN"
+region: "NP"
 script: "Devanagari"
 script: "Limbu"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "lif"
+}
diff --git a/lang/languages/lij.textproto b/lang/languages/lij.textproto
new file mode 100644
index 000000000..a1d691557
--- /dev/null
+++ b/lang/languages/lij.textproto
@@ -0,0 +1,24 @@
+id: "lij"
+name: "Ligurian"
+preferred_name: ""
+autonym: "Ligure"
+population: 536663
+region: "IT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â Ä Æ È É Ê Ë Ì Í Î Ï Ò Ó Ô Ö Ù Ú a b c d e f g h i j k l m n o p q r s t u v w x y z à á â ä æ è é ê ë ì í î ï ò ó ô ö ù ú"
+  marks: "◌̀ ◌́ ◌̂ ◌̈"
+}
+sample_text {
+  masthead_full: "TtUu"
+  masthead_partial: "Ee"
+  tester: "Conscideròu che o riconoscimento da pròpia dignitæ e di driti"
+  poster_sm: "Conscideròu"
+  poster_md: "a proclamma"
+  poster_lg: "Tutte"
+  specimen_48: "Tutte e personn-e nascian libere e pæge in dignitæ e driti. Son"
+  specimen_36: "Nisciun o saiâ sotomisso a scciavitù ni a servitù; a scciavitù e a træta de scciavi son proibie in tutte e forme."
+  specimen_32: "Ògni personn-a a gh’à drito a ’n ordine sociale e internaçionale into quæ i driti e e libertæ proclamæ inte questa Diciaraçion vegnan conpletamente efetivi."
+  specimen_21: "Ninte inte questa diciaraçion o poriâ ese interpretòu comme inplicante do drito, pe quæ se segge Stato, gruppo ò personn-a, a ezercitâ de ativitæ ò a portâ avanti di atti pe-a distruçion di driti ò de libertæ inte lê proclamæ.\nConscideròu che o riconoscimento da pròpia dignitæ e di driti pægi e inalienabili de tutti i menbri da famiggia umann-a o l’é o fondamento da libertæ, da giustiçia e da paxe into mondo,"
+  specimen_16: "Conscideròu che o riconoscimento da pròpia dignitæ e di driti pægi e inalienabili de tutti i menbri da famiggia umann-a o l’é o fondamento da libertæ, da giustiçia e da paxe into mondo,\nConscideròu che a negaçion e o desprexo di driti de personn-e an acaxonòu di atti de barbaritæ che an ofeizo a coscensa de l’umanitæ; e che l’é stæto proclamòu comme ciù erta aspiraçion de l’òmmo l’arivo de ’n mondo into quæ tutti, liberæ da-a poia e da-a mizeia, gödian da libertæ de paròlla e de creddo,\nConscideròu che l’é esensiale che i driti de personn-e segian protezui da de lezze giuridiche perché l’òmmo o no s’atreuve costreito, in urtima istansa, a-a rebelion contra a tirania e l’òprescion,"
+}
diff --git a/lang/languages/lij/language.textproto b/lang/languages/lij/language.textproto
deleted file mode 100644
index af46a4aff..000000000
--- a/lang/languages/lij/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "lij"
-name: "Ligurian"
-preferred_name: ""
-autonym: "Ligure"
-population: 536663
-region: "IT"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â Ä Æ È É Ê Ë Ì Í Î Ï Ò Ó Ô Ö Ù Ú a b c d e f g h i j k l m n o p q r s t u v w x y z à á â ä æ è é ê ë ì í î ï ò ó ô ö ù ú"
-  marks: "◌̀ ◌́ ◌̂ ◌̈"
-}
diff --git a/lang/languages/lij/sampletext.textproto b/lang/languages/lij/sampletext.textproto
deleted file mode 100644
index 77397deef..000000000
--- a/lang/languages/lij/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "lij"
diff --git a/lang/languages/lis/language.textproto b/lang/languages/lis.textproto
similarity index 73%
rename from lang/languages/lis/language.textproto
rename to lang/languages/lis.textproto
index d6f68f614..62b358743 100644
--- a/lang/languages/lis/language.textproto
+++ b/lang/languages/lis.textproto
@@ -7,3 +7,6 @@ region: "CN"
 script: "Fraser"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "lis"
+}
diff --git a/lang/languages/ljp/language.textproto b/lang/languages/ljp.textproto
similarity index 75%
rename from lang/languages/ljp/language.textproto
rename to lang/languages/ljp.textproto
index 1e9f39208..e34ca48ea 100644
--- a/lang/languages/ljp/language.textproto
+++ b/lang/languages/ljp.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/lki/language.textproto b/lang/languages/lki.textproto
similarity index 75%
rename from lang/languages/lki/language.textproto
rename to lang/languages/lki.textproto
index 42d73927e..f984e4b94 100644
--- a/lang/languages/lki/language.textproto
+++ b/lang/languages/lki.textproto
@@ -7,3 +7,6 @@ region: "IR"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/lkt/language.textproto b/lang/languages/lkt.textproto
similarity index 93%
rename from lang/languages/lkt/language.textproto
rename to lang/languages/lkt.textproto
index f9cfc52c6..abf4a33f1 100644
--- a/lang/languages/lkt/language.textproto
+++ b/lang/languages/lkt.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . \" “ ” ( ) \\[ \\] @ * / \\& #"
   index: "A B Č E G Ǧ H Ȟ I K L M N Ŋ O P S Š T U W Y Z Ž"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/lmn/language.textproto b/lang/languages/lmn.textproto
similarity index 75%
rename from lang/languages/lmn/language.textproto
rename to lang/languages/lmn.textproto
index 17673fc86..827a5fe72 100644
--- a/lang/languages/lmn/language.textproto
+++ b/lang/languages/lmn.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Telugu"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "te"
+}
diff --git a/lang/languages/lmo/language.textproto b/lang/languages/lmo.textproto
similarity index 89%
rename from lang/languages/lmo/language.textproto
rename to lang/languages/lmo.textproto
index 5dd192fd6..e5b5e9f6a 100644
--- a/lang/languages/lmo/language.textproto
+++ b/lang/languages/lmo.textproto
@@ -3,10 +3,13 @@ name: "Lombard"
 preferred_name: ""
 autonym: "Lombard"
 population: 363284
-region: "IT"
 region: "CH"
+region: "IT"
 script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á È É Ì Í Ò Ó Ô Ø Ù Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à á è é ì í ò ó ô ø ù ü"
   marks: "◌̀ ◌́ ◌̂ ◌̈"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ln.textproto b/lang/languages/ln.textproto
new file mode 100644
index 000000000..c49b70855
--- /dev/null
+++ b/lang/languages/ln.textproto
@@ -0,0 +1,30 @@
+id: "ln"
+name: "Lingala"
+preferred_name: ""
+autonym: "Lingala"
+population: 3514491
+region: "AO"
+region: "CD"
+region: "CF"
+region: "CG"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I K L M N O P R S T U V W Y Z Á Â É Ê Í Î Ó Ô Ú Ě Ǎ Ǐ Ǒ Ɔ Ɛ a b c d e f g h i k l m n o p r s t u v w y z á â é ê í î ó ô ú ě ǎ ǐ ǒ ɔ ɛ"
+  auxiliary: "J Q X j q x"
+  marks: "◌́ ◌̂ ◌̌"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C D E Ɛ F G {Gb} H I K L M {Mb} {Mp} N {Nd} {Ng} {Nk} {Ns} {Nt} {Ny} {Nz} O Ɔ P R S T U V W Y Z"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Tt"
+  tester: "Na botáláká ’te kondima limɛmya ya bato nyɔ́nsɔ ya molɔ́ngɔ́ mpé"
+  poster_sm: "Na botáláká"
+  poster_md: "Bato nyɔ́nsɔ"
+  poster_lg: "Bato"
+  specimen_48: "Moto nyɔ́nsɔ azalí na makokí mpé bonsɔ́mí nyɔ́nsɔ óyo elimbólámí"
+  specimen_36: "Moto nyɔ́nsɔ azalí na likokí ya kozala na bomɔi, na kozala nsɔ́mí mpé kozala motéma nsɛi na bomoto na yě."
+  specimen_32: "Moto nyɔ́nsɔ azalí na likokí ya bopémisi mpé bopémisi nzóto, míngi ya bozwi eleko ya sémbo ya boúmélí na mosálá mpé na bozwi lifúta na bakonzi ya mbala na mbala."
+  specimen_21: "Moto nyɔ́nsɔ azalí na likokí ’te káti ya bato mpé bikólo, nyɔ́nsɔ ebóngá mpɔ̂ te makokí mpé bonsɔ́mí oyo ekomámí káti ya Lisakoli oyo elónga.\nMobéko atá mɔ̌kɔ́ tɛ́ ya Lisangá óyo ekokí kozala mpɔ̂ na Lɛ́ta, na lisangá ya bato, tǒ na moto, likokí ya kosála likambo óyo ekonyata makokí mpé bonsɔ́mí áwa.\nNa botáláká ’te esengélí koléndisa boyókani na káti ya bikólo,"
+  specimen_16: "Na botáláká ’te kondima limɛmya ya bato nyɔ́nsɔ ya molɔ́ngɔ́ mpé makokí ma bangó óyo ezalí ndéngé mɔ̌kɔ́ mpé bakokí kopímela moto tɛ́ ezalí ntína ya bonsɔ́mí, bosémbo mpé kímyá káti ya molɔ́ngɔ́. Na botáláká ’te komɔ́na mpámba mpé kobóya kotósa esengeli ya moto ebátelama na bokonzi ya bosémbo mpɔ̂ ’te, na sima yangó, moto ákóma na botɔmbɔki esóngó na minyɔ́kɔli tɛ́,\nNa botáláká ’te esengélí koléndisa boyókani na káti ya bikólo,\nNa botáláká ’te kozala bato nyɔ́nsɔ na makanisi ndéngé mɔ̌kɔ́ mpɔ̂ na makokí mpé bonsɔ́mí yangó, ezalí na ntína monɛ́nɛ mpɔ̂ ’te óyo bakáni elónga,\nBato nyɔ́nsɔ na mbótama bazalí nsɔ́mí mpé bakókání na limɛmya mpé makokí. Bazalí na mayɛ́lɛ mpé basengélí kovánda na bondeko o káti na bangó."
+}
diff --git a/lang/languages/ln/language.textproto b/lang/languages/ln/language.textproto
deleted file mode 100644
index eeec7fe3e..000000000
--- a/lang/languages/ln/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "ln"
-name: "Lingala"
-preferred_name: ""
-autonym: "Lingala"
-population: 3514491
-region: "AO"
-region: "CF"
-region: "CG"
-region: "CD"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I K L M N O P R S T U V W Y Z Á Â É Ê Í Î Ó Ô Ú Ě Ǎ Ǐ Ǒ Ɔ Ɛ a b c d e f g h i k l m n o p r s t u v w y z á â é ê í î ó ô ú ě ǎ ǐ ǒ ɔ ɛ"
-  auxiliary: "J Q X j q x"
-  marks: "◌́ ◌̂ ◌̌"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C D E Ɛ F G {Gb} H I K L M {Mb} {Mp} N {Nd} {Ng} {Nk} {Ns} {Nt} {Ny} {Nz} O Ɔ P R S T U V W Y Z"
-}
diff --git a/lang/languages/ln/sampletext.textproto b/lang/languages/ln/sampletext.textproto
deleted file mode 100644
index e4d16bf80..000000000
--- a/lang/languages/ln/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ln"
diff --git a/lang/languages/lo.textproto b/lang/languages/lo.textproto
new file mode 100644
index 000000000..651dc387b
--- /dev/null
+++ b/lang/languages/lo.textproto
@@ -0,0 +1,28 @@
+id: "lo"
+name: "Lao"
+preferred_name: ""
+autonym: "ພາສາລາວ"
+population: 5138706
+region: "LA"
+script: "Lao"
+exemplar_chars {
+  base: "ກ ຂ ຄ ງ ຈ ສ ຊ ຍ ດ ຕ ຖ ທ ນ ບ ປ ຜ ຝ ພ ຟ ມ ຢ ຣ ລ ວ ຫ ອ ຮ ະ າ ເ ແ ໂ ໃ ໄ ຽ"
+  auxiliary: "\\u200B ໐ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙"
+  marks: "◌ັ ◌ິ ◌ີ ◌ຶ ◌ື ◌ຸ ◌ູ ◌ົ ◌ຼ ◌່ ◌້ ◌໊ ◌໋ ◌໌ ◌ໍ"
+  numerals: "໐ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "ຯ ໆ"
+  index: "ກ ຂ ຄ ງ ຈ ສ ຊ ຍ ດ ຕ ຖ ທ ນ ບ ປ ຜ ຝ ພ ຟ ມ ຢ ຣ ລ ວ ຫ {ຫງ} {ຫຍ} {ຫນ} {ຫມ} {ຫລ} {ຫວ} ອ ຮ"
+}
+sample_text {
+  masthead_full: "ມະນດ"
+  masthead_partial: "ເກ"
+  tester: "ດ້ວຍເຫດວ່າ: ການຮັບຮູ້ກຽດຕິສັກອັນມີປະຈຳຢູ່ຕົວບຸກຄົນໃນວົງສະກຸນຂອງມະນຸດທຸກໆຄົນ ແລະ ການຮັບຮູ້ສິດສະເໝີພາບ"
+  poster_sm: "ກອງປະຊຸມໃຫຍ"
+  poster_md: "ຂໍ້ 2.ອີກປະການໜື່ງ"
+  poster_lg: "ແລະ"
+  specimen_48: "ບໍ່ມີຜູ້ໃດເລີຍທີ່ຈະຕ້ອງຖືວ່າ:ມີອາການເປັນທາດ ແລະ ເປັນຂ້ອຍເປັນຂ້າການເປັນທາດ ແລະ ຂ້າທາດນັ້ນ"
+  specimen_36: "ບຸກຄົນທຸກຄົນມີສິດທີ່ຈະມີການສະຫງົບເກີດຂື້ນໃນດ້ານສັງຄົມ ແລະ ໃນດ້ານຕ່າງປະເທດເພື່ອຈະໃຫ້ມີສິດ ແລະ ເສລີພາບທັງມວນທີ່ໄດ້ກ່າວໃນໃບປະກາດສະບັບນີ້ດຳເນີນໄປຢ່າງສັກສິດສົມບູນ."
+  specimen_32: "ຂໍ້ໃດຂໍ້ໜື່ງໃນປະກາດສະບັບນີ້ບໍ່ໃຫ້ເອົາຕິດຄວາມເຂົ້າໄປໃນທາງອັນກ່ຽວແກ່ສິດໃດສິດໜື່ງສະລັບລັດໃດລັດໜື່ງ ໝູ່ຄະນະໃດຄະນະໜື່ງ ຫຼື ບຸກຄົນໃດບຸກຄົນໜື່ງທີ່ຈະດຳເນີນຫຼື ປະຕິບັດການອັນມຸ້ງທຳລາຍສິດ ແລະ ເສລີພາບທັງມວນຢູ່ໃນປະກາດສະບັບນີ້."
+  specimen_21: "ດ້ວຍເຫດວ່າ: ການຮັບຮູ້ກຽດຕິສັກອັນມີປະຈຳຢູ່ຕົວບຸກຄົນໃນວົງສະກຸນຂອງມະນຸດທຸກໆຄົນ ແລະ ການຮັບຮູ້ສິດສະເໝີພາບ ແລະ ສະເຖຍລະພາບຂອງບຸກຄົນເຫຼົ່ານັ້ນ ປະກອບເປັນຮາກຖານຂອງສິດເສລີພາບ ຍຸດຕິທຳ ແລະ ສັນຕິພາບຂອງໂລກ.\nດ້ວຍເຫດວ່າ: ການບໍ່ຮັບຮູ້ ແລະ ໜີ່ນປະໝາດຕໍ່ສິດຂອງມະນຸດນັ້ນໄດ້ເປັນຕົ້ນເຫດໃຫ້ເກີດການກະທຳຢ່າງປ່າເຖື່ອນຊື່ງຈະເຮັດໃຫ້ແຄ້ນໃຈຕໍ່ມະໂນທຳຂອງມະນຸດ ແລະ ເຫັນວ່າການນຳຊື່ງໂລກມະນຸດທີ່ຈະມີອິດສະຫຼະໃນການສະແດງຄວາມເວົ້າ ແລະ ຄວາມເຊື່ອຖືຊື່ງຈະພົ້ນຈາກຄວາມຫວາດຫວັ່ນ ຢ້ານກົວ ແລະ ຍາກຈົນຂົ້ນແຄ້ນນັ້ນໄດ້ຖືກປະກາດວ່າ: ເປັນຄວາມປາຖະໜາອັນຍອດຍີ່ງຂອງມະນຸດ."
+  specimen_16: "ດ້ວຍເຫດວ່າ: ການຮັບຮູ້ກຽດຕິສັກອັນມີປະຈຳຢູ່ຕົວບຸກຄົນໃນວົງສະກຸນຂອງມະນຸດທຸກໆຄົນ ແລະ ການຮັບຮູ້ສິດສະເໝີພາບ ແລະ ສະເຖຍລະພາບຂອງບຸກຄົນເຫຼົ່ານັ້ນ ປະກອບເປັນຮາກຖານຂອງສິດເສລີພາບ ຍຸດຕິທຳ ແລະ ສັນຕິພາບຂອງໂລກ.\nດ້ວຍເຫດວ່າ: ການບໍ່ຮັບຮູ້ ແລະ ໜີ່ນປະໝາດຕໍ່ສິດຂອງມະນຸດນັ້ນໄດ້ເປັນຕົ້ນເຫດໃຫ້ເກີດການກະທຳຢ່າງປ່າເຖື່ອນຊື່ງຈະເຮັດໃຫ້ແຄ້ນໃຈຕໍ່ມະໂນທຳຂອງມະນຸດ ແລະ ເຫັນວ່າການນຳຊື່ງໂລກມະນຸດທີ່ຈະມີອິດສະຫຼະໃນການສະແດງຄວາມເວົ້າ ແລະ ຄວາມເຊື່ອຖືຊື່ງຈະພົ້ນຈາກຄວາມຫວາດຫວັ່ນ ຢ້ານກົວ ແລະ ຍາກຈົນຂົ້ນແຄ້ນນັ້ນໄດ້ຖືກປະກາດວ່າ: ເປັນຄວາມປາຖະໜາອັນຍອດຍີ່ງຂອງມະນຸດ.\nດ້ວຍເຫດວ່າ: ມີຄວາມສຳຄັນທີ່ຕ້ອງລະບຽບສິດປ້ອງກັນສິດທັງຫຼາຍຂອງມະນຸດເພື່ອບໍ່ໃຫ້ບຸກຄົນຖືກບັງຄັບໃຈໃຫ້ຕໍ່ສູ້ຄວາມບຽດບຽນຂ້ຽວແຂ້ນແລະຄວາມກົດຂີ່ຂົ່ມເຫງຈົນເຫຼືອວິໃສ.\nດ້ວຍເຫດວ່າ: ເປັນຂໍ້ສຳຄັນທີ່ຕ້ອງເຊີດຊູສຳພັນທະໄມຕີລະຫວ່າງປະເທດຊາດໃຫ້ດີຍີ່ງຂື້ນ;"
+}
diff --git a/lang/languages/lo/language.textproto b/lang/languages/lo/language.textproto
deleted file mode 100644
index b071e88c7..000000000
--- a/lang/languages/lo/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "lo"
-name: "Lao"
-preferred_name: ""
-autonym: "ພາສາລາວ"
-population: 5138706
-region: "LA"
-script: "Lao"
-exemplar_chars {
-  base: "ກ ຂ ຄ ງ ຈ ສ ຊ ຍ ດ ຕ ຖ ທ ນ ບ ປ ຜ ຝ ພ ຟ ມ ຢ ຣ ລ ວ ຫ ອ ຮ ະ າ ເ ແ ໂ ໃ ໄ ຽ"
-  auxiliary: "\\u200B ໐ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙"
-  marks: "◌ັ ◌ິ ◌ີ ◌ຶ ◌ື ◌ຸ ◌ູ ◌ົ ◌ຼ ◌່ ◌້ ◌໊ ◌໋ ◌໌ ◌ໍ"
-  numerals: "໐ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "ຯ ໆ"
-  index: "ກ ຂ ຄ ງ ຈ ສ ຊ ຍ ດ ຕ ຖ ທ ນ ບ ປ ຜ ຝ ພ ຟ ມ ຢ ຣ ລ ວ ຫ {ຫງ} {ຫຍ} {ຫນ} {ຫມ} {ຫລ} {ຫວ} ອ ຮ"
-}
diff --git a/lang/languages/lo/sampletext.textproto b/lang/languages/lo/sampletext.textproto
deleted file mode 100644
index 47de60d0c..000000000
--- a/lang/languages/lo/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "lo"
diff --git a/lang/languages/lol/language.textproto b/lang/languages/lol.textproto
similarity index 74%
rename from lang/languages/lol/language.textproto
rename to lang/languages/lol.textproto
index 03c286dca..be0a75139 100644
--- a/lang/languages/lol/language.textproto
+++ b/lang/languages/lol.textproto
@@ -7,3 +7,6 @@ region: "CD"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/loz.textproto b/lang/languages/loz.textproto
new file mode 100644
index 000000000..e00c61a85
--- /dev/null
+++ b/lang/languages/loz.textproto
@@ -0,0 +1,24 @@
+id: "loz"
+name: "Lozi"
+preferred_name: ""
+autonym: "siLozi"
+population: 1045596
+region: "ZM"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N Ñ O P S T U W Y Z a b c d e f g h i j k l m n ñ o p s t u w y z ʼ"
+  marks: "◌̃"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Tt"
+  tester: "Kinto ye zibahala kuli mutu kaufela mwa lifasi ki yena makalelo"
+  poster_sm: "Ili nto ye"
+  poster_md: "Kinto ya"
+  poster_lg: "Batu"
+  specimen_48: "Mi hape inge ili nto ya butokwa ku zwiseapili silikani mwa hala\'"
+  specimen_36: "Mi ki nto ya butokwa kuba ni kutwisiso ya liswanelo ze mi tukuluho ki yona ya butokwa kuli muhato wo u kone ku petahala,"
+  specimen_32: "Batu kaufela ba pepilwe inge ba lukuluhile ni liswanelo ze swana. Ba ba ni swanelo ya ku nahana mi ba swanela ku ba ni likezo za buzwale ku mutu yo mung\'wi."
+  specimen_21: "Mutu kaufela u na ni swanelo ya tukuluho ili ye ng\'ozwi mwa tumelelano, ku sina ku talima kuli yo ki mang\'i, sina ka mushobo, mubala, munna kapa musali tumelo, lipolitki kapa minahano, naha kwa zwa, sifumu sa na ni sona kapa ka mwa pepezwi ni zeng\'wi cwalo.\nHa kuna ketululo ye ka lumelezwa bakeng\'i sa lipolitiki kapa bakeng\'i sa naha kwa zwa mutu yo kapa i be naha ye buswa ki naha yeng\'wi."
+  specimen_16: "Mang\'i ni mang\'i u na ni swanelo ya ku pila, ku lukuluha ni silelezo.\nHa kuna ya ka piliswa mwa butaga kapa ku sebeliswa; butanga ni tekisano ya butanga haina ku lumelezwa ne ba hanyinyani.\nHa kuna ya ka utwiswa butuku kapa ku nyandiswa, ku nyefulwe kapa ku fiwa koto ku sina mulatu.\nMang\'i ni mang\'i u na ni swanelo ya ku izibahaza kai ni kai sina mutu fapila\' mulao.\nBatu kaufela ba swana fa pila\' mulao mi kona kuli mutu kaufela u na ni swanelo ya silelezo ya mulao ku sina ku ketululwa. Mutu kaufela u na ni swanelo ye swana ni ba ban\'wi ili ya silelezo ya mulao ku sina ketululo kakuli kaku eza cwalo ba loba mulao wa tumelelano wo."
+}
diff --git a/lang/languages/loz/language.textproto b/lang/languages/loz/language.textproto
deleted file mode 100644
index aa1835796..000000000
--- a/lang/languages/loz/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "loz"
-name: "Lozi"
-preferred_name: ""
-autonym: "siLozi"
-population: 1045596
-region: "ZM"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N Ñ O P S T U W Y Z a b c d e f g h i j k l m n ñ o p s t u w y z ʼ"
-  marks: "◌̃"
-}
diff --git a/lang/languages/loz/sampletext.textproto b/lang/languages/loz/sampletext.textproto
deleted file mode 100644
index 124161c83..000000000
--- a/lang/languages/loz/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "loz"
diff --git a/lang/languages/lrc/language.textproto b/lang/languages/lrc.textproto
similarity index 94%
rename from lang/languages/lrc/language.textproto
rename to lang/languages/lrc.textproto
index b8e72bf1c..6a0c28db7 100644
--- a/lang/languages/lrc/language.textproto
+++ b/lang/languages/lrc.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ ، ٫ ٬ ؛ \\: ! ؟ . … ‹ › « » ( ) \\[ \\] * / \\\\"
   index: "آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ھ و ی"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/lt.textproto b/lang/languages/lt.textproto
new file mode 100644
index 000000000..5472a604a
--- /dev/null
+++ b/lang/languages/lt.textproto
@@ -0,0 +1,29 @@
+id: "lt"
+name: "Lithuanian"
+preferred_name: ""
+autonym: "Lietuviškai"
+population: 2357094
+region: "LT"
+region: "PL"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ą Č Ė Ę Į Š Ū Ų Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ą č ė ę į š ū ų ž"
+  auxiliary: "á à ã {ą\\u0301} {ą\\u0303} {ch} {dz} {dž} é è ẽ {ę\\u0301} {ę\\u0303} {ė\\u0301} {ė\\u0303} {i\\u0307\\u0301}í {i\\u0307\\u0300}ì {i\\u0307\\u0303}ĩ {į\\u0301}{į\\u0307\\u0301} {į\\u0303}{į\\u0307\\u0303} {j\\u0303}{j\\u0307\\u0303} {l\\u0303} {m\\u0303} ñ ó ò õ q {r\\u0303} ú ù ũ {ų\\u0301} {ų\\u0303} {ū\\u0301} {ū\\u0303} w x"
+  marks: "◌̄ ◌̇ ◌̌ ◌̨"
+  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … “ „ ( ) \\[ \\] \\{ \\}"
+  index: "A Ą B C Č D E Ę Ė F G H I Į Y J K L M N O P R S Š T U Ų Ū V Z Ž"
+}
+sample_text {
+  masthead_full: "VvIi"
+  masthead_partial: "Ss"
+  tester: "Atsižvelgdama į tai, kad visiems žmonių giminės nariams būdingo"
+  poster_sm: "atsižvelgdama"
+  poster_md: "Generalinė"
+  poster_lg: "Visi"
+  specimen_48: "skelbia ią Visuotinę žmogaus teisių deklaraciją, kaip visuotinį"
+  specimen_36: "Niekas negali būti kankinamas arba žiauriai, nežmoniškai žeminant jo orumą su juo elgiamasi ir jis baudžiamas."
+  specimen_32: "Atsižvelgdama į tai, kad visiems žmonių giminės nariams būdingo orumo ir lygių bei neatimamų teisių pripainimas yra laisvės, teisingumo ir taikos pasaulyje pagrindas;"
+  specimen_21: "Atsižvelgdama į tai, kad visiems žmonių giminės nariams būdingo orumo ir lygių bei neatimamų teisių pripainimas yra laisvės, teisingumo ir taikos pasaulyje pagrindas;\natsižvelgdama į tai, kad žmogaus teisių visiškas nepaisymas ir niekinimas pastūméjo vykdyti barbariškus aktus, piktinančius žmonijos sąžinę, o sukūrimas pasaulio, kuriame žmonės turės žodžio ir įsitikinimų laisvę ir bus išlaisvinti iš baimės ir skurdo pančių, paskelbtas kaip kilniausias žmogaus siekimas;"
+  specimen_16: "Atsižvelgdama į tai, kad visiems žmonių giminės nariams būdingo orumo ir lygių bei neatimamų teisių pripainimas yra laisvės, teisingumo ir taikos pasaulyje pagrindas;\natsižvelgdama į tai, kad žmogaus teisių visiškas nepaisymas ir niekinimas pastūméjo vykdyti barbariškus aktus, piktinančius žmonijos sąžinę, o sukūrimas pasaulio, kuriame žmonės turės žodžio ir įsitikinimų laisvę ir bus išlaisvinti iš baimės ir skurdo pančių, paskelbtas kaip kilniausias žmogaus siekimas;\natsižvelgdama į tai, jog būtinai reikia, kad žmogaus teises saugotų įstaymo galia, dėl to, kad jis nebūtų priverstas imtis, kaip kraštutinės priemonės, sukilimo prieš tironiją ir priespaudą;"
+}
diff --git a/lang/languages/lt/language.textproto b/lang/languages/lt/language.textproto
deleted file mode 100644
index 0db374b1b..000000000
--- a/lang/languages/lt/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "lt"
-name: "Lithuanian"
-preferred_name: ""
-autonym: "Lietuviškai"
-population: 2357094
-region: "LT"
-region: "PL"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ą Č Ė Ę Į Š Ū Ų Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ą č ė ę į š ū ų ž"
-  auxiliary: "á à ã {ą\\u0301} {ą\\u0303} {ch} {dz} {dž} é è ẽ {ę\\u0301} {ę\\u0303} {ė\\u0301} {ė\\u0303} {i\\u0307\\u0301}í {i\\u0307\\u0300}ì {i\\u0307\\u0303}ĩ {į\\u0301}{į\\u0307\\u0301} {į\\u0303}{į\\u0307\\u0303} {j\\u0303}{j\\u0307\\u0303} {l\\u0303} {m\\u0303} ñ ó ò õ q {r\\u0303} ú ù ũ {ų\\u0301} {ų\\u0303} {ū\\u0301} {ū\\u0303} w x"
-  marks: "◌̄ ◌̇ ◌̌ ◌̨"
-  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … “ „ ( ) \\[ \\] \\{ \\}"
-  index: "A Ą B C Č D E Ę Ė F G H I Į Y J K L M N O P R S Š T U Ų Ū V Z Ž"
-}
diff --git a/lang/languages/lt/sampletext.textproto b/lang/languages/lt/sampletext.textproto
deleted file mode 100644
index 212a51567..000000000
--- a/lang/languages/lt/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "lt"
diff --git a/lang/languages/ltg/language.textproto b/lang/languages/ltg.textproto
similarity index 89%
rename from lang/languages/ltg/language.textproto
rename to lang/languages/ltg.textproto
index e10794c47..3cb6454e7 100644
--- a/lang/languages/ltg/language.textproto
+++ b/lang/languages/ltg.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "Q W X q w x"
   marks: "◌̄ ◌̌ ◌̧"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/lu/language.textproto b/lang/languages/lu.textproto
similarity index 91%
rename from lang/languages/lu/language.textproto
rename to lang/languages/lu.textproto
index 0b4827c15..90899ca52 100644
--- a/lang/languages/lu/language.textproto
+++ b/lang/languages/lu.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E F H I J K L M N O P Q S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/lua.textproto b/lang/languages/lua.textproto
new file mode 100644
index 000000000..2cd104832
--- /dev/null
+++ b/lang/languages/lua.textproto
@@ -0,0 +1,23 @@
+id: "lua"
+name: "Luba-Lulua"
+preferred_name: ""
+autonym: "Tshiluba"
+population: 9770880
+region: "CD"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P S T U V W Y Z a b c d e f g h i j k l m n o p s t u v w y z"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Nn"
+  tester: "Pa kumona ne, kwitaba se bantu bonsu ba pa buloba badi ne buneme"
+  poster_sm: "Pa kumona ne,"
+  poster_md: "Pa kumona"
+  poster_lg: "Bantu"
+  specimen_48: "Pa kumona ne matunga a Nsangila wa Buka-bisamba (ONU) adi mashindike"
+  specimen_36: "Pa kumona ne bwa kukumbaja mapangadika aa, bidi bimpe bantu bonsu bikale ne ngumvwilu umwe wa budikadidi ne makokeshi aa;"
+  specimen_32: "Bantu bonsu badi baledibwa badikadile ne badi ne makokeshi amwe. Badi ne lungenyi lwa bumuntu ne kondo ka moyo, badi ne bwa kwenzelangana malu mu buwetu."
+  specimen_21: "Budikadidi ne makokeshi mafunda mu Mapangadika aa bidi bitangila muntu yonsu, kakuyi disunguluja bisamba, mubidi wa makoba a bantu, bulume anyi bukaji, mwakulu, ntendelelu, ngumvwilu wa malu a cididi anyi dyela dya meji kana onsu, ditunga dya muntu; bubanji anyi bupele, mwaba wa cilelelu ne a mishindu kana yonsu."
+  specimen_16: "Kabidi kabyena bikengela kansungansunga ku malu a cididi, a bunzuji a bukwa matunga anyi a mu ditunga didi muntu ufumina, nansha dyodyo didikadile anyi dikale ku bukenji anyi ku bupika bwa dikwabu.\nMuntu yonso udi ne bukookeshi bwa kwikala ne moyo, kudiikadila ne kusoma talala mu bumuntu bwende.\nMuntu nansha umwe kena mwa kukwaciibwa ku bupika bwalu mushinga wa bapika mmukandikiibwe mu mishindu yawu yonsu.\nMuntu nansha umwe kena mwa kukengeshiibwa anyi kupeshibwa bibawu bya kanyawu bidi kabiyi byakanyina bantu anyi bidi mwa kubapwekesha mulongo.\nMuntu yonsu udi ne bukenji bwa kumanyibwa my myaba yonsu mu bumuntu bwende."
+}
diff --git a/lang/languages/lua/language.textproto b/lang/languages/lua/language.textproto
deleted file mode 100644
index 5f03656a4..000000000
--- a/lang/languages/lua/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "lua"
-name: "Luba-Lulua"
-preferred_name: ""
-autonym: "Tshiluba"
-population: 9770880
-region: "CD"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P S T U V W Y Z a b c d e f g h i j k l m n o p s t u v w y z"
-}
diff --git a/lang/languages/lua/sampletext.textproto b/lang/languages/lua/sampletext.textproto
deleted file mode 100644
index 81493db60..000000000
--- a/lang/languages/lua/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "lua"
diff --git a/lang/languages/luo/language.textproto b/lang/languages/luo.textproto
similarity index 88%
rename from lang/languages/luo/language.textproto
rename to lang/languages/luo.textproto
index c79a4d74b..2e0247d20 100644
--- a/lang/languages/luo/language.textproto
+++ b/lang/languages/luo.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "q x z"
   index: "A B C D E F G H I J K L M N O P R S T U V W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/luy/language.textproto b/lang/languages/luy.textproto
similarity index 85%
rename from lang/languages/luy/language.textproto
rename to lang/languages/luy.textproto
index 271da9576..18ca25329 100644
--- a/lang/languages/luy/language.textproto
+++ b/lang/languages/luy.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "a b c d e f g h i j k l m n o p q r s t u v w x y z"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/luz/language.textproto b/lang/languages/luz.textproto
similarity index 76%
rename from lang/languages/luz/language.textproto
rename to lang/languages/luz.textproto
index 66025fc61..7948c565f 100644
--- a/lang/languages/luz/language.textproto
+++ b/lang/languages/luz.textproto
@@ -7,3 +7,6 @@ region: "IR"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/lv.textproto b/lang/languages/lv.textproto
new file mode 100644
index 000000000..f9dd6d62d
--- /dev/null
+++ b/lang/languages/lv.textproto
@@ -0,0 +1,28 @@
+id: "lv"
+name: "Latvian"
+preferred_name: ""
+autonym: "Latviešu"
+population: 1147550
+region: "LV"
+script: "Latin"
+exemplar_chars {
+  base: "A Ā B C Č D E Ē F G Ģ H I Ī J K Ķ L Ļ M N Ņ O P R S Š T U Ū V Z Ž a ā b c č d e ē f g ģ h i ī j k ķ l ļ m n ņ o p r s š t u ū v z ž"
+  auxiliary: "Q W X Y q w x y"
+  marks: "◌̄ ◌̌ ◌̧"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ ‚ \" “ ” „ ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A Ā B C Č D E Ē F G Ģ H I Ī Y J K Ķ L Ļ M N Ņ O P Q R S Š T U Ū V W X Z Ž"
+}
+sample_text {
+  masthead_full: "VvIi"
+  masthead_partial: "Ss"
+  tester: "Ievērojot, ka visiem cilvēku sabiedrības locekļiem piemītošās"
+  poster_sm: "ievērojot, ka"
+  poster_md: "ievērojot,"
+  poster_lg: "Visi"
+  specimen_48: "ievērojot, ka nepieciešams veicināt draudzīgu attiecību attīstību"
+  specimen_36: "ievērojot, ka šo tiesību un brīvību vispārējai izpratnei ir milzīga nozīme šīs apņemšanās pilnīgai īstenošanai,"
+  specimen_32: "Visi cilvēki piedzimst brīvi un vienlīdzīgi savā pašcieņā un tiesībās. Viņi ir apveltīti ar saprātu un sirdsapziņu, un viņiem jāizturas citam pret citu brālības garā."
+  specimen_21: "Ikvienam ir tiesības uz visām šajā Deklarācijā pasludinātajām tiesībām un brīvībām, bez jebkāda veida atšķirības pēc rases, ādas krāsas, dzimuma, valodas, reliģijas, politiskās vai citas pārliecības, nacionālās vai sociālās izcelsmes, mantiskā stāvokļa, dzimšanas vai cita statusa.\nIkvienam ir tiesības uz dzīvību, brīvību un personas neaizskaramību."
+  specimen_16: "Nevienu nedrīkst turēt verdzībā vai dzimtbūtniecībā; visa veida verdzība un vergu tirdzniecība ir jāaizliedz.\nNevienu nedrīkst pakļaut spīdzināšanai vai cietsirdīgi, necilvēcīgi ar viņu apieties vai sodīt, pazemojot viņa cilvēcisko cieņu.\nIkvienam, visur, ir tiesības būt atzītam par personu likuma priekšā.\nVisi ir vienlīdzīgi likuma priekšā un viņiem ir tiesības, bez jebkādas diskriminācijas, uz vienādu likuma aizsardzību. Visiem ir tiesības uz vienādu aizsardzību pret jebkādu diskrimināciju, pārkāpjot šo Deklarāciju, un pret jebkuru kūdīšanu uz tādu diskrimināciju."
+}
diff --git a/lang/languages/lv/language.textproto b/lang/languages/lv/language.textproto
deleted file mode 100644
index e218f2000..000000000
--- a/lang/languages/lv/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "lv"
-name: "Latvian"
-preferred_name: ""
-autonym: "Latviešu"
-population: 1147550
-region: "LV"
-script: "Latin"
-exemplar_chars {
-  base: "A Ā B C Č D E Ē F G Ģ H I Ī J K Ķ L Ļ M N Ņ O P R S Š T U Ū V Z Ž a ā b c č d e ē f g ģ h i ī j k ķ l ļ m n ņ o p r s š t u ū v z ž"
-  auxiliary: "Q W X Y q w x y"
-  marks: "◌̄ ◌̌ ◌̧"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ ‚ \" “ ” „ ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A Ā B C Č D E Ē F G Ģ H I Ī Y J K Ķ L Ļ M N Ņ O P Q R S Š T U Ū V W X Z Ž"
-}
diff --git a/lang/languages/lv/sampletext.textproto b/lang/languages/lv/sampletext.textproto
deleted file mode 100644
index b0342b0a4..000000000
--- a/lang/languages/lv/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "lv"
diff --git a/lang/languages/lwl/language.textproto b/lang/languages/lwl.textproto
similarity index 75%
rename from lang/languages/lwl/language.textproto
rename to lang/languages/lwl.textproto
index f00c1bf12..bbae1136a 100644
--- a/lang/languages/lwl/language.textproto
+++ b/lang/languages/lwl.textproto
@@ -7,3 +7,6 @@ region: "TH"
 script: "Thai"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "th"
+}
diff --git a/lang/languages/lzh/language.textproto b/lang/languages/lzh.textproto
similarity index 76%
rename from lang/languages/lzh/language.textproto
rename to lang/languages/lzh.textproto
index 31165094d..a4e9ea5ef 100644
--- a/lang/languages/lzh/language.textproto
+++ b/lang/languages/lzh.textproto
@@ -7,3 +7,6 @@ region: "CN"
 script: "Simplified Han"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "zh"
+}
diff --git a/lang/languages/lzz/language.textproto b/lang/languages/lzz.textproto
similarity index 76%
rename from lang/languages/lzz/language.textproto
rename to lang/languages/lzz.textproto
index 1feb3ee01..eed6daf2f 100644
--- a/lang/languages/lzz/language.textproto
+++ b/lang/languages/lzz.textproto
@@ -8,3 +8,6 @@ script: "Georgian"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "lzz"
+}
diff --git a/lang/languages/mad.textproto b/lang/languages/mad.textproto
new file mode 100644
index 000000000..efc39edfd
--- /dev/null
+++ b/lang/languages/mad.textproto
@@ -0,0 +1,27 @@
+id: "mad"
+name: "Madurese"
+preferred_name: ""
+autonym: "Madhurâ"
+population: 16822638
+region: "ID"
+script: "Latin"
+exemplar_chars {
+  base: "ꦄ ꦅ ꦆ ꦇ ꦈ ꦉ ꦊ ꦋ ꦌ ꦍ ꦎ ꦏ ꦐ ꦒ ꦓ ꦔ ꦕ ꦗ ꦚ ꦛ ꦝ ꦞ ꦟ ꦠ ꦢ ꦣ ꦤ ꦥ ꦦ ꦧ ꦨ ꦩ ꦪ ꦫ ꦭ ꦮ ꦯ ꦱ ꦲ"
+  auxiliary: "ꦑ ꦖ ꦘ ꦙ ꦜ ꦡ ꦬ ꦰ"
+  marks: "◌ꦀ ◌ꦁ ◌ꦂ ◌ꦃ ◌꦳ ◌ꦴ ◌ꦵ ◌ꦶ ◌ꦷ ◌ꦸ ◌ꦹ ◌ꦺ ◌ꦻ ◌ꦼ ◌ꦽ ◌ꦾ ◌ꦿ ◌꧀"
+  numerals: "꧐ ꧑ ꧒ ꧓ ꧔ ꧕ ꧖ ꧗ ꧘ ꧙ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "ꧏ ꧞ ꧟ ꧁ ꧂ ꧃ ꧄ ꧅ ꧆ ꧇ ꧈ ꧉ ꧊ ꧋ ꧌ ꧍"
+}
+sample_text {
+  masthead_full: "SsAa"
+  masthead_partial: "Dd"
+  tester: "Saestona pangakowan drajat secara koddrat klaban hak se dha-padha"
+  poster_sm: "Saestona manabi"
+  poster_md: "Saestona"
+  poster_lg: "Sadajana"
+  specimen_48: "Saestona bangsa-bangsa dhari Perserikatan Bangsa-Bangsa e dhalem"
+  specimen_36: "Sabban oreng agaduwi hak istirahat ban prei, tamasok batessa jam-jam alako, klaban are-are prei se opana tetep ebajar."
+  specimen_32: "Sabban oreng agadhuwi hak dha\' tatanan sosial ban internasional, se hak-hak ban kabebasan-kabebasan ekasebut dhalem Parnyataan paneka kengeng elakone sadajana."
+  specimen_21: "Tadha hal dhari dhalem Parnyataan paneka kengeng etafsiragi a beri\' sala settong nagara, kelompok otaba sala settong oreng, hak kaangguy e dhalem kalakoan ponapa bisaos, otaba alakone settong kalakoan se gadhuan tojjuan marosak hak-hak ban kabebasan-kabebasan se ka\'dimma bisaos kasebut dhalem Parnyataan paneka."
+  specimen_16: "Saestona pangakowan drajat secara koddrat klaban hak se dha-padha sareng muttlak dhari sadajana anggota kaluwarga manossa enggi panika dasar dhari kamardikaan, keadilan sareng perdamaian e dunnya.\nSaestona manabi tak agateyagi sareng nganggep enteng hak-hak epon manossa badhi adaddiyagi kalakowan-kalakowan bengges se bisa mapeggel ate nuraniepon umat manossa; wujudepon settong dhunnya, palenggiyanna manossa se badhi arassaagi kenikmatan, kebebasan angocappagi pamanggi ban keyakinan sareng kebebasan dhari rassa tako\' ban kemeskenan ampon daddi pernyataan aspirasi paleng tenggi dhari sadajana ra\'yat biyasa."
+}
diff --git a/lang/languages/mad/language.textproto b/lang/languages/mad/language.textproto
deleted file mode 100644
index 0dacc1799..000000000
--- a/lang/languages/mad/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "mad"
-name: "Madurese"
-preferred_name: ""
-autonym: "Madhurâ"
-population: 16822638
-region: "ID"
-script: "Latin"
-exemplar_chars {
-  base: "ꦄ ꦅ ꦆ ꦇ ꦈ ꦉ ꦊ ꦋ ꦌ ꦍ ꦎ ꦏ ꦐ ꦒ ꦓ ꦔ ꦕ ꦗ ꦚ ꦛ ꦝ ꦞ ꦟ ꦠ ꦢ ꦣ ꦤ ꦥ ꦦ ꦧ ꦨ ꦩ ꦪ ꦫ ꦭ ꦮ ꦯ ꦱ ꦲ"
-  auxiliary: "ꦑ ꦖ ꦘ ꦙ ꦜ ꦡ ꦬ ꦰ"
-  marks: "◌ꦀ ◌ꦁ ◌ꦂ ◌ꦃ ◌꦳ ◌ꦴ ◌ꦵ ◌ꦶ ◌ꦷ ◌ꦸ ◌ꦹ ◌ꦺ ◌ꦻ ◌ꦼ ◌ꦽ ◌ꦾ ◌ꦿ ◌꧀"
-  numerals: "꧐ ꧑ ꧒ ꧓ ꧔ ꧕ ꧖ ꧗ ꧘ ꧙ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "ꧏ ꧞ ꧟ ꧁ ꧂ ꧃ ꧄ ꧅ ꧆ ꧇ ꧈ ꧉ ꧊ ꧋ ꧌ ꧍"
-}
diff --git a/lang/languages/mad/sampletext.textproto b/lang/languages/mad/sampletext.textproto
deleted file mode 100644
index e75803422..000000000
--- a/lang/languages/mad/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mad"
diff --git a/lang/languages/maf/language.textproto b/lang/languages/maf.textproto
similarity index 74%
rename from lang/languages/maf/language.textproto
rename to lang/languages/maf.textproto
index ddf4c6f53..9f8e516ce 100644
--- a/lang/languages/maf/language.textproto
+++ b/lang/languages/maf.textproto
@@ -7,3 +7,6 @@ region: "CM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mag.textproto b/lang/languages/mag.textproto
new file mode 100644
index 000000000..9250c45b1
--- /dev/null
+++ b/lang/languages/mag.textproto
@@ -0,0 +1,27 @@
+id: "mag"
+name: "Magahi"
+preferred_name: ""
+autonym: "मगही"
+population: 15913080
+region: "IN"
+script: "Devanagari"
+exemplar_chars {
+  base: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ऎ ऒ ॳ ॴ ॵ ʼ ‌ ‍"
+  auxiliary: "ॐ"
+  marks: "◌ँ ◌ं ◌ः ◌ऺ ◌ऻ ◌़ ◌ा ◌ि ◌ी ◌ु ◌ू ◌ृ ◌ॆ ◌े ◌ै ◌ॊ ◌ो ◌ौ ◌् ◌ॏ"
+  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "। ॥ ॰"
+}
+sample_text {
+  masthead_full: "सबलग"
+  masthead_partial: "आज"
+  tester: "सभे के ओकर उचित सम्मान तथा मानव परिवार के सब सदस्य के बराबरी के हक ही विश्व समुदाय"
+  poster_sm: "मानवाधिकार के उल्लंघन"
+  poster_md: "यदि कोइयो तानाशाही"
+  poster_lg: "आजादे"
+  specimen_48: "संयुक्त राष्ट्र के लोग सब अपन चार्टर में मौलिक मानवाधिकार, मानव के सम्मान और उपयोगिता तथा"
+  specimen_36: "सभे के ओकर उचित सम्मान तथा मानव परिवार के सब सदस्य के बराबरी के हक ही विश्व समुदाय के स्वतंत्रता, न्याय और शांति के बुनियाद हई।\nअब, एही से,\nमहासभा,"
+  specimen_32: "मानवाधिकार के उल्लंघन हरदम से अमानवीय काम के बजह से ही होव हई। जेकरा से मानवता के अंतकरण दु:खी होव हई। एक आम आदमी के सबसे बड़ा इच्छा इहे होव हई कि ए दुनिया में ओकरा भाषण और विचार के आजादी मीले साथ ही भय और इच्छा से भी मुक्ति मीले।"
+  specimen_21: "सभे के ओकर उचित सम्मान तथा मानव परिवार के सब सदस्य के बराबरी के हक ही विश्व समुदाय के स्वतंत्रता, न्याय और शांति के बुनियाद हई।\nमानवाधिकार के उल्लंघन हरदम से अमानवीय काम के बजह से ही होव हई। जेकरा से मानवता के अंतकरण दु:खी होव हई। एक आम आदमी के सबसे बड़ा इच्छा इहे होव हई कि ए दुनिया में ओकरा भाषण और विचार के आजादी मीले साथ ही भय और इच्छा से भी मुक्ति मीले।\nयदि कोइयो तानाशाही या दमन के खिलाफ बगावत करे लेले मजबूर हई त ओकरा कानून से ओकर मानवाधिकार के सुरक्षा के इंतजाम होए के चाहीं। इहो आवश्यक हई कि राष्ट्र सब के बीच दोस्ती बढ़ाएल जाए।"
+  specimen_16: "सभे के ओकर उचित सम्मान तथा मानव परिवार के सब सदस्य के बराबरी के हक ही विश्व समुदाय के स्वतंत्रता, न्याय और शांति के बुनियाद हई।\nमानवाधिकार के उल्लंघन हरदम से अमानवीय काम के बजह से ही होव हई। जेकरा से मानवता के अंतकरण दु:खी होव हई। एक आम आदमी के सबसे बड़ा इच्छा इहे होव हई कि ए दुनिया में ओकरा भाषण और विचार के आजादी मीले साथ ही भय और इच्छा से भी मुक्ति मीले।\nयदि कोइयो तानाशाही या दमन के खिलाफ बगावत करे लेले मजबूर हई त ओकरा कानून से ओकर मानवाधिकार के सुरक्षा के इंतजाम होए के चाहीं। इहो आवश्यक हई कि राष्ट्र सब के बीच दोस्ती बढ़ाएल जाए।\nसंयुक्त राष्ट्र के लोग सब अपन चार्टर में मौलिक मानवाधिकार, मानव के सम्मान और उपयोगिता तथा आदमी और औरत के बराबर अधिकार के प्रति अपन विश्वास जतेलकई हन। साथ ही उ आर स्वतंत्रता के माहौल में सामाजिक प्रगति तथा जीवन के स्तर के बढ़ावे लेल भी दृढ़ निश्चय कएलकई हन।"
+}
diff --git a/lang/languages/mag/language.textproto b/lang/languages/mag/language.textproto
deleted file mode 100644
index 0ed6e140b..000000000
--- a/lang/languages/mag/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "mag"
-name: "Magahi"
-preferred_name: ""
-autonym: "मगही"
-population: 15913080
-region: "IN"
-script: "Devanagari"
-exemplar_chars {
-  base: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ऎ ऒ ॳ ॴ ॵ ʼ ‌ ‍"
-  auxiliary: "ॐ"
-  marks: "◌ँ ◌ं ◌ः ◌ऺ ◌ऻ ◌़ ◌ा ◌ि ◌ी ◌ु ◌ू ◌ृ ◌ॆ ◌े ◌ै ◌ॊ ◌ो ◌ौ ◌् ◌ॏ"
-  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "। ॥ ॰"
-}
diff --git a/lang/languages/mag/sampletext.textproto b/lang/languages/mag/sampletext.textproto
deleted file mode 100644
index d6737f303..000000000
--- a/lang/languages/mag/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mag"
diff --git a/lang/languages/mai/language.textproto b/lang/languages/mai.textproto
similarity index 95%
rename from lang/languages/mai/language.textproto
rename to lang/languages/mai.textproto
index a3f4b3b6c..2522320c8 100644
--- a/lang/languages/mai/language.textproto
+++ b/lang/languages/mai.textproto
@@ -3,8 +3,8 @@ name: "Maithili"
 preferred_name: ""
 autonym: "मैथिली"
 population: 19249149
-region: "NP"
 region: "IN"
+region: "NP"
 script: "Devanagari"
 exemplar_chars {
   base: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ऎ ऒ ॳ ॴ ॵ ʼ ऽ ‌ ‍"
@@ -14,3 +14,6 @@ exemplar_chars {
   punctuation: "। ॥ ॰"
   index: "\\u093C अ {अ\\u0902} {अः} आ इ ई उ ऊ ऋ ऌ ॡ ए ऐ ओ औ क {क\\u094Dष} ख ग घ च छ ज {ज\\u094Dञ} झ ञ ट ठ ड {ड\\u0902} ढ ण त {त\\u094Dर} थ द ध न प फ ब भ म य र ल व श {श\\u094Dर} ष स ह"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/mak/language.textproto b/lang/languages/mak.textproto
similarity index 74%
rename from lang/languages/mak/language.textproto
rename to lang/languages/mak.textproto
index 7467482df..1455ad90e 100644
--- a/lang/languages/mak/language.textproto
+++ b/lang/languages/mak.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/man.textproto b/lang/languages/man.textproto
new file mode 100644
index 000000000..c4d92253f
--- /dev/null
+++ b/lang/languages/man.textproto
@@ -0,0 +1,26 @@
+id: "man"
+name: "Mandingo"
+preferred_name: ""
+autonym: "Maninkakan"
+population: 630460
+region: "GM"
+script: "Latin"
+script: "N’Ko"
+exemplar_chars {
+  base: "ߐ ߏ ߎ ߍ ߌ ߋ ߊ ߙ ߘ ߗ ߖ ߕ ߔ ߓ ߡ ߟ ߞ ߝ ߜ ߛ ߚ ߒ ߦ ߥ ߤ ߣ ߢ"
+  marks: "◌߫ ◌߬ ◌߭ ◌߮ ◌߯ ◌߰ ◌߱"
+  numerals: "߀ ߁ ߂ ߃ ߄ ߅ ߆ ߇ ߈ ߉"
+}
+sample_text {
+  masthead_full: "AaDd"
+  masthead_partial: "Mm"
+  tester: "Bani fabadenɲa tɔmasere le ye, hɔrɔya ni telen ani jususuma di"
+  poster_sm: "Bani adamaya"
+  poster_md: "Bani jamana"
+  poster_lg: "bɛɛ"
+  specimen_48: "Bani alu bara alu kan di fana, ko alu di adamaya lafasa, ka adamaden"
+  specimen_36: "Mɔɔ bɛɛ di se i makasila i la jamana sariya bonnu la ni bila kɛda i la tɔɲɛli sila ma, ni wo tɛ sariya sila ma."
+  specimen_32: "Bani adamaya lasabati lɔnbaliya ni a la gboyaɲɛ le nanin benkanni di mɛn ka mɔɔlu lamuriti, ka kɛ sababu di fana ka mɔɔlu kunna fulen, ka alu lɔ hɔrɔya ɲinina ka alu bɔ misikinaya dɔ,"
+  specimen_21: "Bani fabadenɲa tɔmasere le ye, hɔrɔya ni telen ani jususuma di dunuɲa dɔ,\nBani adamaya lasabati lɔnbaliya ni a la gboyaɲɛ le nanin benkanni di mɛn ka mɔɔlu lamuriti, ka kɛ sababu di fana ka mɔɔlu kunna fulen, ka alu lɔ hɔrɔya ɲinina ka alu bɔ misikinaya dɔ,\nBani adamaya lakanda ye wajibi le di, fo jamana ye kɛ jamana dafani le di sariya bolo ma, wole ye a kɛla mɔɔlu tɛ muriti ka don jɛdɛ makadan waa la,"
+  specimen_16: "Bani fabadenɲa tɔmasere le ye, hɔrɔya ni telen ani jususuma di dunuɲa dɔ,\nBani adamaya lasabati lɔnbaliya ni a la gboyaɲɛ le nanin benkanni di mɛn ka mɔɔlu lamuriti, ka kɛ sababu di fana ka mɔɔlu kunna fulen, ka alu lɔ hɔrɔya ɲinina ka alu bɔ misikinaya dɔ,\nBani adamaya lakanda ye wajibi le di, fo jamana ye kɛ jamana dafani le di sariya bolo ma, wole ye a kɛla mɔɔlu tɛ muriti ka don jɛdɛ makadan waa la,\nBani jamanalu la tɛɛbɛn ni alu la kaninteya ye fen ne di mɛn kakan ka sɛnbɛnteya,\nBani jamana mɛnnu ye \"ONU\" dɛkuruba kɔnɔ, wolu bara alu kan di ko alu di adamaden nakadan, ka a lawuriki ka ban ka cɛ ni muno lakaɲa ko bɛɛ dɔ,"
+}
diff --git a/lang/languages/man/language.textproto b/lang/languages/man/language.textproto
deleted file mode 100644
index 1a18b34c4..000000000
--- a/lang/languages/man/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "man"
-name: "Mandingo"
-preferred_name: ""
-autonym: "Maninkakan"
-population: 630460
-region: "GM"
-script: "Latin"
-script: "N’Ko"
-exemplar_chars {
-  base: "ߐ ߏ ߎ ߍ ߌ ߋ ߊ ߙ ߘ ߗ ߖ ߕ ߔ ߓ ߡ ߟ ߞ ߝ ߜ ߛ ߚ ߒ ߦ ߥ ߤ ߣ ߢ"
-  marks: "◌߫ ◌߬ ◌߭ ◌߮ ◌߯ ◌߰ ◌߱"
-  numerals: "߀ ߁ ߂ ߃ ߄ ߅ ߆ ߇ ߈ ߉"
-}
diff --git a/lang/languages/man/sampletext.textproto b/lang/languages/man/sampletext.textproto
deleted file mode 100644
index bd86e299c..000000000
--- a/lang/languages/man/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "man"
diff --git a/lang/languages/man_Nkoo/language.textproto b/lang/languages/man_Nkoo.textproto
similarity index 78%
rename from lang/languages/man_Nkoo/language.textproto
rename to lang/languages/man_Nkoo.textproto
index 062f85889..c5461e245 100644
--- a/lang/languages/man_Nkoo/language.textproto
+++ b/lang/languages/man_Nkoo.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 script: "N’Ko"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "bm"
+}
diff --git a/lang/languages/mas/language.textproto b/lang/languages/mas.textproto
similarity index 92%
rename from lang/languages/mas/language.textproto
rename to lang/languages/mas.textproto
index 786655c15..363302212 100644
--- a/lang/languages/mas/language.textproto
+++ b/lang/languages/mas.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   marks: "◌̀ ◌́ ◌̂"
   index: "A B C D E Ɛ G H I Ɨ J K L M N Ŋ O Ɔ P R S T U Ʉ W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/maz.textproto b/lang/languages/maz.textproto
new file mode 100644
index 000000000..d46481fd2
--- /dev/null
+++ b/lang/languages/maz.textproto
@@ -0,0 +1,24 @@
+id: "maz"
+name: "Central Mazahua"
+preferred_name: ""
+autonym: "Jñatrjo"
+population: 437410
+region: "MX"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E G H I J L M N Ñ O P R S T U V X Z Ⱥ Ɇ Ʉ a b c d e g h i j l m n ñ o p r s t u v x z \' ⱥ ɇ ʉ"
+  marks: "◌̃ ◌̱ ◌̵"
+}
+sample_text {
+  masthead_full: "TtEe"
+  masthead_partial: "Xx"
+  tester: "Panru̸ji k\'u̸ mara mimiji na joo texe yo nte̱\'e̱ in dya ra chu̱nji, numa"
+  poster_sm: "Panru̸ji k\'u̸"
+  poster_md: "Nu jmunte̱"
+  poster_lg: "Texe"
+  specimen_48: "Nu Jña\'a yo Pjosu̸ Texe ye Te̱\'e̱ nuyo Ka̸nra̸ a xese ne Xoñijomu̸ ngeje"
+  specimen_36: "Texe b\'ezo o nrrixo pesi yo mboste kja xiskuama, nujua jango ra ts\'apu̸ji yo oru̸, nzakja nu kjuama yo ri pesigoji ye Me\'bonrro."
+  specimen_32: "Nu xiskuamana so\'o k\'u̸ ra ts\'a texto yo jñiñi yo ja̸ra̸ a xese nu xoñijomu̸ o ye nte̱\'e̱, ngek\'ua ra soo ra ts\'aji ye ts\'ibepji nu ra mbosu̸ texe ye te̱\'e̱ nza kja ga mamu̸ na xiskuamana."
+  specimen_21: "Panru̸ji k\'u̸ mara mimiji na joo texe yo nte̱\'e̱ in dya ra chu̱nji, numa so\'o k\'u̸ ra mamu̸ji k\'u̸ ri chjekjoji texezgoji.\nPanru̸ji k\'u̸ ma dya ri pjechiji texto yo jña\'a nuyo nrra pjosu̸ ye nte̱\'e̱, nudyama so\'o k\'u̸ ra potr\'u̸ji yo in Kjuarma; ngek\'ua nesta nura mbaraji k\'u̸ ye nte̱\'e̱, ma sa̸ja̸ kja ne xoñi jomu̸, na kjuana k\'u̸ rambesi nura zi\'i, ra so\'o mamu̸ nu in jña\'a ñeje ra eme nu K\'inchi angeze."
+  specimen_16: "Panru̸ji k\'u̸ mara mimiji na joo texe yo nte̱\'e̱ in dya ra chu̱nji, numa so\'o k\'u̸ ra mamu̸ji k\'u̸ ri chjekjoji texezgoji.\nPanru̸ji k\'u̸ ma dya ri pjechiji texto yo jña\'a nuyo nrra pjosu̸ ye nte̱\'e̱, nudyama so\'o k\'u̸ ra potr\'u̸ji yo in Kjuarma; ngek\'ua nesta nura mbaraji k\'u̸ ye nte̱\'e̱, ma sa̸ja̸ kja ne xoñi jomu̸, na kjuana k\'u̸ rambesi nura zi\'i, ra so\'o mamu̸ nu in jña\'a ñeje ra eme nu K\'inchi angeze.\nPanru̸ji k\'u̸ nuyo jña\'a yo pjosu̸ ye nte̱\'e̱ ximi nesta ra k\'uatr\'u̸ kja xiskuama, ngek\'ua dya ra chu̱\'u̱nji.\nPanru̸ji k\'u̸ nesta ra mimi na jo\'o texto ye tr\'ajñiñi.\nPanru̸ji k\'u̸ yo jñiñi ye jmuru̸ kja nu tr\'angumu̸ a xoñijomu̸, o dyu̸su̸ji ye jña\'a kja naja xiskuama, jango mamu̸ yo nrra pjosu̸ yo nte̱\'e̱ ñeje mamu̸ k\'u̸ yo b\'ezo ñe ye nrrixo chjetroji, kjana xits\'iji k\'u̸ ra mbox k\'u̸ji nura jok\'u̸ji jango ri mimiji nu padya."
+}
diff --git a/lang/languages/maz/language.textproto b/lang/languages/maz/language.textproto
deleted file mode 100644
index dc5441ae4..000000000
--- a/lang/languages/maz/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "maz"
-name: "Central Mazahua"
-preferred_name: ""
-autonym: "Jñatrjo"
-population: 437410
-region: "MX"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E G H I J L M N Ñ O P R S T U V X Z Ⱥ Ɇ Ʉ a b c d e g h i j l m n ñ o p r s t u v x z \' ⱥ ɇ ʉ"
-  marks: "◌̃ ◌̱ ◌̵"
-}
diff --git a/lang/languages/maz/sampletext.textproto b/lang/languages/maz/sampletext.textproto
deleted file mode 100644
index a6885e973..000000000
--- a/lang/languages/maz/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "maz"
diff --git a/lang/languages/mdf/language.textproto b/lang/languages/mdf.textproto
similarity index 90%
rename from lang/languages/mdf/language.textproto
rename to lang/languages/mdf.textproto
index 5b9eb8774..1c660e14a 100644
--- a/lang/languages/mdf/language.textproto
+++ b/lang/languages/mdf.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/mdh/language.textproto b/lang/languages/mdh.textproto
similarity index 75%
rename from lang/languages/mdh/language.textproto
rename to lang/languages/mdh.textproto
index 5a736a113..ff25bb8c1 100644
--- a/lang/languages/mdh/language.textproto
+++ b/lang/languages/mdh.textproto
@@ -7,3 +7,6 @@ region: "PH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mdr/language.textproto b/lang/languages/mdr.textproto
similarity index 74%
rename from lang/languages/mdr/language.textproto
rename to lang/languages/mdr.textproto
index 42d1dba5e..16e220128 100644
--- a/lang/languages/mdr/language.textproto
+++ b/lang/languages/mdr.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/men.textproto b/lang/languages/men.textproto
new file mode 100644
index 000000000..784641e27
--- /dev/null
+++ b/lang/languages/men.textproto
@@ -0,0 +1,24 @@
+id: "men"
+name: "Mende"
+preferred_name: ""
+autonym: "Mɛnde yia"
+population: 1813082
+region: "LR"
+region: "SL"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E Ɛ F G H I J K L M N O Ɔ P S T U V W Y a b d e ɛ f g h i j k l m n o ɔ p s t u v w y"
+}
+sample_text {
+  masthead_full: "NnUu"
+  masthead_partial: "Mm"
+  tester: "A jifa kiliyei na kɛ numu vuu kpɛlɛɛ ti maa hɛwulei lɔ towa kpaupau"
+  poster_sm: "A jifa maa"
+  poster_md: "Kɛɛ nuvuu"
+  poster_lg: "Kpɛlɛɛ"
+  specimen_48: "A jifa ndɔlei nasia ti dunyi hu ti lahei wumbua a ngoyila kɔɔ"
+  specimen_36: "Tao maa ii houni nduahu gɛ i waa nungaa luahu jifa tii gbuani ndɔlɔ yilahu, ɔɔ jifa tia heini ti yekpe va ɔɔ tii yekpe va."
+  specimen_32: "Maa ii houni ti numu gbi hou nduwɔya hu, ɔɔ ti ngi waa mɔnɛmɔnɛ hinda hu, maa ii houni nuu maajia va nduwɔya hu, tao gbɔma mahoungɔ nduwɔyei ye kɛyi kgbi lekee i gbɔyɔ."
+  specimen_21: "Maa ii houni kɔɔ ti kpaagba hinda la nuu gbi ma, tao kɔɔ ti hinda wee a numu na a kɛ kɛ nuvuu yaa a ngie.\nNuvuu gbi lee ngi lɔnya mia kɔɔ sawei i baagɔɔ ngi nuvuu ya ma mia leke gbi.\nNuvuu kpɛlɛɛ ti maahɛwungɔɛ sawei gulɔ, tao mahoungɔ sawei i ti mahu wɛɛ nahi gbi ɛɛ ti hu wɔyɔ. Mahoungɔ sawei i tɔ kɛ hugbatei ji ɛɛ numugbi gbukpuu."
+  specimen_16: "Nuu gbi ngi lɔnya mia kɔɔ sawa kpaambu ngaa yekpe ti ngi lɔnyɛi mavale a watii na ngi lɔnyi nasia ndɔɔ jawei keni numu a nyani ngi ma.\nMaa ii houni ti numu magba, ti ngi wu kpɛgbɛma ɔɔ ti ngi gbɛ ngi yee a baama hu we.\nNuu gbi ngi lɔnya mia nahii ti la nyɔngaa ngi ma tɛ i ngi maahinda gulanga kɔlɛhu ɔɔ i sawa kpoukpou nyaninga, kɔɔ ti ye njie na le fofohu, tao kɔɔ sawakpambu jein jein gɔngaa ti loo ngi va.\nMaa ii houni nuu i yɛ na nahi ta loko wili ngi bundu hinda hu, ngi ye pɛɛbu hinda, kɔlei kɛɛ ngowili na a pili ngitiwoma kia lee ti longɔla, kɛɛ kakpama a baagbuama hu we. Maa houngɔ sawei i nuu gbi maawɛɛ yɛɛ kakpamɛi ji bondayeya."
+}
diff --git a/lang/languages/men/language.textproto b/lang/languages/men/language.textproto
deleted file mode 100644
index 05537dede..000000000
--- a/lang/languages/men/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "men"
-name: "Mende"
-preferred_name: ""
-autonym: "Mɛnde yia"
-population: 1813082
-region: "SL"
-region: "LR"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E Ɛ F G H I J K L M N O Ɔ P S T U V W Y a b d e ɛ f g h i j k l m n o ɔ p s t u v w y"
-}
diff --git a/lang/languages/men/sampletext.textproto b/lang/languages/men/sampletext.textproto
deleted file mode 100644
index a110db58f..000000000
--- a/lang/languages/men/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "men"
diff --git a/lang/languages/mer/language.textproto b/lang/languages/mer.textproto
similarity index 89%
rename from lang/languages/mer/language.textproto
rename to lang/languages/mer.textproto
index 4eb7d01c6..3eb41155d 100644
--- a/lang/languages/mer/language.textproto
+++ b/lang/languages/mer.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌̂"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mey/language.textproto b/lang/languages/mey.textproto
similarity index 72%
rename from lang/languages/mey/language.textproto
rename to lang/languages/mey.textproto
index dc99adbfb..61505bd60 100644
--- a/lang/languages/mey/language.textproto
+++ b/lang/languages/mey.textproto
@@ -6,3 +6,6 @@ population: 7238
 region: "SN"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mfa/language.textproto b/lang/languages/mfa.textproto
similarity index 76%
rename from lang/languages/mfa/language.textproto
rename to lang/languages/mfa.textproto
index a03e731ee..7348508ee 100644
--- a/lang/languages/mfa/language.textproto
+++ b/lang/languages/mfa.textproto
@@ -7,3 +7,6 @@ region: "TH"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/mfe/language.textproto b/lang/languages/mfe.textproto
similarity index 90%
rename from lang/languages/mfe/language.textproto
rename to lang/languages/mfe.textproto
index 879f8caf0..a8265cca5 100644
--- a/lang/languages/mfe/language.textproto
+++ b/lang/languages/mfe.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   numerals: "  \\- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E F G H I J K L M N O P R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mfv/language.textproto b/lang/languages/mfv.textproto
similarity index 72%
rename from lang/languages/mfv/language.textproto
rename to lang/languages/mfv.textproto
index 649afc222..a75535013 100644
--- a/lang/languages/mfv/language.textproto
+++ b/lang/languages/mfv.textproto
@@ -6,3 +6,6 @@ population: 121170
 region: "SN"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mg.textproto b/lang/languages/mg.textproto
new file mode 100644
index 000000000..45430b6c6
--- /dev/null
+++ b/lang/languages/mg.textproto
@@ -0,0 +1,27 @@
+id: "mg"
+name: "Malagasy"
+preferred_name: ""
+autonym: "Malagasy"
+population: 24260130
+region: "MG"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E F G H I J K L M N O P R S T V Y Z À Â È É Ê Ë Ì Î Ï Ô a b d e f g h i j k l m n o p r s t v y z à â è é ê ë ì î ï ô"
+  auxiliary: "c q u w x"
+  marks: "◌̀ ◌́ ◌̂ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B D E F G H I J K L M N O P R S T V Y Z"
+}
+sample_text {
+  masthead_full: "TtEe"
+  masthead_partial: "Rr"
+  tester: "Heverina fa ny fankatoavana ny fahamendrehan\'olombelona sy ny"
+  poster_sm: "Teraka afaka"
+  poster_md: "Samy afaka"
+  poster_lg: "Teraka"
+  specimen_48: "Ambonin\'izany, tsy tokony hahatonga fanavahana mihitsy izay sata"
+  specimen_36: "Manan-jo hitaky ny fankatoavana ny maha-olona azy araka ny voafaritry ny lalna ny tsirairay na aiza na aiza toerana aleany."
+  specimen_32: "Manan-jo hitory amin\'ny Fitsarana misy ao amin\'ny taniny ny olona tsirairay raha mahatsapa fa hosena ny zo fototra nomen\'ny lalam- panorenana azy."
+  specimen_21: "Tsy misy olona azo samborina tsy amin\'antony na tazonim-poana na atao sesi-tany tsy voameloka.\nManan-jo ny olon-drehetra mba hohenoin\'ny Fitsarana am-pahibemaso sy tsy am-piangarana ny heviny, ka ho fitsarana mahaleo tena sy tsy miangatra no hametra ny zony sy ny mahamarim-pototra na tsia ny fiampangana atao aminy."
+  specimen_16: "Tsy misy olona azo hitsabahana ny fiainany manokana, ny fianankaviany, ny fonenany, ny taratasy ifandefasany na hitsahana ny voninahiny sy ny lazany. Zon\'ny olona ny harovan\'ny lalna eo anatrehan\'ny fanitsakitsahana tsy ara-drariny sy tsy ara-dalna rehetra.\nMalalaka amin\'ny heviny sy amin\'ny fivavahana hinoany ary manan-jo hiheno ny feon\'ny fieritreretany ny olon-drehetra. Io zo io dia mamela azy malalaka hiova fivavahana na firehana samihafa. Ny olon-drehetra koa dia manan-jo haneho izany finoany na firehany izany am-pahabemaso na ho an\'olom-bitsy ; amin\'ny alalan\'ny fampianarana na fanaovana fomba..."
+}
diff --git a/lang/languages/mg/language.textproto b/lang/languages/mg/language.textproto
deleted file mode 100644
index 26c1f540d..000000000
--- a/lang/languages/mg/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "mg"
-name: "Malagasy"
-preferred_name: ""
-autonym: "Malagasy"
-population: 24260130
-region: "MG"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E F G H I J K L M N O P R S T V Y Z À Â È É Ê Ë Ì Î Ï Ô a b d e f g h i j k l m n o p r s t v y z à â è é ê ë ì î ï ô"
-  auxiliary: "c q u w x"
-  marks: "◌̀ ◌́ ◌̂ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B D E F G H I J K L M N O P R S T V Y Z"
-}
diff --git a/lang/languages/mg/sampletext.textproto b/lang/languages/mg/sampletext.textproto
deleted file mode 100644
index cb6aedccb..000000000
--- a/lang/languages/mg/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mg"
diff --git a/lang/languages/mgh/language.textproto b/lang/languages/mgh.textproto
similarity index 90%
rename from lang/languages/mgh/language.textproto
rename to lang/languages/mgh.textproto
index 4cbdb7d9a..a39159fb9 100644
--- a/lang/languages/mgh/language.textproto
+++ b/lang/languages/mgh.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mgo/language.textproto b/lang/languages/mgo.textproto
similarity index 92%
rename from lang/languages/mgo/language.textproto
rename to lang/languages/mgo.textproto
index a6739d190..4ec2257e1 100644
--- a/lang/languages/mgo/language.textproto
+++ b/lang/languages/mgo.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: ", ; \\: ! ? . \' ‘ ’ \" “ ”"
   index: "A B {CH} D E Ə F G {GH} I J K M N Ŋ O Ɔ P R S T U W Y Z ʼ"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mgp/language.textproto b/lang/languages/mgp.textproto
similarity index 76%
rename from lang/languages/mgp/language.textproto
rename to lang/languages/mgp.textproto
index e1ec06456..74fd4dc4a 100644
--- a/lang/languages/mgp/language.textproto
+++ b/lang/languages/mgp.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/mgy/language.textproto b/lang/languages/mgy.textproto
similarity index 74%
rename from lang/languages/mgy/language.textproto
rename to lang/languages/mgy.textproto
index 87b73b099..69075f084 100644
--- a/lang/languages/mgy/language.textproto
+++ b/lang/languages/mgy.textproto
@@ -7,3 +7,6 @@ region: "TZ"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mh.textproto b/lang/languages/mh.textproto
new file mode 100644
index 000000000..85ec33417
--- /dev/null
+++ b/lang/languages/mh.textproto
@@ -0,0 +1,24 @@
+id: "mh"
+name: "Marshallese"
+preferred_name: ""
+autonym: "Kajin M̧ajeļ"
+population: 56879
+region: "MH"
+script: "Latin"
+exemplar_chars {
+  base: "A Ā B D E I J K L Ļ M M̧ N Ņ N̄ O Ō O̧ P R T U Ū W a ā b d e i j k l ļ m m̧ n ņ n̄ o ō o̧ p r t u ū w"
+  marks: "◌̄ ◌̦ ◌̧ ◌̨"
+}
+sample_text {
+  masthead_full: "AaRr"
+  masthead_partial: "Mm"
+  tester: "Kinke watoke utiej eo ej mottan maron ko rej jonair wot juon"
+  poster_sm: "Kinke ne ej"
+  poster_md: "Kinke elap"
+  poster_lg: "Armij"
+  specimen_48: "Kinke armij ro otemmjej air United Nations emwij air bar kabine"
+  specimen_36: "Kinke melele eo einwot juon kin maron kein im anemkwoj kein ej men eo elaptata tokjen non kotobrak kalimur in,"
+  specimen_32: "En ejelok en ej dri komakoko ak ber ilo jerbel in komakoko; jerbal in komakoko ak wiakake armij non jerbal in komakoko en mo komoni ilo jabrewot wawin ko."
+  specimen_21: "En ejelol armij en ej ber ilo intan im kokkure non enbwin eo an lak ilo wawin ko rellej, ak kaje kin wawin ko ejelok ilo mantin mour an armij ak ilo wawin eo ej men in lelok non e jerata.\nKajojo armij eor an maron bwe en wor watoke ijoko otemjej ke e ej bar juon armij iman kien.\nKajojo armij eor an maron in kajitok ak bukot wawin ko non lomoren ilo iman dri ekajet ro ak jikin ekajet ko ilo lol ko air nae wawin ko rej kokkure maron ko air rellaptata im kien ko ak jemen e ko rar lilok non e."
+  specimen_16: "En ejelok armij en ej balbuj, ber ilo balbuj ak emwij jilkinlok e jen ailin eo kin kilan jeb.\nKajojo armij eor im jonon an maron wot bar ro jet bwe en ber im jutak iman dri ekajet ro ak ilo jikin ekajet eo emon im ejelok jeb, ilo bukot maron ko an im ijoko kwonan kin jabrewot nana eo ear komone im eor liakelok e kake.\nEn ejelok armij en ej ber ilo aban kin kilan jeb nae mour im men ko an make, bamle eo an, kabijuknen eo an ak leta ko an, ak bareinwot en ejelok men in kokkure utiej eo an im mwilin. Kajojo armij otemjej eor an maron bwe kien en kejbarok e jen men in aban ak kokkure."
+}
diff --git a/lang/languages/mh/language.textproto b/lang/languages/mh/language.textproto
deleted file mode 100644
index 75d2863cd..000000000
--- a/lang/languages/mh/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "mh"
-name: "Marshallese"
-preferred_name: ""
-autonym: "Kajin M̧ajeļ"
-population: 56879
-region: "MH"
-script: "Latin"
-exemplar_chars {
-  base: "A Ā B D E I J K L Ļ M M̧ N Ņ N̄ O Ō O̧ P R T U Ū W a ā b d e i j k l ļ m m̧ n ņ n̄ o ō o̧ p r t u ū w"
-  marks: "◌̄ ◌̦ ◌̧ ◌̨"
-}
diff --git a/lang/languages/mh/sampletext.textproto b/lang/languages/mh/sampletext.textproto
deleted file mode 100644
index 8bce18ddd..000000000
--- a/lang/languages/mh/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mh"
diff --git a/lang/languages/mi.textproto b/lang/languages/mi.textproto
new file mode 100644
index 000000000..949427d36
--- /dev/null
+++ b/lang/languages/mi.textproto
@@ -0,0 +1,26 @@
+id: "mi"
+name: "Maori"
+preferred_name: ""
+autonym: "Māori"
+population: 137913
+region: "NZ"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū"
+  auxiliary: "b c d f g j l q s v x y z"
+  marks: "◌̄"
+  index: "A E H I K M N O P R T U W"
+}
+sample_text {
+  masthead_full: "KkOo"
+  masthead_partial: "Tt"
+  tester: "No te mea na te whakanoa a na te whakahawea ki nga mana o te"
+  poster_sm: "No te mea ki"
+  poster_md: "No te mea"
+  poster_lg: "katoa"
+  specimen_48: "No te mea ko nga iwi o te Kotahitanga kua whakaatu ki roto i"
+  specimen_36: "No te mea e tutaki ai tenei oati he mea nui rawa kia matou te mano tini o te tangata ki enei tikanga rangatira."
+  specimen_32: "Kaua tetahi tangata e hopukia noatia e te ringa o te ture e puritia noatia ranei i roto i tetahi whare herehere e peia noatia ranei ki tetahi whenua ke."
+  specimen_21: "Ko ia tangata e tika ana kia whakatuturutia ki a ia tetahi whakawa tika ki te aroaro o te katoa e tetahi runanga wehekore whakahoahoa ranei, mo runga i te whakataunga i ona tika me nga tikanga hei whakarite mana tae atu hoki ki nga whakapae mona tera kua hara kino ia i raro i te ture.\nKo ia tangata e whai-tika ana ki nga ritenga o te noho pai o te iwi me te ao katoa, ma reira nei e tino tuturu ai nga tika me nga rangatiratanga kua whakararangitia nei ki roto i tenei Whakapuakitanga."
+  specimen_16: "Kahore rawa i roto i tenei Whakapuakitanga tetahi mea e ahei ana kia whakamoaritia tera kei tetahi Mana Kawanatanga, kei tetahi ropu, kei tetahi tangata ranei tetahi mana ki te whakahaere i tetahi ritenga, ki te mahi ranei i tetahi mahi e anga atu ana hei tikanga turaki i tetahi o nga mano me nga rangatiratanga e mau ake nei.\nNo te mea na te whakanoa a na te whakahawea ki nga mana o te tangata i tupu ai nga mahi whakarihariha i pouri ai te ngakau tangata, a ko te kohaetanga o tetahi ao hou e mahorahora ai te tangata ki te korero ki te whakapono, ki te noho noa i runga i te rangimarie a i te ora, kua panuitia hei taumata mo te koingotanga o te ngakau o te mano tini o te tangata."
+}
diff --git a/lang/languages/mi/language.textproto b/lang/languages/mi/language.textproto
deleted file mode 100644
index 76880823c..000000000
--- a/lang/languages/mi/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "mi"
-name: "Maori"
-preferred_name: ""
-autonym: "Māori"
-population: 137913
-region: "NZ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū"
-  auxiliary: "b c d f g j l q s v x y z"
-  marks: "◌̄"
-  index: "A E H I K M N O P R T U W"
-}
diff --git a/lang/languages/mi/sampletext.textproto b/lang/languages/mi/sampletext.textproto
deleted file mode 100644
index b0de21f22..000000000
--- a/lang/languages/mi/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mi"
diff --git a/lang/languages/min.textproto b/lang/languages/min.textproto
new file mode 100644
index 000000000..9ee86a2db
--- /dev/null
+++ b/lang/languages/min.textproto
@@ -0,0 +1,24 @@
+id: "min"
+name: "Minangkabau"
+preferred_name: ""
+autonym: "Baso Minangkabau"
+population: 8010780
+region: "ID"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W Y Z a b c d e f g h i j k l m n o p q r s t u v w y z"
+  auxiliary: "X x"
+}
+sample_text {
+  masthead_full: "SsAa"
+  masthead_partial: "Dd"
+  tester: "Sasungguahnyo pangakuan taradok martabat dasar dan hak-hak nan"
+  poster_sm: "Sasungguahnyo"
+  poster_md: "Deklarasi"
+  poster_lg: "Sadonyo"
+  specimen_48: "Sadonyo manusia dilahiakan mardeka dan punyo martabat sarato"
+  specimen_36: "Indak surang pun buliah dianiayo atau dizalimi, atau dihukum sacaro kajam, tidak bakamanusiaan atau dihino."
+  specimen_32: "Tiok urang punyo hak untuak baistirahat dan liburan, tamasuak pambatasan nan layak taradok jam karajo, dan tatap dapek upah di hari perai atau katiko cuti."
+  specimen_21: "Tiok urang punyo hak mandapek katartiban sosial dan katartiban internasional untuak mawujudkan saluruah hak-hak dan kabebasan sasuai jo Deklarasi ko.\nIndak ciek pun pasal dari Deklarasi ko buliah ditafsirkan sabagai manyatujui adonyo hak suatu negara, kalompok atau sasaurang, untuak malakukan kagiatan apopun, atau malakukan sasuatu nan batujuan marusak hak-hak dan kabebasan-kabebasan nan diuraikan dalam Deklarasi ko."
+  specimen_16: "Sasungguahnyo pangakuan taradok martabat dasar dan hak-hak nan samo sarato mutlak dari tiok anggota kaluarga manusia adolah landasan dari kamardekaan, kaadilan dan pardamaian di dunia;\nSasungguahnyo sikap tak paduli dan malecehkan hak-hak asasi manusia tabukti mangakibatkan parilaku biadab nan sangat malukoi nurani umat manusia, dan alah dicanangkannyo suatu dunia di ma tiok urang dapek manikmati kabebasan manyampaikan pandapek, bakayakinan, dan kabebasan dari raso takuik dan dari kakurangan, sabagai cito-cito paliang tinggi dari sadonyo urang;\nSasungguahnyo supayo urang indak tapaso mamiliah barontak sabagai usaho pangabisan untuak manantang kazaliman dan panindasan, Hak-hak Asasi Manusia paralu dijamin malalui tartib hukum;"
+}
diff --git a/lang/languages/min/language.textproto b/lang/languages/min/language.textproto
deleted file mode 100644
index 8e62f8f8a..000000000
--- a/lang/languages/min/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "min"
-name: "Minangkabau"
-preferred_name: ""
-autonym: "Baso Minangkabau"
-population: 8010780
-region: "ID"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W Y Z a b c d e f g h i j k l m n o p q r s t u v w y z"
-  auxiliary: "X x"
-}
diff --git a/lang/languages/min/sampletext.textproto b/lang/languages/min/sampletext.textproto
deleted file mode 100644
index a77e9865d..000000000
--- a/lang/languages/min/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "min"
diff --git a/lang/languages/mk.textproto b/lang/languages/mk.textproto
new file mode 100644
index 000000000..22ab5ee98
--- /dev/null
+++ b/lang/languages/mk.textproto
@@ -0,0 +1,30 @@
+id: "mk"
+name: "Macedonian"
+preferred_name: ""
+autonym: "Македонски"
+population: 1608564
+region: "AL"
+region: "GR"
+region: "MK"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ѓ Ѕ Ј Љ Њ Ќ Џ а б в г д е ж з и к л м н о п р с т у ф х ц ч ш ѓ ѕ ј љ њ ќ џ Ѐ Ѝ ѐ ѝ"
+  auxiliary: "ѐ ѝ"
+  marks: "◌́ ◌̀"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] \\{ \\}"
+  index: "А Б В Г Д Ѓ Е Ж З Ѕ И Ј К Л Љ М Н Њ О П Р С Т Ќ У Ф Х Ц Ч Џ Ш"
+}
+sample_text {
+  masthead_full: "СсИи"
+  masthead_partial: "Тт"
+  tester: "Бидејќи признавањето на вроденото достоинство, и на еднаквите"
+  poster_sm: "Бидејќи земјите"
+  poster_md: "Генералното"
+  poster_lg: "Сите"
+  specimen_48: "Ја прогласува оваа Универзална декларација на човековите права"
+  specimen_36: "Никој нема да биде роб или потчинет; ропството и трговијата со робови ќе бидат забранети во сите нивни форми."
+  specimen_32: "Секој има право на ефикасни правни лекови пред надлежните национални судови за дела што ги кршат основните права што му припаѓаат според уставот или законот."
+  specimen_21: "Никој човек нема да биде подложен на произволно апсење, притвор или прогонување.\nСекој има потполно еднакво право на праведно и јавно судење пред независен и непристрасен суд, при одредувањето на неговите права и обврски и во услови на какво и да е кривично обвинение против него.\nНикој нема да биде изложен на произволно вмешување во неговиот приватен и семеен живот, домот или преписката, ниту пак на напади врз неговата чест и углед. Секој има право на правна заштита од таквото вмешување или напади."
+  specimen_16: "Секој има право на слобода на мислата, совеста и религија. Ова право ја вклучува и слободата – човекот да ја промени својата религија или убедување, како и слободата – човекот, индивидуално или во заедница со други луѓе, приватно или јавно, да ја манифестира својата религија или убедување преку подучување, практикување, одржување служби или обреди.\nСекој има право на слобода на мислење и изразување. Ова право ја вклучува и слободата да се застапува одредено мислење без никакво вмешување и да се бараат, да се примаат и да се даваат информации и идеи преку медиумите и без оглед на границите."
+}
diff --git a/lang/languages/mk/language.textproto b/lang/languages/mk/language.textproto
deleted file mode 100644
index 2cb8f5204..000000000
--- a/lang/languages/mk/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "mk"
-name: "Macedonian"
-preferred_name: ""
-autonym: "Македонски"
-population: 1608564
-region: "GR"
-region: "AL"
-region: "MK"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ѓ Ѕ Ј Љ Њ Ќ Џ а б в г д е ж з и к л м н о п р с т у ф х ц ч ш ѓ ѕ ј љ њ ќ џ Ѐ Ѝ ѐ ѝ"
-  auxiliary: "ѐ ѝ"
-  marks: "◌́ ◌̀"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] \\{ \\}"
-  index: "А Б В Г Д Ѓ Е Ж З Ѕ И Ј К Л Љ М Н Њ О П Р С Т Ќ У Ф Х Ц Ч Џ Ш"
-}
diff --git a/lang/languages/mk/sampletext.textproto b/lang/languages/mk/sampletext.textproto
deleted file mode 100644
index 0d0560123..000000000
--- a/lang/languages/mk/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mk"
diff --git a/lang/languages/ml.textproto b/lang/languages/ml.textproto
new file mode 100644
index 000000000..ca50afd9d
--- /dev/null
+++ b/lang/languages/ml.textproto
@@ -0,0 +1,35 @@
+id: "ml"
+name: "Malayalam"
+preferred_name: ""
+autonym: "മലയാളം"
+population: 43280501
+region: "AE"
+region: "BH"
+region: "GB"
+region: "IL"
+region: "IN"
+region: "MY"
+region: "QA"
+region: "SG"
+script: "Malayalam"
+exemplar_chars {
+  base: "അ ആ ഇ ഈ ഉ ഊ ഋ ഌ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര റ ല ള ഴ വ ശ ഷ സ ഹ ൠ ൡ ൺ ൻ ർ ൽ ൾ ൿ"
+  auxiliary: ""
+  marks: "◌ം ◌ഃ ◌ാ ◌ി ◌ീ ◌ു ◌ൂ ◌ൃ ◌െ ◌േ ◌ൈ ◌് ◌ൗ"
+  numerals: "൦ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "അ ആ ഇ ഈ ഉ ഊ ഋ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര ല വ ശ ഷ സ ഹ ള ഴ റ"
+}
+sample_text {
+  masthead_full: "മനഷയ"
+  masthead_partial: "രല"
+  tester: "മനുഷ്യ സമുദായത്തിൻ്റെ ജന്മസിദ്ധമായ അന്തസ്സും സമാവകാശവും ലോകത്തിൽ സ്വാതന്ത്ര്യം, നീതി, സമാധാനം എന്നിവയുടെ"
+  poster_sm: "മനുഷ്യാവകാശങ്ങളെ"
+  poster_md: "മനുഷ്യരെല്ലാവരും"
+  poster_lg: "അന്തസ്സോടും"
+  specimen_48: "ജാതി, മതം, നിറം, ഭാഷ, സ്ത്രീപുരുഷഭേദം, രാഷ്ട്രീയാഭിപ്രായം സ്വത്ത്‌, കുലം എന്നിവയെ കണക്കാക്കാതെ ഈ പ്രഖ്യാപനത്തിൽ"
+  specimen_36: "വ്യവസ്ഥാപിതമായ ഭരണത്താലും നിയമത്താലും സമ്മതിക്കപ്പെട്ട അവകാശങ്ങളെ ലംഘിച്ചു ആരെങ്കിലും പ്രവർത്തിക്കുകയാണെങ്കിൽ നിയമാനുസൃതമായ പ്രതിവിധി തേടുന്നതിനുള്ള അധികാരം എല്ലാവർക്കും ഉണ്ടായിരിക്കുന്നതാണ്‌."
+  specimen_32: "സ്വതന്ത്രചിന്തക്കും സ്വതന്ത്ര മതവിശ്വാസത്തിനും എല്ലാവർക്കും അധികാരമുണ്ട്‌. ഒറ്റക്കായോ കൂട്ടമായിത്തന്നേയോ മതം മാറുവാനും പരസ്യമായോ രഹസ്യമായോ തൻ്റെ മതവിശ്വാസങ്ങളെ പ്രകടിപ്പിക്കുവാനും ആചരിക്കുവാനും ആരാധിക്കാനുമുള്ള അധികാരവും ഇതിൽതന്നെ അടങ്ങിയിരിക്കുന്നു."
+  specimen_21: "സ്വതന്ത്രമായ അഭിപ്രായപ്രകടനത്തിന്നു എല്ലാവർക്കും അധികാരമുണ്ട്‌. അതായത്‌ യാതൊരു തടസ്സവുംകൂടാതെ അഭിപ്രായങ്ങളെ ആരായുവാനും മറ്റുള്ളവർക്ക്‌ ഏതൊരുപാധിയിൽ കൂടിയും യാതൊരതിർത്തികളെയും കണക്കാക്കാതെ എല്ലായിടത്തുമെത്തിക്കുവാനുള്ള അധികാരവുമുണ്ടെന്നു താൽപ്പര്യം.\nസമുദായത്തിലെ ഒരംഗമായതുകൊണ്ടു സമുദായത്തിൽനിന്നുമുള്ള രക്ഷക്ക്‌ ഏതൊരാൾക്കും അർഹതയുണ്ട്‌. അതാതു രാജ്യത്തിൻ്റെ കഴിവുകൾക്കനുസരിച്ചും ദേശീയ സംരംഭങ്ങളെക്കൊണ്ടും അന്തർദേശീയ സഹകരണം കൊണ്ടും അവരവരുടെ അന്തസ്സിന്നു അപരിത്യാജ്യമായ സാമുദായികവും സാംസ്കാരികവും സാമ്പത്തികവുമായ അവകാശങ്ങളെ നേടുന്നതിന്നും തൻ്റെ സ്വതന്ത്രമായ വ്യക്തിത്വത്തെ പരിപോഷിപ്പിക്കുന്നതിന്നും ഏതൊരാൾക്കും അധികാരമുള്ളതാണ്‌."
+  specimen_16: "ന്യായമായ പ്രവൃത്തിസമയം ഇടക്കിടക്കു ശമ്പളത്തോടുകൂടിയ ഒഴിവുദിവസങ്ങൾ, ഒഴിവുസമയം, വിശ്രമം ഇതുകൾക്ക്‌ ഏതൊരാൾക്കും അവകാശമുള്ളതാണ്‌.\nഈ പ്രഖ്യാപനത്തിൽ പ്രതിപാദിച്ചിട്ടുള്ള അധികാരസ്വാതന്ത്ര്യങ്ങളെ കൈവരുത്തക്ക രീതിയിലുള്ള സാമുദായികവും അന്തർരാഷ്ട്രീയവുമായ ഒരു ജീവിതത്തോതിന്ന് എല്ലാവരും അർഹരാണ്‌.\nഒരു രാജ്യത്തിന്നോ, വകുപ്പിന്നോ, വ്യക്തിക്കോ ഇഷ്ടമുള്ള പ്രവൃത്തികളിലെല്ലാമേർപ്പെടാമെന്നോ, ഇതിലടങ്ങിയിരിക്കുന്ന തത്വങ്ങൾക്കെതിരായിത്തന്നെ എന്തെങ്കിലും പ്രവർത്തിക്കാമെന്നോ ഉള്ള രീതിയിൽ ഈ പ്രഖ്യാപനത്തെ വ്യാഖ്യാനിക്കാൻ പാടുള്ളതല്ല.\nമനുഷ്യാവകാശങ്ങളെ കുറിക്കുന്ന ഈ പൊതുപ്രഖ്യാപനത്തെ ഒരു പ്രമാണമായി കരുതി ഏതൊരു വ്യക്തിക്കും സംഘടനക്കും അവരുടെ പ്രയത്നംകൊണ്ടു മനുഷ്യാവകാശങ്ങളെ ബഹുമാനിച്ചു വകവെച്ചു കൊടുക്കാൻ യത്നിക്കേണ്ടതാണ്‌. ക്രമേണ രാഷ്ട്രീയവും അന്തർരാഷ്ട്രീയവുമായ പ്രവർത്തനങ്ങളെക്കൊണ്ടു ഈ പ്രഖ്യാപനത്തിലടങ്ങിയിരിക്കുന്ന അവകാശങ്ങളെ ഐക്യരാഷ്ട്ര സംഘടനയിലെ അംഗങ്ങളെക്കൊണ്ടും അവരുടെ അധികാരത്തിലിരിക്കുന്ന ജനങ്ങളെക്കൊണ്ടും ഫലപ്രദമാകത്തക്ക രീതിയിൽ അംഗീകരിപ്പിക്കുവാൻ ശ്രമിക്കേണ്ടതുമാണ്‌."
+}
diff --git a/lang/languages/ml/language.textproto b/lang/languages/ml/language.textproto
deleted file mode 100644
index 0ab32303b..000000000
--- a/lang/languages/ml/language.textproto
+++ /dev/null
@@ -1,22 +0,0 @@
-id: "ml"
-name: "Malayalam"
-preferred_name: ""
-autonym: "മലയാളം"
-population: 43280501
-region: "MY"
-region: "SG"
-region: "GB"
-region: "AE"
-region: "IL"
-region: "QA"
-region: "BH"
-region: "IN"
-script: "Malayalam"
-exemplar_chars {
-  base: "അ ആ ഇ ഈ ഉ ഊ ഋ ഌ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര റ ല ള ഴ വ ശ ഷ സ ഹ ൠ ൡ ൺ ൻ ർ ൽ ൾ ൿ"
-  auxiliary: ""
-  marks: "◌ം ◌ഃ ◌ാ ◌ി ◌ീ ◌ു ◌ൂ ◌ൃ ◌െ ◌േ ◌ൈ ◌് ◌ൗ"
-  numerals: "൦ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "അ ആ ഇ ഈ ഉ ഊ ഋ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര ല വ ശ ഷ സ ഹ ള ഴ റ"
-}
diff --git a/lang/languages/ml/sampletext.textproto b/lang/languages/ml/sampletext.textproto
deleted file mode 100644
index ef9bbf7f7..000000000
--- a/lang/languages/ml/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ml"
diff --git a/lang/languages/mls/language.textproto b/lang/languages/mls.textproto
similarity index 74%
rename from lang/languages/mls/language.textproto
rename to lang/languages/mls.textproto
index ca98fef1b..3ac656d64 100644
--- a/lang/languages/mls/language.textproto
+++ b/lang/languages/mls.textproto
@@ -7,3 +7,6 @@ region: "SD"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mn/language.textproto b/lang/languages/mn.textproto
similarity index 94%
rename from lang/languages/mn/language.textproto
rename to lang/languages/mn.textproto
index 53dd90656..f39d129aa 100644
--- a/lang/languages/mn/language.textproto
+++ b/lang/languages/mn.textproto
@@ -14,3 +14,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "А Б В Г Д Е Ж З И Й К Л М Н О Ө П Р С Т У Ү Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/mn_Mong/language.textproto b/lang/languages/mn_Mong.textproto
similarity index 77%
rename from lang/languages/mn_Mong/language.textproto
rename to lang/languages/mn_Mong.textproto
index 94cb2e74f..c9b1fde64 100644
--- a/lang/languages/mn_Mong/language.textproto
+++ b/lang/languages/mn_Mong.textproto
@@ -7,3 +7,6 @@ region: "CN"
 script: "Cyrillic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/mni/language.textproto b/lang/languages/mni.textproto
similarity index 93%
rename from lang/languages/mni/language.textproto
rename to lang/languages/mni.textproto
index 6db9e017c..d1c096719 100644
--- a/lang/languages/mni/language.textproto
+++ b/lang/languages/mni.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   numerals: "০ ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯"
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
 }
+sample_text {
+  fallback_language: "bn"
+}
diff --git a/lang/languages/mnw.textproto b/lang/languages/mnw.textproto
new file mode 100644
index 000000000..3ec735d8b
--- /dev/null
+++ b/lang/languages/mnw.textproto
@@ -0,0 +1,25 @@
+id: "mnw"
+name: "Mon"
+preferred_name: ""
+autonym: "ဘာသာ မန်"
+population: 966113
+region: "MM"
+region: "TH"
+script: "Myanmar"
+exemplar_chars {
+  base: "က ခ ဂ ဃ င စ ဆ ဇ ဈ ဉ ည ဋ ဌ ဍ ဎ ဏ တ ထ ဒ ဓ န ပ ဖ ဗ ဘ မ ယ ရ လ ဝ သ ဟ ဠ အ ဢ ဣ ဤ ဥ ဦ ဧ ဨ ဩ ဪ ဿ ၀ ၁ ၂ ၃ ၄ ၅ ၆ ၇ ၈ ၉ ၊ ။ ၌ ၍ ၎ ၏ ၐ ၑ ၒ ၓ ၔ ၕ ၚ ၛ ၜ ၝ ၡ ၥ ၦ ၮ ၯ ၰ ၵ ၶ ၷ ၸ ၹ ၺ ၻ ၼ ၽ ၾ ၿ ႀ ႁ ႎ ႐ ႑ ႒ ႓ ႔ ႕ ႖ ႗ ႘ ႙ ႞ ႟"
+  marks: "◌ါ ◌ာ ◌ိ ◌ီ ◌ု ◌ူ ◌ေ ◌ဲ ◌ဳ ◌ဴ ◌ဵ ◌ံ ◌့ ◌း ◌္ ◌် ◌ျ ◌ြ ◌ွ ◌ှ ◌ၖ ◌ၗ ◌ၘ ◌ၙ ◌ၞ ◌ၟ ◌ၠ ◌ၢ ◌ၣ ◌ၤ ◌ၧ ◌ၨ ◌ၩ ◌ၪ ◌ၫ ◌ၬ ◌ၭ ◌ၱ ◌ၲ ◌ၳ ◌ၴ ◌ႂ ◌ႃ ◌ႄ ◌ႅ ◌ႆ ◌ႇ ◌ႈ ◌ႉ ◌ႊ ◌ႋ ◌ႌ ◌ႍ ◌ႏ ◌ႚ ◌ႛ ◌ႜ ◌ႝ"
+}
+sample_text {
+  masthead_full: "မဟဂၚ"
+  masthead_partial: "အဿ"
+  tester: "ပိုဲမၞိဟ်တံညးဂမၠိုၚ် သီုဖအိုတ် ဂုဏ်သိက္ခာမၞိဟ် မပါကၠုၚ် နူဂဝ်မိဂှ် တုပ်သၟဟ်ညးသ္ကအ်တုဲ အခေါၚ်အရာဂမၠိုၚ်ဝွံ တးပဲါထောံဟွံဂွံ သ္ဒးသ္ပစၟတ်သမ္တီ"
+  poster_sm: "စကာအဝဵုတုဲ အုပ်ဓုပ်ဒၟံၚ်"
+  poster_md: "လတူ အခေါၚ်အရာမၞိဟ်ကေုာံ"
+  poster_lg: "မၞိဟ်ဂမၠိုၚ်"
+  specimen_48: "ဇၟာပ်ဂကောံတအ်လေဝ် လတူလိက်လလောၚ်တြးတအ်ဂှ် စှ်ေစိုတ်တုဲ အတိုၚ်မွဲဂၠးတိ စပ်ကဵုအခေါၚ်အရာ ဂမၠိုၚ် ကေုာံ အခေါၚ်ဗၠးၜးဂှ် ရှ်ေသှ်ေတုဲ ဗတောန်ကဵုပညာ၊"
+  specimen_36: "ဇၟာပ်မၞိဟ်ဝွံ ယဝ်ရ ဒးဒုၚ်ဖံက်ပလီု အခေါၚ်အရာသဇိုၚ် မဇိုန်ဏှၚ်လဝ် အတ်ိုၚ်သဇိုၚ်ဒက်ပတန်သၞောဝ် (ဟွံသေၚ်) နကဵုသၞောဝ်ဥပဒေ အပ္ဍဲဍုၚ်မ္ဂး နကဵုရုၚ်သၞောဝ်ဓရ်ကၟိန်ဍုၚ် ဒးကဵုပရေၚ်စဵုဒၞာ မၚ်မွဲအာ စဵုကဵုစိုပ်တရဴရောၚ်။"
+  specimen_32: "ဇၟာပ်မၞိဟ် အခေါၚ်ကူချပ်စၚ်ခြၚ်သၠးပွး၊ အခေါၚ်ပါ်ပဲါဗၠေတ်ဒး ကေုာံ အခေါၚ်ရှ်ေသှ်ေနွံရ။ အခေါၚ်အရာတံဏံဝွံ သာသနာရှ်ေသှ်ေ ဟွံသေၚ်မ္ဂး ဓရ်ပတှ်ေတံ အခေါၚ်ပြံၚ်လှာဲသၠးပွး၊ နကဵုပူဂဵုမွဲကီုဒှ်၊ ပံၚ်ကောံကဵုညးဂမၠိုၚ်ကီုဒှ် သာ သနာဇကုရှ်ေသှ်ေ ဟွံသေၚ်သာ်ဂှ် ဓရ်ပတှ်ေတံဂှ် ဂတညးဍုၚ်ကွာန်ဂမၠိုၚ်ကီုဒှ်၊ တၞဟ်ခြာကီုဒှ် အခေါၚ်ပတိုန်ထ္ၜး ဗွဲမသၠး ပွး၊ အခေါၚ်စကာ၊ အခေါၚ်ရှ်ေသှ်ေ ကေုာံ အခေါၚ်ဒက်ပတန်တံ ပါလုပ်ရ။"
+  specimen_21: "ဇၟာပ်မၞိဟ် ပရေၚ်သၠးပွး လညာတ်ပါ်ပဲါ ကေုာံ ဓမံက်ထ္ၜးတံ အခေါၚ်နွံရ။ အခေါၚ်အရာတံဏံဝွံ ဟွံမွဲကဵုပထုဲပလီုမွဲသာ် ဗွဲမသၠးပွး အခေါၚ်လညာတ်ပါ်ပဲါတံကီု၊ တၚ်နၚ်ပရိုၚ်တံကီု ကူချပ်စၚ်ခြၚ်တံဂှ် နူကဵုပရိုၚ်မဳဒဳယျာမွဲမွဲကဆံၚ် ဟွံမွဲကဵုပယျဵု ဒၞက်မွဲသာ် အခေါၚ်လ္ၚတ်ဂၠိုက်ဂၠာဲ၊ အခေါၚ်ဒုၚ်ဂိုၚ်ကေတ် ကေုာံ အခေါၚ်တရးတံ ပါလုပ်ရ။\nဇၟာပ်မၞိဟ် နကဵုကောန်ဂကောံပရေၚ်မၞိဟ်မွဲ အခေါၚ်ဒုၚ်စသိုၚ် ပရေၚ်ဘဝမၞိဟ် ဂီုကၠီုနွံတုဲ ပရေၚ်ရုန်ဂစာန်ကောန်ဂကူ၊ ပရေၚ်ပံၚ်ကောံရေၚ်တၠုၚ်ကုဍုၚ်ဂၠးကဝ်တံဂှ် ဗွဲမကိတ်ညဳကဵု ဂကောံမၞိဟ်ဍုၚ်ဇကု ကေုာံ တမ်ရိုဟ်တုဲ ရေၚ်တၠုၚ်အာ ပရေၚ်ဖောအ်ဗြေဝ် သၠးပွးဂုဏ်သိက္ခာ ကေုာံ စရာဲဍာ်ဒကေဝ်ပူဂဵုဂှ် ဟွံမွဲဟွံတုဲ သီုကဵု ဒးရေၚ်တၠုၚ်အာ ပရေၚ်ပိုန်ဒြပ်၊ ပရေၚ်မၞိဟ် ကေုာံ အခေါၚ်အရာယေန်သၞာၚ်တံ ဒးနွံရ။"
+  specimen_16: "ဇၟာပ်မၞိဟ် ဗွဲမတုပ်သၟဟ်ကဵု ပရူပရာ အခိၚ်ကၠောန်ကမၠောန် ကေုာံ အခေါၚ်ဒုၚ်စသိုၚ် သြန်ဂိတု၊ စၟတ်သမ္တီလဝ် အခိၚ် ဇူကမၠောန်ဂှ် အခေါၚ်ဇူလၟောဝ် ကေုာံ အခေါၚ်ဇူကမၠောန်တံ ဒးနွံရ။\nဇၟာပ်မၞိဟ် အခေါၚ်သၠးပွး ကေုာံ အခေါၚ်အရာဓမံက်ထ္ၜးလဝ် ပ္ဍဲလိက်လလောၚ်တရးဏံ ယဝ်ရ မိက်ဂွံဓမံက်ပတိုန်ထ္ၜးမ္ဂး အတိုၚ်သၞောတ်ပရေၚ်မၞိဟ် ကေုာံ သၞောတ်ပရေၚ်ဆက်စၠောံဍုၚ်ဂၠးကဝ် ဒးနွံရ။\nသွက်ဍုၚ်မွဲဍုၚ်ကီုဒှ်၊ သွက်မၞိဟ် မွဲဂကောံကီုဒှ်၊ သွက်ပူဂဵုမွဲကီုဒှ်၊ အခေါၚ်အရာ ကေုာံ အခေါၚ်သၠးပွး မပါလုပ်မံၚ် ပ္ဍဲလိက် လလောၚ်အခေါၚ်အရာမၞိဟ် အလုံလိုက်မွဲဏံ ရန်ကဵုဂွံလီုလာ်အာကီု၊ ရန်ကဵုမွဲမွဲသာ်တုဲ နကဵုအလဵုဇကု ကံက်နုက်တိတ်အဓိပ္ပါယ်မရေဝ် နူကဵုလိက်လလောၚ်ဏံတုဲ စကာပ္ဍဲဒၞာဲတၞဟ်မွဲမွဲဂှ် သ္ပဟွံဂွံရ။\nပိုဲမၞိဟ်တံညးဂမၠိုၚ် သီုဖအိုတ် ဂုဏ်သိက္ခာမၞိဟ် မပါကၠုၚ် နူဂဝ်မိဂှ် တုပ်သၟဟ်ညးသ္ကအ်တုဲ အခေါၚ်အရာဂမၠိုၚ်ဝွံ တးပဲါထောံဟွံဂွံ သ္ဒးသ္ပစၟတ်သမ္တီ ညးသ္ကအ် ရန်တၟအ်ကဵု အခေါၚ်ဗၠးၜး အခေါၚ်နွံကဵုဗဗွဲဓရ် အခေါၚ်ၜိုဟ်လလမ်တံဂှ် ဒှ်တမ်သဇိုၚ်မူလ ဂကောံမၞိဟ်ပိုဲတအ်ရောၚ်။\nလတူဟွံသ္ပကာကဵု အခေါၚ်အရာမၞိဟ်ဂှ် မဒှ်ပူဂဵု စၚ်ခြၚ် ခိုဟ်ပရေံ ဟွံလေပ် ဒှ်မၞိဟ် နွံလက်သန် ရုန်မဵုကြမ်ကြ ပလီုပလာ်ဗွိုၚ်မၞိဟ်ကီုတအ်ဂှ် ဒစဵုဒစးတုဲ တၞဟ်န ဂွံကလိဂွံ အခေါၚ်ဟီုဂး ဗၠးဗၠးၜးၜးကီု၊ သွက်ဂွံအခေါၚ် နွံဓရ်ပတှ်ေ နွံရှ်ေသှ်ေသၠးပွးကီု၊ သွက်ဂွံဗၠးၜးတိတ် နူအရာမဖေက်ဂၟံက် ကေုာံ ကၠောဝ်ဗျဵုကဟၚ်တအ်ဂမၠိုၚ်အိုဿီုကီု အတိုၚ်မၞိဟ်ပိုဲတအ် ရန်တၟအ်လဝ် သၠုၚ်အိုတ် ဂကောံမၞိဟ် ခိုဟ်တၟိုဟ်ၜိုဟ်သြိုဟ်မွဲ ဂွံမံက်ဂတဝ်ဂှ် ဂိုၚ်စွံလဝ် တၚ်ရန်တၟံ သၠုၚ်အိုတ်ဟေၚ်ရ။"
+}
diff --git a/lang/languages/mnw/language.textproto b/lang/languages/mnw/language.textproto
deleted file mode 100644
index 0f34a2bd9..000000000
--- a/lang/languages/mnw/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "mnw"
-name: "Mon"
-preferred_name: ""
-autonym: "ဘာသာ မန်"
-population: 966113
-region: "MM"
-region: "TH"
-script: "Myanmar"
-exemplar_chars {
-  base: "က ခ ဂ ဃ င စ ဆ ဇ ဈ ဉ ည ဋ ဌ ဍ ဎ ဏ တ ထ ဒ ဓ န ပ ဖ ဗ ဘ မ ယ ရ လ ဝ သ ဟ ဠ အ ဢ ဣ ဤ ဥ ဦ ဧ ဨ ဩ ဪ ဿ ၀ ၁ ၂ ၃ ၄ ၅ ၆ ၇ ၈ ၉ ၊ ။ ၌ ၍ ၎ ၏ ၐ ၑ ၒ ၓ ၔ ၕ ၚ ၛ ၜ ၝ ၡ ၥ ၦ ၮ ၯ ၰ ၵ ၶ ၷ ၸ ၹ ၺ ၻ ၼ ၽ ၾ ၿ ႀ ႁ ႎ ႐ ႑ ႒ ႓ ႔ ႕ ႖ ႗ ႘ ႙ ႞ ႟"
-  marks: "◌ါ ◌ာ ◌ိ ◌ီ ◌ု ◌ူ ◌ေ ◌ဲ ◌ဳ ◌ဴ ◌ဵ ◌ံ ◌့ ◌း ◌္ ◌် ◌ျ ◌ြ ◌ွ ◌ှ ◌ၖ ◌ၗ ◌ၘ ◌ၙ ◌ၞ ◌ၟ ◌ၠ ◌ၢ ◌ၣ ◌ၤ ◌ၧ ◌ၨ ◌ၩ ◌ၪ ◌ၫ ◌ၬ ◌ၭ ◌ၱ ◌ၲ ◌ၳ ◌ၴ ◌ႂ ◌ႃ ◌ႄ ◌ႅ ◌ႆ ◌ႇ ◌ႈ ◌ႉ ◌ႊ ◌ႋ ◌ႌ ◌ႍ ◌ႏ ◌ႚ ◌ႛ ◌ႜ ◌ႝ"
-}
diff --git a/lang/languages/mnw/sampletext.textproto b/lang/languages/mnw/sampletext.textproto
deleted file mode 100644
index 6f3354b76..000000000
--- a/lang/languages/mnw/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mnw"
diff --git a/lang/languages/moe/language.textproto b/lang/languages/moe.textproto
similarity index 86%
rename from lang/languages/moe/language.textproto
rename to lang/languages/moe.textproto
index 7d458da44..2ffb21db3 100644
--- a/lang/languages/moe/language.textproto
+++ b/lang/languages/moe.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Î Û a b c d e f g h i j k l m n o p q r s t u v w x y z â î û"
   marks: "◌̂"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/moh/language.textproto b/lang/languages/moh.textproto
similarity index 88%
rename from lang/languages/moh/language.textproto
rename to lang/languages/moh.textproto
index 994bb8b38..6b7583e28 100644
--- a/lang/languages/moh/language.textproto
+++ b/lang/languages/moh.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á À É È Í Ì Ó Ò Ú Ù a b c d e f g h i j k l m n o p q r s t u v w x y z á à é è í ì ó ò ú ù ’"
   marks: "◌̀ ◌́"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mos.textproto b/lang/languages/mos.textproto
new file mode 100644
index 000000000..a17556ed9
--- /dev/null
+++ b/lang/languages/mos.textproto
@@ -0,0 +1,23 @@
+id: "mos"
+name: "Mossi"
+preferred_name: ""
+autonym: ""
+population: 8334160
+region: "BF"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E Ɛ F G H I Ɩ L M N O P R S T U V Ʋ W Y Z a b d e ɛ f g h i ɩ l m n o p r s t u v ʋ w y z \'"
+}
+sample_text {
+  masthead_full: "NnIi"
+  masthead_partial: "Ss"
+  tester: "B wilgame tɩ ninsaal bʊʊd fãa tara a burkĩndlim la a yel-segdɩ"
+  poster_sm: "B wilgame tɩ"
+  poster_md: "Tɩ sẽn yɩɩd"
+  poster_lg: "fãa"
+  specimen_48: "D sẽn mi tɩ nasõzini (tẽmsã fãa lagem-n-taar kãsengã) le mooname"
+  specimen_36: "Pa tog n sɩbg ninsaal buudã fãa ye, pa tog n sɩbg ninsaal tɩ sɩbgrã yɩ toog wʊsgo, tɩ pa sẽn na maan ninsaal ye."
+  specimen_32: "Ned buud fãa tara sor n tõe n kẽng a tẽngẽ bʊʊd soog taoore n tɩ bʊ ne weoogre, sɩbgr buud fãa b sẽn maan-a, tɩ ninsaalb yel-segdɩ sebrã gɩdge, tɩ laloa mi tiiri."
+  specimen_21: "Pa tar sor n tõe n yõk ned zaalem, n pag-a roogo bɩ n yiis-a a tẽngẽ n tɩ ning zĩĩg a to tɩ laloa zɩ tiir ye.\nNed buud fãa tara sor wa laloa sẽn wilgã, t\'a yell ta bʊ-kaoodb sẽn so bʊʊdã, n tõe n kao tɩ pãn-dãmb ka lob b toogo, la sẽn bʊʊd sɩd taoore, tɩ b bʊ nin-buiid taoore n wilg a yel-segdɩ bɩ a tɩlae-yɛla, bɩ n wilg b sẽn yet tɩ yẽnda soabã maana bũmb ningã kongr sẽn taẽ."
+  specimen_16: "[Missing]\nNed fãa tara sor n tõe n tags a sẽn date, n bʊgs a sẽn date la a tũ wẽnd-sor ninga a sẽn date. Sor-kãng a sẽn tarã wɛɛngẽ a tõeeme n teem wẽnd-sor n tũ bɩ n teem tẽebo a le tõeeme n wilg a wẽnd-sor bɩ a tẽebo ne kaorengo, maana maanego tɩ yɩ yẽnda a ye bɩ n naag ne a taaba tɩ yɩ neb sʊka bɩ bãmb bal ne taaba.\nNed buud fãa tara sor n tõe n tẽ a sẽn date la a gom a sẽn date, rẽnda n kɩt tɩ ned pa tog n zoe rabeem ne a tẽeb wilgri, la a tar sor n tõe n bao n bãng kibay la a paam kibay n tall-b n piuug zĩĩg fãa n pa ges tẽmsã tods ye, tɩ yɩ ne rabay buud fãa a sẽn date."
+}
diff --git a/lang/languages/mos/language.textproto b/lang/languages/mos/language.textproto
deleted file mode 100644
index b6b0f3b2a..000000000
--- a/lang/languages/mos/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "mos"
-name: "Mossi"
-preferred_name: ""
-autonym: ""
-population: 8334160
-region: "BF"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E Ɛ F G H I Ɩ L M N O P R S T U V Ʋ W Y Z a b d e ɛ f g h i ɩ l m n o p r s t u v ʋ w y z \'"
-}
diff --git a/lang/languages/mos/sampletext.textproto b/lang/languages/mos/sampletext.textproto
deleted file mode 100644
index 404c06506..000000000
--- a/lang/languages/mos/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mos"
diff --git a/lang/languages/mr.textproto b/lang/languages/mr.textproto
new file mode 100644
index 000000000..20cf7da83
--- /dev/null
+++ b/lang/languages/mr.textproto
@@ -0,0 +1,28 @@
+id: "mr"
+name: "Marathi"
+preferred_name: ""
+autonym: "मराठी"
+population: 92826300
+region: "IN"
+script: "Devanagari"
+exemplar_chars {
+  base: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ‌ ‍"
+  auxiliary: "ॐ"
+  marks: "◌ँ ◌ं ◌ः ◌़ ◌ा ◌ि ◌ी ◌ु ◌ू ◌ृ ◌े ◌ै ◌ो ◌ौ ◌्"
+  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "। ॥ ॰"
+  index: "\\u200D ॐ \\u0902 ः अ आ इ ई उ ऊ ऋ ऌ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ळ ऽ \\u0945 \\u094D"
+}
+sample_text {
+  masthead_full: "सरवम"
+  masthead_partial: "नय"
+  tester: "ज्या अर्थी मानव कुटुँवातील सर्व व्यक्तींची स्वाभाविक प्रतिष्ठा व त्यांचे समान व अहरणीय अधिकार"
+  poster_sm: "ज्या अर्थी, मानवी"
+  poster_md: "ज्या अर्थी, जुलूम"
+  poster_lg: "सर्व"
+  specimen_48: "ज्या अर्थी, राष्ट्र राष्ट्रांमध्ये मित्रस्वाचे संबंध बृद्धिंगत करण्याच्या कार्यास चालना देणे अत्यावश्यक"
+  specimen_36: "घटनेने किंवा कायद्याने दिलेल्या मूलभूत हक्कांचा भंग करण्यार्‍या कृत्यांच्या बाबतीत सक्षम राष्ट्रीय अधिकारणा मार्फत परिणाम-कारक उपाययोजना करण्याचा प्रत्येकास अधिकार आहे."
+  specimen_32: "प्रत्येकाला समान भूमिकेवरून त्याचे अधिकार व जवाबदार्‍या निश्चित करण्याच्या संबंधात किंवा त्याच्यावरील कोणत्याहि दंडनीय आरोपाचा न्यायनिर्णय करण्याच्या संबंधात स्वतंत्र व निःपक्षपाती अधिकरणामार्फत न्याय्य व जाहीर सुनावणी केली जाण्याचा हक्क आहे."
+  specimen_21: "कोणाचेहि खाजगी जीवन, त्याचे कुटुंब, घर अथवा त्याचा पत्रव्यवहार यांच्या संबंधात स्वच्छंद ढवळाढवळ होता कामा नये; त्याचप्रमाणे त्याची प्रतिष्ठा किंवा नावलौकिक यावर हल्ला होता कामा नये. अशी ढवळाढवळ किंवा हल्ला झाल्यास त्याविरुद्ध प्रत्येकास कायद्याने संरक्षण मिळण्याचा अधिकार आहे.\nप्रत्येकास विचारस्वातंत्र्य, आपल्या सदसद्विवेकबुद्धिनुसार वागण्याचे स्वातंत्र्य असण्याचा अधिकार आहे या अधिकारांत स्वतःचा धर्म अथवा श्रद्धा बदलण्याच्या स्वातंत्र्याचा आणि एकट्याने वा इतरांसह सामुदायिकरीत्या आपला धर्म अथवा श्रद्धा, शिकवणुकीत, व्यवहारात, उपासनेत व आचरणात जाहीर रीतीने अथवा खासगी रीतीने व्यक्त करण्याच्चा स्वातंत्र्याचा समावेश होतो."
+  specimen_16: "प्रत्येकास मतस्वातंत्र्य व भाषणस्वातंत्र्य असण्याचा अधिकार आहे. या अधिकारात कोणतीही ढवळाढवळ न होता मत बाळगण्याच्या स्वातंत्र्याचा. तसेच कोणत्याही माध्यमातून व सीमांचा विचार न करता माहिती व विचार ग्रहण करण्याचा प्रयत्न करणे, ती मिळविणे व इतरांना ती देणे यासंबंधीच्या स्वातंत्र्याचा समावेश होतो.\nप्रत्येकास समाजाचा एक घटक या नात्याने सामाजिक सुरक्षितता प्राप्त करून घेण्याचा अधिकार आहे आणि राष्ट्रीय प्रयत्न व आंतरराष्ट्रीय सहकार्य यांच्या द्वारे व प्रत्येक राष्ट्राच्या व्यवस्थेनुसार व साधनसंमतीनुसार आपल्या प्रतिष्ठेस व आपल्या व्यक्तिमत्वाच्या मुक्त विकासासाठी अनिवार्य असलेले आर्थिक, सामाजिक व सांस्कृतिक अधिकार संपादन करण्याचा हक्क आहे.\nवाजवी मर्यांदा असलेले कामाचे तास व ठराविक मुदतीने पगारी सुट्या धरून प्रत्येकास विश्रांति व आराम मिळण्याचा अधिकार आहे.\nह्या जाहीरनाम्यात ग्रथित केलेले अधिकार व स्वातंत्र्य पूर्णपणे साध्य करता येतील अशा सामाजिक व आंतरराष्ट्रीय व्यवस्थेचा प्रत्येकास हक्क आहे."
+}
diff --git a/lang/languages/mr/language.textproto b/lang/languages/mr/language.textproto
deleted file mode 100644
index 4a6f631f3..000000000
--- a/lang/languages/mr/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "mr"
-name: "Marathi"
-preferred_name: ""
-autonym: "मराठी"
-population: 92826300
-region: "IN"
-script: "Devanagari"
-exemplar_chars {
-  base: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ‌ ‍"
-  auxiliary: "ॐ"
-  marks: "◌ँ ◌ं ◌ः ◌़ ◌ा ◌ि ◌ी ◌ु ◌ू ◌ृ ◌े ◌ै ◌ो ◌ौ ◌्"
-  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "। ॥ ॰"
-  index: "\\u200D ॐ \\u0902 ः अ आ इ ई उ ऊ ऋ ऌ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ळ ऽ \\u0945 \\u094D"
-}
diff --git a/lang/languages/mr/sampletext.textproto b/lang/languages/mr/sampletext.textproto
deleted file mode 100644
index ad14a1749..000000000
--- a/lang/languages/mr/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mr"
diff --git a/lang/languages/mrd/language.textproto b/lang/languages/mrd.textproto
similarity index 76%
rename from lang/languages/mrd/language.textproto
rename to lang/languages/mrd.textproto
index c0303444d..02e39d9d5 100644
--- a/lang/languages/mrd/language.textproto
+++ b/lang/languages/mrd.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/mrj/language.textproto b/lang/languages/mrj.textproto
similarity index 90%
rename from lang/languages/mrj/language.textproto
rename to lang/languages/mrj.textproto
index 36a89b453..e90a9452f 100644
--- a/lang/languages/mrj/language.textproto
+++ b/lang/languages/mrj.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӓ Ӧ Ӱ Ӹ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӓ ӧ ӱ ӹ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/mro/language.textproto b/lang/languages/mro.textproto
similarity index 73%
rename from lang/languages/mro/language.textproto
rename to lang/languages/mro.textproto
index 5f707a4b7..5c1d7e3e0 100644
--- a/lang/languages/mro/language.textproto
+++ b/lang/languages/mro.textproto
@@ -7,3 +7,6 @@ region: "BD"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ms/language.textproto b/lang/languages/ms.textproto
similarity index 92%
rename from lang/languages/ms/language.textproto
rename to lang/languages/ms.textproto
index 3ebc01136..6072194b3 100644
--- a/lang/languages/ms/language.textproto
+++ b/lang/languages/ms.textproto
@@ -3,15 +3,18 @@ name: "Malay"
 preferred_name: ""
 autonym: "Malaysia"
 population: 34869275
-region: "ID"
-region: "SG"
-region: "MY"
 region: "BN"
-script: "Perso-Arabic"
+region: "ID"
+region: "MY"
+region: "SG"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "ء ‎ ا ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ل م ن ه و ى ي چ ڠ ڤ ک ڽ ۏ ݢ"
   numerals: "٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩"
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "ha"
+}
diff --git a/lang/languages/ms_Arab/language.textproto b/lang/languages/ms_Arab.textproto
similarity index 81%
rename from lang/languages/ms_Arab/language.textproto
rename to lang/languages/ms_Arab.textproto
index 011aeba38..f088f3eba 100644
--- a/lang/languages/ms_Arab/language.textproto
+++ b/lang/languages/ms_Arab.textproto
@@ -3,10 +3,13 @@ name: "Malay (Arabic)"
 preferred_name: ""
 autonym: ""
 population: 3228030
-region: "ID"
-region: "CC"
 region: "BN"
-script: "Perso-Arabic"
+region: "CC"
+region: "ID"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ha"
+}
diff --git a/lang/languages/mt.textproto b/lang/languages/mt.textproto
new file mode 100644
index 000000000..f76d7f3ab
--- /dev/null
+++ b/lang/languages/mt.textproto
@@ -0,0 +1,28 @@
+id: "mt"
+name: "Maltese"
+preferred_name: ""
+autonym: "Malti"
+population: 457267
+region: "MT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À È Ì Î Ò Ù Ċ Ġ Ħ Ż a b c d e f g h i j k l m n o p q r s t u v w x y z à è ì î ò ù ċ ġ ħ ż"
+  auxiliary: "c y"
+  marks: "◌̀ ◌̂ ◌̇"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ , ; \\: ! ? . \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\}"
+  index: "A B Ċ C D E F Ġ G {GĦ} H Ħ I {IE*} J K L M N O P Q R S T U V W X Y Ż Z"
+}
+sample_text {
+  masthead_full: "IiLl"
+  masthead_partial: "Bb"
+  tester: "Billi l-għarfien tad-dinjità proprja tal-membri kollha tal-familja"
+  poster_sm: "Billi t-tkasbir"
+  poster_md: "Billi hu"
+  poster_lg: "kollha"
+  specimen_48: "Billi hu essenzjali li jkun imħeġġeġ l-iżvilupp ta’ relazzjonijiet"
+  specimen_36: "Billi fehma komuni ta’ dawn il-jeddijiet u l-libertajiet hi tal-akbar importanza għat-twettiq sħiħ ta’ din il-wegħda,"
+  specimen_32: "Il-bnedmin kollha jitwieldu ħielsa u ugwali fid-dinjità u d-drittijiet. Huma mogħnija bir-raġuni u bil-kuxjenza u għandhom iġibu ruħhom ma’ xulxin bi spirtu ta’ aħwa."
+  specimen_21: "Kulħadd hu intitolat għal dawn il-jeddijiet u l-libertajiet imxandra f’din l-Istqarrija, bla ebda għażla, bħal ta’ razza, lewn, sess, ilsien, reliġjon, opinjoni politika jew kull opinjoni oħra, oriġini nazzjonali jew soċjali, proprjetà, twelid jew kull qagħda oħra.\nKull bniedem għandu l-jedd għall-ħajja, għall-ħelsien u għas-sigurtà tal-persuna tiegħu."
+  specimen_16: "Ħadd m’għandu jinżamm ilsir jew fi stat li jixbah lil dak ta’ lsir. L-iskjavitù u n-negozju tal-ilsiera fl-għamliet kollha tagħhom m’għandhomx jitħallew isiru.\nĦadd m’għandu jingħata tortura jew kastig jew trattament aħrax, li ma jixraqx lill-bniedem jew li jbaxxih.\nKulħadd għandu l-jedd li jintgħaraf kullimkien bħala persuna quddiem il-liġi.\nKulħadd huwa ndaqs quddiem il-liġi u għandu l-jedd, bla ebda għażla, għal protezzjoni ugwali mil-liġi. Kulħadd għandu l-jedd għal protezzjoni ndaqs kontra kull għażla li tikser din l-Istqarrija u kontra kull provokazzjoni għal għażla bħal din."
+}
diff --git a/lang/languages/mt/language.textproto b/lang/languages/mt/language.textproto
deleted file mode 100644
index fef977cf0..000000000
--- a/lang/languages/mt/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "mt"
-name: "Maltese"
-preferred_name: ""
-autonym: "Malti"
-population: 457267
-region: "MT"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À È Ì Î Ò Ù Ċ Ġ Ħ Ż a b c d e f g h i j k l m n o p q r s t u v w x y z à è ì î ò ù ċ ġ ħ ż"
-  auxiliary: "c y"
-  marks: "◌̀ ◌̂ ◌̇"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ , ; \\: ! ? . \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\}"
-  index: "A B Ċ C D E F Ġ G {GĦ} H Ħ I {IE*} J K L M N O P Q R S T U V W X Y Ż Z"
-}
diff --git a/lang/languages/mt/sampletext.textproto b/lang/languages/mt/sampletext.textproto
deleted file mode 100644
index 5ff6104b4..000000000
--- a/lang/languages/mt/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "mt"
diff --git a/lang/languages/mtr/language.textproto b/lang/languages/mtr.textproto
similarity index 75%
rename from lang/languages/mtr/language.textproto
rename to lang/languages/mtr.textproto
index 8ee848c05..8f33113ea 100644
--- a/lang/languages/mtr/language.textproto
+++ b/lang/languages/mtr.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/mua/language.textproto b/lang/languages/mua.textproto
similarity index 91%
rename from lang/languages/mua/language.textproto
rename to lang/languages/mua.textproto
index 5a669f7c5..5976a99aa 100644
--- a/lang/languages/mua/language.textproto
+++ b/lang/languages/mua.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B Ɓ C D Ɗ E Ǝ F G H I J K L M N Ŋ O P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mus/language.textproto b/lang/languages/mus.textproto
similarity index 86%
rename from lang/languages/mus/language.textproto
rename to lang/languages/mus.textproto
index 12d4d3c66..a73fcbc3c 100644
--- a/lang/languages/mus/language.textproto
+++ b/lang/languages/mus.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ē a b c d e f g h i j k l m n o p q r s t u v w x y z ē"
   marks: "◌̄"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mvy/language.textproto b/lang/languages/mvy.textproto
similarity index 76%
rename from lang/languages/mvy/language.textproto
rename to lang/languages/mvy.textproto
index 965a8c2a7..f9267f4dd 100644
--- a/lang/languages/mvy/language.textproto
+++ b/lang/languages/mvy.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/mwk/language.textproto b/lang/languages/mwk.textproto
similarity index 75%
rename from lang/languages/mwk/language.textproto
rename to lang/languages/mwk.textproto
index 7bda5f9f5..135536503 100644
--- a/lang/languages/mwk/language.textproto
+++ b/lang/languages/mwk.textproto
@@ -7,3 +7,6 @@ region: "ML"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mwr/language.textproto b/lang/languages/mwr.textproto
similarity index 75%
rename from lang/languages/mwr/language.textproto
rename to lang/languages/mwr.textproto
index 48904b302..c1a62f2ee 100644
--- a/lang/languages/mwr/language.textproto
+++ b/lang/languages/mwr.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/mwv/language.textproto b/lang/languages/mwv.textproto
similarity index 74%
rename from lang/languages/mwv/language.textproto
rename to lang/languages/mwv.textproto
index b754f4bfa..ac76eb079 100644
--- a/lang/languages/mwv/language.textproto
+++ b/lang/languages/mwv.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mxc/language.textproto b/lang/languages/mxc.textproto
similarity index 74%
rename from lang/languages/mxc/language.textproto
rename to lang/languages/mxc.textproto
index eb18da3e1..5e72c871b 100644
--- a/lang/languages/mxc/language.textproto
+++ b/lang/languages/mxc.textproto
@@ -7,3 +7,6 @@ region: "ZW"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/my.textproto b/lang/languages/my.textproto
new file mode 100644
index 000000000..286d7ef1f
--- /dev/null
+++ b/lang/languages/my.textproto
@@ -0,0 +1,29 @@
+id: "my"
+name: "Burmese"
+preferred_name: ""
+autonym: "မြန်မာစာ / မြန်မာစကား"
+population: 36559231
+region: "BD"
+region: "MM"
+script: "Myanmar"
+exemplar_chars {
+  base: "က ခ ဂ ဃ င စ ဆ ဇ ဈ ဉ ည ဋ ဌ ဍ ဎ ဏ တ ထ ဒ ဓ န ပ ဖ ဗ ဘ မ ယ ရ လ ဝ သ ဣ ဤ ဥ ဦ ဧ ဩ ဪ"
+  auxiliary: "၀႐ ၁႑ ၂႒ ၃႓ ၄႔ ၅႕ ၆႖ ၇႗ ၈႘ ၉႙ ၵ ၚ ၽ ၾ ၐ ၑ ၥ ဨ ဢ ၒ ၓ ၔ ၕ \\u1033 ၖ ၗ \\u1058 \\u1059 \\u1034 ၢ \\u1086 ၤ ႈ ႊ ႏ"
+  marks: "◌ါ ◌ာ ◌ိ ◌ီ ◌ု ◌ူ ◌ေ ◌ဲ ◌ံ ◌့ ◌း ◌္ ◌် ◌ျ ◌ြ ◌ွ ◌ှ ◌ၖ ◌ၗ"
+  numerals: "\\- ‑ , . % ‰ + 0၀ 1၁ 2၂ 3၃ 4၄ 5၅ 6၆ 7၇ 8၈ 9၉"
+  punctuation: "၊ ။ ‘ ’ “ ”"
+  index: "က ခ ဂ ဃ င စ ဆ ဇ ဈ ဉ ည ဋ ဌ ဍ ဎ ဏ တ ထ ဒ ဓ န ပ ဖ ဗ ဘ မ ယ ရ လ ဝ သ ဟ ဠ အ"
+}
+sample_text {
+  masthead_full: "လတငသ"
+  masthead_partial: "ညပ"
+  tester: "လူခပ်သိမ်း၏ မျိုးရိုးဂုဏ်သိက္ခာနှင့်တကွ လူတိုင်းအညီအမျှခံစားခွင့်ရှိသည့် အခွင့်အရေးများကို အသိအမှတ်ပြုခြင်းသည် လူခပ်သိမ်း၏လွတ်လပ်မှု၊"
+  poster_sm: "လူ့အခွင့်ရေးများကို အရေးမထား"
+  poster_md: "လူခပ်သိမ်းတို့သည်၊"
+  poster_lg: "လူတိုင်းသည်"
+  specimen_48: "နိုင်ငံ အချင်းချင်း ချစ်ခင်ရင်းနှီးစွာ ဆက်ဆံရေးကို ပိုမိုတိုးတက်စေရန် ကြံဆောင်ရမည်ဖြစ်သောကြောင့် လည်းကောင်း၊ ကမ္ဘာ့ကုလသမဂ္ဂအဖွဲ့ဝင်တို့သည်"
+  specimen_36: "ကမ္ဘာ့ကုလသမဂ္ဂအဖွဲ့ဝင် နိုင်ငံတို့သည် ကုလသမဂ္ဂအဖွဲ့နှင့်ပူးပေါင်း၍ လူအခွင့်အရေးများကိုလည်းကောင်း၊ အခြေခံလွတ်လပ်ခွင့် အခွင့်အရေးများကိုလည်းကောင်း၊ ကမ္ဘာ့တဝှမ်းလုံးတွင် ရိုသေလေးစား ကျင့်သုံးစောင့်စည်းကြခြင်းကို အားပေးမည်ဟု ကတိပြုပြီးဖြစ်သောကြောင့် လည်းကောင်း၊"
+  specimen_32: "ဖွဲ့စည်းပုံ အခြေခံဥပဒေက သော်လည်းကောင်း အခြား ဥပဒေက သော်လည်းကောင်း လူတိုင်းအတွက် ပေးထားသည့် အခြေခံ အခွင့်အရေး များသည် ချိုးဖောက် ဖျက်ဆီးခြင်းခံခဲ့ရလျှင် ထိုသို့ ချိုးဖောက်ဖျက်ဆီးသော ပြုလုပ်မှုကြောင့် ဖြစ်ပေါ်လာသော နစ်နာချက် အတွက် ထိုသူသည် နိုင်ငံဆိုင်ရာ အာဏာပိုင်တရားရုံးတွင် ထိရောက်စွာ သက်သာ ခွင့်ရနိုင်စေရမည်။"
+  specimen_21: "မည်သူမျှ ဥပဒေအရ မဟုတ်သော ဖမ်းဆီးခြင်းကို ဖြစ်စေ၊ ချုပ်နှောင်ခြင်းကို ဖြစ်စေ၊ ပြည်နှင်ခြင်းကို ဖြစ်စေ မခံစေရ။\nအခွင့်အရေးများနှင့် တာဝန် ဝတ္တရားများကို အဆုံးအဖြတ်ခံရာတွင် လည်းကောင်း၊ ပြစ်မှုကြောင့် တရားစွဲဆို စီရင်ဆုံးဖြတ်ခံရာတွင် လည်းကောင်း၊ လူတိုင်းသည် လွတ်လပ်၍ ဘက်မလိုက်သော တရားရုံးတော်၏ လူအများ ရှေ့မှောက်တွင် မျှတစွာ ကြားနာစစ်ဆေးခြင်းကို တူညီစွာ ခံစားပိုင်ခွင့်ရှိသည်။\nမည်သူမျှ မိမိသဘောအတိုင်း အေးချမ်းလွတ်လပ်စွာ နေထိုင်ခြင်းကို သော်လည်းကောင်း၊ မိမိ၏ မိသားစုကို သော်လည်းကောင်း၊ မိမိ၏ နေအိမ် အသိုက်အဝန်းကို သော်လည်းကောင်း၊ စာပေးစာယူကို သော်လည်းကောင်း၊ ဥပဒေအရ မဟုတ်သော ဝင်ရောက် စွက်ဖက်ခြင်း မခံစေရ။ ထို့ပြင် မိမိ၏ဂုဏ်သိက္ခာ ကိုလည်း အထက်ပါအတိုင်း ပုတ်ခတ်ခြင်း မခံစေရ။ လူတိုင်းတွင် ထိုသို့ ဝင်ရောက်စွက်ဖက်ခြင်းမှ သော်လည်းကောင်း ပုတ်ခတ်ခြင်းမှ သော်လည်းကောင်း ဥပဒေအရ ကာကွယ် ပိုင်ခွင့်ရှိသည်။"
+  specimen_16: "လူတိုင်းတွင် လွတ်လပ်စွာ တွေးခေါ် ကြံဆနိုင်ခွင့်၊ လွတ်လပ်စွာ ခံယူရပ်တည်နိုင်ခွင့် နှင့် လွတ်လပ်စွာ သက်ဝင် ကိုးကွယ်နိုင်ခွင့်ရှိသည်။ အဆိုပါ အခွင့်အရေးများ၌ မိမိကိုးကွယ်သည့် ဘာသာကို သို့တည်းမဟုတ် သက်ဝင်ယုံကြည်ချက်ကို လွတ်လပ်စွာ ပြောင်းလဲနိုင်ခွင့် ပါဝင်သည့် အပြင် မိမိတစ်ယောက် ချင်းဖြစ်စေ၊ အခြားသူများနှင့် စုပေါင်း၍ဖြစ်စေ၊ ပြည်သူအများ ရှေ့မှောက်တွင် သော်လည်းကောင်း၊ ရှေ့မှောက်တွင် မဟုတ်ဘဲ သော်လည်းကောင်း၊ မိမိ ကိုးကွယ်သော ဘာသာကို သို့တည်းမဟုတ် သက်ဝင် ယုံကြည်ချက်ကို လွတ်လပ်စွာ သင်ပြနိုင်ခွင့်၊ ကျင့်သုံးနိုင်ခွင့်၊ ဝတ်ပြုကိုးကွယ်နိုင်ခွင့်နှင့် ဆောက်တည် နိုင်ခွင့်တို့လည်း ပါဝင်သည်။\nလူတိုင်းတွင် လွတ်လပ်စွာ ထင်မြင် ယူဆနိုင်ခွင့်နှင့် လွတ်လပ်စွာ ဖွင့်ဟ ဖော်ပြနိုင်ခွင့်ရှိသည်။ အဆိုပါ အခွင့်အရေးများ၌ အနှောင့် အယှက်မရှိဘဲ လွတ်လပ်စွာ ထင်မြင်ယူဆနိုင်ခွင့် ပါဝင် သည့်အပြင်၊ နိုင်ငံနယ်နိမိတ်များကို ထောက်ထားရန် မလိုဘဲ သတင်းအကြောင်းအရာနှင့် သဘောတရားများကို တနည်းနည်းဖြင့် လွတ်လပ်စွာ ရှာယူဆည်းပူးနိုင်ခွင့်၊ လက်ခံနိုင်ခွင့်နှင့် ဝေငှ ဖြန့်ချီခွင့်တို့လည်း ပါဝင်သည်။\nလူတိုင်းတွင် လူ့အဖွဲ့အစည်း၏ အဖွဲ့ဝင်တစ်ဦးအနေနှင့် လူမှုရေး လုံခြုံခွင့်ရယူပိုင့်ခွင့်ရှိသည့်အပြင် နိုင်ငံရေးကြိုးပမ်းမှုဖြင့်ဖြစ်စေ၊ နိုင်ငံတကာ ပူပေါင်းဆောင်ရွက်မှုဖြင့်ဖြစ်စေ၊ နိုင်ငံအသီးသီး၏ဖွဲ့စည်းပုံနှင့် လည်းကောင်း၊ သယံဇာတအင်အားနှင့်လည်းကောင်း ထိုလူ၏ ဂုဏ်သိက္ခာနှင့် စရိုက်လက္ခဏာ လွတ်လပ်စွာ တိုးတက်မြင့်မားရေးအတွက် မရှိမဖြစ်လိုအပ်သော စီးပွားရေး၊ လူမှုရေးနှင့် ယဉ်ကျေးမှု အခွင့်အရေးများကို သုံးစွဲပိုင်ခွင့်ရှိသည်။"
+}
diff --git a/lang/languages/my/language.textproto b/lang/languages/my/language.textproto
deleted file mode 100644
index e249a9160..000000000
--- a/lang/languages/my/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "my"
-name: "Burmese"
-preferred_name: ""
-autonym: "မြန်မာစာ / မြန်မာစကား"
-population: 36559231
-region: "MM"
-region: "BD"
-script: "Myanmar"
-exemplar_chars {
-  base: "က ခ ဂ ဃ င စ ဆ ဇ ဈ ဉ ည ဋ ဌ ဍ ဎ ဏ တ ထ ဒ ဓ န ပ ဖ ဗ ဘ မ ယ ရ လ ဝ သ ဣ ဤ ဥ ဦ ဧ ဩ ဪ"
-  auxiliary: "၀႐ ၁႑ ၂႒ ၃႓ ၄႔ ၅႕ ၆႖ ၇႗ ၈႘ ၉႙ ၵ ၚ ၽ ၾ ၐ ၑ ၥ ဨ ဢ ၒ ၓ ၔ ၕ \\u1033 ၖ ၗ \\u1058 \\u1059 \\u1034 ၢ \\u1086 ၤ ႈ ႊ ႏ"
-  marks: "◌ါ ◌ာ ◌ိ ◌ီ ◌ု ◌ူ ◌ေ ◌ဲ ◌ံ ◌့ ◌း ◌္ ◌် ◌ျ ◌ြ ◌ွ ◌ှ ◌ၖ ◌ၗ"
-  numerals: "\\- ‑ , . % ‰ + 0၀ 1၁ 2၂ 3၃ 4၄ 5၅ 6၆ 7၇ 8၈ 9၉"
-  punctuation: "၊ ။ ‘ ’ “ ”"
-  index: "က ခ ဂ ဃ င စ ဆ ဇ ဈ ဉ ည ဋ ဌ ဍ ဎ ဏ တ ထ ဒ ဓ န ပ ဖ ဗ ဘ မ ယ ရ လ ဝ သ ဟ ဠ အ"
-}
diff --git a/lang/languages/my/sampletext.textproto b/lang/languages/my/sampletext.textproto
deleted file mode 100644
index c3ad6f517..000000000
--- a/lang/languages/my/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "my"
diff --git a/lang/languages/myv/language.textproto b/lang/languages/myv.textproto
similarity index 89%
rename from lang/languages/myv/language.textproto
rename to lang/languages/myv.textproto
index aa760e9b6..39cc18781 100644
--- a/lang/languages/myv/language.textproto
+++ b/lang/languages/myv.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/myx/language.textproto b/lang/languages/myx.textproto
similarity index 74%
rename from lang/languages/myx/language.textproto
rename to lang/languages/myx.textproto
index e065bfc86..d0a530a5a 100644
--- a/lang/languages/myx/language.textproto
+++ b/lang/languages/myx.textproto
@@ -7,3 +7,6 @@ region: "UG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/mzn/language.textproto b/lang/languages/mzn.textproto
similarity index 93%
rename from lang/languages/mzn/language.textproto
rename to lang/languages/mzn.textproto
index af090f1c5..99b0dcd24 100644
--- a/lang/languages/mzn/language.textproto
+++ b/lang/languages/mzn.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ ، ٫ ٬ ؛ \\: ! ؟ . … ‹ › « » ( ) \\[ \\] * / \\\\"
   index: "آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/na/language.textproto b/lang/languages/na.textproto
similarity index 73%
rename from lang/languages/na/language.textproto
rename to lang/languages/na.textproto
index aa9f6052d..d2d31e9f8 100644
--- a/lang/languages/na/language.textproto
+++ b/lang/languages/na.textproto
@@ -7,3 +7,6 @@ region: "NR"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nan/language.textproto b/lang/languages/nan.textproto
similarity index 69%
rename from lang/languages/nan/language.textproto
rename to lang/languages/nan.textproto
index bfe18fd8f..511a515f7 100644
--- a/lang/languages/nan/language.textproto
+++ b/lang/languages/nan.textproto
@@ -10,3 +10,16 @@ exemplar_chars {
   auxiliary: "乒 乓 仂 仓 伞 侣 傈 傣 僳 冥 凉 刨 匕 卑 卞 厘 厦 厨 吕 呣 唇 啤 啮 喱 嗅 噘 噢 坝 堤 墟 奎 妆 婴 媚 宅 寺 尬 尴 屑 屿 巽 巾 弓 彗 惊 戟 扔 扰 扳 抛 挂 捂 摇 撅 撤 杆 杖 柜 柱 栗 栽 桶 棍 棕 棺 楔 楠 榈 槟 橙 洒 浆 涌 淇 滕 滚 滩 灾 烛 烟 焰 煎 犬 猫 瑚 瓢 甫 皱 盆 盔 盲 眨 眯 瞌 矿 碑 祈 祭 祷 禄 稻 竿 笼 筒 篷 粟 粮 纠 纬 缆 缎 耸 脚 舔 舵 艇 艮 芽 苜 苞 菇 菱 葫 葵 蒸 蓿 蔽 薯 蘑 蚂 蛛 蜗 蜘 蜡 蝎 蝴 螃 裹 谍 谬 豚 账 跤 踪 躬 轴 辐 迹 郁 鄙 酢 钉 钥 钮 钯 铂 铅 铛 锄 锑 锚 锤 镑 闺 阱 隧 雕 霾 靴 靶 鞠 颠 馏 驼 骆 髦 魁 鲤 鲸 鳄 鸽"
   numerals: "% + - . 0 1 2 3 4 5 6 7 8 9 ‰ 〇"
 }
+sample_text {
+  masthead_full: "人生而自"
+  masthead_partial: "由在"
+  tester: "鉴于对人权的勿会合创治已发展为野赤暴行，即号暴行玷污了人类的道行，而一个人人享有言论合信仰自由并无恐惧合匮乏的世界的来临，已互宣布为普通人民的最高的雄心"
+  poster_sm: "发布即个世界人权宣言"
+  poster_md: "人人过过有权享有生命"
+  poster_lg: "人人生而自由"
+  specimen_48: "法律之前人人平等，并有权享受法律的平等保庇，无受任何歧视。人人有权享受平等保庇，以无受违逆即个宣言的任何歧视行为以及煽动即款歧视的任何行为的败害"
+  specimen_36: "鉴于对人类社会的成员拢固有的尊严及其平等的合无移的权利的承认，乃是世界自由、正义合和平的底置，\n鉴于对人权的勿会合创治已发展为野赤暴行，即号暴行玷污了人类的道行，而一个人人享有言论合信仰自由并无恐惧合匮乏的世界的来临，已互宣布为普通人民的最高的雄心，"
+  specimen_32: "鉴于对人类社会的成员拢固有的尊严及其平等的合无移的权利的承认，乃是世界自由、正义合和平的底置，\n鉴于对人权的勿会合创治已发展为野赤暴行，即号暴行玷污了人类的道行，而一个人人享有言论合信仰自由并无恐惧合匮乏的世界的来临，已互宣布为普通人民的最高的雄心，\n鉴于为互人类勿会致到起散对杀政合创治进行反叛，有必要互人权受法治的保庇，"
+  specimen_21: "鉴于对人类社会的成员拢固有的尊严及其平等的合无移的权利的承认，乃是世界自由、正义合和平的底置，\n鉴于对人权的勿会合创治已发展为野赤暴行，即号暴行玷污了人类的道行，而一个人人享有言论合信仰自由并无恐惧合匮乏的世界的来临，已互宣布为普通人民的最高的雄心，\n鉴于为互人类勿会致到起散对杀政合创治进行反叛，有必要互人权受法治的保庇，\n鉴于有必要促进各国间好斗头关系的发展，\n鉴于各联合国国家的人民已在联合国宪章中对头讲因对基本人权、人格尊严合价值以及丈夫查某平等权利的信念，并决心促成较大自由中的社会进步合生活水平的改善，\n鉴于各会员国业已咒誓同联合国合作以促进对人权合基本自由的普遍尊重合遵行，\n鉴于对即号权利合自由的普遍知空对于即个咒誓的充分实现具有设汰大的重要性，"
+  specimen_16: "鉴于对人类社会的成员拢固有的尊严及其平等的合无移的权利的承认，乃是世界自由、正义合和平的底置，\n鉴于对人权的勿会合创治已发展为野赤暴行，即号暴行玷污了人类的道行，而一个人人享有言论合信仰自由并无恐惧合匮乏的世界的来临，已互宣布为普通人民的最高的雄心，\n鉴于为互人类勿会致到起散对杀政合创治进行反叛，有必要互人权受法治的保庇，\n鉴于有必要促进各国间好斗头关系的发展，\n鉴于各联合国国家的人民已在联合国宪章中对头讲因对基本人权、人格尊严合价值以及丈夫查某平等权利的信念，并决心促成较大自由中的社会进步合生活水平的改善，\n鉴于各会员国业已咒誓同联合国合作以促进对人权合基本自由的普遍尊重合遵行，\n鉴于对即号权利合自由的普遍知空对于即个咒誓的充分实现具有设汰大的重要性，\n因此即辄，\n大会，\n发布即个世界人权宣言，作为所有人民合所有国家下力实现的共同标准，以期每一个人合社会机构定定带着即个宣言，下力倚傍教诲合教育促进对权利合自由的尊重，并倚傍国家的合国际的渐进措施，互即号权利合自由在各会员国本身人民及在因管辖下地的人民中得到普遍合有效的承认合遵行；\n人人生而自由，在尊严合权利上一律平等。因赋有脾胃合道行，并着以兄弟关系的精神相对待。\n人人有资格享有即个宣言所载的一切权利合自由，无分种族、肤色、性别、语言、宗教、政治抑其他见解、国籍抑社会出身、财产、出生抑其他身分等任何区别。"
+}
diff --git a/lang/languages/nan/sampletext.textproto b/lang/languages/nan/sampletext.textproto
deleted file mode 100644
index f5a8b3796..000000000
--- a/lang/languages/nan/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nan"
diff --git a/lang/languages/nap/language.textproto b/lang/languages/nap.textproto
similarity index 89%
rename from lang/languages/nap/language.textproto
rename to lang/languages/nap.textproto
index 3f45bf792..43d7c7eb8 100644
--- a/lang/languages/nap/language.textproto
+++ b/lang/languages/nap.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â È É Ê Ì Í Î Ò Ó Ô Ù Ú Û a b c d e f g h i j k l m n o p q r s t u v w x y z à á â è é ê ì í î ò ó ô ù ú û"
   marks: "◌̀ ◌́ ◌̂"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/naq/language.textproto b/lang/languages/naq.textproto
similarity index 92%
rename from lang/languages/naq/language.textproto
rename to lang/languages/naq.textproto
index 584dae817..2083e236c 100644
--- a/lang/languages/naq/language.textproto
+++ b/lang/languages/naq.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌̀ ◌́ ◌̂ ◌̃ ◌̄ ◌̈"
   index: "A B C D E F G H I K M N O P Q R S T U W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nb.textproto b/lang/languages/nb.textproto
new file mode 100644
index 000000000..d7bc30354
--- /dev/null
+++ b/lang/languages/nb.textproto
@@ -0,0 +1,23 @@
+id: "nb"
+name: "Norwegian Bokmål"
+preferred_name: ""
+autonym: ""
+population: 5468932
+region: "NO"
+region: "SJ"
+script: "Latin"
+exemplar_chars {
+}
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Ee"
+  tester: "Da anerkjennelsen av menneskeverd og like og umistelige rettigheter"
+  poster_sm: "da De Forente"
+  poster_md: "nå denne"
+  poster_lg: "Alle"
+  specimen_48: "Enhver har krav på alle de rettigheter og friheter som er nevnt"
+  specimen_36: "Enhver har rett til hvile og fritid, herunder rimelig begrensning av arbeidstiden og regelmessige ferier med lønn."
+  specimen_32: "Enhver har krav på en sosial og internasjonal orden som fullt ut kan virkeliggjøre de rettigheter og friheter som er nevnt i denne erklæring."
+  specimen_21: "Intet i denne erklæring skal tolkes slik at det gir noen stat, gruppe eller person rett til å ta del i noen virksomhet eller foreta noen handling som tar sikte på å ødelegge noen av de rettigheter og friheter som er nevnt i Erklæringen.\nDa anerkjennelsen av menneskeverd og like og umistelige rettigheter for alle medlemmer av menneskeslekten er grunnlaget for frihet, rettferdighet og fred i verden,"
+  specimen_16: "Da anerkjennelsen av menneskeverd og like og umistelige rettigheter for alle medlemmer av menneskeslekten er grunnlaget for frihet, rettferdighet og fred i verden,\nda tilsidesettelse av og forakt for menneskerettighetene har ført til barbariske handlinger som har rystet menneskehetens samvittighet, og da framveksten av en verden hvor menneskene har tale- og trosfrihet og frihet fra frykt og nød, er blitt kunngjort som folkenes høyeste mål,\nda det er nødvendig at menneskerettighetene blir beskyttet av loven for at menneskene ikke skal tvinges til som siste utvei å gjøre opprør mot tyranni og undertrykkelse,"
+}
diff --git a/lang/languages/nb/language.textproto b/lang/languages/nb/language.textproto
deleted file mode 100644
index 9c1b27bed..000000000
--- a/lang/languages/nb/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "nb"
-name: "Norwegian Bokmål"
-preferred_name: ""
-autonym: ""
-population: 5468932
-region: "SJ"
-region: "NO"
-script: "Latin"
-exemplar_chars {
-}
diff --git a/lang/languages/nb/sampletext.textproto b/lang/languages/nb/sampletext.textproto
deleted file mode 100644
index f03e263c8..000000000
--- a/lang/languages/nb/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nb"
diff --git a/lang/languages/nch/language.textproto b/lang/languages/nch.textproto
similarity index 77%
rename from lang/languages/nch/language.textproto
rename to lang/languages/nch.textproto
index 53e987df8..986f663d4 100644
--- a/lang/languages/nch/language.textproto
+++ b/lang/languages/nch.textproto
@@ -7,3 +7,6 @@ region: "MX"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nd/language.textproto b/lang/languages/nd.textproto
similarity index 88%
rename from lang/languages/nd/language.textproto
rename to lang/languages/nd.textproto
index 955c1f446..fbba84120 100644
--- a/lang/languages/nd/language.textproto
+++ b/lang/languages/nd.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "r"
   index: "A B C D E F G H I J K L M N O P Q S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ndc/language.textproto b/lang/languages/ndc.textproto
similarity index 76%
rename from lang/languages/ndc/language.textproto
rename to lang/languages/ndc.textproto
index 7b049aa3f..10330be38 100644
--- a/lang/languages/ndc/language.textproto
+++ b/lang/languages/ndc.textproto
@@ -8,3 +8,6 @@ region: "ZW"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nds.textproto b/lang/languages/nds.textproto
new file mode 100644
index 000000000..e27554983
--- /dev/null
+++ b/lang/languages/nds.textproto
@@ -0,0 +1,29 @@
+id: "nds"
+name: "Low German"
+preferred_name: ""
+autonym: "Niedersächsisch"
+population: 11520008
+region: "DE"
+region: "NL"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ë Ï Ö Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ß ä ë ï ö ü"
+  auxiliary: "ẞ"
+  marks: "◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
+  index: "A B C D E F G H I J K L M N O P Q R S ẞ T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Dd"
+  tester: "Vunwegen wat dat Anerkennen vun de Wüürd, mit de all Minschen"
+  poster_sm: "vunwegen wat"
+  poster_md: "vunwegen"
+  poster_lg: "All"
+  specimen_48: "vunwegen wat dat nödig is, dat mang de Natschonen föddert ward,"
+  specimen_36: "Vunwegen wat dat Anerkennen vun de Wüürd, mit de all Minschen baren sünd, un de Rechten, de all Maten vun"
+  specimen_32: "vunwegen wat dat nödig is, de Minschenrechten dörch dat Regeern vun’t Recht Schuul  geven, dat de Minsch nich dwungen  as lest Middel Wedderpart to hollen Tyrannei un Ünnerdrücken,"
+  specimen_21: "Vunwegen wat dat Anerkennen vun de Wüürd, mit de all Minschen baren sünd, un de Rechten, de all Maten vun de Gemeenschupp vun de Minschen hebbt un de gliek un nich to verköpen sünd, de Grundlaag vun Frieheit un Freden in de Welt is, un wat dat recht und billig togeiht,\nvunwegen wat dat nödig is, de Minschenrechten dörch dat Regeern vun’t Recht Schuul  geven, dat de Minsch nich dwungen  as lest Middel Wedderpart to hollen Tyrannei un Ünnerdrücken,"
+  specimen_16: "Vunwegen wat dat Anerkennen vun de Wüürd, mit de all Minschen baren sünd, un de Rechten, de all Maten vun de Gemeenschupp vun de Minschen hebbt un de gliek un nich to verköpen sünd, de Grundlaag vun Frieheit un Freden in de Welt is, un wat dat recht und billig togeiht,\nvunwegen wat dat Verkennen un Minnachten vun de Minschen rechten to unminschlich Doon föhrt hett, un dat Geweten vun de Minschen daarvun vull is vun Schann, is dat vör nehmste Wark vun de Minschen dat Buen vun een Welt, wo elk un een seggen un gloven dröff, wat he will un he frie is vun Bang sien un Noot,"
+}
diff --git a/lang/languages/nds/language.textproto b/lang/languages/nds/language.textproto
deleted file mode 100644
index bdf75ee43..000000000
--- a/lang/languages/nds/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "nds"
-name: "Low German"
-preferred_name: ""
-autonym: "Niedersächsisch"
-population: 11520008
-region: "NL"
-region: "DE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ë Ï Ö Ü a b c d e f g h i j k l m n o p q r s t u v w x y z ß ä ë ï ö ü"
-  auxiliary: "ẞ"
-  marks: "◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
-  index: "A B C D E F G H I J K L M N O P Q R S ẞ T U V W X Y Z"
-}
diff --git a/lang/languages/nds/sampletext.textproto b/lang/languages/nds/sampletext.textproto
deleted file mode 100644
index 60cad1432..000000000
--- a/lang/languages/nds/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nds"
diff --git a/lang/languages/ne.textproto b/lang/languages/ne.textproto
new file mode 100644
index 000000000..087ad11d5
--- /dev/null
+++ b/lang/languages/ne.textproto
@@ -0,0 +1,29 @@
+id: "ne"
+name: "Nepali"
+preferred_name: ""
+autonym: ""
+population: 20903374
+region: "BT"
+region: "IN"
+region: "NP"
+script: "Devanagari"
+exemplar_chars {
+  base: "\\u093C \\u0901 \\u0902 ः ॐ अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ऽ ा ि ी \\u0941 \\u0942 \\u0943 \\u0944 \\u0945 \\u0947 \\u0948 ॉ ो ौ \\u094D"
+  auxiliary: "\\u200C\\u200D"
+  numerals: "\\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९"
+  punctuation: "\\- ‑ — , ; ! ? । \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\}"
+  index: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह"
+}
+sample_text {
+  masthead_full: "सबवय"
+  masthead_partial: "कत"
+  tester: "मानव परिवारका सबै सदस्यहरूको अन्तर्निहित मान तथा सम्मान र अवछिन्न अधिकारहरूको मान्यता"
+  poster_sm: "मानव अधिकारहरू"
+  poster_md: "अत्याचार र दमनको"
+  poster_lg: "व्यक्ति"
+  specimen_48: "संयुक्त राष्ट्र संघका जनता हरूले मानवका मौलिक अधिकारहरू र मनुष्यको मान तथा कदर र नर"
+  specimen_36: "सबै व्यक्ति हरू जन्मजात स्वतन्त्र हुन ती सबैको समान अधिकार र महत्व छ। निजहरूमा विचार शक्ति र सद्धिचार भएकोले निजहरूले आपसमा भातृत्वको भावना बाट व्यवहार गर्नु पर्छ।"
+  specimen_32: "सबै व्यक्तिहरु कानूनको द्दष्टिमा समान छन् र बिना भेदमाव कानूनको समान संरक्षणको हकदार हुनेछन् । सबैलाई यस घोषणाको उल्लङ्घन गरी गरिएको भेदमान वा त्यस्तो भेदभाव गर्न गरिएको उक्साहट विरुद्ध समान संरक्षणको अधिकार छ ।"
+  specimen_21: "संविधान वा कानुन द्वारा दिइएको मौलिक अधिकारहरू भङ्ग गर्ने कार्यहरूको विरुद्ध योग्य राष्ट्रिय अदालतको प्रभावोत्पादक उपचारको सबैलाई अधिकार हुनेछ।\nकसैलाई पनि मनमानी ढाँगले देश निष्कासित वा गिरफ्तार वा नजर बन्द गरिने छैन।\nकुनै व्यक्ति उपर लगाइएको फौजदारी आरोपको विरुद्ध निजको अधिकार दायित्व निरोपन गर्दै स्वतन्त्र र न्याय युक्त अदालतबाट सुनुवाइको हक प्रत्येक व्यक्ति लाइ समान रूपले हुनेछ।\nकुनैपनि व्यक्तिको गोप्यता परिवार, घर वा पत्र व्यवहारको प्रति मनमानी हस्तक्षेप गरिने छैन र कसैको सम्मान तथा ख्याति माथि चोट पुर्‍याइने छैन र त्यस्तो हस्तक्षेप वा चोटको विरुद्ध प्रत्येक व्यक्तिलाई कानुनी संरक्षणको अधिकार हुनेछ।"
+  specimen_16: "प्रत्येक व्यक्तिलाई विचार, मत, धार्मिक स्वतन्त्रताको अधिकार छ। धर्म वा मत बदल्ने स्वतन्त्रता र सार्वजनिक तथा व्यक्तिगत रूपमा एकलै वा समूहमा आफ्नो धर्म वा मतलाई शिक्षा आचरण\nप्रत्येक व्यक्तिलाई विचार र अभिव्यक्ति स्वतन्त्रताको अधिकार छ । यस अधिकारमा कुनै हस्तक्षेप बिना आक्ना मतहरु अभिव्यक्त गर्ने र कुनै पनि अवरोध र सीमाहरु बिना सञ्चार माध्यमद्धारा सूचना प्रात्प गर्ने, खोज्ने र प्रसार गर्ने अधिकार समावेश छ ।\nसमाजको सदस्यको हैसियतमा प्रत्येक व्यक्तिलाई सामाजिक सुरक्षाको अधिकार छ र साथै प्रत्येक व्यक्तिलाई राज्यको राष्ट्रिय प्रयत्न वा अन्तराष्ट्रय सहयोग मार्फत तथा स्रोत र साधन अनुसार उसको प्रतिष्ठा र स्वतन्त्र व्यक्तित्व विकासको लागि अपरिहार्य आर्थिक, सामाजिक र सांस्कुतिक अधिकारहरु उपभोग गर्ने अधिकार छ ।\nप्रत्येक व्यक्तिलाई मुनासिव कार्य समय सीमा र वेतन सहितको आवधिक विदा सहित विश्राम र फुर्सतको आधिकार छ ।"
+}
diff --git a/lang/languages/ne/language.textproto b/lang/languages/ne/language.textproto
deleted file mode 100644
index dfaabc04b..000000000
--- a/lang/languages/ne/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "ne"
-name: "Nepali"
-preferred_name: ""
-autonym: ""
-population: 20903374
-region: "NP"
-region: "BT"
-region: "IN"
-script: "Devanagari"
-exemplar_chars {
-  base: "\\u093C \\u0901 \\u0902 ः ॐ अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ऽ ा ि ी \\u0941 \\u0942 \\u0943 \\u0944 \\u0945 \\u0947 \\u0948 ॉ ो ौ \\u094D"
-  auxiliary: "\\u200C\\u200D"
-  numerals: "\\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९"
-  punctuation: "\\- ‑ — , ; ! ? । \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\}"
-  index: "अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह"
-}
diff --git a/lang/languages/ne/sampletext.textproto b/lang/languages/ne/sampletext.textproto
deleted file mode 100644
index abdfb7c77..000000000
--- a/lang/languages/ne/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ne"
diff --git a/lang/languages/new/language.textproto b/lang/languages/new.textproto
similarity index 75%
rename from lang/languages/new/language.textproto
rename to lang/languages/new.textproto
index 0e2e7fa2f..ace0e72ab 100644
--- a/lang/languages/new/language.textproto
+++ b/lang/languages/new.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/ng.textproto b/lang/languages/ng.textproto
new file mode 100644
index 000000000..8b3b6d48e
--- /dev/null
+++ b/lang/languages/ng.textproto
@@ -0,0 +1,23 @@
+id: "ng"
+name: "Ndonga"
+preferred_name: ""
+autonym: ""
+population: 552314
+region: "NA"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E F G H I J K L M N O P R S T U V W Y Z a b d e f g h i j k l m n o p r s t u v w y z"
+}
+sample_text {
+  masthead_full: "AaNn"
+  masthead_partial: "Tt"
+  tester: "Uuna mpoka pwa taambwa ko esimano lyomuntu pavalo nuuthikepamwe"
+  poster_sm: "Uuna mpoka"
+  poster_md: "Uuna aantu"
+  poster_lg: "Aantu"
+  specimen_48: "Uuna mpoka pe na euvoko Iyuuthemba mbuka nemanguluko nena osha"
+  specimen_36: "Omuntu kehe oku na uuthemba wokuvululukwa, osho wo okulonga ootundi dha yeleka nokukala e na omafudho ye ta futwa."
+  specimen_32: "Omuntu kehe oku na uuthemba welandulathano Iyopankalathano nolyomuuyuni moka uuthemba nemanguluko ndyoka Iya popiwa mOmushangwa nguka li na okugwanithwa."
+  specimen_21: "Inaku tolokwa nando sha meuvathano ndika kutya otashi gandja uuthemba kOshilongo kehe, ogundu yaantu okugandja uuthemba washa okwiitula miinima yi na elalakano Iyokuteya po uuthemba washa nemanguluko ndyoka Iya popiwa muka.\nUuna mpoka pwa taambwa ko esimano lyomuntu pavalo nuuthikepamwe osho wo uuthemba wopaumwene waantu ayehe yomezimo lyuuntu ogwo omukanka gwemanguluko, uuyuki nombili muuyuni."
+  specimen_16: "Uuna mpoka pwa taambwa ko esimano lyomuntu pavalo nuuthikepamwe osho wo uuthemba wopaumwene waantu ayehe yomezimo lyuuntu ogwo omukanka gwemanguluko, uuyuki nombili muuyuni.\nUuna mpoka uuthemba womuntu inaau simanekwa nowa dhinika e tau tanaukile monkalo yuupwidhi mboka tau yono po eiuvo lyuuntu nonkalo moka aantu taa ka nyanyukilwa nokukala ye na emanguluko lyokupopya neitaalo osho wo emanguluko kuutile nokoompumbwe ongoshilalakanenwa sha simana shaantu ayehe.\nUuna mpoka sha pumbiwa opo omuntu kaa thiminikwe a hogolole ongonkatu yahugunina opo a ninge oshipotha mokukondjitha uuhepeki nethiminiko, opo uuthemba wuuntu wu gamenwe pampango."
+}
diff --git a/lang/languages/ng/language.textproto b/lang/languages/ng/language.textproto
deleted file mode 100644
index 40baecc07..000000000
--- a/lang/languages/ng/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "ng"
-name: "Ndonga"
-preferred_name: ""
-autonym: ""
-population: 552314
-region: "NA"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E F G H I J K L M N O P R S T U V W Y Z a b d e f g h i j k l m n o p r s t u v w y z"
-}
diff --git a/lang/languages/ng/sampletext.textproto b/lang/languages/ng/sampletext.textproto
deleted file mode 100644
index 49113e5bb..000000000
--- a/lang/languages/ng/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ng"
diff --git a/lang/languages/ngl/language.textproto b/lang/languages/ngl.textproto
similarity index 74%
rename from lang/languages/ngl/language.textproto
rename to lang/languages/ngl.textproto
index de5b89eda..29a2e47e7 100644
--- a/lang/languages/ngl/language.textproto
+++ b/lang/languages/ngl.textproto
@@ -7,3 +7,6 @@ region: "MZ"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nhe/language.textproto b/lang/languages/nhe.textproto
similarity index 77%
rename from lang/languages/nhe/language.textproto
rename to lang/languages/nhe.textproto
index 7d9f4854f..03c996989 100644
--- a/lang/languages/nhe/language.textproto
+++ b/lang/languages/nhe.textproto
@@ -7,3 +7,6 @@ region: "MX"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nhw/language.textproto b/lang/languages/nhw.textproto
similarity index 77%
rename from lang/languages/nhw/language.textproto
rename to lang/languages/nhw.textproto
index 18ffce4a2..19500ad7d 100644
--- a/lang/languages/nhw/language.textproto
+++ b/lang/languages/nhw.textproto
@@ -7,3 +7,6 @@ region: "MX"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nij/language.textproto b/lang/languages/nij.textproto
similarity index 74%
rename from lang/languages/nij/language.textproto
rename to lang/languages/nij.textproto
index 459d7f8c4..3e55a874c 100644
--- a/lang/languages/nij/language.textproto
+++ b/lang/languages/nij.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/niu.textproto b/lang/languages/niu.textproto
new file mode 100644
index 000000000..451d99265
--- /dev/null
+++ b/lang/languages/niu.textproto
@@ -0,0 +1,24 @@
+id: "niu"
+name: "Niuean"
+preferred_name: ""
+autonym: "Niuē"
+population: 1120
+region: "NU"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū"
+  marks: "◌̄"
+}
+sample_text {
+  masthead_full: "KkOo"
+  masthead_partial: "Ee"
+  tester: "Ha kua ha ha i ai e kitiaaga ke he fakalilifu mo e fakatatai"
+  poster_sm: "Ha kua ha ha"
+  poster_md: "Ha kua ha"
+  poster_lg: "tau"
+  specimen_48: "Ha kua ha ha i ai e tonuhia ke omoi e fakatupuaga he tau fakafetuiaga"
+  specimen_36: "Nakai lata ha tagata ke lauia he fakakikiveka poke fakamamahi, fakaehiehi ai ko e tagata poke eke fakakelea poke fakahala."
+  specimen_32: "Kua tonuhia e tau tagata oti ke he taha peehiaga fakafetui mo e laulahi ne kua fakamau ai e tau tonuhia mo e tau tokanoaaga he Fakaveaga nai ke kitia e fakakatoatoaaga."
+  specimen_21: "Nakai fai mena kua tohia ai ke he Maveheaga nai ke talahau ai kua tuhi fakamahao ke he ha Kautu taha, ha matakau poke ha tagata e ha tonuhia ke matutaki ke he ha tauteaga poke taute ai taha mena ke moumou aki e tau tonuhia mo e tau tokanoaaga kua fakamau ai nai.\nHa kua ha ha i ai e kitiaaga ke he fakalilifu mo e fakatatai mo e nakai fakakehe he tau tonuhia he tau tutaki oti he magafaoa he tau tagata ko e matapatu he fakatokanoa, haohao mitaki mo e mafola he lalolagi."
+  specimen_16: "Ha kua ha ha i ai e kitiaaga ke he fakalilifu mo e fakatatai mo e nakai fakakehe he tau tonuhia he tau tutaki oti he magafaoa he tau tagata ko e matapatu he fakatokanoa, haohao mitaki mo e mafola he lalolagi.\nHa kua ha ha i ai e fakatikai mo e fakavihia he tau tonuhia fakatagata kua tupu mai ai e tau mahani ekefakakelea ne kua nakai fiafia e tau manamanatu he tau tagata, mo e kamata ai foki ke kitia e fakatino ma e lalolagi kua maeke ai e tau tagata ke fakaatā ke vagahau mo e talia mo e tokanoa mai he matakutaku mo e manako kua fakailoa ai ko e manako uho ha ia he tau tagata katoa oti."
+}
diff --git a/lang/languages/niu/language.textproto b/lang/languages/niu/language.textproto
deleted file mode 100644
index c557876fc..000000000
--- a/lang/languages/niu/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "niu"
-name: "Niuean"
-preferred_name: ""
-autonym: "Niuē"
-population: 1120
-region: "NU"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū"
-  marks: "◌̄"
-}
diff --git a/lang/languages/niu/sampletext.textproto b/lang/languages/niu/sampletext.textproto
deleted file mode 100644
index 6a7c1a7de..000000000
--- a/lang/languages/niu/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "niu"
diff --git a/lang/languages/njo.textproto b/lang/languages/njo.textproto
new file mode 100644
index 000000000..9e81747a0
--- /dev/null
+++ b/lang/languages/njo.textproto
@@ -0,0 +1,23 @@
+id: "njo"
+name: "Ao Naga"
+preferred_name: ""
+autonym: ""
+population: 305000
+region: "IN"
+script: "Latin"
+exemplar_chars {
+  base: "A B C E I J K L M N O P R S T U Y Z a b c e i j k l m n o p r s t u y z"
+}
+sample_text {
+  masthead_full: "MmEe"
+  masthead_partial: "Ii"
+  tester: "Kechiaseralima rangben nung nung nisung ka tim temeten aser kasa"
+  poster_sm: "Kechiaserkodang"
+  poster_md: "Kechiaser"
+  poster_lg: "Meimchir"
+  specimen_48: "Kechiaser United Nations Temzüng nung meimchir temeten aser nüjiba"
+  specimen_36: "Nisung shinga alar mekümdaktsütsü mesüra alar tia nung mayutsü, yamala mapa ajak nungi nisung ajak kümzüka alitsü."
+  specimen_32: "Tim masüba maparen atema kari nisung ka temeten anema mesüra tejak ajia tim masüba mapa inyakra, ozüng meteter tsüngdang pei temeten rateta ashitsü melaa lir."
+  specimen_21: "Kija taküm, kibong mesüra kinunger kisüng atema, mesüra nisung pei kija atema kari tenüng menükdaktsütsü makok.Nisung ajak yamala mapa tamajung anema kümzüktsü iba ozüng dak tashi lir.\nTamangba yimsü atema nisung shia pei pei amangnüba yimsü dak amangtsü, mesüra melenshia amangtsü akok, ibai lokti nung mesüra kija taküm nung pei jurila temeten kübok amangtsü aser külemtsü akok."
+  specimen_16: "Nisung shia kechi jembinür tenokdangba kecha makai jembitsü akok. Idaki tebilemba mejangjungtepi lemsateptsü, osangtem agizüktsü aser agütsütsü tashi alitsü.\nNisung shia pei state nung rongsenketsüng, loktiliba aser sobaliba kümzüka alitsü atema pei litsü nung aser pei litsü atena or aliba lokti ajak nung kija nüjiso tentet ajak den kasa temeten alitsü.\nNisung shia pei tenzükba mapa nungi anizüngsük agitsü, mesüra mapa nungi sodi mapang telemtet kaa agitsü akok, saka aahzüka aliba nungi itasen agütsütsüla.\nIba telemtetba Sangdong nung kechi tashi aser temeten melaa ali, iba kübok sadoka alitsü nisung ajak kasa temeten kar."
+}
diff --git a/lang/languages/njo/language.textproto b/lang/languages/njo/language.textproto
deleted file mode 100644
index 6e473e0ad..000000000
--- a/lang/languages/njo/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "njo"
-name: "Ao Naga"
-preferred_name: ""
-autonym: ""
-population: 305000
-region: "IN"
-script: "Latin"
-exemplar_chars {
-  base: "A B C E I J K L M N O P R S T U Y Z a b c e i j k l m n o p r s t u y z"
-}
diff --git a/lang/languages/njo/sampletext.textproto b/lang/languages/njo/sampletext.textproto
deleted file mode 100644
index fb6036787..000000000
--- a/lang/languages/njo/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "njo"
diff --git a/lang/languages/nl.textproto b/lang/languages/nl.textproto
new file mode 100644
index 000000000..bb62d2a5b
--- /dev/null
+++ b/lang/languages/nl.textproto
@@ -0,0 +1,36 @@
+id: "nl"
+name: "Dutch"
+preferred_name: ""
+autonym: "Nederlands"
+population: 31709104
+region: "AW"
+region: "BE"
+region: "BQ"
+region: "CW"
+region: "DE"
+region: "FR"
+region: "NL"
+region: "SR"
+region: "SX"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Â Ä È É Ê Ë Í Ï Ó Ô Ö Ú Û Ü IJ a b c d e f g h i j k l m n o p q r s t u v w x y z á â ä è é ê ë í ï ó ô ö ú û ü ij"
+  auxiliary: "ȷ"
+  marks: "◌̀ ◌́ ◌̂ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Ee"
+  tester: "Overwegende, dat erkenning van de inherente waardigheid en van"
+  poster_sm: "Overwegende,"
+  poster_md: "Op grond"
+  poster_lg: "Alle"
+  specimen_48: "Alle mensen worden vrij en gelijk in waardigheid en rechten geboren."
+  specimen_36: "Niemand zal in slavernij of horigheid gehouden worden. Slavernij en slavenhandel in iedere vorm zijn verboden."
+  specimen_32: "Een ieder heeft recht op rust en op eigen vrije tijd, met inbegrip van een redelijke beperking van de arbeidstijd, en op periodieke vakanties met behoud van loon."
+  specimen_21: "Een ieder heeft recht op het bestaan van een zodanige maatschappelijke en internationale orde, dat de rechten en vrijheden, in deze Verklaring genoemd, daarin ten volle kunnen worden verwezenlijkt.\nGeen bepaling in deze Verklaring zal zodanig mogen worden uitgelegd, dat welke Staat, groep of persoon dan ook, daaraan enig recht kan ontlenen om iets te ondernemen of handelingen van welke aard ook te verrichten, die vernietiging van een van de rechten en vrijheden, in deze Verkaring genoemd, ten doel hebben."
+  specimen_16: "Overwegende, dat erkenning van de inherente waardigheid en van de gelijke en onvervreemdbare rechten van alle leden van de mensengemeenschap grondslag is voor de vrijheid, gerechtigheid en vrede in de wereld;\nOverwegende, dat terzijdestelling van en minachting voor de rechten van de mens geleid hebben tot barbaarse handelingen, die het geweten van de mensheid geweld hebben aangedaan en dat de komst van een wereld, waarin de mensen vrijheid van meningsuiting en geloof zullen genieten, en vrij zullen zijn van vrees en gebrek, is verkondigd als het hoogste ideaal van iedere mens;"
+}
diff --git a/lang/languages/nl/language.textproto b/lang/languages/nl/language.textproto
deleted file mode 100644
index 615e2d187..000000000
--- a/lang/languages/nl/language.textproto
+++ /dev/null
@@ -1,23 +0,0 @@
-id: "nl"
-name: "Dutch"
-preferred_name: ""
-autonym: "Nederlands"
-population: 31709104
-region: "BQ"
-region: "CW"
-region: "BE"
-region: "SX"
-region: "SR"
-region: "NL"
-region: "AW"
-region: "FR"
-region: "DE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Â Ä È É Ê Ë Í Ï Ó Ô Ö Ú Û Ü IJ a b c d e f g h i j k l m n o p q r s t u v w x y z á â ä è é ê ë í ï ó ô ö ú û ü ij"
-  auxiliary: "ȷ"
-  marks: "◌̀ ◌́ ◌̂ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/nl/sampletext.textproto b/lang/languages/nl/sampletext.textproto
deleted file mode 100644
index 186a513ef..000000000
--- a/lang/languages/nl/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nl"
diff --git a/lang/languages/nmg/language.textproto b/lang/languages/nmg.textproto
similarity index 93%
rename from lang/languages/nmg/language.textproto
rename to lang/languages/nmg.textproto
index 33608c34c..0d1f98100 100644
--- a/lang/languages/nmg/language.textproto
+++ b/lang/languages/nmg.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B Ɓ C D E Ǝ Ɛ F G H I J K L M N Ŋ O Ɔ P R S T U V W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nn.textproto b/lang/languages/nn.textproto
new file mode 100644
index 000000000..84293209f
--- /dev/null
+++ b/lang/languages/nn.textproto
@@ -0,0 +1,24 @@
+id: "nn"
+name: "Norwegian Nynorsk"
+preferred_name: ""
+autonym: ""
+population: 1366860
+region: "NO"
+script: "Latin"
+exemplar_chars {
+  auxiliary: "á ǎ č ç đ è ê ń ñ ŋ š ŧ ü ž ä ö"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+}
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Ee"
+  tester: "Då det å godkjenne det naturlege menneskeverdet med like og umissande"
+  poster_sm: "og då hån og"
+  poster_md: "og då det"
+  poster_lg: "Alle"
+  specimen_48: "og då folka i Dei Sameinte Nasjonane har stadfest trua si i denne"
+  specimen_36: "Då det å godkjenne det naturlege menneskeverdet med like og umissande rettar for alle menneske på jorda"
+  specimen_32: "Då det å godkjenne det naturlege menneskeverdet med like og umissande rettar for alle menneske på jorda er grunnlaget for fridom, rettferd og fred i verda,"
+  specimen_21: "Då det å godkjenne det naturlege menneskeverdet med like og umissande rettar for alle menneske på jorda er grunnlaget for fridom, rettferd og fred i verda,\nog då hån og vørdsløyse mot menneskerettane har ført til barbariske handlingar som har skaka samvitet til menneskeretta, er framvoksteren i den verda der menneska skal ha talefridom og trusfridom og vere løyste frå otte og naud, kunngjord som det høgste målet for kvart menneske,"
+  specimen_16: "Då det å godkjenne det naturlege menneskeverdet med like og umissande rettar for alle menneske på jorda er grunnlaget for fridom, rettferd og fred i verda,\nog då hån og vørdsløyse mot menneskerettane har ført til barbariske handlingar som har skaka samvitet til menneskeretta, er framvoksteren i den verda der menneska skal ha talefridom og trusfridom og vere løyste frå otte og naud, kunngjord som det høgste målet for kvart menneske,\nog då det er nødvendig at menneskerettane blir verna om av lover slik at menneska ikkje blir tvinga til å finne den siste utvegen i å gjere opprør mot tyranni og trælekår,"
+}
diff --git a/lang/languages/nn/language.textproto b/lang/languages/nn/language.textproto
deleted file mode 100644
index 629d8989a..000000000
--- a/lang/languages/nn/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "nn"
-name: "Norwegian Nynorsk"
-preferred_name: ""
-autonym: ""
-population: 1366860
-region: "NO"
-script: "Latin"
-exemplar_chars {
-  auxiliary: "á ǎ č ç đ è ê ń ñ ŋ š ŧ ü ž ä ö"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-}
diff --git a/lang/languages/nn/sampletext.textproto b/lang/languages/nn/sampletext.textproto
deleted file mode 100644
index 15cf5f7cc..000000000
--- a/lang/languages/nn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nn"
diff --git a/lang/languages/nnh/language.textproto b/lang/languages/nnh.textproto
similarity index 94%
rename from lang/languages/nnh/language.textproto
rename to lang/languages/nnh.textproto
index 952491a13..c1dbc875f 100644
--- a/lang/languages/nnh/language.textproto
+++ b/lang/languages/nnh.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: ", ; \\: ! ? . \' ‘ ’ « »"
   index: "A B C D E Ɛ F G H I J K L M N Ŋ O Ɔ P {Pf} R S {Sh} T {Ts} U Ʉ V W Ẅ Y Ÿ Z ʼ"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nod/language.textproto b/lang/languages/nod.textproto
similarity index 75%
rename from lang/languages/nod/language.textproto
rename to lang/languages/nod.textproto
index 47c8001a6..d07cddbda 100644
--- a/lang/languages/nod/language.textproto
+++ b/lang/languages/nod.textproto
@@ -7,3 +7,6 @@ region: "TH"
 script: "Lanna"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "nod"
+}
diff --git a/lang/languages/noe/language.textproto b/lang/languages/noe.textproto
similarity index 75%
rename from lang/languages/noe/language.textproto
rename to lang/languages/noe.textproto
index eb542714e..c2026ecc2 100644
--- a/lang/languages/noe/language.textproto
+++ b/lang/languages/noe.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/nqo/language.textproto b/lang/languages/nqo.textproto
similarity index 74%
rename from lang/languages/nqo/language.textproto
rename to lang/languages/nqo.textproto
index 837e1cb64..3859e3c6f 100644
--- a/lang/languages/nqo/language.textproto
+++ b/lang/languages/nqo.textproto
@@ -7,3 +7,6 @@ region: "GN"
 script: "N’Ko"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "bm"
+}
diff --git a/lang/languages/nr.textproto b/lang/languages/nr.textproto
new file mode 100644
index 000000000..4b594394d
--- /dev/null
+++ b/lang/languages/nr.textproto
@@ -0,0 +1,23 @@
+id: "nr"
+name: "South Ndebele"
+preferred_name: ""
+autonym: "isiNdebele"
+population: 903417
+region: "ZA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "AaBb"
+  masthead_partial: "Nn"
+  tester: "Loba isimilo lenhlonipho lamalungelo agcweleyo oluntu kuyisisekelo"
+  poster_sm: "Loba ukunganaki"
+  poster_md: "Loba ukuze"
+  poster_lg: "Abantu"
+  specimen_48: "Loba abantu baMazwe aManyaneyo betshengise ukholo lwabo kumalungelo"
+  specimen_36: "Loba amazwe ami wodwa ezimisela uKumanyana laMazwe aManyaneyo ukuze aqakathekise ukuhlonitshwa kwamalungelo abantu,"
+  specimen_32: "Lesisivumelwano samalungelo oluntu silotshiwe ukuze umuntu lezigaba zabantu jikelele zigcine lesi sivumelwano engqondweni, yizizwe zonke lamazwe asabuswa ngamanye."
+  specimen_21: "Abantu bonke bazalwa bekhululekile njalo belingana kumalungelo abo. Balesipho sikanembeza, ngakho bamele baphathane ngomoya otshengisa ubuhlobo lobunye.\nWonke umuntu ulelungelo lokuthola inkululeko lamalungelo alotshwe kulesi sivumelwano hngokupheleleyo kunganakwa ubuhlobo, umbala, ukuthi uyindoda kumbe ngumfazi, ulimi, ukholo, ezimayelana lombangazwe, lenotho kanye lasipi lasiphi isimo phakathi kwabantu."
+  specimen_16: "Njalo kakusoze kube lomahluko ekuphathweni kwabantu emthethweni loba ngowaliphi ilizwe loba yisiphi lesimo selizwe lapho umuntu avela khona - lanxa lelolizwe lizibusa kumbe libuswa ngelinye.\nWonke umuntu ulelungelo lempilo, lelenkululeko lelenhlalakahle.\nKakho umuntu ozakwenziwa isigqili, kumbe isithunjwa; ubugqili lokuthengisa izichaka kuzanqatshelwa ngazo zonke indlela.\nAkula muntu ozahlutshwa ahlukuluzwe loba aphathwe ngesihluku langendlela eyangisayo kumbe elocuku.\nWonke umuntu ulelungelo emthethweni lokuphathwa njengomuntu.\nBonke abantu bayalingana phambi komthetho, kungekho bandlululo. Abantu bonke bayavikelwa ekubandlululweni. Ubandlululo luvunyelwa yisivumelwano lesi njalo akuvunyelwa ukubasela ubandlululo."
+}
diff --git a/lang/languages/nr/language.textproto b/lang/languages/nr/language.textproto
deleted file mode 100644
index 923a13e98..000000000
--- a/lang/languages/nr/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "nr"
-name: "South Ndebele"
-preferred_name: ""
-autonym: "isiNdebele"
-population: 903417
-region: "ZA"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/nr/sampletext.textproto b/lang/languages/nr/sampletext.textproto
deleted file mode 100644
index f6c4179f4..000000000
--- a/lang/languages/nr/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nr"
diff --git a/lang/languages/nsk/language.textproto b/lang/languages/nsk.textproto
similarity index 74%
rename from lang/languages/nsk/language.textproto
rename to lang/languages/nsk.textproto
index fb26678d4..94cc8b242 100644
--- a/lang/languages/nsk/language.textproto
+++ b/lang/languages/nsk.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "UCAS"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "cr"
+}
diff --git a/lang/languages/nso.textproto b/lang/languages/nso.textproto
new file mode 100644
index 000000000..2a2011fd1
--- /dev/null
+++ b/lang/languages/nso.textproto
@@ -0,0 +1,24 @@
+id: "nso"
+name: "Northern Sotho"
+preferred_name: ""
+autonym: "Sepedi"
+population: 5307578
+region: "ZA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ê Ô Š a b c d e f g h i j k l m n o p q r s t u v w x y z ê ô š"
+  marks: "◌̂ ◌̌"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Tt"
+  tester: "Le ge re dutše re tseba gore seriti seo motho a belegilwego ka"
+  poster_sm: "Le ge re dutše"
+  poster_md: "Le ge re"
+  poster_lg: "Batho"
+  specimen_48: "Le ge re dutše re tseba gore go bohlokwa go godiša tšweletšopele"
+  specimen_36: "Mang le mang o na le tokelo ya go tsebja lefelong le lengwe le le lengwe bjalo ka motho pele ga molao."
+  specimen_32: "Mang le mang o na le tokelo ya go khutša le go itketla, go akaretšwa le nako ye e swanetšego ya diiri tša mošomo le matšatši a maikhutšo ao a lefelwago ka mehla ge a le boikhutšong."
+  specimen_21: "Mang le mang o lokelwa ke bophelo bjo bo lokilego setšhabeng le lefaseng ka bophara moo ditokelo le ditokologo tše di theilwego Boikanong bjo di kgonago go tšweletšwa.\nGa go selo mo Boikanong bjo se se ka kwešišwago bjalo ka seo se lebanego le mmušo ofe kapa ofe, sehlopha goba motho go dira mošomo ofe goba ofe wo o lebišitšwego pšhatlaganyong ya ditokelo le ditokologo tše di beilwego mokhwi."
+  specimen_16: "Le ge re dutše re tseba gore seriti seo motho a belegilwego ka sona le tekatekanelo gammogo le ditokelo tšeo di sa tšeelwego kgang tša batho ka moka ke motheo wa tokologo ya toka le khutšo lefseng ka bophara.\nLe ge re dutše re tseba gore go se elwe hloko le go phaelwa ka thoko ga ditokelo tša botho go tlišitše dilešadihlong tšeo di rumutšego le go šišinya maikutlo le letswalo la botho bathong, go tla ga pono le tebelelo ye mpsha mo lefaseng yeo e ikemišeditšego go ela hloko gore batho ba swanetše go ipshina ka tokologo ya polelo, ya bodumedi gammogo le go se tšhoge selo goba gona go duma, go dirile gore se se boletšwego ka mo godimo e be dinyakwa tša maemo a godimodimo tša batho ka moka."
+}
diff --git a/lang/languages/nso/language.textproto b/lang/languages/nso/language.textproto
deleted file mode 100644
index a64002c69..000000000
--- a/lang/languages/nso/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "nso"
-name: "Northern Sotho"
-preferred_name: ""
-autonym: "Sepedi"
-population: 5307578
-region: "ZA"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ê Ô Š a b c d e f g h i j k l m n o p q r s t u v w x y z ê ô š"
-  marks: "◌̂ ◌̌"
-}
diff --git a/lang/languages/nso/sampletext.textproto b/lang/languages/nso/sampletext.textproto
deleted file mode 100644
index a76247bd5..000000000
--- a/lang/languages/nso/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nso"
diff --git a/lang/languages/nus/language.textproto b/lang/languages/nus.textproto
similarity index 92%
rename from lang/languages/nus/language.textproto
rename to lang/languages/nus.textproto
index 50759cd01..c320bfd9a 100644
--- a/lang/languages/nus/language.textproto
+++ b/lang/languages/nus.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E Ɛ F G Ɣ H I J K L M N Ŋ O Ɔ P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/nv.textproto b/lang/languages/nv.textproto
new file mode 100644
index 000000000..c2de8fb2c
--- /dev/null
+++ b/lang/languages/nv.textproto
@@ -0,0 +1,24 @@
+id: "nv"
+name: "Navajo"
+preferred_name: ""
+autonym: "Diné Bizaad"
+population: 166319
+region: "US"
+script: "Latin"
+exemplar_chars {
+  base: "A Ą B C D E Ę G H I Į J K L Ł M N O Ǫ S T W X Y Z a á ą ą́ b c d e é ę ę́ g h i í į į́ j k l ł m n o ó ǫ ǫ́ s t w x y z ʼ"
+  marks: "◌́ ◌̨"
+}
+sample_text {
+  masthead_full: "BbIi"
+  masthead_partial: "Ll"
+  tester: "Kótʼéego Hazʼaah: Baá akohwiindzingo éí ílį́go adaanisįikéesgo"
+  poster_sm: "Kʼad Kótʼe"
+  poster_md: "Tsídí tʼáá"
+  poster_lg: "tʼáá"
+  specimen_48: "Tsídí tʼáá ájítʼé bee háhazʼą́ iináʼázhdoolííłgo áádóó ʼałdó tʼáá"
+  specimen_36: "Łaʼdah éí doo naalteehʼé dooleełda dóó dooháida yá naal aʼí dooleeł da dóó doo naaltehʼé adoolniiłgo doo bee hazʼą́ąda."
+  specimen_32: "Tsíʼdí tʼáá ájíłtsoh bee háhazʼą́ tʼáa dooleʼé há hashtʼe doolníiłgo wááshindoon áájí yá ʼééhósinígíí ákótʼéego bee hazʼáanii bee háʼahootʼíʼ yę́ę biłaszihgo."
+  specimen_21: "Tʼáá háida éí biniinaanii ádingo doo biʼdidool tsoołda dóó doo yahʼadooltʼeeł da dóó doo chʼi dinóol cheeł da.\nTʼáá ájíłtsoh bee háʼahóótʼíʼ tʼáá aheeł tʼéego diné binááł há baahwinitʼį́įgo doo háájída achʼíhjí nilíígíí binááł éí há yaa nídáastʼįįdgo yee nidahodooʼááł bee há ahootʼígíí dóó bee hóholnígíí dóó haʼátʼííshį́į́ awáalyahjí bee hakʼehástʼahígíí."
+  specimen_16: "Tʼáá héiida bił hazʼánígíí báʼ áłchínííní dah bighan dah doo háii tʼáaodah éíí baa tį́į́ʼdoodáałdah. Tʼáá ajiłtsoh bee hazʼą́ąnii bikʼehgo bee háhóchį́.\nTʼáá ájíłtsoh bee baʼahóótʼiʼ tʼáá hó adahnahojitʼáago dóó nitsijikeesgo dóó hweʼoodląʼ hólóogo díí bee háʼahootʼiʼígíí naanáłahjį́ʼ hweʼoodląʼígíí beeʼizhdidooʼgáałgo bee hazʼą́. Dinétahjį́ hweʼoodląʼígíí bee hwééhozín doo áádóó bee nazhnitin doo. Áádóó ałdóʼ áájį́ bá hozhdísin doo.\nTʼáá ájíłtsoh tʼáadooleʼé baa ntsíjíkeesgo bee hazdoodzihgo bee háhazʼą́. Díí baa ntsíjíkeesígíí éí héídah doo hániʼ iidoolííłda. Áádóó bikah nazhnitáago dóó nízhdiiláago bee hadeesdzih jinizingo béésh halneʼé, naalkidídah doodaiiʼ naaltsoos biyiʼjį́ʼ bee hazdoodzihgo bee háhazʼą́."
+}
diff --git a/lang/languages/nv/language.textproto b/lang/languages/nv/language.textproto
deleted file mode 100644
index 197026534..000000000
--- a/lang/languages/nv/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "nv"
-name: "Navajo"
-preferred_name: ""
-autonym: "Diné Bizaad"
-population: 166319
-region: "US"
-script: "Latin"
-exemplar_chars {
-  base: "A Ą B C D E Ę G H I Į J K L Ł M N O Ǫ S T W X Y Z a á ą ą́ b c d e é ę ę́ g h i í į į́ j k l ł m n o ó ǫ ǫ́ s t w x y z ʼ"
-  marks: "◌́ ◌̨"
-}
diff --git a/lang/languages/nv/sampletext.textproto b/lang/languages/nv/sampletext.textproto
deleted file mode 100644
index e4caf6c54..000000000
--- a/lang/languages/nv/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nv"
diff --git a/lang/languages/nxq/language.textproto b/lang/languages/nxq.textproto
similarity index 74%
rename from lang/languages/nxq/language.textproto
rename to lang/languages/nxq.textproto
index 11a8d769f..2b0b82d91 100644
--- a/lang/languages/nxq/language.textproto
+++ b/lang/languages/nxq.textproto
@@ -7,3 +7,6 @@ region: "CN"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ny.textproto b/lang/languages/ny.textproto
new file mode 100644
index 000000000..072c14188
--- /dev/null
+++ b/lang/languages/ny.textproto
@@ -0,0 +1,27 @@
+id: "ny"
+name: "Nyanja"
+preferred_name: ""
+autonym: "Chicheŵa"
+population: 17026780
+region: "MW"
+region: "MZ"
+region: "ZM"
+region: "ZW"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ŋ Ŵ a b c d e f g h i j k l m n o p q r s t u v w x y z ŋ ŵ"
+  marks: "◌̂"
+}
+sample_text {
+  masthead_full: "AaNn"
+  masthead_partial: "Tt"
+  tester: "Popeza kuti citsimikizo ca khalidwe loyenera la munthu mu banja"
+  poster_sm: "Popeza kuti"
+  poster_md: "Anthu onse"
+  poster_lg: "Anthu"
+  specimen_48: "Munthu aliyense ali ndi danga lokhala ndi ufulu onse ofunikira"
+  specimen_36: "Munthu aliyense ali obvomerezedwa mu umoyo wace wa umunthu molingana ndi lamulo loyang\' ana pa makhalidwe a munthu."
+  specimen_32: "Munthu aliyense ali nalo danga kapena ufulu wa cisangalalo ca moyo wace molingana ndi chibvomerezo ca zofuna za lamulo losamalira khalidwe la umoyo wa munthu."
+  specimen_21: "Zosindikizidwa zonse za chibvomerezo ca lamulo losamalira khalidwe la umoyo wa munthu, sizitanthauza kuti Boma, kagulu ka anthu kapena munthu wina aliyense ali ndi danga kapena ufulu ocita zinthu zina zonse zofuna kuononga cilingo ca chibvomerezoci ai.\nPopeza kuti citsimikizo ca khalidwe loyenera la munthu mu banja lonse ndico tsinde la ufulu, ungwiro ndi mtendere pa dziko liri lonse la pansi,"
+  specimen_16: "Popeza kuti citsimikizo ca khalidwe loyenera la munthu mu banja lonse ndico tsinde la ufulu, ungwiro ndi mtendere pa dziko liri lonse la pansi,\nPopeza kuti kusalabadira ufulu wa munthu kwabweretsa khalidwe la nkhalwe pa umoyo wa munthu, ndi kutinso kusintha kwa zinthu pa dziko la pansi mwakufuna kupereka ufulu weni-weni pa umoyo wa munthu aliyense ndilo funo la munthu wamba aliyense,\nPopeza kuti ndi kofunikira kuti ufulu wa munthu ucinjirizidwe ndi lamulo pofuna kupewa nkhondo yomenyera ufulu kukhala ngati njira yomwe munthu angagwiritse nchito pofuna kumasulidwa ku nsinga za nkhalwe,"
+}
diff --git a/lang/languages/ny/language.textproto b/lang/languages/ny/language.textproto
deleted file mode 100644
index a1e1cc6c3..000000000
--- a/lang/languages/ny/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "ny"
-name: "Nyanja"
-preferred_name: ""
-autonym: "Chicheŵa"
-population: 17026780
-region: "MW"
-region: "MZ"
-region: "ZW"
-region: "ZM"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ŋ Ŵ a b c d e f g h i j k l m n o p q r s t u v w x y z ŋ ŵ"
-  marks: "◌̂"
-}
diff --git a/lang/languages/ny/sampletext.textproto b/lang/languages/ny/sampletext.textproto
deleted file mode 100644
index eedec5963..000000000
--- a/lang/languages/ny/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ny"
diff --git a/lang/languages/nym.textproto b/lang/languages/nym.textproto
new file mode 100644
index 000000000..1ee74ca44
--- /dev/null
+++ b/lang/languages/nym.textproto
@@ -0,0 +1,23 @@
+id: "nym"
+name: "Nyamwezi"
+preferred_name: ""
+autonym: ""
+population: 1932242
+region: "TZ"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E Ɛ F G H I J L M N Ŋ O Ɔ P S T U V W Z a b d e ɛ f g h i j l m n ŋ o ɔ p s t u v w z"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Nn"
+  tester: "NGUNO Ubumanicha kubi banhu bose balin’ikujo na haki ja bulinganile"
+  poster_sm: "NGUNO giki"
+  poster_md: "NGUNO kinhu"
+  poster_lg: "Banhu"
+  specimen_48: "NGUNO u ng’w’Ilagilo banhu ba mahanga bizunilija giki i haki ja"
+  specimen_36: "NGUNO banhu bose kumanicha wiyagalule na haki jinijo hu kinhu cha kwendya umu kuzimanicha kisoga na malagilo genayo."
+  specimen_32: "Kila munhu wina wiyagalule wa kuyomba isho aliganika bila kwingililwa na munhu bungi, kubokela na kusambaja mhola na miganika ga bangi ku nzila ya kwandika na kutangaja."
+  specimen_21: "Kila ng’wene mu kaya ina haki ya kulabadwa na kupiwa nsabo ja nsi kubitila wizunilija wa nsi na mahanga gose hu aweje kuhangama.\nKila munhu wina haki ya kwisuhya na kuyega hakimo na kupandika ninga ya kwisuhya na ninga ya kulipwa.\nKila munhu apiwe haki na wiyagalule giti umo Ihano linili lilihaya.\nNduhu nsi, luganda nulu munhu alatumile il’Ihano linili kukenanga haki na wiyagalule ubo wabalwa ng’w’Ihano linili."
+  specimen_16: "NGUNO Ubumanicha kubi banhu bose balin’ikujo na haki ja bulinganile hu chandyo cha kwiyagalula, kwenha haki na lubango,\nNGUNO ukwihugija na kuleka kulondalonga haki ja banhu huko kwenheleja mashito magakanazu ga kudacha na kumala masala banhu kukoba welelo i ya banhu bose balabi na buyegi wa kwiyagalula, kuyomba, kwinja boba na kupandika shose isho bushikobaga,\nNGUNO giki ulu abanhu bakasaziwagwa kuhaya basole mashilanga kuzitula bushimba, kulema kwibonelwa na bahanya ba nsi Ilagilo lya Nsi lilabade haki jabo,\nNGUNO kinhu kihannya hu kubejja na kukuja bunwani na nsi zingi,"
+}
diff --git a/lang/languages/nym/language.textproto b/lang/languages/nym/language.textproto
deleted file mode 100644
index 00f6ef990..000000000
--- a/lang/languages/nym/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "nym"
-name: "Nyamwezi"
-preferred_name: ""
-autonym: ""
-population: 1932242
-region: "TZ"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E Ɛ F G H I J L M N Ŋ O Ɔ P S T U V W Z a b d e ɛ f g h i j l m n ŋ o ɔ p s t u v w z"
-}
diff --git a/lang/languages/nym/sampletext.textproto b/lang/languages/nym/sampletext.textproto
deleted file mode 100644
index cc2756d94..000000000
--- a/lang/languages/nym/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nym"
diff --git a/lang/languages/nyn.textproto b/lang/languages/nyn.textproto
new file mode 100644
index 000000000..6db080e9b
--- /dev/null
+++ b/lang/languages/nyn.textproto
@@ -0,0 +1,24 @@
+id: "nyn"
+name: "Nyankole"
+preferred_name: ""
+autonym: "Runyankore"
+population: 2724939
+region: "UG"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K M N O P R S T U V W Y Z a b c d e f g h i j k m n o p r s t u v w y z"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "AaBb"
+  masthead_partial: "Nn"
+  tester: "Ekitiinisa ky\'omuntu ekyobuhangwa nikiingana nobushoborozi obutakabaasa"
+  poster_sm: "Obutagyendera"
+  poster_md: "Ekibiina"
+  poster_lg: "Abantu"
+  specimen_48: "Abantu boona ahu bari ahabwokugira ekyetengo kimwe ekyamahanga"
+  specimen_36: "Tihariho muntu oshemereire kukwatirwa omubuhuuku. Obuhuuku, nobushubuzi bw\'abahuuku, tiburikwiikirizibwa omunsi yoona."
+  specimen_32: "Buri muntu ahatari kushoroora naatekwa kuhozesibwa \"omu mushana\" omu kooti etaine kugweera orubaju rumwe kandi nokumanyisibwa omushango gwoona ogurikuba nigumutabaarizibwa."
+  specimen_21: "Ekitinisa kyomuntu, amakage, ab\'eka ye, ebihandiko bye hamwe namabaruhage tibishemereire kutahirirwa narishi kuzanirwaho. Buri muntu aine obushoborozi bwokweyambisa ebiragiro kuzibira abo abarikwenda kwetasya omu nshonga ze wenka.\nBuri muntu aine obugabe okwahura ekirungi aha kibi, nokurond ediini eyi arashome kandi aine obugabe we wenka narishi nabataahibe okuteeka omu nkora ebi arikwiikirizamu."
+  specimen_16: "Buri muntu aine obugabe kugira enteekateka ye kandi nokugamba narishi okuhandiika nkoku arikuteekateeka. Kandi buri muntu aine obugabe okurabya ebyarikutekyereza aha Radio, Television, empapura z\'amahurire, nemihanda endiijo.\nBuri munyansi aine obushoborozi kutuura n\'abantu bataahi be omu nisingye , eki kimbaasise kutereeza engyesho ze, nokuhika aha byaarikurubirira ebye kitiinisa nkomuntu arikuraba omu kukora kweihanga rye okurugiirira ahanteekateeka nenkozesa yobugaiga obweihanga omu byentasya, ebyemiturire ya bantu, nobuhangwa bwaabo, ebitarikubasa kunagiijurwa omu kukurakurana oku."
+}
diff --git a/lang/languages/nyn/language.textproto b/lang/languages/nyn/language.textproto
deleted file mode 100644
index efd019373..000000000
--- a/lang/languages/nyn/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "nyn"
-name: "Nyankole"
-preferred_name: ""
-autonym: "Runyankore"
-population: 2724939
-region: "UG"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K M N O P R S T U V W Y Z a b c d e f g h i j k m n o p r s t u v w y z"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/nyn/sampletext.textproto b/lang/languages/nyn/sampletext.textproto
deleted file mode 100644
index 0a77d4aa3..000000000
--- a/lang/languages/nyn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nyn"
diff --git a/lang/languages/nzi.textproto b/lang/languages/nzi.textproto
new file mode 100644
index 000000000..74a835448
--- /dev/null
+++ b/lang/languages/nzi.textproto
@@ -0,0 +1,23 @@
+id: "nzi"
+name: "Nzima"
+preferred_name: ""
+autonym: ""
+population: 293402
+region: "GH"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E Ɛ F G H I K L M N O Ɔ P R S T U V W Y Z a b d e ɛ f g h i k l m n o ɔ p r s t u v w y z"
+}
+sample_text {
+  masthead_full: "MmEe"
+  masthead_partial: "Nn"
+  tester: "Wɔ mekɛ ala mɔɔ Maanle Maanle mɔɔ wɔ Eku ye anu la gyinlabelɛ"
+  poster_sm: "Wɔ mekɛ ala"
+  poster_md: "MAAMGBOLE"
+  poster_lg: "Menli"
+  specimen_48: "le debie ko mɔɔ yelie yedo nu yemaa awie biala nee Maanle biala,"
+  specimen_36: "Ɔnle kɛ bɛkile awie biala nyane anzɛɛ bɛyɛ ye atisesebɛ, amumuyɛ anzɛɛ bɛgua ɔ nyunlu aze anzɛɛ bɛtwi ɔ nyunlu."
+  specimen_32: "Sonla biala lɛ adenle kɛ saa awie yɛ debie mɔɔ tia anwoadenlenyianlɛ ne mɔ mɔɔ maamulɛ nwo mɛla anzɛɛ mɛla ɛva ɛmaa ye la a, ɔwɔ kɛ kɔɔto ne mɔ pepɛ die ye."
+  specimen_21: "Ɔnle kɛ bɛkye sonla, bɛfa sonla bɛsie anzɛɛ bɛye sonla bɛfi maanle ne anu wɔ mekɛ mɔɔ ɔtɛfonle mɛla anzɛɛ mɛla ɛmmaa adenle la.\nWɔ awie biala adenlenyianlɛ nee ye gyima ne mɔ anwo adwenlevalɛ nwo anzɛɛ saa bɛka kɛ awie biala ɛyɛ ɛtane a ɔwɔ kɛ kɔɔto mɔɔ di ɔ ti anwo na ɔnli mɔguazo la di ye edwɛkɛ wɔ bagua nu."
+  specimen_16: "Ɔnle kɛ menli fa bɛ nloa wulowula awie feabo, ye abusua, ye sua nu edwɛkɛ nu anzɛɛ ɔnle kɛ bɛkenga ye ahɛlata anzɛɛ bɛbɔ ye anyiemgba bɛsɛkye ye anyunlunyia. Sonla zɛhae lɛ adenle maa mɛla ne pepɛ die ye anzɛɛ bɔ ɔ nwo bane wɔ zɛhae akpɔsemadi ɛbɛla ne mɔ anwo.\nSonla biala lɛ adenle kɛ ɔdwenle adwenle biala na ɔsonle debie biala mɔɔ ɔkulo la, eza ɔlɛ adenle ɔkakyi ye Nyamenlezonlenlɛ ne anzɛɛ ye diedi ne nee fanwodi, yɛɛ akee noko ɔlɛ ɔ nwo adenle kɛ ɔ ngome anzɛɛ ɔ nee menli wɔ bagua anzɛɛ fealera nu ɔkile yɛ asɔne anzɛɛ ye diedi ne wɔ ngilehilelɛ, nyɛleɛ, ɛzonlenlɛ nee boɛnleanlɛ nu."
+}
diff --git a/lang/languages/nzi/language.textproto b/lang/languages/nzi/language.textproto
deleted file mode 100644
index fca4363d5..000000000
--- a/lang/languages/nzi/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "nzi"
-name: "Nzima"
-preferred_name: ""
-autonym: ""
-population: 293402
-region: "GH"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E Ɛ F G H I K L M N O Ɔ P R S T U V W Y Z a b d e ɛ f g h i k l m n o ɔ p r s t u v w y z"
-}
diff --git a/lang/languages/nzi/sampletext.textproto b/lang/languages/nzi/sampletext.textproto
deleted file mode 100644
index fe70c2bcd..000000000
--- a/lang/languages/nzi/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "nzi"
diff --git a/lang/languages/oc.textproto b/lang/languages/oc.textproto
new file mode 100644
index 000000000..d85ef43ed
--- /dev/null
+++ b/lang/languages/oc.textproto
@@ -0,0 +1,24 @@
+id: "oc"
+name: "Occitan"
+preferred_name: "Occitan"
+autonym: "Occitan"
+population: 2035446
+region: "FR"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Ç È É Ë Í Ï Ò Ó Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à á ç è é ë í ï ò ó ú ü"
+  marks: "◌̀ ◌́ ◌̈ ◌̧"
+}
+sample_text {
+  masthead_full: "TtÓó"
+  masthead_partial: "Uu"
+  tester: "Tóuti lis uman naisson libre. Soun egau pèrla digneta e li dre."
+  poster_sm: "Tout èsse uman"
+  poster_md: "En mai, se"
+  poster_lg: "Tóuti"
+  specimen_48: "Degun sara soumés à l\'esclavitudo o à laservitudo. Es enebi en"
+  specimen_36: "Cadun a dre de se pausa e de s\'espaça. A dreà uno tanco resounablo de la journado de travai, à de counget regulié e paga."
+  specimen_32: "Touto persouno a lou dre de viéure dins unmitan souciau e internaciounau proun ourdouna, que li dre esplica dins aquestodeclaracioun d\'aqui se ié poscon aplica en plen."
+  specimen_21: "Res, ni Estat ni groupamen nimai unopersouno, poudra assaja de tira d\'aquesto declaracioun lou dre de fairequaucarèn pèr escracha li dre e li liberta que ié soun esplica.\nTóuti lis uman naisson libre. Soun egau pèrla digneta e li dre. An tóuti uno resoun e uno counsciènci. Se dèvon tenifreirenau lis un \'mé lis autre."
+  specimen_16: "Tóuti lis uman naisson libre. Soun egau pèrla digneta e li dre. An tóuti uno resoun e uno counsciènci. Se dèvon tenifreirenau lis un \'mé lis autre.\nTout èsse uman a tóuti li liberta e tóuti lidre prouclama dins aquesto declaracioun, sènso ges li destria pèr de raço, decoulour, de sèisse, de lengo, de religioun, d\'idèio poulitico o d\'autro meno,d\'óurigino naciounalo o soucialo, de richesso, de neissènço o d\'àutricoundicioun.\nEn mai, se fara ges de destriamen foundasubre l\'estatut pouliti, amenistratiéu o internaciounau dóu païs o de l\'endréde la persouno, fugue aquel endré independènt o sa soubeiraneta countourrouladoo limitado d\'un biais o d\'un autre."
+}
diff --git a/lang/languages/oc/language.textproto b/lang/languages/oc/language.textproto
deleted file mode 100644
index 80be0d731..000000000
--- a/lang/languages/oc/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "oc"
-name: "Occitan"
-preferred_name: "Occitan"
-autonym: "Occitan"
-population: 2035446
-region: "FR"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Ç È É Ë Í Ï Ò Ó Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à á ç è é ë í ï ò ó ú ü"
-  marks: "◌̀ ◌́ ◌̈ ◌̧"
-}
diff --git a/lang/languages/oc/sampletext.textproto b/lang/languages/oc/sampletext.textproto
deleted file mode 100644
index fb9994672..000000000
--- a/lang/languages/oc/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "oc"
diff --git a/lang/languages/om.textproto b/lang/languages/om.textproto
new file mode 100644
index 000000000..bf022f1d9
--- /dev/null
+++ b/lang/languages/om.textproto
@@ -0,0 +1,27 @@
+id: "om"
+name: "Oromo"
+preferred_name: ""
+autonym: "Afaan Oromoo"
+population: 34897120
+region: "ET"
+region: "KE"
+region: "SO"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z \'"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "NnAa"
+  masthead_partial: "Mm"
+  tester: "Ulfinni fi wal-qixxummaan ilmoo namaa kan uummattoota hundaa akka"
+  poster_sm: "Mirga namummaa"
+  poster_md: "Uummanni"
+  poster_lg: "Namooti"
+  specimen_48: "Biyyoota gidduutti walitti-dhufeenyi michumaa fi wal-jaalalaa akka"
+  specimen_36: "Akkasumas guddina hawaasummaa fi wayyaawuu sadarkaa jireenyaa fiduuf kan murannoodhaan hojjetan waan ta\'eef;"
+  specimen_32: "Kana malees immoo, garaagarummaan kamiyyuu karaa siyaasaa, karaa biyyummaa, karaa wal-caalmaa sadarkaa bulchiisa biyyaa fi karaa adda-addaa hin godhamu."
+  specimen_21: "Namni kamiyyuu mirga jiraachuu, birmadummaa argachuu fi mirga qaamni isaa eegamuu ni qaba.\nNamni homtuu garbummaa jalatti hin bulu, garbummaa fi daldalli garbaa bifa kamiin iyyuu dhorkaa dha.\nNamni kamiyyuu reebichii fi gidiraan hammeenyaa yookaan immoo wanti ulfina namummaa isaa hanqisu yookaan kan hammeenyaan adabsiisu irra hin ga\'u."
+  specimen_16: "Namni kamiyyuu akka namummaa isaatti seera duratti beekame kabajaa argachuu qaba.\nNamoonni hundi seera fuula duratti wal-qixxee ilaalamanii, garaagarummaa tokko malee, eegumsa seeraa argachuu qabu. Namoonni hundinuu waan labsii kanaan mormee isaan addaan qoodu hundumaa irraa eegamuu qabu.\nNamni kamiyyuu mirgoota heeraan yookaan seeraan isaaf kenname cabsuudhaan waan isa hubu hundumaa irraa karaa mana murtii yookaan yaa\'ii biyyaa eegumsa argachuuf mirga ni qaba.\nNamni kamiyyuu garmalee hin hidhamu, biyyaas hin ari\'atamu.\nNamni kamiyyuu yeroo yakkaan himatamee mirgooti isaa fi ittigaafatamni isaa murteeffamutti, qaama loogii irraa birmaduu ta\'etti dhiyaatee sirrii, qajeeltoo fi wal-qixummaadhaan gaafatamuuf mirga ni qabaata."
+}
diff --git a/lang/languages/om/language.textproto b/lang/languages/om/language.textproto
deleted file mode 100644
index 4e7e492c5..000000000
--- a/lang/languages/om/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "om"
-name: "Oromo"
-preferred_name: ""
-autonym: "Afaan Oromoo"
-population: 34897120
-region: "ET"
-region: "SO"
-region: "KE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z \'"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/om/sampletext.textproto b/lang/languages/om/sampletext.textproto
deleted file mode 100644
index 6123daf38..000000000
--- a/lang/languages/om/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "om"
diff --git a/lang/languages/or/language.textproto b/lang/languages/or.textproto
similarity index 95%
rename from lang/languages/or/language.textproto
rename to lang/languages/or.textproto
index 9cda62c3e..4d79aa557 100644
--- a/lang/languages/or/language.textproto
+++ b/lang/languages/or.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "ଅ ଆ ଇ ଈ ଉ ଊ ଋ ଏ ଐ ଓ ଔ କ ଖ ଗ ଘ ଙ ଚ ଛ ଜ ଝ ଞ ଟ ଠ ଡ ଢ ଣ ତ ଥ ଦ ଧ ନ ପ ଫ ବ ଭ ମ ଯ ର ଲ ଳ ଶ ଷ ସ ହ {କ\\u0B4Dଷ}"
 }
+sample_text {
+  fallback_language: "or"
+}
diff --git a/lang/languages/os.textproto b/lang/languages/os.textproto
new file mode 100644
index 000000000..c0dea0320
--- /dev/null
+++ b/lang/languages/os.textproto
@@ -0,0 +1,29 @@
+id: "os"
+name: "Ossetic"
+preferred_name: ""
+autonym: "Ирон"
+population: 616987
+region: "GE"
+region: "RU"
+script: "Cyrillic"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Æ Č Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä æ č š ž"
+  auxiliary: ""
+  marks: "◌̈ ◌̌"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
+  index: "А Ӕ Б В Г {Гъ} Д {Дж} {Дз} Е Ё Ж З И Й К {Къ} Л М Н О П {Пъ} Р С Т {Тъ} У Ф Х {Хъ} Ц {Цъ} Ч {Чъ} Ш Щ Ы Э Ю Я"
+}
+sample_text {
+  masthead_full: "АаДд"
+  masthead_partial: "Ӕӕ"
+  tester: "Нӕй рохуаты уадзӕн ӕппӕт дзыллӕджын бинонты уӕнгтӕн сӕ намысӕн"
+  poster_sm: "Адӕймӕгтӕ се"
+  poster_md: "Уымӕй уӕлдай,"
+  poster_lg: "\'ппӕт"
+  specimen_48: "Хъуамӕ мачи уа цагъар ӕмӕ уацары; цагъар ӕмӕ цагъайрӕгты уӕйгӕнынадӕн"
+  specimen_36: "Алы адӕймагӕн дӕр ис бар ӕнтысджытӕй йӕ бартӕ бахъахъӕнын тӕрхондоны, уыцы бартӕ йын лӕвӕрд сты закъон ӕмӕ конституцийӕ."
+  specimen_32: "Алы адӕймагӕн дӕр ис бар йӕхи хъуыды, намыс ӕмӕ динӕн; ардӕм хауы дин ӕмӕ фӕндтӕ ивыны бар, куыд иунӕгӕй, афтӕ иннӕтимӕ бастӕй динон ӕмӕ ритуалон ӕгъдӕуттӕ ӕххӕстгӕнгӕйӕ."
+  specimen_21: "Алы адӕймагӕн дӕр ис йӕхи разӕнгарддзинады бар ӕмӕ сӕ сӕрибарӕй равдисын дӕр; ацы бармӕ хауы хи разӕнгарддзинадыл хӕцын ӕмӕ хибарӕй агурын, исын ӕмӕ парахат кӕнын информаци ӕмӕ фӕндтӕ цыфӕнды мадзӕлттӕй паддзахадон арӕнтӕй хицӕнӕй.\nАлы адӕймагӕн дӕр, куыд ӕхсӕнады уӕнгӕн, ис бар социалон ӕххуысӕн, стӕй йӕ намысы, хибарӕй рӕзты экономикон ӕмӕ культурон уавӕрты национ, ӕхсӕнадӕмон ӕмӕ алы паддзахады мадзӕлтты ӕххуысы бар."
+  specimen_16: "Алы адӕймагӕн дӕр ис бар улӕфынӕн ӕмӕ йӕ рӕстӕг ӕрвитынӕн, уимӕ кусӕн бон ӕмбӕлгӕ къаддӕр кӕнынӕн ӕмӕ фидгӕ ӕрвылазон улӕфӕн рӕстӕгӕн.\nАлы адӕймагӕн дӕр ис бар социалон ӕмӕ ӕхсӕнадӕмон фӕткӕн, кӕцыйы ацы Декларацийы ӕвдыст бартӕ уыдзысты ӕнӕхъӕнӕй ӕххӕстгонд.\nАцы Декларацийы фыст уацтӕ хъуамӕ ма уой ӕмбӕрст куыд лӕвӕрд бартӕ цавӕрдӕр паддзахадӕн, адӕмы къордӕн кӕнӕ хицӕн адӕймӕгтӕн исты архайд аразын, кӕцы цӕуа ацы Декларацийы ӕвдыст барты ныхмӕ.\nАдӕймӕгтӕ се \'ппӕт дӕр райгуырынц сӕрибарӕй ӕмӕ ӕмхуызонӕй сӕ барты. Уыдон ӕххӕст сты зонд ӕмӕ намысӕй, ӕмӕ кӕрӕдзийӕн хъуамӕ уой ӕфсымӕрты хуызӕн."
+}
diff --git a/lang/languages/os/language.textproto b/lang/languages/os/language.textproto
deleted file mode 100644
index b01cb639a..000000000
--- a/lang/languages/os/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "os"
-name: "Ossetic"
-preferred_name: ""
-autonym: "Ирон"
-population: 616987
-region: "RU"
-region: "GE"
-script: "Cyrillic"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Æ Č Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä æ č š ž"
-  auxiliary: ""
-  marks: "◌̈ ◌̌"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
-  index: "А Ӕ Б В Г {Гъ} Д {Дж} {Дз} Е Ё Ж З И Й К {Къ} Л М Н О П {Пъ} Р С Т {Тъ} У Ф Х {Хъ} Ц {Цъ} Ч {Чъ} Ш Щ Ы Э Ю Я"
-}
diff --git a/lang/languages/os/sampletext.textproto b/lang/languages/os/sampletext.textproto
deleted file mode 100644
index 4e8014a94..000000000
--- a/lang/languages/os/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "os"
diff --git a/lang/languages/osa/language.textproto b/lang/languages/osa.textproto
similarity index 73%
rename from lang/languages/osa/language.textproto
rename to lang/languages/osa.textproto
index d9e8a4160..379c23806 100644
--- a/lang/languages/osa/language.textproto
+++ b/lang/languages/osa.textproto
@@ -7,3 +7,6 @@ region: "US"
 script: "Osage"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "osa"
+}
diff --git a/lang/languages/pa.textproto b/lang/languages/pa.textproto
new file mode 100644
index 000000000..4bec90de0
--- /dev/null
+++ b/lang/languages/pa.textproto
@@ -0,0 +1,32 @@
+id: "pa"
+name: "Punjabi"
+preferred_name: ""
+autonym: "ਪੰਜਾਬੀ,"
+population: 37669517
+region: "GB"
+region: "IN"
+region: "KE"
+region: "SG"
+script: "Gurmukhi"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ݨ ں و ه ھ ء ی ے"
+  auxiliary: "ॐ"
+  marks: "◌ؕ"
+  numerals: "੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "। ॥ ॰"
+  index: "ੳ ਅ ੲ ਸ ਹ ਕ ਖ ਗ ਘ ਙ ਚ ਛ ਜ ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ ਬ ਭ ਮ ਯ ਰ ਲ ਵ ੜ"
+}
+sample_text {
+  masthead_full: "ਸਰਮਨ"
+  masthead_partial: "ਖਪ"
+  tester: "ਜਦ ਕਿ ਮਨੁੱਖੀ ਪਰਿਵਾਰ ਦੇ ਸਾਰੇ ਮੈਂਬਰਾਂ ਦੀ ਧੁਰ ਅੰਦਰਲੀ ਅੰਤਰੀਵ ਸ਼ਾਨ ਅਤੇ ਬਰਾਬਰੀ ਤੇ ਨਾ ਟਾਲੇ ਜਾ ਸਕਣ"
+  poster_sm: "ਜਦ ਕਿ ਮਨੁੱਖੀ ਅਧਿਕਾਰਾਂ"
+  poster_md: "ਅਤੇ ਇਹ ਅਜਿਹੇ"
+  poster_lg: "ਮਨੁੱਖੀ"
+  specimen_48: "ਜਦਕਿ ਇਸ ਤੋਂ ਪਹਿਲਾਂ ਕਿ ਮਨੁੱਖ ਬੇਬਸ ਹੋ ਕੇ ਆਖਰੀ ਚਾਰੇ ਵਜੋਂ ਜ਼ੁਲਮ ਤੇ ਦਮਨ ਦੇ ਵਿਰੁਧ ਬਗਾਵਤ ਕਰਨ"
+  specimen_36: "ਕਿਸੇ ਵੀ ਵਿਅਕਤੀ ਨੂੰ ਤਸੀਹੇ ਨਹੀਂ ਦਿਤੇ ਜਾਣਗੇ ਅਤੇ ਉਸ ਨਾਲ ਅਣਮਨੁੱਖੀ ਵਰਤਾਓ ਨਹੀਂ ਕੀਤਾ ਜਾਏਗਾ ਅਤੇ ਉਸ ਨੂੰ ਇਹੋ ਜਿਹੀ ਸਜ਼ਾ ਨਹੀਂ ਦਿੱਤੀ ਜਾਏਗੀ ਜਿਸ ਦਾ ਮਨੋਰਥ ਉਸ ਨੂੰ ਨੀਵਾਂ ਕਰਨਾ ਹੋਵੇ ।"
+  specimen_32: "ਸਭਨਾ ਲੋਕਾਂ ਨੂੰ ਕਾਨੂੰਨ ਸਾਹਮਣੇ ਬਰਾਬਰ ਸਮਝਿਆ ਜਾਵੇਗਾ ਅਤੇ ਉਨ੍ਹਾਂ ਨੂੰ ਬਿਨਾਂ ਕਿਸੇ ਭੇਦ ਭਾਵ ਤੋਂ ਕਾਨੂੰਨ ਮੁਤਾਬਿਕ ਬਰਾਬਰ ਦੀ ਸੁਰੱਖਿਆ ਮਿਲੇਗੀ । ਸਭਨਾ ਲੋਕਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਭੇਦ ਭਾਵ ਦੇ ਖਿ਼ਲਾਫ ਬਰਾਬਰ ਦੀ ਸੁਰੱਖਿਆ ਮਿਲੇਗੀ ਅਤੇ ਭੇਦ ਭਾਵ ਕਰਨ ਵਾਲੀ ਉਕਸਾਹਟ ਵਿਰੁਧ ਵੀ ਉਸ ਨੂੰ ਬਰਾਬਰ ਦੀ ਸੁਰੱਖਿਆ ਮਿਲੇਗੀ ।"
+  specimen_21: "ਜੇਕਰ ਕਿਸੇ ਵਿਅਕਤੀ ਨੂੰ ਮਹਿਸੂਸ ਹੁੰਦਾ ਹੈ ਕਿ ਸੰਵਿਧਾਨ ਜਾਂ ਕਾਨੂੰਨ ਤਹਿਤ ਮਿਲੇ ਬੁਨਿਆਦੀ ਅਧਿਕਾਰਾਂ ਦੀ ਉਲੰਘਣਾ ਹੋਈ ਹੈ ਤਾਂ ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਯੋਗ ਨਿਆਂ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਰਾਸ਼ਟਰੀ ਟਿ੍ਰਬਿਊਨਲਾਂ ਤਕ ਪਹੁੰਚ ਕਰਨ ਦਾ ਹੱਕ ਹਾਸਲ ਹੈ ।\nਕਿਸੇ ਵਿਅਕਤੀ ਨੂੰ ਐਵੇਂ ਆਪਹੁਦਰੇ ਢੰਗ ਜਾਂ ਮਨਮਰਜੀ ਨਾਲ ਗਿ੍ਰਫਤਾਰ, ਨਜ਼ਰਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾਏਗਾ ਜਾ ਦੇਸ਼ ਨਿਕਾਲਾ ਨਹੀਂ ਦਿੱਤਾ ਜਾਏਗਾ ।\nਹਰੇਕ ਵਿਅਕਤੀ ਨੂੰ ਫੌਜਦਾਰੀ ਦੋਸ਼ ਲਗਣ ਦੀ ਸੂਰਤ ਵਿਚ ਆਪਣੇ ਹੱਕਾਂ ਤੇ ਜਿ਼ੰਮੇਵਾਰੀਆਂ ਨੂੰ ਮਿਲਣ ਲਈ ਇਕ ਸੁਤੰਤਰ ਤੇ ਨਿਰਪੱਖ ਟਿ੍ਰਬਿਊਨਲ ਅੱਗੇ ਨਿਆਂ ਪੂਰਵਕ ਤੇ ਜਨਤਕ ਸੁਣਵਾਈ ਦਾ ਹੱਕ ਹਾਸਲ ਹੈ ।"
+  specimen_16: "ਕਿਸੇ ਵੀ ਵਿਅਕਤੀ ਦੇ ਨਿਜੀ ਜੀਵਨ ਵਿਚ, ਘਰ, ਪਰਿਵਾਰ ਜਾਂ ਉਸ ਦੇ ਚਿੱਠੀ ਪੱਤਰ ਵਿਚ ਆਪਹੁਦਰੀ ਦਜ਼ਲਅੰਦਾਜ਼ੀ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ ਅਤੇ ਨਾ ਹੀ ਉਸ ਦੇ ਮਾਣ ਸਨਮਾਨ ਤੇ ਸ਼ੋਹਰਤ ਨੂੰ ਧੱਕਾ ਪਹੁੰਚਾਇਆ ਜਾਏਗਾ । ਹਰੇਕ ਅਜਿਹੇ ਵਿਅਕਤੀ ਨੂੰ ਅਜਿਹੀ ਦਜ਼ਲਅੰਦਾਜ਼ੀ ਵਿਰੁਧ ਕਾਨੂੰਨ ਹੇਠ ਸੁਰੱਖਿਆ ਮਿਲੇਗੀ ।\nਹਰੇਕ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣੀ ਰਾਏ ਰੱਖਣ ਅਤੇ ਪ੍ਰਗਟ ਕਰਨ ਦਾ ਹੱਕ ਹਾਸਲ ਹੈ । ਇਸ ਹੱਕ ਵਿਚ ਬਗੈਰ ਕਿਸੇ ਦਜ਼ਲ ਅੰਦਾਜ਼ੀ ਤੋਂ ਆਪਣੀ ਰਾਏ ਰੱਖਣ ਦੀ ਆਜ਼ਾਦੀ ਸ਼ਾਮਲ ਹੈ ਅਤੇ ਦੇਸ਼ ਕਾਲ ਦੀਆਂ ਹੱਦਾਂ ਤੋਂ ਮੁਕਤ ਹੋ ਕੇ ਕਿਸੇ ਵੀ ਮਾਧਿਅਮ ਰਾਹੀਂ ਜਾਣਕਾਰੀ ਤੇ ਵਿਚਾਰ ਮੰਗਣ, ਲੈਣ ਤੇ ਜਾਣਕਾਰੀ ਦੇਣ ਦਾ ਹੱਕ ਇਸ ਅਧਿਕਾਰ ਵਿਚ ਸ਼ਾਮਲ ਹੈ ।\nਹਰੇਕ ਵਿਅਕਤੀ ਨੂੰ ਸਮਾਜ ਦਾ ਮੈਂਬਰ ਹੋਣ ਤੇ ਨਾਤੇ ਸਮਾਜਕ ਸੁਰੱਖਿਆ ਦਾ ਅਧਿਕਾਰ ਹੈ ਅਤੇ ਉਹ ਰਾਸ਼ਟਰੀ ਯਤਨਾਂ ਰਾਹੀਂ ਜਾਂ ਅੰਤਰਰਾਸ਼ਟਰੀ ਸਹਿਯੋਗ ਰਾਹੀਂ ਅਤੇ ਸਬੰਧਿਤ ਮੁਲਕ ਦੇ ਸਾਧਨਾਂ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੋਇਆ ਆਪਣੇ ਆਰਥਕ, ਸਮਾਜਕ ਤੇ ਸਭਿਆਚਾਰਕ ਹੱਕਾਂ ਦੀ ਪੂਰਤੀ ਕਰਨ ਦਾ ਹੱਕਦਾਰ ਹੈ ਜੋ ਉਸ ਦੀ ਸ਼ਖਸੀਅਤ ਦੇ ਸੁਤੰਤਰ ਵਿਕਾਸ ਤੇ ਉਸਦੇ ਮਾਣ ਤਾਨ ਲਈ ਜ਼ਰੂਰੀ ਹੁੰਦੇ ਹਨ ।"
+}
diff --git a/lang/languages/pa/language.textproto b/lang/languages/pa/language.textproto
deleted file mode 100644
index f474129ba..000000000
--- a/lang/languages/pa/language.textproto
+++ /dev/null
@@ -1,19 +0,0 @@
-id: "pa"
-name: "Punjabi"
-preferred_name: ""
-autonym: "ਪੰਜਾਬੀ,"
-population: 37669517
-region: "KE"
-region: "SG"
-region: "IN"
-region: "GB"
-script: "Perso-Arabic"
-script: "Gurmukhi"
-exemplar_chars {
-  base: "ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ݨ ں و ه ھ ء ی ے"
-  auxiliary: "ॐ"
-  marks: "◌ؕ"
-  numerals: "੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "। ॥ ॰"
-  index: "ੳ ਅ ੲ ਸ ਹ ਕ ਖ ਗ ਘ ਙ ਚ ਛ ਜ ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ ਬ ਭ ਮ ਯ ਰ ਲ ਵ ੜ"
-}
diff --git a/lang/languages/pa/sampletext.textproto b/lang/languages/pa/sampletext.textproto
deleted file mode 100644
index 86f117c37..000000000
--- a/lang/languages/pa/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "pa"
diff --git a/lang/languages/pa_Arab/language.textproto b/lang/languages/pa_Arab.textproto
similarity index 92%
rename from lang/languages/pa_Arab/language.textproto
rename to lang/languages/pa_Arab.textproto
index 0cb553f77..7339c7a60 100644
--- a/lang/languages/pa_Arab/language.textproto
+++ b/lang/languages/pa_Arab.textproto
@@ -4,11 +4,14 @@ preferred_name: ""
 autonym: ""
 population: 163450700
 region: "PK"
-script: "Perso-Arabic"
 script: "Gurmukhi"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "\\u064F ء آ ؤ ئ ا ب پ ت ث ٹ ج چ ح خ د ذ ڈ ر ز ڑ ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں ه ھ ہ و ی ے"
   auxiliary: "\\u200E\\u200F أ ٻ ة ٺ ټ ٽ"
   numerals: "\\u200E \\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "ء آ ؤ ئ ا ب پ ت ث ٹ ج چ ح خ د ذ ڈ ر ز ڑ ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں ه ھ ہ و ی ے"
 }
+sample_text {
+  fallback_language: "pa_Arab"
+}
diff --git a/lang/languages/pag/language.textproto b/lang/languages/pag.textproto
similarity index 75%
rename from lang/languages/pag/language.textproto
rename to lang/languages/pag.textproto
index 1cfacbc68..8e7ca9343 100644
--- a/lang/languages/pag/language.textproto
+++ b/lang/languages/pag.textproto
@@ -7,3 +7,6 @@ region: "PH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/pam.textproto b/lang/languages/pam.textproto
new file mode 100644
index 000000000..1ede6746c
--- /dev/null
+++ b/lang/languages/pam.textproto
@@ -0,0 +1,24 @@
+id: "pam"
+name: "Pampanga"
+preferred_name: ""
+autonym: "Kapampangan"
+population: 2511162
+region: "PH"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E G H I K L M N O P Q R S T U W Y a b d e g h i k l m n o p r s t u w y"
+  auxiliary: "C F J V X Z c f j q v x z"
+}
+sample_text {
+  masthead_full: "DdIi"
+  masthead_partial: "Nn"
+  tester: "Uling ing pamangilala king likas a karangalan at king pante at"
+  poster_sm: "Uling e tamu"
+  poster_md: "Lebagan do"
+  poster_lg: "Ding"
+  specimen_48: "Uling tune maulaga, bang ing tau e mapilitang gumerang lumaban"
+  specimen_36: "Uling maulagang abalu ra ding sabla ding karapatan at kalayang iti bang pilming matupad ing pangakung iti."
+  specimen_32: "Ding sablang tau mibait lang malaya at pante-pante king karangalan at karapatan. Ila mipagkaluban lang katuliran at konsensiya ay dapat misaupan king diwang pamikapatiran."
+  specimen_21: "Ing balang metung atin iyang karapatan karing anggang karapatan at kalayang tikda na ning Proklamasyun a iti, king alang lalon ninu mang lahi, kule, pangatau, salita, reliyun, kapaniwalan king pulitika o aliwa pang pamaniwala penibatang bansa o lipunan, pibandian, kepaitan o aliwa pang kabilyan.\nDing balang metung atin lang karapatang mie kalayan at kaligtasan antimong tau."
+  specimen_16: "Alang ninu man ing dapat gawan alipan o busabus; makabawal la ding sablang bage pamanalipa at pamangalakal alipan.\nAlang ninu man ing mipailalam ya king labis a pamipasakit o pamagmalupit, a e makatau mababang pamanuring o pamamarusa.\nIng balang metung atin iyang karapatang kilalanan, nokarin man, anting metung a tau king arap ning batas.\nDing sabla pante-pante la king arap ning atas at atin lang karapatan king pante-pante proteksyun ning batas a alang pipilinan. Ding sabla atin lang karapatan king pante-pante laban king nanu mang pamimili a labag king Proklamasyun a iti at laban king nanu mang pamanulsul king mesabing pamamili."
+}
diff --git a/lang/languages/pam/language.textproto b/lang/languages/pam/language.textproto
deleted file mode 100644
index cd66e5a9e..000000000
--- a/lang/languages/pam/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "pam"
-name: "Pampanga"
-preferred_name: ""
-autonym: "Kapampangan"
-population: 2511162
-region: "PH"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E G H I K L M N O P Q R S T U W Y a b d e g h i k l m n o p r s t u w y"
-  auxiliary: "C F J V X Z c f j q v x z"
-}
diff --git a/lang/languages/pam/sampletext.textproto b/lang/languages/pam/sampletext.textproto
deleted file mode 100644
index 6b08c9be3..000000000
--- a/lang/languages/pam/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "pam"
diff --git a/lang/languages/pap.textproto b/lang/languages/pap.textproto
new file mode 100644
index 000000000..fe290fd3e
--- /dev/null
+++ b/lang/languages/pap.textproto
@@ -0,0 +1,26 @@
+id: "pap"
+name: "Papiamento"
+preferred_name: ""
+autonym: "Papiamentu"
+population: 211640
+region: "AW"
+region: "BQ"
+region: "CW"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z È Ò Ù Ü Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z è ò ù ü ñ"
+  marks: "◌̀ ◌̃ ◌̈"
+}
+sample_text {
+  masthead_full: "TtUu"
+  masthead_partial: "Rr"
+  tester: "Considerando cu reconocemento di e dignidad inherente y di e"
+  poster_sm: "Considerando"
+  poster_md: "Asamblea"
+  poster_lg: "Tur"
+  specimen_48: "Tur ser humano ta nace liber y igual den dignidad y den derecho."
+  specimen_36: "Considerando cu reconocemento di e dignidad inherente y di e derechonan igual y inalienabel di tur miembro"
+  specimen_32: "Considerando cu reconocemento di e dignidad inherente y di e derechonan igual y inalienabel di tur miembro di famia humano ta base di libertad, husticia y paz na mundo;"
+  specimen_21: "Considerando cu reconocemento di e dignidad inherente y di e derechonan igual y inalienabel di tur miembro di famia humano ta base di libertad, husticia y paz na mundo;\nConsiderando cu indiferencia y menosprecio pa derecho humano a resulta den actonan di barbarie cu a agredi consenshi di humanidad, y cu a proclama, como e aspiracion mas halto di ser humano, binimento di un mundo den cua hende, libera di temor y di miseria, lo disfruta di libertad di palabra y libertad di creencia;"
+  specimen_16: "Considerando cu reconocemento di e dignidad inherente y di e derechonan igual y inalienabel di tur miembro di famia humano ta base di libertad, husticia y paz na mundo;\nConsiderando cu indiferencia y menosprecio pa derecho humano a resulta den actonan di barbarie cu a agredi consenshi di humanidad, y cu a proclama, como e aspiracion mas halto di ser humano, binimento di un mundo den cua hende, libera di temor y di miseria, lo disfruta di libertad di palabra y libertad di creencia;\nConsiderando cu ta esencial pa derecho humano ta protegi pa un regimen di derecho, a fin cu ser humano no haya su mes obliga di recuri, na ultimo instancia, na rebelion contra tirania y opresion;"
+}
diff --git a/lang/languages/pap/language.textproto b/lang/languages/pap/language.textproto
deleted file mode 100644
index c52909bb6..000000000
--- a/lang/languages/pap/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "pap"
-name: "Papiamento"
-preferred_name: ""
-autonym: "Papiamentu"
-population: 211640
-region: "CW"
-region: "BQ"
-region: "AW"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z È Ò Ù Ü Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z è ò ù ü ñ"
-  marks: "◌̀ ◌̃ ◌̈"
-}
diff --git a/lang/languages/pap/sampletext.textproto b/lang/languages/pap/sampletext.textproto
deleted file mode 100644
index 4a06609c7..000000000
--- a/lang/languages/pap/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "pap"
diff --git a/lang/languages/pau.textproto b/lang/languages/pau.textproto
new file mode 100644
index 000000000..e71788bff
--- /dev/null
+++ b/lang/languages/pau.textproto
@@ -0,0 +1,24 @@
+id: "pau"
+name: "Palauan"
+preferred_name: ""
+autonym: "a tekoi er a Belau"
+population: 16046
+region: "PW"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E Ę F I K L M N O P R S T U Z a b c d e ę f i k l m n o p r s t u z"
+  marks: "◌̨"
+}
+sample_text {
+  masthead_full: "AaRr"
+  masthead_partial: "Oo"
+  tester: "Alewaisei ea klaolengei ra chemolt \'l omengull ma klaodengei ra"
+  poster_sm: "Alewaisei ea"
+  poster_md: "Alewaisei"
+  poster_lg: "rogui"
+  specimen_48: "Alewaisei eng kngmal klou \'l ungil al borngii a omengedmokl \'l"
+  specimen_36: "Alewaisei ea klou \'l klaodengei ra ikal llemalt ma ilmokl a klou a belkul ra rolel omengedmeklel aikal tegoi."
+  specimen_32: "A rogui \'l chad el mechell a ngarngii a ilmokl er tir ra diosisiu el llemalt. Ngarngii er tir a uldesuir mete mo meruul el mo rar bebil lokiu a ungil \'l omeruul ra klauchad."
+  specimen_21: "Ar bek \'l chad a ngarngii a llemeltir ra ikal mla medung \'l ilmokl ma llemalt, \'l diak a ngodech lolkebai er tir, \'l ua uchelel a chad, ma iro, ma klechad, ma klaodengei ra tegoi, ma uldesuel, ma belual, ma klalou, ma klechelid, ma blekerdelel a cherellel.\nE dirrek el diak lebol uchul ea chad a choriid aikang el dimle uchul a tegoi ra buai \'l lengarngii malechub eng belulachad er ngii, al dokurits ma lak eng diosisiu, malechub engdi ngodech el blekeradel ra beluu."
+  specimen_16: "Ar bek \'l chad a ngarngii a llemeltir ra klengar, ma ilmokl, ma budech ra klechad er tir.\nNgdiak a chad \'l mo sibai malechub engmo meruul a urrerel a sibai; ma rolel a siobai ra oterullel ma ocheral ar sibai amo mekull.\nNgdiak a chad \'l mo mukcharm malechub engmo obals ra meringel \'l omeruul el ngii a diak el kirel el mora chad.\nAr bek \'l chad a morngii a llemeltir ra klechad ra medal a llach ra ngidil bashio.\nA rogui \'l chad a diosisiu a klisichir ra medal a llach mete me mekegar ra llach el dimo chosisiu a omengkar el mor tir. Ma rogui \'l chad a diosisiu a llemeltir mete mo mekegar el diosisiu a blekerdelir alsekum tial subed a ngarngii a metemall er ngii."
+}
diff --git a/lang/languages/pau/language.textproto b/lang/languages/pau/language.textproto
deleted file mode 100644
index 576164f89..000000000
--- a/lang/languages/pau/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "pau"
-name: "Palauan"
-preferred_name: ""
-autonym: "a tekoi er a Belau"
-population: 16046
-region: "PW"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E Ę F I K L M N O P R S T U Z a b c d e ę f i k l m n o p r s t u z"
-  marks: "◌̨"
-}
diff --git a/lang/languages/pau/sampletext.textproto b/lang/languages/pau/sampletext.textproto
deleted file mode 100644
index 7d3c1c884..000000000
--- a/lang/languages/pau/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "pau"
diff --git a/lang/languages/pcd.textproto b/lang/languages/pcd.textproto
new file mode 100644
index 000000000..0ddb77ce5
--- /dev/null
+++ b/lang/languages/pcd.textproto
@@ -0,0 +1,24 @@
+id: "pcd"
+name: "Picard"
+preferred_name: ""
+autonym: "Picard"
+population: 746330
+region: "FR"
+script: "Latin"
+exemplar_chars {
+  base: "A  ŠB C Ç D E Ê É È F G I Î Ï K L H J M N O Ô P Q R S T U Û V W Y Ŷ Z Æ Œ a â å b c ç d e ê é è f g i î ï k l h j m n o ô p q r s t u û v w y ŷ z æ œ"
+  marks: "◌̀ ◌́ ◌̂ ◌̈ ◌̊ ◌̧"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Ss"
+  tester: "Considèrant qui l\' rèspèt dèl dignité, qu\'apartint sorlon l\' nateûre"
+  poster_sm: "considèrant"
+  poster_md: "li jènèrale"
+  poster_lg: "Tos"
+  specimen_48: "prôclame cisse Dèclaråcion dès dreûts d\' l\'ome come riprézintant"
+  specimen_36: "In-ome n\'a måy li dreût d\'assèrvi in-ôte ome, d\'ènnè fé in-èsclåve èt \'ne martchandèye qu\'on pout vinde ou atch\'ter."
+  specimen_32: "Chaskeun\' deût-èsse vrèyemint lîbe d\'atre°re divant lès djudjes di s\' payis tot lès cis qu\'adjihèt conte lès me°sses dreûts rik\'nohous d\'vins l\'constitucion ou d\'vins li lwè."
+  specimen_21: "Nouk ni pout, sins nole bone re°zon, èsse arèsté, rèssèré, ou bin tchèssî foû di s\' payis.\nTot l\'monde a parèlièmint l\' dreût d\' ple°tî s\' cåse divant on tribunål qui seûye lîbe èt sins parti-pris. Et li d\'vwèr dè tribunål, ci sèrè d\' décîder so lès dreûts èt so lès obligåcions dès ple°tieûs ou bin d\' djudjî si l\' acuzé èst coupåbe ou ènocint di çou qu\'on l\' amète."
+  specimen_16: "Il èst disfindou d\' s\'intrimète sins re°zon d\'vins lès-afe°res d\'ine saquî ou di s\' famile, di brokî è s\' mohone, di nahî d\'vins lès lètes qu\'i r\'çût ou qu\'il èvôye. Il èst disfindou d\' l\' ac\'sûre divins si-oneûr ou d\'vins s\' réputåcion. A d\' fåt d\' çoula, chaskeun\' a l\' dreût d\' rèclamer l\'pretècsion dès lwès.\nChaskeun\' èst me°sse di sès-îdèyes, di s\' consyinca, di s\' rilidjon. Coula vout dîre qu\'il èst lîbe dè régler s\' vèye so sès prôpés-îdèyes èt so s\' rilidjon, tot seû ou bin avou dès-ôtes, è s\' mohone come å d\' foû, avou l\'ansègnemint, lès pratiques, lès-ûzances èt lès cèrèmon\'rèyes qui l\'agrèyèt."
+}
diff --git a/lang/languages/pcd/language.textproto b/lang/languages/pcd/language.textproto
deleted file mode 100644
index d0e4d99c5..000000000
--- a/lang/languages/pcd/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "pcd"
-name: "Picard"
-preferred_name: ""
-autonym: "Picard"
-population: 746330
-region: "FR"
-script: "Latin"
-exemplar_chars {
-  base: "A  ŠB C Ç D E Ê É È F G I Î Ï K L H J M N O Ô P Q R S T U Û V W Y Ŷ Z Æ Œ a â å b c ç d e ê é è f g i î ï k l h j m n o ô p q r s t u û v w y ŷ z æ œ"
-  marks: "◌̀ ◌́ ◌̂ ◌̈ ◌̊ ◌̧"
-}
diff --git a/lang/languages/pcd/sampletext.textproto b/lang/languages/pcd/sampletext.textproto
deleted file mode 100644
index fb8a4d1a4..000000000
--- a/lang/languages/pcd/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "pcd"
diff --git a/lang/languages/pcm.textproto b/lang/languages/pcm.textproto
new file mode 100644
index 000000000..bd4aa3ae5
--- /dev/null
+++ b/lang/languages/pcm.textproto
@@ -0,0 +1,27 @@
+id: "pcm"
+name: "Nigerian Pidgin"
+preferred_name: ""
+autonym: ""
+population: 44945880
+region: "NG"
+script: "Latin"
+exemplar_chars {
+  base: "a á b {ch} d e é ẹ {ẹ\\u0301} f g {gb} h i í j k {kp} l m n o ó ọ {ọ\\u0301} p r s {sh} t u ú v w y z {zh}"
+  auxiliary: "à c è {ẹ\\u0300} ì ò {ọ\\u0300} q ù x"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B {CH} D E F G H I J K L M N O P R S T U V W Y Z"
+}
+sample_text {
+  masthead_full: "EeVv"
+  masthead_partial: "Rr"
+  tester: "Dem recognise say human beings get dignity wey dey with us and"
+  poster_sm: "Since e be"
+  poster_md: "Since e de"
+  poster_lg: "Everi"
+  specimen_48: "Since dem say all di people for di meeting of di whole world"
+  specimen_36: "Everi one naim get right to live, get right to do as e like and right to see say im life safe for where e dey."
+  specimen_32: "Everi one naim de entitle to say wen e face people wey go judge am, dem must to make sure say mago mago no de wen dem de do im case, if dem say e do something wey e bad."
+  specimen_21: "Dem talk say nobodi fit put mouth any how for anoda person mata or im family or im house mata or even any ting wey e concern di person. Wen everibodi know say person good, nobodi get right to de go about to say di person na bad person. Everibodi as di law, talk naim goment must to protect, if anybodi wan do dat kind ting to person."
+  specimen_16: "Everione naim get right to tink any ting e like, do as e like or do as im mind tell am to do, do di kind religion e wan do. Naim be say person fit change im religion or wetin e tink say naim be di truth for im religion. E fit do dis by imself or make nobodi know or with other people, make everibodi know. If e like self, e fit teach people dis im religion, e fit show di kind religion wey e belong to, for di way, wey e de behave or way, wey e serve im god.\nEverione naim get right to tink or talk wetin e like about any mata. Naim be say wen di person tink about wetin e like, nobodi get right to say make e no tink like dat. Even sef di person get right to look for or get any information wey e like from any where."
+}
diff --git a/lang/languages/pcm/language.textproto b/lang/languages/pcm/language.textproto
deleted file mode 100644
index 510fa9790..000000000
--- a/lang/languages/pcm/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "pcm"
-name: "Nigerian Pidgin"
-preferred_name: ""
-autonym: ""
-population: 44945880
-region: "NG"
-script: "Latin"
-exemplar_chars {
-  base: "a á b {ch} d e é ẹ {ẹ\\u0301} f g {gb} h i í j k {kp} l m n o ó ọ {ọ\\u0301} p r s {sh} t u ú v w y z {zh}"
-  auxiliary: "à c è {ẹ\\u0300} ì ò {ọ\\u0300} q ù x"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B {CH} D E F G H I J K L M N O P R S T U V W Y Z"
-}
diff --git a/lang/languages/pcm/sampletext.textproto b/lang/languages/pcm/sampletext.textproto
deleted file mode 100644
index 807a33493..000000000
--- a/lang/languages/pcm/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "pcm"
diff --git a/lang/languages/pdc/language.textproto b/lang/languages/pdc.textproto
similarity index 76%
rename from lang/languages/pdc/language.textproto
rename to lang/languages/pdc.textproto
index 9a10b9729..ba49b9a84 100644
--- a/lang/languages/pdc/language.textproto
+++ b/lang/languages/pdc.textproto
@@ -7,3 +7,6 @@ region: "US"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/pdt/language.textproto b/lang/languages/pdt.textproto
similarity index 75%
rename from lang/languages/pdt/language.textproto
rename to lang/languages/pdt.textproto
index 0fe9af34a..0f07ad41f 100644
--- a/lang/languages/pdt/language.textproto
+++ b/lang/languages/pdt.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/pfl/language.textproto b/lang/languages/pfl.textproto
similarity index 75%
rename from lang/languages/pfl/language.textproto
rename to lang/languages/pfl.textproto
index 3b7917c14..a16681363 100644
--- a/lang/languages/pfl/language.textproto
+++ b/lang/languages/pfl.textproto
@@ -7,3 +7,6 @@ region: "DE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/pko/language.textproto b/lang/languages/pko.textproto
similarity index 86%
rename from lang/languages/pko/language.textproto
rename to lang/languages/pko.textproto
index 23afb42b6..a9584c533 100644
--- a/lang/languages/pko/language.textproto
+++ b/lang/languages/pko.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E G H I J K L M N O P R S T U W Y a b c d e g h i j k l m n o p r s t u w y"
   auxiliary: "F Q V X Z f q v x z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/pl.textproto b/lang/languages/pl.textproto
new file mode 100644
index 000000000..f4c753c53
--- /dev/null
+++ b/lang/languages/pl.textproto
@@ -0,0 +1,34 @@
+id: "pl"
+name: "Polish"
+preferred_name: ""
+autonym: "Polski"
+population: 38273562
+region: "CZ"
+region: "DE"
+region: "IL"
+region: "PL"
+region: "RO"
+region: "SK"
+region: "UA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ó Ą Ć Ę Ł Ń Ś Ź Ż a b c d e f g h i j k l m n o p q r s t u v w x y z ó ą ć ę ł ń ś ź ż"
+  auxiliary: "à â å ä æ ç é è ê ë î ï ô ö œ q ß ù û ü v x ÿ"
+  marks: "◌́ ◌̇ ◌̨"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' \" ” „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& # % † ‡ ′ ″ ° ~"
+  index: "A B C Ć D E F G H I J K L Ł M N O Ó P Q R S Ś T U V W X Y Z Ź Ż"
+}
+sample_text {
+  masthead_full: "WwSs"
+  masthead_partial: "Zz"
+  tester: "ZWAŻYWSZY, że uznanie przyrodzonej godności oraz równych i niezbywalnych"
+  poster_sm: "ZWAŻYWSZY, że"
+  poster_md: "ZWAŻYWSZY,"
+  poster_lg: "Wszyscy"
+  specimen_48: "ZWAŻYWSZY, że konieczne jest popieranie rozwoju przyjaznych stosunków"
+  specimen_36: "ZWAŻYWSZY, że jednakowe rozumienie tych praw i wolności ma olbrzymie znaczenie dla ich pełnej realizacji,"
+  specimen_32: "Wszyscy ludzie rodzą się wolni i równi pod względem swej godności i swych praw. Są oni obdarzeni rozumem i sumieniem i powinni postępować wobec innych w duchu braterstwa."
+  specimen_21: "Każdy człowiek posiada wszystkie prawa i wolności zawarte w niniejszej Deklaracji bez względu na jakiekolwiek różnice rasy, koloru, płci, języka, wyznania, poglądów politycznych i innych, narodowości, pochodzenia społecznego, majątku, urodzenia lub jakiegokolwiek innego stanu.\nKażdy człowiek ma prawo do życia, wolności i bezpieczeństwa swej osoby."
+  specimen_16: "Nie wolno nikogo czynić niewolnikiem ani nakładać na nikogo służebności; niewolnictwo i handel niewolnikami są zakazane we wszystkich swych postaciach.\nNie wolno nikogo torturować ani karać lub traktować w sposób okrutny, nieludzki lub poniżający.\nKażdy człowiek ma prawo do uznawania wszędzie jego osobowości prawnej.\nWszyscy są równi wobec prawa i mają prawo, bez jakiejkolwiek różnicy, do jednakowej ochrony prawnej. Wszyscy mają prawo do jednakowej ochrony przed jakąkolwiek dyskryminacją, będącą pogwałceniem niniejszej Deklaracji, i przed jakimkolwiek narażeniem na taką dyskryminację."
+}
diff --git a/lang/languages/pl/language.textproto b/lang/languages/pl/language.textproto
deleted file mode 100644
index df418f058..000000000
--- a/lang/languages/pl/language.textproto
+++ /dev/null
@@ -1,21 +0,0 @@
-id: "pl"
-name: "Polish"
-preferred_name: ""
-autonym: "Polski"
-population: 38273562
-region: "CZ"
-region: "SK"
-region: "DE"
-region: "RO"
-region: "PL"
-region: "UA"
-region: "IL"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ó Ą Ć Ę Ł Ń Ś Ź Ż a b c d e f g h i j k l m n o p q r s t u v w x y z ó ą ć ę ł ń ś ź ż"
-  auxiliary: "à â å ä æ ç é è ê ë î ï ô ö œ q ß ù û ü v x ÿ"
-  marks: "◌́ ◌̇ ◌̨"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' \" ” „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& # % † ‡ ′ ″ ° ~"
-  index: "A B C Ć D E F G H I J K L Ł M N O Ó P Q R S Ś T U V W X Y Z Ź Ż"
-}
diff --git a/lang/languages/pl/sampletext.textproto b/lang/languages/pl/sampletext.textproto
deleted file mode 100644
index 9f0bc6eb3..000000000
--- a/lang/languages/pl/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "pl"
diff --git a/lang/languages/pms/language.textproto b/lang/languages/pms.textproto
similarity index 88%
rename from lang/languages/pms/language.textproto
rename to lang/languages/pms.textproto
index c41adcdd3..fcfeb728d 100644
--- a/lang/languages/pms/language.textproto
+++ b/lang/languages/pms.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Ä È Ë Ì Ï Ò Ö Ù Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à ä è ë ì ï ò ö ù ü"
   marks: "◌̀ ◌̈"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/pnt/language.textproto b/lang/languages/pnt.textproto
similarity index 78%
rename from lang/languages/pnt/language.textproto
rename to lang/languages/pnt.textproto
index a7ba13e21..f7bdce424 100644
--- a/lang/languages/pnt/language.textproto
+++ b/lang/languages/pnt.textproto
@@ -9,3 +9,6 @@ script: "Greek"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "pnt"
+}
diff --git a/lang/languages/pon.textproto b/lang/languages/pon.textproto
new file mode 100644
index 000000000..5191ecf3d
--- /dev/null
+++ b/lang/languages/pon.textproto
@@ -0,0 +1,23 @@
+id: "pon"
+name: "Pohnpeian"
+preferred_name: ""
+autonym: "Pohnpei"
+population: 23560
+region: "FM"
+script: "Latin"
+exemplar_chars {
+  base: "A D E H I K L M N O P R S T U W a d e h i k l m n o p r s t u w"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Hh"
+  tester: "Pwehki eh sansalehr oh dehde me mie uhdahn kesempwelen de pwungin"
+  poster_sm: "Pwehki seu"
+  poster_md: "Pwehki eh"
+  poster_lg: "Tohn"
+  specimen_48: "Pwehki eh kesempwal kitail en ngongki kekeirdahn nanpwung mwahu"
+  specimen_36: "Aramas karos ahniki de paiki pwungin mour, pwungin saledek oh pil pwungin saledek sang apwal en paliwar."
+  specimen_32: "Sohte aramas emen kak wia lidu men de doadoahk ni mwomwen lidu men; lidu de pesineski de pwainda lidukan uhong poason wet oh pil pahn inepwihdi ni soangen mwohmw karos."
+  specimen_21: "Sohte me pahn mi pahn kalokolok en mahn de kamakam duehla mahn.\nAramas karos ahniki de paiki pwungin kawawih wasa karos pahn menemenen Kosonned.\nAramas karos ni nan irair pahrek ehu pahn kosonned oh ahniki de paiki epwel kan pahn kosonned. Aramas karos ahniki de paiki epwel pahrek pwehn kore songen apwal akan me uhong poason wet de me pahn kasohwe irehkan nan poason wet."
+  specimen_16: "Aramas karos ahniki de paiki soangen epwel katapan akan me pwihn koiek en teneki sapwung kan me uhong poason en pwung kesempwal me kosonned kosnehiong irail.\nSohte me pahn pakadeida, de poardi, de selidi, de pekeusda.\nAramas karos aniki de paiki pwung karos me irair en kopwung pahrek oh pil kapeidek nan pokkon rehn pwihn ehu me seu peupali, pwehn kosonehdi de kasalehda arail pwung kan oh pwukoah kan oh pil songen pekeid me uhong irail karos.\nSohte me kak lidere emen nin sohte kahrepe, de eh peneinei, imwe oh kisin likou me e kadar de me emen kadarodohng, oh pil sohte me kak kauwehla eden emen de mwaren emen. Karos ahniki de paiki epwelpen pahn kosonned ohng songen liderewes de kawehla eden aramas kwukat."
+}
diff --git a/lang/languages/pon/language.textproto b/lang/languages/pon/language.textproto
deleted file mode 100644
index dd8de6fdd..000000000
--- a/lang/languages/pon/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "pon"
-name: "Pohnpeian"
-preferred_name: ""
-autonym: "Pohnpei"
-population: 23560
-region: "FM"
-script: "Latin"
-exemplar_chars {
-  base: "A D E H I K L M N O P R S T U W a d e h i k l m n o p r s t u w"
-}
diff --git a/lang/languages/pon/sampletext.textproto b/lang/languages/pon/sampletext.textproto
deleted file mode 100644
index 854869ea8..000000000
--- a/lang/languages/pon/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "pon"
diff --git a/lang/languages/prd/language.textproto b/lang/languages/prd.textproto
similarity index 90%
rename from lang/languages/prd/language.textproto
rename to lang/languages/prd.textproto
index a4524cb7d..aab2ff6db 100644
--- a/lang/languages/prd/language.textproto
+++ b/lang/languages/prd.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٔ ◌ٰ"
   numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/ps.textproto b/lang/languages/ps.textproto
new file mode 100644
index 000000000..77fe0cf88
--- /dev/null
+++ b/lang/languages/ps.textproto
@@ -0,0 +1,31 @@
+id: "ps"
+name: "Pashto"
+preferred_name: ""
+autonym: "یوسفزئی پښتو"
+population: 51207631
+region: "AE"
+region: "AF"
+region: "IR"
+region: "PK"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "ﺍ ﺏ پ ﺕ ټ ﺙ ﺝ چ ﺡ ﺥ څ ځ ﺩ ډ ﺫ ﺭ ړ ﺯ ژ ږ ﺱ ﺵ ښ ﺹ ﺽ ﻁ ﻅ ﻉ ﻍ ﻑ ﻕ ک ګ ﻝ ﻡ ﻥ ڼ ﻭ ه ۀ ي ې ی ۍ ئ"
+  auxiliary: "\\u200C \\u200D \\u200E\\u200F ے"
+  marks: "◌ٔ"
+  numerals: "\\u200E \\- ‑ , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹"
+  punctuation: "، ; \\: ! ۔ \' ‘ ( ) \\[ \\] \\{ \\} /"
+  index: "آ ا ء ب پ ت ټ ث ج ځ چ څ ح خ د ډ ذ ر ړ ز ژ ږ س ش ښ ص ض ط ظ ع غ ف ق ک ګ ل م ن ڼ ه و ی"
+}
+sample_text {
+  masthead_full: "دبشر"
+  masthead_partial: "ټو"
+  tester: "څرنګه چې دبشري کورنۍ دټولو غړو ذاتي حېثيت پيثزندنه او دهغوي پر"
+  poster_sm: "لکه څنګه چې"
+  poster_md: "له هغه ځايه"
+  poster_lg: "بشر"
+  specimen_48: "له هغه ځايه چې اساساً لازم دي چې د ملتونو تر منځ و دوستانه اړيکو"
+  specimen_36: "هر څوک حق لري چې په ټولنه کښې د داسيې نظم غوښتونکي شي چې په دې اعلاميه کښې بيان شوي حقوق او ازادي تأمين کړي۔"
+  specimen_32: "له هغه ځايه چې اساساً بايد د بشري حقوقو د قانون په اجرا کولو سره حمايت وشي، چې بشر د وروستې علاج په نوم د ظلم او فشار پر ضد په قيام مجبور نه شي،"
+  specimen_21: "څرنګه چې دبشري کورنۍ دټولو غړو ذاتي حېثيت پيثزندنه او دهغوي پر رنګ او انتقال نه منونکي حقوق په نړۍ کښې د ازادۍ ، عدالت او سولې اساس تشکيلوي،\nلکه څنګه چې د بشري حقوق تحقير او د هغو نه پيژندنه په وحشيانه عملونو منجر شوي چې د بشريت روح په ګناه مجبوروي او دهغې نړۍ ظهور يي چې په هغې کښې بشر په بيان او عقيده کښې ازاد اور له ويرې او فقر څخه فارغ وي، د بشر دلوړو آمالو تر سرليک لاندي اعلان کړي دي۔"
+  specimen_16: "څرنګه چې دبشري کورنۍ دټولو غړو ذاتي حېثيت پيثزندنه او دهغوي پر رنګ او انتقال نه منونکي حقوق په نړۍ کښې د ازادۍ ، عدالت او سولې اساس تشکيلوي،\nلکه څنګه چې د بشري حقوق تحقير او د هغو نه پيژندنه په وحشيانه عملونو منجر شوي چې د بشريت روح په ګناه مجبوروي او دهغې نړۍ ظهور يي چې په هغې کښې بشر په بيان او عقيده کښې ازاد اور له ويرې او فقر څخه فارغ وي، د بشر دلوړو آمالو تر سرليک لاندي اعلان کړي دي۔\nله هغه ځايه چې اساساً بايد د بشري حقوقو د قانون په اجرا کولو سره حمايت وشي، چې بشر د وروستې علاج په نوم د ظلم او فشار پر ضد په قيام مجبور نه شي،\nله هغه ځايه چې اساساً لازم دي چې د ملتونو تر منځ و دوستانه اړيکو پراختيا بايد تشويق شي،"
+}
diff --git a/lang/languages/ps/language.textproto b/lang/languages/ps/language.textproto
deleted file mode 100644
index 2a2f3c649..000000000
--- a/lang/languages/ps/language.textproto
+++ /dev/null
@@ -1,18 +0,0 @@
-id: "ps"
-name: "Pashto"
-preferred_name: ""
-autonym: "یوسفزئی پښتو"
-population: 51207631
-region: "AE"
-region: "AF"
-region: "IR"
-region: "PK"
-script: "Perso-Arabic"
-exemplar_chars {
-  base: "ﺍ ﺏ پ ﺕ ټ ﺙ ﺝ چ ﺡ ﺥ څ ځ ﺩ ډ ﺫ ﺭ ړ ﺯ ژ ږ ﺱ ﺵ ښ ﺹ ﺽ ﻁ ﻅ ﻉ ﻍ ﻑ ﻕ ک ګ ﻝ ﻡ ﻥ ڼ ﻭ ه ۀ ي ې ی ۍ ئ"
-  auxiliary: "\\u200C \\u200D \\u200E\\u200F ے"
-  marks: "◌ٔ"
-  numerals: "\\u200E \\- ‑ , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹"
-  punctuation: "، ; \\: ! ۔ \' ‘ ( ) \\[ \\] \\{ \\} /"
-  index: "آ ا ء ب پ ت ټ ث ج ځ چ څ ح خ د ډ ذ ر ړ ز ژ ږ س ش ښ ص ض ط ظ ع غ ف ق ک ګ ل م ن ڼ ه و ی"
-}
diff --git a/lang/languages/ps/sampletext.textproto b/lang/languages/ps/sampletext.textproto
deleted file mode 100644
index f66275dec..000000000
--- a/lang/languages/ps/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ps"
diff --git a/lang/languages/pt/language.textproto b/lang/languages/pt.textproto
similarity index 95%
rename from lang/languages/pt/language.textproto
rename to lang/languages/pt.textproto
index f39640abc..a47e89680 100644
--- a/lang/languages/pt/language.textproto
+++ b/lang/languages/pt.textproto
@@ -3,20 +3,20 @@ name: "Portuguese"
 preferred_name: ""
 autonym: "Português"
 population: 237135427
-region: "GQ"
-region: "LU"
-region: "ST"
-region: "TL"
+region: "AG"
+region: "AO"
+region: "BR"
+region: "CH"
 region: "CV"
+region: "FR"
+region: "GQ"
+region: "GW"
+region: "LU"
+region: "MO"
 region: "MZ"
 region: "PT"
-region: "BR"
-region: "GW"
-region: "CH"
-region: "FR"
-region: "AO"
-region: "MO"
-region: "AG"
+region: "ST"
+region: "TL"
 script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â Ã Ç È É Ê Í Ò Ó Ô Õ Ú Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à á â ã ç è é ê í ò ó ô õ ú ü"
@@ -26,3 +26,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/puu/language.textproto b/lang/languages/puu.textproto
similarity index 74%
rename from lang/languages/puu/language.textproto
rename to lang/languages/puu.textproto
index 186b5a967..26843bf66 100644
--- a/lang/languages/puu/language.textproto
+++ b/lang/languages/puu.textproto
@@ -7,3 +7,6 @@ region: "GA"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/qu.textproto b/lang/languages/qu.textproto
new file mode 100644
index 000000000..9b0ba786f
--- /dev/null
+++ b/lang/languages/qu.textproto
@@ -0,0 +1,30 @@
+id: "qu"
+name: "Quechua"
+preferred_name: ""
+autonym: "Runa Simi"
+population: 11385851
+region: "BO"
+region: "EC"
+region: "PE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z ñ"
+  auxiliary: "Č Ĉ Š Ž č ĉ š ž"
+  marks: "◌̃ ◌̂ ◌̌"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A {Ch} H I K L {Ll} M N Ñ P Q S T U W Y"
+}
+sample_text {
+  masthead_full: "LlAa"
+  masthead_partial: "Pp"
+  tester: "Pachantin ayllu wawaq allin kausaypi kananta yuyaykuspan, kay"
+  poster_sm: "Runaq runa"
+  poster_md: "Runapaqpuni"
+  poster_lg: "Llapa"
+  specimen_48: "Teqse muyuntin \"munduq\" \"estadonkuna\" juñuykunakuspan, ancha allinta"
+  specimen_36: "Leypaq-qa, jatun kamachikuypaq-qa llapa runapas kikillan, \"igual-lían kanchis; mana pitapas ajílaspa, mana pitapas t\'aqarparispa."
+  specimen_32: "Llapa runapas, imamantaña juchachasqa kaspapas, \"tribunalpa\" uyarisqanmi kanan; chayman jina juchayoq kasqanpas, mana juchayoq kasqanpaq yachakunanpaq."
+  specimen_21: "Manan piqpa imayna kausakusqantapas tapupakuyta atinchischo. Manataqmi imaynatas warminwan, wawankunawan tiyan chaytapas yachayta munananchischu. Manan runaq allin kasqanta, \"honranta\", allin runa kasqanta panpachanachu; Chaykuna ruwasqamantaqa \"leymi\" muchuchinan. Chay tukuywanpis, manan pipas qelqa apachisqanchista, \"carta\" chaskinanchista pakallapi, mana yachasqanchis \"liita\" yachayta atinchu. Llapa runan chay mana chaninmanta \"libre\" l:anan, \"leypa\" \"protejisqan"
+  specimen_16: "Llapa runan yuyaykukuyta, jamut\'ayta atin yuyaychakusqanman jina. Manan pipas chaytaqa jark\'ayta atinmanchu. Kaqtaqmi ima \"religionpipas\" kausayta atin tukuy runaq yachashasqan.\nTukuy runapas umanpi yuyaykusqantan rimarinan manapitapas manchakuspa. Yuyaykusqantataqmi pachantin runaman, teqsi muyuntin, lluy \"munduntin\" runaman riqsichinan yachananpaq. Sut\'in rimaqtan pacha kamaq taytachapas yanapan. Chay yuyaykukusqanmantaqa, ruwasqanmantaqa manan pipas cheqniytapas, juchachaytapas atinchu.\nLlapa runan, imaynan kausasqanman jina llaqtanwan, \"nacionninwan\" qochikunan mikhuytapas, tukuy ima kausaytapas; yachaytawanpas, yachayninman yapananpaq, chaywantaq jananchasqa runa kananpaq."
+}
diff --git a/lang/languages/qu/language.textproto b/lang/languages/qu/language.textproto
deleted file mode 100644
index b50821356..000000000
--- a/lang/languages/qu/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "qu"
-name: "Quechua"
-preferred_name: ""
-autonym: "Runa Simi"
-population: 11385851
-region: "PE"
-region: "BO"
-region: "EC"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z ñ"
-  auxiliary: "Č Ĉ Š Ž č ĉ š ž"
-  marks: "◌̃ ◌̂ ◌̌"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A {Ch} H I K L {Ll} M N Ñ P Q S T U W Y"
-}
diff --git a/lang/languages/qu/sampletext.textproto b/lang/languages/qu/sampletext.textproto
deleted file mode 100644
index 2e32424c8..000000000
--- a/lang/languages/qu/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "qu"
diff --git a/lang/languages/quc.textproto b/lang/languages/quc.textproto
new file mode 100644
index 000000000..f9941e29a
--- /dev/null
+++ b/lang/languages/quc.textproto
@@ -0,0 +1,23 @@
+id: "quc"
+name: "Kʼicheʼ"
+preferred_name: ""
+autonym: "Qatzijob\'al"
+population: 1200731
+region: "GT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C E H I J K L M N O P Q R S T U W X Y Z a b c e h i j k l m n o p q r s t u w x y z \'"
+}
+sample_text {
+  masthead_full: "KkOo"
+  masthead_partial: "Nn"
+  tester: "Rumal che ri uchokonsab\'exik ri ya\'talik kab\'anik, ri uq\'atoj tzij"
+  poster_sm: "Rumal che ri"
+  poster_md: "Rumal che"
+  poster_lg: "Konojel"
+  specimen_48: "Rumal che ri xuqe\' nimalaj rajawaxik chi kak\'oji\' ch\'ab\'en ib\' chkixo\'l"
+  specimen_36: "Maj jun winaq ya\'tal ta chech kab\'an k\'ax chech, xuq kupatanij ta ne jun chik winaq we man kaya ta tojb\'al rech."
+  specimen_32: "Maj jun winaq ya\'tal ta chech xaq k\'ate\' kachapatajik, xuq kokisax pa che\' we maj umak ub\'anom; xuqe kelesaxik, xuq koqatax b\'i chupam pa ri utinamit."
+  specimen_21: "Ronojel winaq ya\'tal chech katatab\'exik jasa je\' ri karaj kuya uch\'ob\'ik; xuqe katob\'an ri q\'atb\'altzij ruk\' xa jeri\' junam ri q\'atoj tzij kaq\'at pa kiwi\'.\nMaj jun winaq ya\'tal ta chech kab\'an jalum tzij, q\'ab\'am tzij pa ri uk\'aslemal, pa ri rachoch; xuq kajelk\'atix ta ne ri jastaq rech. Xuqe\' man ya\'tal taj kakichik, kayoq\'ik; are k\'u we jewa\' kuk\'ulmaj rajawaxik kuya utob\'anik ri q\'atb\'altzij chech."
+  specimen_16: "Ronojel winaq ya\'tal chech kub\'an ronojel uwach jachke na k\'u ri kumajab\'ej chwach; utz kub\'ij, kuq\'alajisaj jachke ri k\'o pa ri uchomanik, xuqe\' kutzukuj, kucha\'o jachke ri ukojonik kumajab\'ej chwach. Ya\'tal xuq chech kuchokonsab\'ej, kuk\'utunsaj jachke ri\' ri ukojb\'al. Kuq\'alajisaj chkiwach nik\'aj winaq chik we jeri\' kape pa ri uchomanik xa ta apawije\' kariqitaj wi.\nRonojel winaq ya\'tal chech kub\'ij, kuq\'alajisaj jasa je k\'o pa ri uchomanik, ronojel jasa je ri kuto, karilo; xuq man ya\'tal ta k\'ut chi ketzelax rumal ri uchomanik kuya\'o; ya\'tal xuq chech kusol uxe\', kareta\'maj jachke ri karaj jeri\' kub\'an chech, la je k\'ut pine ta ne k\'ate\' ri are taq wa\' kuya chi na ub\'ixik, uq\'alajisaxik xa ta apawije\' karaj kub\'an wi."
+}
diff --git a/lang/languages/quc/language.textproto b/lang/languages/quc/language.textproto
deleted file mode 100644
index 4b31c624a..000000000
--- a/lang/languages/quc/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "quc"
-name: "Kʼicheʼ"
-preferred_name: ""
-autonym: "Qatzijob\'al"
-population: 1200731
-region: "GT"
-script: "Latin"
-exemplar_chars {
-  base: "A B C E H I J K L M N O P Q R S T U W X Y Z a b c e h i j k l m n o p q r s t u w x y z \'"
-}
diff --git a/lang/languages/quc/sampletext.textproto b/lang/languages/quc/sampletext.textproto
deleted file mode 100644
index 188254b47..000000000
--- a/lang/languages/quc/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "quc"
diff --git a/lang/languages/qug.textproto b/lang/languages/qug.textproto
new file mode 100644
index 000000000..d46b60a3a
--- /dev/null
+++ b/lang/languages/qug.textproto
@@ -0,0 +1,25 @@
+id: "qug"
+name: "Chimborazo Highland Quichua"
+preferred_name: ""
+autonym: "Runa Simi"
+population: 963579
+region: "EC"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z ñ"
+  auxiliary: "Č Ĉ Š Ž č ĉ š ž"
+  marks: "◌̃ ◌̂ ◌̌"
+}
+sample_text {
+  masthead_full: "TtUu"
+  masthead_partial: "Kk"
+  tester: "Kawsaypi yuyashpa, kishpiriy, paktakay, allpapachapi kasikllakawsay"
+  poster_sm: "TINKIRISHKA"
+  poster_md: "Titikirishka"
+  poster_lg: "Tukuy"
+  specimen_48: "Tukuy runakunami maypipash kishpirishka, sumaykaypi(dignidad) paktapakta"
+  specimen_36: "Mana pi watashka, utushka, makashka kankachu. Mana pi, anchamillashka,.\nwiwatashina rikushka, kumurichishka, lIapishka kankachu."
+  specimen_32: "Kawsaypi yuyashpa, hayñi yuyaykuna, kishpirishka yuyay kuna tukuypi\ntiyachun, shina lIaktakuna arinishka kamachika, tukuysami kawsayta charik\nrunakunaman pampanta paktachun."
+  specimen_21: "Kawsaypi yuyashpa, kishpiriy, paktakay, allpapachapi kasikllakawsay tiksi\nkakpimi tukuy runakuna sumak kawsayta charichun nishpa riksin; shinallatak\nsumaykayta(dignidad), paktapakta hayñita ayllumanta mana pi kichuchunmi\nriksin.\nKawsaypi yuyashpa, runakunapak hayñitaka, paypak hayñimi nishpa shuktak\nkamachi lIikakuna kamashka kachun. Shina waKcha runakuna piñaywan\nhatarikpi, tikra charikkuna mana wakchakunata hawalla wichkana wasiman\npushachun, mana hawalla wañuchichunpash."
+  specimen_16: "Kawsaypi yuyashpa, kishpiriy, paktakay, allpapachapi kasikllakawsay tiksi\nkakpimi tukuy runakuna sumak kawsayta charichun nishpa riksin; shinallatak\nsumaykayta(dignidad), paktapakta hayñita ayllumanta mana pi kichuchunmi\nriksin.\nKawsaypi yuyashpa, piñashpa mana riksina, runakunapak hayñita saruy,\nrunapura wañunakuna yuyaymi tukuysami kawsaypi sapiyashka nin.\nChaymi tukuysami lIakikunata IIaktakunaman apamushka. Chaymantami\nrunakunaka tukuy IIaktakunapi kaparishpa kishpirishka kawsayta yuyashpa\nmashkay kallarin; wakcha runakuna, IIakta runakuna, upallalla kawsak\nrunakuna, shitashka runakuna kishpirinata munan. Mashná kay pachapi\nkawsakkunami kay amsa, ñawsa, milli kawsaymanta lIukshinata munan. Kipaka\nkishpiy rimayta, yuyayta charina kan."
+}
diff --git a/lang/languages/qug/language.textproto b/lang/languages/qug/language.textproto
deleted file mode 100644
index e8e776d5f..000000000
--- a/lang/languages/qug/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "qug"
-name: "Chimborazo Highland Quichua"
-preferred_name: ""
-autonym: "Runa Simi"
-population: 963579
-region: "EC"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z ñ"
-  auxiliary: "Č Ĉ Š Ž č ĉ š ž"
-  marks: "◌̃ ◌̂ ◌̌"
-}
diff --git a/lang/languages/qug/sampletext.textproto b/lang/languages/qug/sampletext.textproto
deleted file mode 100644
index 1a9758ebc..000000000
--- a/lang/languages/qug/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "qug"
diff --git a/lang/languages/raj/language.textproto b/lang/languages/raj.textproto
similarity index 76%
rename from lang/languages/raj/language.textproto
rename to lang/languages/raj.textproto
index 814379c6e..c122601f9 100644
--- a/lang/languages/raj/language.textproto
+++ b/lang/languages/raj.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/rcf/language.textproto b/lang/languages/rcf.textproto
similarity index 76%
rename from lang/languages/rcf/language.textproto
rename to lang/languages/rcf.textproto
index fcc8ef065..8b3e940fc 100644
--- a/lang/languages/rcf/language.textproto
+++ b/lang/languages/rcf.textproto
@@ -7,3 +7,6 @@ region: "RE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/rej/language.textproto b/lang/languages/rej.textproto
similarity index 74%
rename from lang/languages/rej/language.textproto
rename to lang/languages/rej.textproto
index c8b1c7d87..ce99d1570 100644
--- a/lang/languages/rej/language.textproto
+++ b/lang/languages/rej.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/rgn.textproto b/lang/languages/rgn.textproto
new file mode 100644
index 000000000..7f1b5f926
--- /dev/null
+++ b/lang/languages/rgn.textproto
@@ -0,0 +1,22 @@
+id: "rgn"
+name: "Romagnol"
+preferred_name: ""
+autonym: ""
+population: 0
+region: "IT"
+script: "Latin"
+exemplar_chars {
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Jj"
+  tester: "Considerèd che u riconoscimènt dla dignità cla riguèrda tot i"
+  poster_sm: "Considerèd"
+  poster_md: "L\'ASEMBLEA"
+  poster_lg: "Tot"
+  specimen_48: "la presènta dichiarazioun universèla di dirét umèn cumè ideél"
+  specimen_36: "Nisuna persouna la putrà èsa sotoposta m\'la tortura o ma un tratamènt o punizioun crudeli, disumèni o degradènti."
+  specimen_32: "Ogni persouna la à dirét m\'u ripos e m\'el temp lébri, tnénd count ad conseguénza d\'una giosta limitazioun dli ouri \'d lavour e ad ferie retribuidi."
+  specimen_21: "Ogni persouna la à dirét m\'un ourdni suciél e internaziunèl te quale i dirét e al libertà proclamid tla presènta Dichiarazioun i posa èsa completamènt realizid.\nNisuna pèrta dla presènta Dichiarazioun la pò èsa interpretèda tu sèns da arughés, da pèrta d\'un qualsiasi Stèd o grop o persouna, un dirét da esercitè un\'atività o da mèta in at un\'azioun c\'la épa u scop da prevariché di dirét o dli libertà proclamid tla Dichiarazioun stèsa."
+  specimen_16: "Considerèd che u riconoscimènt dla dignità cla riguèrda tot i mémbri dla famèia umèna e di su dirét, cumpagn e irrinunciabli, e costitués e\' fundamènt dla libertà, dla giustizia e dla pèsa te mand;\nConsiderèd che la negazioun e el disprèz di dirét umèn i à port ma gist d\'inciviltà che i ufènd la cuscinza dl\'umanità, e che la cunquésta d\'un mand duvè che al persouni al goda dla libertà at parola e at credo (foida) e dla libertà da la paura e da e\' bsagn, l\'è stè proclamèd cumè la piò granda aspirazioun dl\'om;\nConsiderèd che l\'è indispensabli che i dirét umèn i sia difois da lègi, se u s vò evitè che l\'om u sia custrèt a ricora, cumè utma pusibilità, m\'la ribelioun countra la tirania e l\'opresioun;"
+}
diff --git a/lang/languages/rgn/language.textproto b/lang/languages/rgn/language.textproto
deleted file mode 100644
index d224296d8..000000000
--- a/lang/languages/rgn/language.textproto
+++ /dev/null
@@ -1,9 +0,0 @@
-id: "rgn"
-name: "Romagnol"
-preferred_name: ""
-autonym: ""
-population: 0
-region: "IT"
-script: "Latin"
-exemplar_chars {
-}
diff --git a/lang/languages/rgn/sampletext.textproto b/lang/languages/rgn/sampletext.textproto
deleted file mode 100644
index c04426607..000000000
--- a/lang/languages/rgn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "rgn"
diff --git a/lang/languages/ria/language.textproto b/lang/languages/ria.textproto
similarity index 75%
rename from lang/languages/ria/language.textproto
rename to lang/languages/ria.textproto
index 7ae3b1e37..75106985b 100644
--- a/lang/languages/ria/language.textproto
+++ b/lang/languages/ria.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/rif/language.textproto b/lang/languages/rif.textproto
similarity index 77%
rename from lang/languages/rif/language.textproto
rename to lang/languages/rif.textproto
index 7a0518f8a..853bacae2 100644
--- a/lang/languages/rif/language.textproto
+++ b/lang/languages/rif.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 script: "Tifinagh"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "tzm"
+}
diff --git a/lang/languages/rif_Latn/language.textproto b/lang/languages/rif_Latn.textproto
similarity index 79%
rename from lang/languages/rif_Latn/language.textproto
rename to lang/languages/rif_Latn.textproto
index 0763c716b..bb3f455f6 100644
--- a/lang/languages/rif_Latn/language.textproto
+++ b/lang/languages/rif_Latn.textproto
@@ -9,3 +9,6 @@ script: "Latin"
 script: "Tifinagh"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "tzm"
+}
diff --git a/lang/languages/rjs/language.textproto b/lang/languages/rjs.textproto
similarity index 75%
rename from lang/languages/rjs/language.textproto
rename to lang/languages/rjs.textproto
index be1238b42..8d48f1db8 100644
--- a/lang/languages/rjs/language.textproto
+++ b/lang/languages/rjs.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/rkt/language.textproto b/lang/languages/rkt.textproto
similarity index 92%
rename from lang/languages/rkt/language.textproto
rename to lang/languages/rkt.textproto
index c24f8ea90..a10f69900 100644
--- a/lang/languages/rkt/language.textproto
+++ b/lang/languages/rkt.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   marks: "◌ঁ ◌ং ◌ঃ ◌় ◌া ◌ি ◌ী ◌ু ◌ূ ◌ৃ ◌ে ◌ৈ ◌্ ◌ৗ"
   numerals: "০ ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯"
 }
+sample_text {
+  fallback_language: "bn"
+}
diff --git a/lang/languages/rm.textproto b/lang/languages/rm.textproto
new file mode 100644
index 000000000..0edfb5ff8
--- /dev/null
+++ b/lang/languages/rm.textproto
@@ -0,0 +1,27 @@
+id: "rm"
+name: "Romansh"
+preferred_name: ""
+autonym: "Rumantsch"
+population: 42019
+region: "CH"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Â È É Ê Î Ò Ô Ö Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à â è é ê î ò ô ö ü"
+  auxiliary: "á ă â å ä ā æ ç ĕ ê ë ē í ĭ î ï ī ñ ó ŏ ô ö ø ō œ ú ŭ û ü ū ÿ"
+  marks: "◌̀ ◌́ ◌̂ ◌̈"
+  numerals: ". ’ % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  index: "A À B C D E É È F G H I Ì J K L M N O Ò P Q R S T U Ù V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtUu"
+  masthead_partial: "Oo"
+  tester: "Considerand cha l\'arcugnuschentscha da la dignità immanenta in"
+  poster_sm: "Considerand"
+  poster_md: "proclama"
+  poster_lg: "Tuots"
+  specimen_48: "sco l\'ideal cumünaivel dad obtgnair per tuot ils pövels e tuot"
+  specimen_36: "Ingün nu po gnir tgnü in sclavitüd o in servitüd; sclavitüd e commerzi da sclavs sun scumandats in tuot lur appariziuns."
+  specimen_32: "Mincha persuna ha il dret ad ün uorden social ed internaziunal, i\'l qual ils drets e las libertats manzunats illa Decleranza preschainta pon gnir realisats plainamaing."
+  specimen_21: "Ingüna disposiziun da la Decleranza preschainta nu po gnir interpretada in quel sen chi resultess landroura per ün stadi, per üna gruppa o per üna persuna qualunque dret da pratichar una actività o dad accumplir ün fat chi vessan per mera da desdrüer ils drets e las libertats manzunadas in quista Decleranza."
+  specimen_16: "Considerand cha l\'arcugnuschentscha da la dignità immanenta in tuot ils members da la famiglia umana e da lur drets eguals ed inalienabels constituischa la fundamainta da la libertà, da la guistia e da la pasch in quist muond.\nConsiderand cha la mancanza da la cugnuschentscha e\'l spredsch dals drets da l\'uman han manà a fats da barbarissem chi offendan la conscienza da l\'umanità e cha la fuormaziun d\'ün muond, ingio cha\'ls umans saran libers da discuorrer e da crajer, liberats da la temma e da la misiergia, es gnu proclamà sco la mera la plü ota da l\'uman,\nConsiderand chi\'d es important, cha\'ls drets da l\'uman vegnan protets d\'ün regimaint da dret, per cha l\'uman nu vegna sforzà sco ultim mez a la revolta cunter la tirannia e l\'oppressiun,"
+}
diff --git a/lang/languages/rm/language.textproto b/lang/languages/rm/language.textproto
deleted file mode 100644
index f95ee9dc9..000000000
--- a/lang/languages/rm/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "rm"
-name: "Romansh"
-preferred_name: ""
-autonym: "Rumantsch"
-population: 42019
-region: "CH"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Â È É Ê Î Ò Ô Ö Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à â è é ê î ò ô ö ü"
-  auxiliary: "á ă â å ä ā æ ç ĕ ê ë ē í ĭ î ï ī ñ ó ŏ ô ö ø ō œ ú ŭ û ü ū ÿ"
-  marks: "◌̀ ◌́ ◌̂ ◌̈"
-  numerals: ". ’ % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  index: "A À B C D E É È F G H I Ì J K L M N O Ò P Q R S T U Ù V W X Y Z"
-}
diff --git a/lang/languages/rm/sampletext.textproto b/lang/languages/rm/sampletext.textproto
deleted file mode 100644
index a2f9bcc60..000000000
--- a/lang/languages/rm/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "rm"
diff --git a/lang/languages/rmf/language.textproto b/lang/languages/rmf.textproto
similarity index 76%
rename from lang/languages/rmf/language.textproto
rename to lang/languages/rmf.textproto
index 746a66dbb..136e63edc 100644
--- a/lang/languages/rmf/language.textproto
+++ b/lang/languages/rmf.textproto
@@ -7,3 +7,6 @@ region: "FI"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/rmo/language.textproto b/lang/languages/rmo.textproto
similarity index 75%
rename from lang/languages/rmo/language.textproto
rename to lang/languages/rmo.textproto
index ccdfee1ea..a70c8131a 100644
--- a/lang/languages/rmo/language.textproto
+++ b/lang/languages/rmo.textproto
@@ -7,3 +7,6 @@ region: "CH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/rmt/language.textproto b/lang/languages/rmt.textproto
similarity index 75%
rename from lang/languages/rmt/language.textproto
rename to lang/languages/rmt.textproto
index e675bd2d2..9194da2b6 100644
--- a/lang/languages/rmt/language.textproto
+++ b/lang/languages/rmt.textproto
@@ -7,3 +7,6 @@ region: "IR"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/rmu/language.textproto b/lang/languages/rmu.textproto
similarity index 75%
rename from lang/languages/rmu/language.textproto
rename to lang/languages/rmu.textproto
index 9914590da..013760c05 100644
--- a/lang/languages/rmu/language.textproto
+++ b/lang/languages/rmu.textproto
@@ -7,3 +7,6 @@ region: "SE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/rn.textproto b/lang/languages/rn.textproto
new file mode 100644
index 000000000..0994431c3
--- /dev/null
+++ b/lang/languages/rn.textproto
@@ -0,0 +1,25 @@
+id: "rn"
+name: "Rundi"
+preferred_name: ""
+autonym: "Ikirundi"
+population: 7475454
+region: "BI"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "AaBb"
+  masthead_partial: "Nn"
+  tester: "Ibonye ko kwemera ko abantu bose bategerezwa guhabwa agateka"
+  poster_sm: "Ibonye ko ari"
+  poster_md: "Isanze ko"
+  poster_lg: "Abantu"
+  specimen_48: "Ibonye ko ari nkenerwa gushigikira iterambere ry\'imigenderanire"
+  specimen_36: "Ibonye ko kwemera ko abantu bose bategerezwa guhabwa agateka n\'ukubahirizwa kimwe, ari ryo shingiro ryukwishira"
+  specimen_32: "Ibonye ko kwemera ko abantu bose bategerezwa guhabwa agateka n\'ukubahirizwa kimwe, ari ryo shingiro ryukwishira n\'ukwizana, ubutungane n\'amahoro kw\'isi."
+  specimen_21: "Ibonye ko kwemera ko abantu bose bategerezwa guhabwa agateka n\'ukubahirizwa kimwe, ari ryo shingiro ryukwishira n\'ukwizana, ubutungane n\'amahoro kw\'isi.\nIbonye ko kutemera n\'ukudakwirikiza ingingo zubahiriza zina muntu vyatumye hakorwa amabi atagira uko avugwa kandi ko isi izira ubwicanyi n\'amaganya, abantu bose bakavuga kandi bakemera uko bavyifuza ari yo yemejwe ko zina muntu wese anyotewe imbere ya vyose."
+  specimen_16: "Ibonye ko kwemera ko abantu bose bategerezwa guhabwa agateka n\'ukubahirizwa kimwe, ari ryo shingiro ryukwishira n\'ukwizana, ubutungane n\'amahoro kw\'isi.\nIbonye ko kutemera n\'ukudakwirikiza ingingo zubahiriza zina muntu vyatumye hakorwa amabi atagira uko avugwa kandi ko isi izira ubwicanyi n\'amaganya, abantu bose bakavuga kandi bakemera uko bavyifuza ari yo yemejwe ko zina muntu wese anyotewe imbere ya vyose.\nIbonye ko ari nkenerwa ko ingingo zubahiriza zina muntu zubahirizwa n\'amategeko atomoye kugira ngo umuntu, aburaniwe, ntaruhire kwiyamiriza agahotoro n\'akarenganyo,"
+}
diff --git a/lang/languages/rn/language.textproto b/lang/languages/rn/language.textproto
deleted file mode 100644
index 781916a80..000000000
--- a/lang/languages/rn/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "rn"
-name: "Rundi"
-preferred_name: ""
-autonym: "Ikirundi"
-population: 7475454
-region: "BI"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/rn/sampletext.textproto b/lang/languages/rn/sampletext.textproto
deleted file mode 100644
index ed60641b7..000000000
--- a/lang/languages/rn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "rn"
diff --git a/lang/languages/rng/language.textproto b/lang/languages/rng.textproto
similarity index 74%
rename from lang/languages/rng/language.textproto
rename to lang/languages/rng.textproto
index c2da3bd4a..998d2eb8b 100644
--- a/lang/languages/rng/language.textproto
+++ b/lang/languages/rng.textproto
@@ -7,3 +7,6 @@ region: "MZ"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ro.textproto b/lang/languages/ro.textproto
new file mode 100644
index 000000000..c93c101cf
--- /dev/null
+++ b/lang/languages/ro.textproto
@@ -0,0 +1,33 @@
+id: "ro"
+name: "Romanian"
+preferred_name: ""
+autonym: "Молдовеняскэ"
+population: 22085633
+region: "HU"
+region: "IL"
+region: "MD"
+region: "RO"
+region: "RS"
+region: "UA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Î Ă Ș Ț a b c d e f g h i j k l m n o p q r s t u v w x y z â î ă ș ț"
+  auxiliary: "Ş Ţ ş ţ"
+  marks: "◌̂ ◌̆ ◌̦ ◌̧"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ \" “ ” „ « » ( ) \\[ \\] @ * /"
+  index: "A Ă Â B C D E F G H I Î J K L M N O P Q R S Ș T Ț U V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Aa"
+  tester: "Considerând că recunoașterea demnității inerente tuturor membrilor"
+  poster_sm: "Considerând"
+  poster_md: "ADUNAREA"
+  poster_lg: "Toate"
+  specimen_48: "prezenta DECLARAȚIE UNIVERSALĂ A DREPTURILOR OMULUI, ca ideal"
+  specimen_36: "Nimeni nu va fi ținut în sclavie, nici în servitute; sclavajul și comerțul cu sclavi sunt interzise sub toate formele lor."
+  specimen_32: "Orice persoană are dreptul la o orânduire socială și internațională în care drepturile și libertățile expuse în prezenta Declarație pot fi pe deplin înfăptuite."
+  specimen_21: "Nicio dispoziție a prezentei Declarații nu poate fi interpretată ca implicând pentru vreun stat, grupare sau persoană dreptul de a se deda la vreo activitate sau de a săvârși vreun act îndreptat spre desființarea unor drepturi sau libertăți enunțate în prezenta Declarație.\nConsiderând că recunoașterea demnității inerente tuturor membrilor familiei umane și a drepturilor lor egale și inalienabile constituie fundamentul libertății, dreptății și păcii în lume,"
+  specimen_16: "Considerând că recunoașterea demnității inerente tuturor membrilor familiei umane și a drepturilor lor egale și inalienabile constituie fundamentul libertății, dreptății și păcii în lume,\nConsiderând că ignorarea și disprețuirea drepturilor omului au dus la acte de barbarie care revoltă conștiința omenirii și că făurirea unei lumi în care ființele umane se vor bucura de libertatea cuvântului și a convingerilor și vor fi eliberate de teamă și mizerie a fost proclamată drept cea mai înaltă aspirație a oamenilor,\nConsiderând că este esențial ca drepturile omului să fie ocrotite de autoritatea legii pentru ca omul să nu fie silit să recurgă, ca soluție extremă, la revoltă împotriva tiraniei și asupririi,"
+}
diff --git a/lang/languages/ro/language.textproto b/lang/languages/ro/language.textproto
deleted file mode 100644
index 0ff4f2ffb..000000000
--- a/lang/languages/ro/language.textproto
+++ /dev/null
@@ -1,20 +0,0 @@
-id: "ro"
-name: "Romanian"
-preferred_name: ""
-autonym: "Молдовеняскэ"
-population: 22085633
-region: "HU"
-region: "MD"
-region: "RO"
-region: "UA"
-region: "RS"
-region: "IL"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Î Ă Ș Ț a b c d e f g h i j k l m n o p q r s t u v w x y z â î ă ș ț"
-  auxiliary: "Ş Ţ ş ţ"
-  marks: "◌̂ ◌̆ ◌̦ ◌̧"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ \" “ ” „ « » ( ) \\[ \\] @ * /"
-  index: "A Ă Â B C D E F G H I Î J K L M N O P Q R S Ș T Ț U V W X Y Z"
-}
diff --git a/lang/languages/ro/sampletext.textproto b/lang/languages/ro/sampletext.textproto
deleted file mode 100644
index 3be574c0c..000000000
--- a/lang/languages/ro/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ro"
diff --git a/lang/languages/rob/language.textproto b/lang/languages/rob.textproto
similarity index 74%
rename from lang/languages/rob/language.textproto
rename to lang/languages/rob.textproto
index 8bf1b0dbc..bbb999e46 100644
--- a/lang/languages/rob/language.textproto
+++ b/lang/languages/rob.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/rof/language.textproto b/lang/languages/rof.textproto
similarity index 86%
rename from lang/languages/rof/language.textproto
rename to lang/languages/rof.textproto
index fd70eb95c..bb506997e 100644
--- a/lang/languages/rof/language.textproto
+++ b/lang/languages/rof.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "q x"
   index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/rtm/language.textproto b/lang/languages/rtm.textproto
similarity index 74%
rename from lang/languages/rtm/language.textproto
rename to lang/languages/rtm.textproto
index 7ce55b145..59e0bacb7 100644
--- a/lang/languages/rtm/language.textproto
+++ b/lang/languages/rtm.textproto
@@ -7,3 +7,6 @@ region: "FJ"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ru.textproto b/lang/languages/ru.textproto
new file mode 100644
index 000000000..fa3996757
--- /dev/null
+++ b/lang/languages/ru.textproto
@@ -0,0 +1,49 @@
+id: "ru"
+name: "Russian"
+preferred_name: ""
+autonym: "Русский"
+population: 195630064
+region: "BG"
+region: "BY"
+region: "CN"
+region: "DE"
+region: "EE"
+region: "FI"
+region: "GE"
+region: "IL"
+region: "KG"
+region: "KZ"
+region: "LT"
+region: "LV"
+region: "MD"
+region: "MN"
+region: "PL"
+region: "RU"
+region: "SJ"
+region: "TJ"
+region: "TM"
+region: "UA"
+region: "US"
+region: "UZ"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё"
+  auxiliary: "А́ Е́ И́ О́ У́ Ы́ Э́ Ю́ Я́ а́ е́ и́ о́ у́ ы́ э́ ю́ я́"
+  marks: "◌̆ ◌̈ ◌́"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
+  index: "А Б В Г Д Е Ё Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ы Э Ю Я"
+}
+sample_text {
+  masthead_full: "ВвСс"
+  masthead_partial: "Ее"
+  tester: "Принимая во внимание, что признание достоинства, присущего всем"
+  poster_sm: "принимая во"
+  poster_md: "принимая"
+  poster_lg: "Все"
+  specimen_48: "принимая во внимание, что народы Объединенных Наций подтвердили"
+  specimen_36: "Никто не должен содержаться в рабстве или в подневольном состоянии; рабство и работорговля запрещаются во всех их видах."
+  specimen_32: "Каждый человек имеет право на социальный и международный порядок, при котором права и свободы, изложенные в настоящей Декларации, могут быть полностью осуществлены."
+  specimen_21: "Ничто в настоящей Декларации не может быть истолковано, как предоставление какому-либо государству, группе лиц или отдельным лицам права заниматься какой-либо деятельностью или совершать действия, направленные к уничтожению прав и свобод, изложенных в настоящей Декларации.\nПринимая во внимание, что признание достоинства, присущего всем членам человеческой семьи, и равных и неотъемлемых прав их является основой свободы, справедливости и всеобщего мира; и"
+  specimen_16: "Принимая во внимание, что признание достоинства, присущего всем членам человеческой семьи, и равных и неотъемлемых прав их является основой свободы, справедливости и всеобщего мира; и\nпринимая во внимание, что пренебрежение и презрение к правам человека привели к варварским актам, которые возмущают совесть человечества, и что создание такого мира, в котором люди будут иметь свободу слова и убеждений и будут свободны от страха и нужды, провозглашено как высокое стремление людей; и\nпринимая во внимание, что необходимо, чтобы права человека охранялись властью закона в целях обеспечения того, чтобы человек не был вынужден прибегать, в качестве последнего средства, к восстанию против тирании и угнетения; и"
+}
diff --git a/lang/languages/ru/language.textproto b/lang/languages/ru/language.textproto
deleted file mode 100644
index b7c60697f..000000000
--- a/lang/languages/ru/language.textproto
+++ /dev/null
@@ -1,36 +0,0 @@
-id: "ru"
-name: "Russian"
-preferred_name: ""
-autonym: "Русский"
-population: 195630064
-region: "GE"
-region: "US"
-region: "KZ"
-region: "SJ"
-region: "CN"
-region: "KG"
-region: "TM"
-region: "LT"
-region: "UZ"
-region: "TJ"
-region: "DE"
-region: "MD"
-region: "RU"
-region: "LV"
-region: "FI"
-region: "BY"
-region: "MN"
-region: "BG"
-region: "PL"
-region: "UA"
-region: "EE"
-region: "IL"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё"
-  auxiliary: "А́ Е́ И́ О́ У́ Ы́ Э́ Ю́ Я́ а́ е́ и́ о́ у́ ы́ э́ ю́ я́"
-  marks: "◌̆ ◌̈ ◌́"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ‚ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\& #"
-  index: "А Б В Г Д Е Ё Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ы Э Ю Я"
-}
diff --git a/lang/languages/ru/sampletext.textproto b/lang/languages/ru/sampletext.textproto
deleted file mode 100644
index c7c8bea2b..000000000
--- a/lang/languages/ru/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ru"
diff --git a/lang/languages/rue/language.textproto b/lang/languages/rue.textproto
similarity index 90%
rename from lang/languages/rue/language.textproto
rename to lang/languages/rue.textproto
index 0c4510fc7..e930cc984 100644
--- a/lang/languages/rue/language.textproto
+++ b/lang/languages/rue.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ь Э Ю Я Ё Є І Ї Ґ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ь э ю я ё є і ї ґ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/rug/language.textproto b/lang/languages/rug.textproto
similarity index 74%
rename from lang/languages/rug/language.textproto
rename to lang/languages/rug.textproto
index e455c2e50..add0d42a7 100644
--- a/lang/languages/rug/language.textproto
+++ b/lang/languages/rug.textproto
@@ -7,3 +7,6 @@ region: "SB"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/rw.textproto b/lang/languages/rw.textproto
new file mode 100644
index 000000000..bfa42ab4f
--- /dev/null
+++ b/lang/languages/rw.textproto
@@ -0,0 +1,27 @@
+id: "rw"
+name: "Kinyarwanda"
+preferred_name: ""
+autonym: "Kinyarwanda"
+population: 11083625
+region: "CD"
+region: "RW"
+region: "UG"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "AaBb"
+  masthead_partial: "Nn"
+  tester: "- Ugushyira ukizana, ituze n\'ubutungane mu bihugu bishingiye ku"
+  poster_sm: "- Gusuzugura"
+  poster_md: "- Ali ngombwa"
+  poster_lg: "Abantu"
+  specimen_48: "- Ibihugu byunz\'ubumwe byiyemeje muli Charte ya l\'ONU kuzahora byubaha"
+  specimen_36: "Abantu bose bavuka aliko bakwiye agaciro no kwubahwa kimwe. Bose bavukana ubwenge n\'umutima, bagomba kugilirana kivandimwe."
+  specimen_32: "Kandi nta muntu uruta undi, ngo kuko baba bakomoka mu bihugu batareshya. Ali abaturage b\'ibihugu byigenga cyanga se bigitwarwa, bikiyoborwa n\'ibindi, bose ni abantu kimwe."
+  specimen_21: "Umuntu wese agomba kubaho, gushyira akizana no kutarengana.\nNta muntu ukwiye guhinduka imbohe cyanga umuja. Kugira abantu abaja cyanga se kubacururuza biraciwe rwose.\nNta muntu ugomba kugilirwa urugomo, kuzira agashinyaguro, kwicwa urupfu rubi.\nAho umuntu ali hose agomba kurengerwa n\'amategeko y\'igihugu.\nAbantu bose ni kimwe ku byerekeye amategeko, kandi bose niki agomba kubarengera kimwe, akabalinda akarengane gaciye ukubili n\'ili Tangazo, akabalinda ndetse n\'ibishobora byose gutera ako karengane."
+  specimen_16: "Buli muntu afite ububasha bwo kuregera inkiko imigenzereze yose iciye ku burenganzira yahawe n\'amategeko.\nNtawe ushobora gufunga umuntu ku karengane cyanga se kumuca mu gihugu.\nUrubanza rw\'umuntu wese, mbere yo gucibwa, rugomba kwumvikana ku mugaragaro, nta karengane, abacamanza bakabona kurukiranura batabera.\nNtawe ugomba kwirohera nta mpamvu mu byerekeye imibereho y\'umuntu n\'iy\'abe, mu rugo rwe no mu nzandiko ze, cyanga se ngo amusebye. Muli ibyo byose kandi amategeko y\'igihugu agomba kulinda umuntu wese akarengane.\nMu bitekerezo by\'umuntu, mu bimutunganiye idini, buli muntu agomba gushyira akizana. Nukuvuga ko ashobora guhindura ibitekezo bye n\'idini, kubigaragaza mu ruhame cyanga ahiherereye, kubyigisha na kubikulikiza, ku mutima no mu mihango ibigaragaza."
+}
diff --git a/lang/languages/rw/language.textproto b/lang/languages/rw/language.textproto
deleted file mode 100644
index 301764b66..000000000
--- a/lang/languages/rw/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "rw"
-name: "Kinyarwanda"
-preferred_name: ""
-autonym: "Kinyarwanda"
-population: 11083625
-region: "UG"
-region: "RW"
-region: "CD"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/rw/sampletext.textproto b/lang/languages/rw/sampletext.textproto
deleted file mode 100644
index 57e2b6fc9..000000000
--- a/lang/languages/rw/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "rw"
diff --git a/lang/languages/rwk/language.textproto b/lang/languages/rwk.textproto
similarity index 88%
rename from lang/languages/rwk/language.textproto
rename to lang/languages/rwk.textproto
index bda4c6b5b..4c86f61cc 100644
--- a/lang/languages/rwk/language.textproto
+++ b/lang/languages/rwk.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "Q X q x"
   index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ryu/language.textproto b/lang/languages/ryu.textproto
similarity index 75%
rename from lang/languages/ryu/language.textproto
rename to lang/languages/ryu.textproto
index 56ce94bf4..1ff666555 100644
--- a/lang/languages/ryu/language.textproto
+++ b/lang/languages/ryu.textproto
@@ -7,3 +7,6 @@ region: "JP"
 script: "Katakana"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ryu"
+}
diff --git a/lang/languages/sa.textproto b/lang/languages/sa.textproto
new file mode 100644
index 000000000..49263f3cd
--- /dev/null
+++ b/lang/languages/sa.textproto
@@ -0,0 +1,32 @@
+id: "sa"
+name: "Sanskrit"
+preferred_name: ""
+autonym: "संस्कृतम्"
+population: 15913
+region: "IN"
+script: "Devanagari"
+script: "Grantha"
+script: "Sharada"
+script: "Siddham"
+script: "Sinhala"
+exemplar_chars {
+  base: "अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ‌ ‍"
+  auxiliary: "ॐ"
+  marks: "◌ँ ◌ं ◌ः ◌़ ◌ा ◌ि ◌ी ◌ु ◌ू ◌ृ ◌े ◌ै ◌ो ◌ौ ◌्"
+  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "। ॥ ॰"
+  index: "अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह"
+}
+sample_text {
+  masthead_full: "सरवम"
+  masthead_partial: "नत"
+  tester: "यत्र जगति शान्ति-न्याय-स्वातन्त्र्याणां आधारः मानव-परिवारस्य सर्वेषामपि सदस्यानां साम्यानां अखण्डितानाञ्च"
+  poster_sm: "सर्वे मानवाः स्वतन्त्राः"
+  poster_md: "अस्यां अभिघोषणायां"
+  poster_lg: "सर्वे"
+  specimen_48: "एतदतिरिक्तम्, कस्याश्चिदपि प्रभुसत्तायाः नियमनान्तर्गतम्, स्वाधीनस्य आत्मप्रशासनेतर-तन्त्रस्य, न्यासितन्त्रस्य"
+  specimen_36: "सर्वोऽपि जनः जीवन-स्वातन्त्र्य-सुरक्षाधिकारं संधत्ते।\nन कमपि जनं दासत्वेन पराधीनत्वेन वा धारयितुं अनुज्ञास्यते। अपि च दासव्यापारः पूर्णरूपेण प्रतिषिद्धः स्थास्यति।"
+  specimen_32: "विधेः समक्षं सर्वेऽपि तुल्याः समानाश्च वर्तन्ते। अपि च विनैव कमपि भेदं विधेः तुल्यं संरक्षणमवाप्तुं अर्हन्ति। अस्याः अभिघोषणायाः उल्लंघने कमपि भेदं, एतादृग्भेदं वा अभिलक्ष्य कामपि चेष्टां विरुध्य समान-संरक्षणार्हाः सर्वेऽपि वर्तन्ते।"
+  specimen_21: "सर्वे मानवाः स्वतन्त्राः समुत्पन्नाः वर्तन्ते अपि च, गौरवदृशा अधिकारदृशा च समानाः एव वर्तन्ते। एते सर्वे चेतना-तर्क-शक्तिभ्यां सुसम्पन्नाः सन्ति। अपि च, सर्वेऽपि बन्धुत्व-भावनया परस्परं व्यवहरन्तु।\nअस्यां अभिघोषणायां निर्दिष्टाः सर्वेऽपि अधिकाराः सर्वाण्यपि च स्वातन्त्र्याणि, विनैव जाति-वर्ण-लिंग-भाषा-धर्म-राजनीतिक-तदितर-मन्तव्यादि-भेदम्, राष्ट्रियं सामाजिकाधारं सम्पज्जन्म-तदितर स्तरञ्च अविगणय्य, अधिगन्तुं सर्वोऽपि जनः प्रभवति।\nएतदतिरिक्तम्, कस्याश्चिदपि प्रभुसत्तायाः नियमनान्तर्गतम्, स्वाधीनस्य आत्मप्रशासनेतर-तन्त्रस्य, न्यासितन्त्रस्य वा वास्तव्यस्य प्रदेशस्य देशस्य वा राजनीतिक-सीमा-निबन्धनान्ताराष्ट्रिक-स्तराधारेण न कोऽपि भेदो विधास्यते।"
+  specimen_16: "सर्वे मानवाः स्वतन्त्राः समुत्पन्नाः वर्तन्ते अपि च, गौरवदृशा अधिकारदृशा च समानाः एव वर्तन्ते। एते सर्वे चेतना-तर्क-शक्तिभ्यां सुसम्पन्नाः सन्ति। अपि च, सर्वेऽपि बन्धुत्व-भावनया परस्परं व्यवहरन्तु।\nअस्यां अभिघोषणायां निर्दिष्टाः सर्वेऽपि अधिकाराः सर्वाण्यपि च स्वातन्त्र्याणि, विनैव जाति-वर्ण-लिंग-भाषा-धर्म-राजनीतिक-तदितर-मन्तव्यादि-भेदम्, राष्ट्रियं सामाजिकाधारं सम्पज्जन्म-तदितर स्तरञ्च अविगणय्य, अधिगन्तुं सर्वोऽपि जनः प्रभवति।\nएतदतिरिक्तम्, कस्याश्चिदपि प्रभुसत्तायाः नियमनान्तर्गतम्, स्वाधीनस्य आत्मप्रशासनेतर-तन्त्रस्य, न्यासितन्त्रस्य वा वास्तव्यस्य प्रदेशस्य देशस्य वा राजनीतिक-सीमा-निबन्धनान्ताराष्ट्रिक-स्तराधारेण न कोऽपि भेदो विधास्यते।\nसर्वोऽपि जनः जीवन-स्वातन्त्र्य-सुरक्षाधिकारं संधत्ते।\nन कमपि जनं दासत्वेन पराधीनत्वेन वा धारयितुं अनुज्ञास्यते। अपि च दासव्यापारः पूर्णरूपेण प्रतिषिद्धः स्थास्यति।\nन कमपि जनं विरुध्य अवमाननात्मकं व्यवहारं दण्डं वा क्रूरं अमानवीयं प्रतोदनं वा प्रवर्तयितुं अनुज्ञास्यते।"
+}
diff --git a/lang/languages/sa/language.textproto b/lang/languages/sa/language.textproto
deleted file mode 100644
index 869b142b2..000000000
--- a/lang/languages/sa/language.textproto
+++ /dev/null
@@ -1,19 +0,0 @@
-id: "sa"
-name: "Sanskrit"
-preferred_name: ""
-autonym: "संस्कृतम्"
-population: 15913
-region: "IN"
-script: "Devanagari"
-script: "Grantha"
-script: "Sharada"
-script: "Siddham"
-script: "Sinhala"
-exemplar_chars {
-  base: "अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ‌ ‍"
-  auxiliary: "ॐ"
-  marks: "◌ँ ◌ं ◌ः ◌़ ◌ा ◌ि ◌ी ◌ु ◌ू ◌ृ ◌े ◌ै ◌ो ◌ौ ◌्"
-  numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "। ॥ ॰"
-  index: "अ आ इ ई उ ऊ ऋ ॠ ऌ ॡ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह"
-}
diff --git a/lang/languages/sa/sampletext.textproto b/lang/languages/sa/sampletext.textproto
deleted file mode 100644
index 0ab18c8c0..000000000
--- a/lang/languages/sa/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sa"
diff --git a/lang/languages/saf/language.textproto b/lang/languages/saf.textproto
similarity index 74%
rename from lang/languages/saf/language.textproto
rename to lang/languages/saf.textproto
index c5c5ac360..6e0bab0eb 100644
--- a/lang/languages/saf/language.textproto
+++ b/lang/languages/saf.textproto
@@ -7,3 +7,6 @@ region: "GH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sah.textproto b/lang/languages/sah.textproto
new file mode 100644
index 000000000..bcf160975
--- /dev/null
+++ b/lang/languages/sah.textproto
@@ -0,0 +1,28 @@
+id: "sah"
+name: "Sakha"
+preferred_name: ""
+autonym: "Сахалыы"
+population: 453510
+region: "RU"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ҕ Ҥ Ү Һ Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ҕ ҥ ү һ ө"
+  auxiliary: "в е ё ж з ф ц ш щ ъ ь ю я"
+  marks: "◌̆ ◌̈"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\:"
+  index: "А Б Г Ҕ Д {Дь} И Й К Л М Н {Нь} Ҥ О Ө П Р С Т У Ү Х Һ Ч Ы Э"
+}
+sample_text {
+  masthead_full: "ДдЬь"
+  masthead_partial: "Оо"
+  tester: "Киһи аймах бэйэ суолтатын өйдөбулэ, тэҥ уонна быстыспат бырааба"
+  poster_sm: "киһи быраабын"
+  poster_md: "киһи бырааба"
+  poster_lg: "Дьон"
+  specimen_48: "Холбоһуктаах Нациялар норуоттара Устааптарыгар киһи сүрүн быраабыгар,"
+  specimen_36: "Киһи аймах бэйэ суолтатын өйдөбулэ, тэҥ уонна быстыспат бырааба аан дойдуга көҥүл уонна кырдьык биир төрүтэ"
+  specimen_32: "ыйыллыбыт быраап уонна көҥүл диэн эйдэбуллэри дириҥник өйдөөһүн бу бэриллибит бигэ тыллары олоххо киллэриигэ улахан суолталааҕын болҕомтоҕо ылан туран.  Генеральнай Ассамблея,"
+  specimen_21: "Киһи аймах бэйэ суолтатын өйдөбулэ, тэҥ уонна быстыспат бырааба аан дойдуга көҥүл уонна кырдьык биир төрүтэ буоларын болҕомтоҕо ылан туран,\nкиһи быраабын ахсарбат буолуу уонна сэнээһин түмүгэр дьон аймах суобаһын абардар варвардыы  быһыылар  тахсыбаттарынан,  тыл  уонна  санаа  көҥүлүгэр,  кыһалҕата,  куттала суох олоххо дьон дьулуһарын болҕомтоҕо ылан туран,"
+  specimen_16: "Киһи аймах бэйэ суолтатын өйдөбулэ, тэҥ уонна быстыспат бырааба аан дойдуга көҥүл уонна кырдьык биир төрүтэ буоларын болҕомтоҕо ылан туран,\nкиһи быраабын ахсарбат буолуу уонна сэнээһин түмүгэр дьон аймах суобаһын абардар варвардыы  быһыылар  тахсыбаттарынан,  тыл  уонна  санаа  көҥүлүгэр,  кыһалҕата,  куттала суох олоххо дьон дьулуһарын болҕомтоҕо ылан туран,\nкиһи бырааба сокуон былааһынан харыстаныахтааҕын, киһи батталлаах былааһы утары өрө турууну бүтэһик ньыма курдук туһамматын туһугар,\nноруоттар икки ардыларыгар доҕордоһууну күүһүрдэр туһугар,\nыйыллыбыт быраап уонна көҥүл диэн эйдэбуллэри дириҥник өйдөөһүн бу бэриллибит бигэ тыллары олоххо киллэриигэ улахан суолталааҕын болҕомтоҕо ылан туран.  Генеральнай Ассамблея,"
+}
diff --git a/lang/languages/sah/language.textproto b/lang/languages/sah/language.textproto
deleted file mode 100644
index f91d06754..000000000
--- a/lang/languages/sah/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "sah"
-name: "Sakha"
-preferred_name: ""
-autonym: "Сахалыы"
-population: 453510
-region: "RU"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ҕ Ҥ Ү Һ Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ҕ ҥ ү һ ө"
-  auxiliary: "в е ё ж з ф ц ш щ ъ ь ю я"
-  marks: "◌̆ ◌̈"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\:"
-  index: "А Б Г Ҕ Д {Дь} И Й К Л М Н {Нь} Ҥ О Ө П Р С Т У Ү Х Һ Ч Ы Э"
-}
diff --git a/lang/languages/sah/sampletext.textproto b/lang/languages/sah/sampletext.textproto
deleted file mode 100644
index 3f2c3d909..000000000
--- a/lang/languages/sah/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sah"
diff --git a/lang/languages/saq/language.textproto b/lang/languages/saq.textproto
similarity index 88%
rename from lang/languages/saq/language.textproto
rename to lang/languages/saq.textproto
index 2ed356f91..791d8fd7d 100644
--- a/lang/languages/saq/language.textproto
+++ b/lang/languages/saq.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "F Q X Z f q x z"
   index: "A B C D E G H I J K L M N O P R S T U V W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sas/language.textproto b/lang/languages/sas.textproto
similarity index 74%
rename from lang/languages/sas/language.textproto
rename to lang/languages/sas.textproto
index 0190a1727..83b8af7dd 100644
--- a/lang/languages/sas/language.textproto
+++ b/lang/languages/sas.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sat/language.textproto b/lang/languages/sat.textproto
similarity index 89%
rename from lang/languages/sat/language.textproto
rename to lang/languages/sat.textproto
index 8f8a50ef7..e1afde7bc 100644
--- a/lang/languages/sat/language.textproto
+++ b/lang/languages/sat.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "ᱚ ᱛ ᱜ ᱝ ᱞ ᱟ ᱠ ᱡ ᱢ ᱣ ᱤ ᱥ ᱦ ᱧ ᱨ ᱩ ᱪ ᱫ ᱬ ᱭ ᱮ ᱯ ᱰ ᱱ ᱲ ᱳ ᱴ ᱵ ᱶ ᱷ ᱸ ᱹ ᱺ ᱻ ᱼ ᱽ"
   numerals: "\\- ‑ , . % + 0᱐ 1᱑ 2᱒ 3᱓ 4᱔ 5᱕ 6᱖ 7᱗ 8᱘ 9᱙"
 }
+sample_text {
+  fallback_language: "sat"
+}
diff --git a/lang/languages/sav/language.textproto b/lang/languages/sav.textproto
similarity index 72%
rename from lang/languages/sav/language.textproto
rename to lang/languages/sav.textproto
index e3e1f3bb8..3f83aec48 100644
--- a/lang/languages/sav/language.textproto
+++ b/lang/languages/sav.textproto
@@ -6,3 +6,6 @@ population: 236046
 region: "SN"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/saz/language.textproto b/lang/languages/saz.textproto
similarity index 75%
rename from lang/languages/saz/language.textproto
rename to lang/languages/saz.textproto
index c7a0e4fe7..fa6628ad4 100644
--- a/lang/languages/saz/language.textproto
+++ b/lang/languages/saz.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Saurashtra"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "saz"
+}
diff --git a/lang/languages/sbp/language.textproto b/lang/languages/sbp.textproto
similarity index 92%
rename from lang/languages/sbp/language.textproto
rename to lang/languages/sbp.textproto
index 3f147996e..aca516a95 100644
--- a/lang/languages/sbp/language.textproto
+++ b/lang/languages/sbp.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E F G H I J K L M N O P S T U V W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sc.textproto b/lang/languages/sc.textproto
new file mode 100644
index 000000000..49f234054
--- /dev/null
+++ b/lang/languages/sc.textproto
@@ -0,0 +1,24 @@
+id: "sc"
+name: "Sardinian"
+preferred_name: ""
+autonym: "Sardu"
+population: 1060845
+region: "IT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Ç È Ì Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à ç è ì ò ù"
+  marks: "◌̀ ◌̧"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Uu"
+  tester: "Cunsiderende chi su reconnoschimentu de sa dinnidade inerente"
+  poster_sm: "Cunsiderende"
+  poster_md: "s\'Assemblea"
+  poster_lg: "Totu"
+  specimen_48: "custa decraratzione universale de sos deretos de s\'òmine comente"
+  specimen_36: "Nemos at a poder esser assuzetadu a sa tortura, ne a penas o a tratamentos crudeles, inumanos o degradantes."
+  specimen_32: "Onzi pessone tenet deretu a su pasu e a su disaogu e mescamente a unu lìmite zustu de su tempus de traballu e a lissèntzias periòdicas pagadas."
+  specimen_21: "Onzi pessone tenet deretu chi rennet, in àmbitu sotziale e in àmbitu internatzionale, un\'òrdine fatu a manera chi sos deretos e sas libertades proclamadas in sa Decraratzione presente bi podant agatare efetu cumpretu.\nCunsiderende chi su reconnoschimentu de sa dinnidade inerente a totu sos membros de sa famìlia umana e de sos deretos issoro eguales e inalienàbiles costìtuit su fundamentu de sa libertade, de sa zustìssia e de sa paghe in su mundu,"
+  specimen_16: "Cunsiderende chi su reconnoschimentu de sa dinnidade inerente a totu sos membros de sa famìlia umana e de sos deretos issoro eguales e inalienàbiles costìtuit su fundamentu de sa libertade, de sa zustìssia e de sa paghe in su mundu,\nCunsiderende chi su misconnoschimentu e su dispretziu de sos deretos de s\'òmine ant zutu a atziones de barbaridade chi bulluzant sa cussèntzia de s\'umanidade e chi sa bènnida de unu mundu in ue sos èsseres umanos ant a esser lìberos de faeddare e de creer, liberados dae su terrore e dae sa misèria, est proclamadu comente s\'isetu prus mannu de s\'òmine,"
+}
diff --git a/lang/languages/sc/language.textproto b/lang/languages/sc/language.textproto
deleted file mode 100644
index b898c12e0..000000000
--- a/lang/languages/sc/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "sc"
-name: "Sardinian"
-preferred_name: ""
-autonym: "Sardu"
-population: 1060845
-region: "IT"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Ç È Ì Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à ç è ì ò ù"
-  marks: "◌̀ ◌̧"
-}
diff --git a/lang/languages/sc/sampletext.textproto b/lang/languages/sc/sampletext.textproto
deleted file mode 100644
index 108b51db3..000000000
--- a/lang/languages/sc/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sc"
diff --git a/lang/languages/sck/language.textproto b/lang/languages/sck.textproto
similarity index 75%
rename from lang/languages/sck/language.textproto
rename to lang/languages/sck.textproto
index 5240788e5..340e41e4c 100644
--- a/lang/languages/sck/language.textproto
+++ b/lang/languages/sck.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/scn/language.textproto b/lang/languages/scn.textproto
similarity index 87%
rename from lang/languages/scn/language.textproto
rename to lang/languages/scn.textproto
index 76fffefda..e60b1a37c 100644
--- a/lang/languages/scn/language.textproto
+++ b/lang/languages/scn.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Â È Ì Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à â è ì ò ù"
   marks: "◌̀ ◌̂"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sco.textproto b/lang/languages/sco.textproto
new file mode 100644
index 000000000..81cf5a786
--- /dev/null
+++ b/lang/languages/sco.textproto
@@ -0,0 +1,23 @@
+id: "sco"
+name: "Scots"
+preferred_name: ""
+autonym: "Scots Leid"
+population: 1775549
+region: "GB"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ȝ a b c d e f g h i j k l m n o p q r s t u v w x y z ȝ"
+}
+sample_text {
+  masthead_full: "AaWw"
+  masthead_partial: "Hh"
+  tester: "Forsameikle as kenning for the inherent dignity and for the richts,"
+  poster_sm: "Forsameikle"
+  poster_md: "The General"
+  poster_lg: "human"
+  specimen_48: "Proclaims this Universal Declaration o Human Richts as a common"
+  specimen_36: "Naebody shal be hauden in thirldom or slavery; slavery and the slave trade shal be prohibit in aw their forms."
+  specimen_32: "Awbody hes the richt til an effective remeid aff o the competent national tribunals for acts that daes skaith til the fundamental richts grantit him o the constitution or by law."
+  specimen_21: "Naebody shal be gart thole wulsome arrest, detention nor exile.\nAwbody is entitelt in ful equality til a fair and public hearing frae a staund-alane and even-haundit tribunal in the determination o his richts and duties and o ony criminal chairge conter him.\nNaebody shal be gart thole wulsome intromission wi his privacy, faimily, hame or letters, nor tae onsets upon his honour and repute. Awbody hes the richt tae the beild o the law conter sic intromission or onsets."
+  specimen_16: "Awbody hes the richt tae freedom o thocht, conscience and religioun; this richt includes the freedom tae chynge his religioun or belief, and freedom, aither his lane or in commonty and in public or in quietie, tae witness his religioun or belief in teaching, practick, worship and observance.\nAwbody hes the richt tae freedom o opinioun and expression; this richt includes freedom tae haud opiniouns wi nae intermeddling and tae seek, come by and gie oot wittings and conceits throu ony media and tentless o frontiers.\nAwbody hes the richt tae saucht and leisure, includin wyce stents on wark-oors and periodic time aff wi pey."
+}
diff --git a/lang/languages/sco/language.textproto b/lang/languages/sco/language.textproto
deleted file mode 100644
index 60d29ddab..000000000
--- a/lang/languages/sco/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "sco"
-name: "Scots"
-preferred_name: ""
-autonym: "Scots Leid"
-population: 1775549
-region: "GB"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ȝ a b c d e f g h i j k l m n o p q r s t u v w x y z ȝ"
-}
diff --git a/lang/languages/sco/sampletext.textproto b/lang/languages/sco/sampletext.textproto
deleted file mode 100644
index 4e8be3b91..000000000
--- a/lang/languages/sco/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sco"
diff --git a/lang/languages/scs/language.textproto b/lang/languages/scs.textproto
similarity index 75%
rename from lang/languages/scs/language.textproto
rename to lang/languages/scs.textproto
index 0b07bcb6f..91ea8beea 100644
--- a/lang/languages/scs/language.textproto
+++ b/lang/languages/scs.textproto
@@ -7,3 +7,6 @@ region: "CA"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sd/language.textproto b/lang/languages/sd.textproto
similarity index 94%
rename from lang/languages/sd/language.textproto
rename to lang/languages/sd.textproto
index ebbfc1b37..92a57b841 100644
--- a/lang/languages/sd/language.textproto
+++ b/lang/languages/sd.textproto
@@ -3,10 +3,10 @@ name: "Sindhi"
 preferred_name: ""
 autonym: "सिन्धी"
 population: 31467954
-region: "PK"
 region: "IN"
-script: "Perso-Arabic"
+region: "PK"
 script: "Devanagari"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "ء أ ؤ ئ ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ل م ن ه و پ چ ژ ک گ ی ڄ ٺ ٽ ٿ ڀ ٻ ڙ ڍ ڊ ڏ ڌ ڇ ڃ ڦ ڻ ڱ ڳ ڪ"
   auxiliary: "ॐ"
@@ -15,3 +15,6 @@ exemplar_chars {
   punctuation: "। ॥ ॰"
   index: "ا ب ٻ پ ڀ ت ث ٺ ٽ ٿ ج {جھ} ڃ ڄ چ ڇ ح خ د ذ ڊ ڌ ڍ ڏ ر ز ڙ س ش ص ض ط ظ ع غ ف ڦ ق ک ڪ گ {گھ} ڱ ڳ ل م ن ڻ ه ھ و ي"
 }
+sample_text {
+  fallback_language: "sd"
+}
diff --git a/lang/languages/sd_Deva/language.textproto b/lang/languages/sd_Deva.textproto
similarity index 94%
rename from lang/languages/sd_Deva/language.textproto
rename to lang/languages/sd_Deva.textproto
index 6a557bee5..abbb04cc0 100644
--- a/lang/languages/sd_Deva/language.textproto
+++ b/lang/languages/sd_Deva.textproto
@@ -4,11 +4,14 @@ preferred_name: ""
 autonym: ""
 population: 344783
 region: "IN"
-script: "Perso-Arabic"
 script: "Devanagari"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "\\u093C \\u0902 अ आ इ ई उ ऊ ए ऐ ओ औ क ख ग ॻ घ ङ च छ ज ॼ झ ञ ट ठ ड ॾ ढ ण त थ द ध न प फ ब ॿ भ म य र ल व श ष स ह ा ि ी \\u0941 \\u0942 \\u0943 \\u0944 \\u0945 \\u0947 \\u0948 ॉ ो ौ \\u094D"
   auxiliary: "\\u200C\\u200D"
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
 }
+sample_text {
+  fallback_language: "sd"
+}
diff --git a/lang/languages/sdc/language.textproto b/lang/languages/sdc.textproto
similarity index 88%
rename from lang/languages/sdc/language.textproto
rename to lang/languages/sdc.textproto
index 167f770cd..99d697a66 100644
--- a/lang/languages/sdc/language.textproto
+++ b/lang/languages/sdc.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Ç È Ì Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à ç è ì ò ù"
   marks: "◌̀ ◌̧"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sdh/language.textproto b/lang/languages/sdh.textproto
similarity index 86%
rename from lang/languages/sdh/language.textproto
rename to lang/languages/sdh.textproto
index 31d88d37d..4b760a5f6 100644
--- a/lang/languages/sdh/language.textproto
+++ b/lang/languages/sdh.textproto
@@ -8,3 +8,6 @@ script: "Perso-Arabic"
 exemplar_chars {
   base: "ا ب ت ج ح خ د ر ز س ش ع غ ف ق ل م ن و پ چ ڕ ژ ڤ ک گ ڵ ھ ۆ ی ێ ە"
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/se.textproto b/lang/languages/se.textproto
new file mode 100644
index 000000000..5bbba76e2
--- /dev/null
+++ b/lang/languages/se.textproto
@@ -0,0 +1,29 @@
+id: "se"
+name: "Northern Sami"
+preferred_name: ""
+autonym: "Sámegiella"
+population: 51529
+region: "FI"
+region: "NO"
+region: "SE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Ä Å Æ Ö Ø Č Đ Ŋ Š Ŧ Ž a b c d e f g h i j k l m n o p q r s t u v w x y z á ä å æ ö ø č đ ŋ š ŧ ž"
+  auxiliary: "à ç é è í ń ñ ó ò q ú w x y ü ø æ å ä ã ö"
+  marks: "◌́ ◌̈ ◌̊ ◌̌"
+  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  index: "A Á B C Č D Đ E É F G H I J K L M N Ŋ O P Q R S Š T Ŧ U V W X Y Z Ž Ø Æ Å Ä Ö"
+}
+sample_text {
+  masthead_full: "BbUu"
+  masthead_partial: "Oo"
+  tester: "Buot olbmot leat riegádan friddjan ja olmmošárvvu ja olmmošvuoigatvuođaid"
+  poster_sm: "Juohkehaš lea"
+  poster_md: "Orruneatnama"
+  poster_lg: "Buot"
+  specimen_48: "Juohke olbmos lea vuoigatvuohta eallimii, friddjavuhtii ja persovnnalaš"
+  specimen_36: "Juohke olbmos lea juohke sajis vuoigatvuohta dasa, ahte son galgá dovddastuvvot olmmošoktagassan lága ovddas."
+  specimen_32: "Juohkehaččas lea vuoigatvuohta vuoigatvuohta vuoiŋŋadussii ja luopmoáigái: dan vuoigatvuođa vuollái gullá maiddái bargoáiggi govttolaš ráddjehus ja mearreáigásaš bálkkáhuvvon luopmu."
+  specimen_21: "Juohkehaš sáhttá gáibidit dakkár sosiálalaš ja internašuvnnalaš ortnega mii ollislaččat sáhttá duohtandahkat daid vuoigatvuođaid ja friddjavuođaid , mat dán julggaštusas leat namuhuvvon.\nIi mihkkige dán julggaštusas sáhte nu dulkojuvvot ahte dat vuoigada ovttage stáhta, juhkosa dahje olmmošoktagasa oassádallat dakkár doaimmas, dahje dahkat dakkár dagu, mii duššindagašii ovttage dain vuoigatvuođain dahje friddjavuođain mat leat namahuvvon Julggaštusas."
+  specimen_16: "Buot olbmot leat riegádan friddjan ja olmmošárvvu ja olmmošvuoigatvuođaid dáfus. Sii leat jierbmalaš olbmot geain lea oamedovdu ja sii gálggaše leat dego vieljačagat.\nJuohkehaš lea vuoigaduvvon buot daid vuoigatvuođaide ja friddjavuođaide, mat dán julggaštusas leat namahuvvon, almmá mange vealahaga, náli, ivnni, sohkabeali, giela, oskku, politihkalaš dahje eará miellaguottu, naššuvnnalaš dahje sosiálalaš surggiideami, opmodaga, riegádeami dahje eará dilálašvuođa dáfus.\nOrruneatnama dahje -guovllu politihkalaš, lágaválddálaš dahje internaššuvnnalaš dilli maiddá ii galgga váikkuhit vealahusa, lehkos dat eanan dahje guovlu iešstivrejeaddji dahje earáid geahču vuolde dahje muđui mange láhkái earáid hálddus stivrra dáfus."
+}
diff --git a/lang/languages/se/language.textproto b/lang/languages/se/language.textproto
deleted file mode 100644
index 2456b567c..000000000
--- a/lang/languages/se/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "se"
-name: "Northern Sami"
-preferred_name: ""
-autonym: "Sámegiella"
-population: 51529
-region: "SE"
-region: "NO"
-region: "FI"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Ä Å Æ Ö Ø Č Đ Ŋ Š Ŧ Ž a b c d e f g h i j k l m n o p q r s t u v w x y z á ä å æ ö ø č đ ŋ š ŧ ž"
-  auxiliary: "à ç é è í ń ñ ó ò q ú w x y ü ø æ å ä ã ö"
-  marks: "◌́ ◌̈ ◌̊ ◌̌"
-  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  index: "A Á B C Č D Đ E É F G H I J K L M N Ŋ O P Q R S Š T Ŧ U V W X Y Z Ž Ø Æ Å Ä Ö"
-}
diff --git a/lang/languages/se/sampletext.textproto b/lang/languages/se/sampletext.textproto
deleted file mode 100644
index b29bd7151..000000000
--- a/lang/languages/se/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "se"
diff --git a/lang/languages/sef/language.textproto b/lang/languages/sef.textproto
similarity index 76%
rename from lang/languages/sef/language.textproto
rename to lang/languages/sef.textproto
index 4948a4156..76442463e 100644
--- a/lang/languages/sef/language.textproto
+++ b/lang/languages/sef.textproto
@@ -7,3 +7,6 @@ region: "CI"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/seh/language.textproto b/lang/languages/seh.textproto
similarity index 89%
rename from lang/languages/seh/language.textproto
rename to lang/languages/seh.textproto
index f96546d47..b71a79b1a 100644
--- a/lang/languages/seh/language.textproto
+++ b/lang/languages/seh.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sei/language.textproto b/lang/languages/sei.textproto
similarity index 86%
rename from lang/languages/sei/language.textproto
rename to lang/languages/sei.textproto
index 0a5b803f7..cc3ffe59a 100644
--- a/lang/languages/sei/language.textproto
+++ b/lang/languages/sei.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ö a b c d e f g h i j k l m n o p q r s t u v w x y z ö"
   marks: "◌̈"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ses/language.textproto b/lang/languages/ses.textproto
similarity index 92%
rename from lang/languages/ses/language.textproto
rename to lang/languages/ses.textproto
index d5d270ed0..6e3eb1e16 100644
--- a/lang/languages/ses/language.textproto
+++ b/lang/languages/ses.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A Ã B C D E Ẽ F G H I J K L M N Ɲ Ŋ O Õ P Q R S Š T U W X Y Z Ž"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sg.textproto b/lang/languages/sg.textproto
new file mode 100644
index 000000000..60a7555b1
--- /dev/null
+++ b/lang/languages/sg.textproto
@@ -0,0 +1,27 @@
+id: "sg"
+name: "Sango"
+preferred_name: ""
+autonym: "Sängö"
+population: 2935521
+region: "CF"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Ä Ê Ë Î Ï Ô Ö Û Ü a b c d e f g h i j k l m n o p q r s t u v w x y z â ä ê ë î ï ô ö û ü"
+  auxiliary: "c q x"
+  marks: "◌̂ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B D E F G H I J K L M N O P R S T U V W Y Z"
+}
+sample_text {
+  masthead_full: "AaDd"
+  masthead_partial: "Üü"
+  tester: "Na hïngängö bîanî atene nëngö terê tî zo na lïngbïngö terê tî"
+  poster_sm: "Na hïngängö"
+  poster_md: "Ayeke kötä"
+  poster_lg: "Adü"
+  specimen_48: "Na hïngängö nî atene ayeke kötä yê mîngi tî mû ngangü na mäïngö"
+  specimen_36: "Zo ôko alîngbi tî dutï na gbe tî ngbâa pëpëe. Akânga lêgë bîanî na dutï tî ngbäa ngâ na dëngö buzë tî kängö zo na ngbâa."
+  specimen_32: "Alîngbi ôko pëpëe tî gbû zo na kânga wala tî bata lo na kânga wala tî tokua zo yongôro na ködörö tî lo gï sêngê sêngê, töngana ndâ nî ayeke da pëpëe."
+  specimen_21: "Zo kûê ayeke na ngangü, lêgë ôko na âmbâ tî lo, tî tene amä polêlê tënë tî yângâ tî lo na lê tî boro ngbanga sô fadë afa ânde wala ângangü wala âkuandiä tî lo wala töngana pängö ïrï na tënë sô alï ngbanga da na ndö tî lo sô ayeke mbîrîmbîrî.\nAlîngbi ôko pëpëe tî yôro terê na mbänä na yâ tî sêdutï tî zo wala tî sëwa tî lo wala tî da tî lo wala tî dîko mbëtïsû tî lo. Alîngbi pëpëe tî buba ïrï tî zo ngâ na wüngö tî ïrï tî lo. Zo kûê ayeke na ngangü tî tene ndiä abata lo ngbanga tî âmarä kpälë töngasö."
+  specimen_16: "Amû na zo kûe zarä tî bibê, tî boro-li na tî mäbê ; ngangü sô afa atene zo kûê ayeke na zarä tî gbîan mäbê tî lo, wala bibê tî lo ngâ na zarä tî fa polêlê mäbê ti lo, lo ôko wala na yâ tî mbênî bûngbi, polêlê wala koiko, na lêgë tî fängô mbëtï, tî särängö yê, tî vöröngö nzapä ngâ na särängö ângôbo.\nAmû na zo kûê ngangü tî zarä tî bibê na tî särängö tënë. Sô atene alîngbi tî doroko zo pëpëe ndâli tî âbibê tî lo. Amû ngâ na zo kûê ngangü tî gi, tî wara na tî vûnga âsango na âkodë na âmarä lêgë kûê, na zïängö bê pëpëe na ndö tî tënë tî âmeka.\nAmû na zo kûe ngangü tî woterë tî lo, tî sâra ngîâ ngâ. Sô atene alîngbi tî dë gï na lêgë nî längö kâpä tî kua ngâ na âlängö tî wöngö terê sô afûta nî."
+}
diff --git a/lang/languages/sg/language.textproto b/lang/languages/sg/language.textproto
deleted file mode 100644
index 21fcab201..000000000
--- a/lang/languages/sg/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "sg"
-name: "Sango"
-preferred_name: ""
-autonym: "Sängö"
-population: 2935521
-region: "CF"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Ä Ê Ë Î Ï Ô Ö Û Ü a b c d e f g h i j k l m n o p q r s t u v w x y z â ä ê ë î ï ô ö û ü"
-  auxiliary: "c q x"
-  marks: "◌̂ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B D E F G H I J K L M N O P R S T U V W Y Z"
-}
diff --git a/lang/languages/sg/sampletext.textproto b/lang/languages/sg/sampletext.textproto
deleted file mode 100644
index e391df574..000000000
--- a/lang/languages/sg/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sg"
diff --git a/lang/languages/sgs/language.textproto b/lang/languages/sgs.textproto
similarity index 74%
rename from lang/languages/sgs/language.textproto
rename to lang/languages/sgs.textproto
index 8903928d2..e527d6121 100644
--- a/lang/languages/sgs/language.textproto
+++ b/lang/languages/sgs.textproto
@@ -7,3 +7,6 @@ region: "LT"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/shi/language.textproto b/lang/languages/shi.textproto
similarity index 92%
rename from lang/languages/shi/language.textproto
rename to lang/languages/shi.textproto
index 5793e90cb..6f520f01e 100644
--- a/lang/languages/shi/language.textproto
+++ b/lang/languages/shi.textproto
@@ -4,8 +4,8 @@ preferred_name: ""
 autonym: "Tachelhit"
 population: 3093867
 region: "MA"
-script: "Perso-Arabic"
 script: "Latin"
+script: "Perso-Arabic"
 script: "Tifinagh"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N Q R S T U W X Y Z Ɛ Ɣ Ḍ Ḥ Ṛ Ṣ Ṭ Ž a b c d e f g h i j k l m n q r s t u w x y z ɛ ɣ ʷ ḍ ḥ ṛ ṣ ṭ ž"
@@ -13,3 +13,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "ⴰ ⴱ ⴳ ⴷ ⴹ ⴻ ⴼ ⴽ ⵀ ⵃ ⵄ ⵅ ⵇ ⵉ ⵊ ⵍ ⵎ ⵏ ⵓ ⵔ ⵕ ⵖ ⵙ ⵚ ⵛ ⵜ ⵟ ⵡ ⵢ ⵣ ⵥ"
 }
+sample_text {
+  fallback_language: "shi"
+}
diff --git a/lang/languages/shi_Latn/language.textproto b/lang/languages/shi_Latn.textproto
similarity index 91%
rename from lang/languages/shi_Latn/language.textproto
rename to lang/languages/shi_Latn.textproto
index 4d2cac936..4c2b0d48a 100644
--- a/lang/languages/shi_Latn/language.textproto
+++ b/lang/languages/shi_Latn.textproto
@@ -4,8 +4,8 @@ preferred_name: ""
 autonym: ""
 population: 3093867
 region: "MA"
-script: "Perso-Arabic"
 script: "Latin"
+script: "Perso-Arabic"
 script: "Tifinagh"
 exemplar_chars {
   base: "a b c d ḍ e ɛ f g {gʷ} ɣ h ḥ i j k {kʷ} l m n q r ṛ s ṣ t ṭ u w x y z"
@@ -13,3 +13,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D Ḍ E Ɛ F G {Gʷ} Ɣ H Ḥ I J K {Kʷ} L M N Q R Ṛ S Ṣ T Ṭ U W X Y Z"
 }
+sample_text {
+  fallback_language: "shi"
+}
diff --git a/lang/languages/shn.textproto b/lang/languages/shn.textproto
new file mode 100644
index 000000000..b0bf5c346
--- /dev/null
+++ b/lang/languages/shn.textproto
@@ -0,0 +1,25 @@
+id: "shn"
+name: "Shan"
+preferred_name: ""
+autonym: "လိၵ်ႈတႆး / ၵႂၢမ်းတႆး"
+population: 3687984
+region: "MM"
+region: "TH"
+script: "Myanmar"
+exemplar_chars {
+  base: "ၵ ၶ င ၸ သ ၺ တ ထ ၼ ပ ၽ ၾ မ ယ ရ လ ဝ ႁ ဢ a i ( )"
+  marks: "◌ိ ◌ီ ◌ု ◌ူ ◌ေ ◌ဵ ◌း ◌် ◌ျ ◌ြ ◌ွ ◌ၢ ◌ႂ ◌ႃ ◌ႄ ◌ႅ ◌ႆ ◌ႇ ◌ႈ ◌ႉ ◌ႊ"
+}
+sample_text {
+  masthead_full: "ၵၼပဢ"
+  masthead_partial: "တမ"
+  tester: "ႁပ်ႉႁွင်းတူၺ်းထိုင်တေႃႇ သုၼ်ႇလႆႈသုၼ်ႇပဵၼ် ဢၼ်ၵူၼ်းၵူႊၵေႃႉထုၵ်ႇလီၸၢမ်ႇပူၺ်ႈၵူႊၵေႃႉၵူႊၵူၼ်း ၸွမ်းလူၺ်ႈ ၵုင်ႇမုၼ်ၸိူဝ်ႉၶိူဝ်းၽႂ်မၼ်းၼၼ်ႉ ပဵၼ်ပိုၼ်ႉထၢၼ်လူင်"
+  poster_sm: "ယွၼ်ႉပိူဝ်ႈ ၶီႇၼဵၵ်းတဵၵ်းတဵင်ပေႉၵိၼ်"
+  poster_md: "ၼင်ႇႁိုဝ်ၸိုင်ႈမိူင်းၸိူဝ်းၼႆႉ"
+  poster_lg: "ၵူၼ်းၵူႊၵေႃႉၼႆႉ"
+  specimen_48: "လုၵ်ႈၸုမ်း ၸၢတ်ႈၸိုင်ႈလုမ်ႈၾႃႉၶဝ်ၼႆႉ ၼင်ႇႁိုဝ် ၼႂ်းလုမ်ႈၾႃႉၵူႊတီႈတီႈ တေႁၵ်ႉသႃပႂ်ႉပႃး သုၼ်ႇလႆႈသုၼ်ႇပဵၼ်ၵူၼ်း၊ သုၼ်ႇလႆႈသုၼ်ႇပဵၼ်ပိုၼ်ႉထၢၼ်ၽၢႆႇလွတ်ႈလႅဝ်းထၢင်ႇႁၢင်ႊၵႂႃႇၼၼ်ႉ"
+  specimen_36: "ၵူၼ်းၵူႊၵေႃႉၼႆႉ ပဵၼ်ဢၼ်ၵိူတ်ႇမႃးလူၺ်ႈၵုင်ႇမုၼ်ဢၼ်လွတ်ႈလႅဝ်းၽဵင်ႇပဵင်းၵၼ် လႄႈ သုၼ်ႇလႆႈဢၼ် လွတ်ႈလႅဝ်းၽဵင်ႇ ပဵင်းၵၼ်။ ၶဝ်ၼႆႉ မီးၺၢၼ်ႇဢၼ်မေႃထတ်းသၢင် လႄႈ ၸႂ်ဢၼ်ႁူႉၸၵ်းၾိင်ႈတိုဝ်းၵမ် ၼၼ်ႉလႄႈ ထုၵ်ႇဝႆႉၸႂ်ပီႈဢွၵ်ႇ ၼွင်ႉၶႆႇၵၼ်သေ တိတ်းတေႃႇၵၼ်။"
+  specimen_32: "ၵူၼ်းၵူႊၵေႃႉၼႆႉ မီးသုၼ်ႇလႆႈတႃႇၶုၺ်ႉႁၼ်ပိူင်ႇငမ်းသုၼ်ႇလႆႈလႄႈ လွင်ႈလွတ်ႈလႅဝ်းတင်းသဵင်ႈ ဢၼ်ပိုတ်ႇၼေဝႆႉ ၼႂ်း လိၵ်ႈပိုၼ်ၽၢဝ်ႇၼႆႉသေ တေဢမ်ႇလႆႈမီးလွင်ႈၸႅၵ်ႇၼႄလူၺ်ႈ ၸၢဝ်းၶိူဝ်း၊ သီၽိဝ်၊ ၶိူင်ႈၽွၵ်ႇ၊ ၵႂၢမ်းလၢတ်ႈ၊ ၸၢဝ်းၵိူဝ်း ယမ်၊ ပၢႆးႁပ်ႉႁၼ်ၵၢၼ်မိူင်း ဢိၵ်ႇတၢင်ႇလွင်ႈ၊ ငဝ်ႈႁၢၵ်ႈ ဢၼ်ၵဵဝ်ႇလူၺ်ႈ ၸိုင်ႈမိူင်း ႁိုဝ် ၸၼ်ႉထၢၼ်ႈၵၼ်ႊၵူၼ်း၊ လွင်ႈ မၢၵ်ႈမီးလီပဵၼ်၊ လွင်ႈၶိူဝ်းႁိူၼ်း လႄႈ ၸၼ်ႉထၢၼ်ႈတၢင်ႇၸိူဝ်ႉတၢင်ႇပိူင် ၸိူဝ်းၼႆႉ။"
+  specimen_21: "လိူဝ်ၼၼ်ႉ ဢိင်ၼိူဝ် ၾၢႆႇပၢႆးမိူင်း၊ ၾၢႆႇတတ်းသိၼ်တွၼ်ႇၾိင်ႈ ဢမ်ႇၼၼ် ၾၢႆႇၶဝ်ႈဢွၵ်ႇတေႃႇၵူႊမိူင်းမိူင်း ၶွင်ၸိုင်ႈမိူင်း ႁိုဝ်ၼႃႈတီႈဢၼ်ၵူၼ်းၵေႃႉၼိုင်ႈယူႇသဝ်းၼၼ်ႉသေ တေဢမ်ႇလႆႈမီးလွင်ႈၸႅၵ်ႇၽႄၵၼ်။ ဝႆႉဝႃႈၼႃႈတီႈ ၼၼ်ႉ ပဵၼ်ဢၼ်လွတ်ႈလႅဝ်းသဝ်းၶေႃ ၵေႃႈလီ၊ ပဵၼ်ဢၼ်မီးဢႃႇၼႃႇတႃႇ ၽွင်းငမ်းၵမ်ႈၽွင်ႈၵွၺ်း ႁိုဝ် ပဵၼ်ၼႃႈတီႈ ဢၼ်ၸၢတ်ႈၸိုင်ႈလုမ်ႈၾႃႉၵုမ်းၵႂၢၼ်းတူၺ်းထိုင်ဝႆႉၼၼ်ႉ ၵေႃႈယႃႇ တႃႇတေဢိင်ၼိူဝ် လွင်ႈဝႃႈ ၸႂ်ႈဢမ်ႇၸႂ်ႈၼႃႈတီႈၸိူ ဝ်းၼၼ်ႉသေ ၸႅၵ်ႇၽႄၵၼ်ၼႆႉ တိုၼ်းတေဢမ်ႇလႆႈမီး။\nၵူၼ်းၵူႊၵေႃႉ မီးသုၼ်ႇလႆႈ တႃႇၶီးၸိုၼ်ႈ၊ တႃႇလွတ်ႈလႅဝ်းထၢင်ႇႁၢင်ႊ လႄႈ တႃႇႁူမ်ႇလူမ်ႈၸူဝ်ႊပၢၼ်မၼ်း။\nတေဢမ်ႇလႆႈတဵၵ်းႁႂ်ႈၽူႈလႂ်ႁဵတ်းၶႃႈၸႂ်ႉ ဢမ်ႇၼၼ် တဵၵ်းႁဵတ်းၼင်ႇၶႃႈၸႂ်ႉ။ ၵႃႊပဵၼ်လွင်ႈတဵၵ်း ႁႂ်ႈႁဵတ်း ၶႃႈၸႂ်ႉ လႄႈ လွင်ႈၵႃႉၶၢႆၶႃႈၸႂ်ႉၼႆႉ တေလႆႈဢိုတ်းႁၢမ်ႈပႅတ်ႈ ႁႂ်ႈပႃးၸဵမ် ၼႃႈၵၢၼ် ဢၼ်ငၢႆးမိူၼ်ၼႆ။"
+  specimen_16: "တေဢမ်ႇလႆႈၶႃၸႂ်ဢမ်ႇၼၼ် တိတ်းတေႃႇႁၢဝ်ႈႁၢဝ်ႈႁႅင်းႁႅင်း ထၢၼ်ႈပေႃးဢမ်ႇမိူၼ်ၵူၼ်းသေ ႁဵတ်းႁႂ်ႈတိူဝ်ႉ သရေႇၼႃႈ တႃ ဢမ်ႇၼၼ် တေဢမ်ႇလႆႈပၼ်တူတ်ႈတၢမ်ႇ မိူၼ်ၼႆ တီႈၽူႈလႂ်ၽႂ်သေၵေႃႉ။\nတီႈပၵ်းပိူင်ၼၼ်ႉ ၵူၼ်းၵူႊၵေႃႉၼႆႉ မီးသုၼ်ႇလႆႈ ထုၵ်ႇမၵ်းမၼ်ႈၼင်ႇ ၵူၼ်းၵေႃႉၼိုင်ႈ တႃႇၵူႊလွင်ႈ။\nၵူၼ်းတင်းသဵင်ႈၼႆႉ တီႈပၵ်းပိူင်ၾိင်ႈမိူင်းၼၼ်ႉ ၽဵင်ႇပဵင်းဢၼ်သေဢမ်ႇၵႃး လွင်ႈဢၼ်ပၵ်းပိူင် ၾိင်ႈမိူင်း ၵႅတ်ႇၶေပၼ် ၼၼ်ႉၵေႃႈ ဢမ်ႇမီးလွင်ႈပႅၵ်ႇပိူင်ႈၵၼ်သေ မီးသုၼ်ႇလႆႈ တႃႇၶုၺ်ႉႁၼ်ၽဵင်ႇပဵင်းၵၼ်။ ၵူၼ်းတင်းသဵင်ႈၼႆႉ မီးသုၼ်ႇလႆႈ ၽဵင်ႇၽဵင်ႇပဵင်းပဵင်း တႃႇၶုၺ်ႉႁၼ် ဢၼ်ၵႅတ်ႇၶေပၼ် လွင်ႈပူၼ်ႉပႅၼ်တေႃႇလိၵ်ႈပိုၼ်ၽၢဝ်ႇၼႆႉသေ ၸႅၵ်ႇၽႄၵၼ်လႂ်၊ လွင်ႈသူၼ်းႁူၺ်ႈ ႁႂ်ႈၸႅၵ်ႇၽႄၵၼ်လႂ်ၼၼ်ႉယူႇ။\nသင်ဝႃႈ လႆႈပူၼ်ႉပႅၼ်တေႃႇ သုၼ်ႇလႆႈပိုၼ်ႉငဝ်ႈ ဢၼ်လၵ်းမိူင်း ဢမ်ႇၼၼ် ၾိင်ႈမိူင်း ဢၼ်ႁပ်ႉႁွင်းပၼ်ဝႆႉၼၼ်ႉၸိုင် ၵူၼ်းၵူႊၵေႃႉၼႆႉ တၵ်းမီး သုၼ်ႇလႆႈတႃႇႁပ်ႉဢဝ် ဢၼ်လုမ်းတွၼ်ႇၾိင်ႈၸိုင်ႈမိူင်း ၶိုၼ်းၵေႈ သၢႆလူတ်းလူမ်ပၼ် ထိုင်တီႈ လီငၢမ်းၼၼ်ႉယူႇ။\nဢမ်ႇၶဝ်ႈတၢင်းၵၢၼ်ပၵ်းပိူင်ၾိင်ႈမိူင်းသေ ၽူႈလႂ်ၵေႃႈ တေဢမ်ႇႁႂ်ႈလႆႈထုၵ်ႇတီႉၺွပ်း  ႁိုဝ် လိုပ်ႈဢွၵ်ႇမိူင်း။\nမိူဝ်ႈလႆႈထုၵ်ႇတတ်းၶၢၼ်း သုၼ်ႇလႆႈ လႄႈ ၼႃႈၶွင်ပုၼ်ႈၽွၼ်းမၼ်းၼၼ်ႉလႂ်၊ မိူဝ်ႈလႆႈထုၵ်ႇမၢပ်ႇမႂ်ထိုင် ယွၼ်ႉလိူင်ႈၽိတ်း ၾိင်ႈၼၼ်ႉလႂ် ၵူၼ်းၵူႊၵေႃႉၼႆႉ မီးသုၼ်ႇလႆႈၽဵင်ႇပဵင်းမိူၼ်ၵၼ် တႃႇလႆႈထုၵ်ႇလုမ်းတွၼ်ႇၾိင်ႈ ဢၼ်လွတ်ႈလႅဝ်း လႄႈ ဢၼ်ဢမ်ႇၸွမ်းပႃႈၽၢႆႇၼၼ်ႉ ၵူတ်ႇထတ်းၽဵင်ႇၽဵၼ်ႈ တီႈၼႃႈၵူၼ်းၼမ်။\nၵူၼ်းၵူႊၵေႃႉၼႆႉ မီးသုၼ်ႇလႆႈ တႃႇဝူၼ်ႉၶႆႈ၊ ႁပ်ႉႁၼ်၊ ၵိူဝ်းယမ် လွတ်ႈလွတ်ႈလႅဝ်းလႅဝ်းသေ ၼႂ်းၼၼ်ႉ ပႃးဝႆႉသုၼ်ႇလႆႈ တႃႇလႅၵ်ႈလၢႆႈၸၢဝ်းၵိူဝ်းယမ် လႄႈ ပၢႆးယုမ်ႇယမ်ၸဝ်ႈၵဝ်ႇၼၼ်ႉ လွတ်ႈလွတ်ႈလႅဝ်းလႅဝ်းယူႇ။ လိူဝ်ၼၼ်ႉ ယူႇတီႈၵေႃႉ လႂ်ၽႂ်မၼ်းလႄႈသင် ႁူမ်ႈလူၺ်ႈတင်းတၢင်ႇၵေႃႉသေလႄႈသင် ၸွမ်းၼင်ႇ  ၸဝ်ႈၵဝ်ႇ ၵိူဝ်းယမ် ဢမ်ႇၼၼ် ပူင်သွၼ်လႆႈ၊ ၽိုၵ်းၵမ်လႆႈ၊ ၵိူဝ်းယမ်ၼပ်ႉထိုဝ်လႆႈ တီႈၽၢႆႇၼႃႈၵူၼ်းမိူင်း တင်းလၢႆ လႄႈ တီႈလပ်ႉလင်ၶဝ်ၼၼ်ႉ လွတ်ႈလွတ်ႈလႅဝ်း လႅဝ်းယူႇ။"
+}
diff --git a/lang/languages/shn/language.textproto b/lang/languages/shn/language.textproto
deleted file mode 100644
index a9f1c9d37..000000000
--- a/lang/languages/shn/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "shn"
-name: "Shan"
-preferred_name: ""
-autonym: "လိၵ်ႈတႆး / ၵႂၢမ်းတႆး"
-population: 3687984
-region: "MM"
-region: "TH"
-script: "Myanmar"
-exemplar_chars {
-  base: "ၵ ၶ င ၸ သ ၺ တ ထ ၼ ပ ၽ ၾ မ ယ ရ လ ဝ ႁ ဢ a i ( )"
-  marks: "◌ိ ◌ီ ◌ု ◌ူ ◌ေ ◌ဵ ◌း ◌် ◌ျ ◌ြ ◌ွ ◌ၢ ◌ႂ ◌ႃ ◌ႄ ◌ႅ ◌ႆ ◌ႇ ◌ႈ ◌ႉ ◌ႊ"
-}
diff --git a/lang/languages/shn/sampletext.textproto b/lang/languages/shn/sampletext.textproto
deleted file mode 100644
index 89d5aae4c..000000000
--- a/lang/languages/shn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "shn"
diff --git a/lang/languages/si.textproto b/lang/languages/si.textproto
new file mode 100644
index 000000000..6b018beb7
--- /dev/null
+++ b/lang/languages/si.textproto
@@ -0,0 +1,27 @@
+id: "si"
+name: "Sinhala"
+preferred_name: ""
+autonym: "සිංහල"
+population: 15564656
+region: "LK"
+script: "Sinhala"
+exemplar_chars {
+  base: "අ ආ ඇ ඈ ඉ ඊ උ ඌ ඍ ඎ එ ඒ ඓ ඔ ඕ ඖ ට ඨ ඩ ඪ ණ ඬ ත ථ ද ධ න ඳ ප ඵ බ භ ම ඹ ය ර ල ව ළ ශ ෂ ස හ ෆ"
+  auxiliary: "\\u200B\\u200C\\u200D ඎ ඏ ඐ ඦ ෳ"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "අ ආ ඇ ඈ ඉ ඊ උ ඌ ඍ එ ඒ ඓ ඔ ඕ ඖ ක ඛ ග ඝ ඞ ඟ ච ඡ ජ ඣ ඥ ඤ ට ඨ ඩ ඪ ණ ඬ ත ථ ද ධ න ඳ ප ඵ බ භ ම ඹ ය ර ල ව ශ ෂ ස හ ළ ෆ"
+}
+sample_text {
+  masthead_full: "සයලම"
+  masthead_partial: "නෂ"
+  tester: "ලෝකයේ පවත්නා නිදහස, යුක්තිය සහ සාමය යන්නෙහි පදනම මිනිස් පවුලේ සියලු දෙනාගේ ම සහජ ගරුත්වය"
+  poster_sm: "මානව අයිතිවාසිකම්"
+  poster_md: "දුෂ්ඨ පාලකයන්ට"
+  poster_lg: "සියලු"
+  specimen_48: "මූලික මානව අයිතිවාසිකම් කෙරෙහිත්, මිනිසාගේ ගරුත්වය හා අගය කෙරෙහිත්, ස්ත්‍රී පුරුෂ දෙපක්ෂයේ සමාන"
+  specimen_36: "මානව අයිතිවාසිකම් හා මූලික ස්වාධීනත්වයන් කෙරෙහි විශ්ව ගරුත්වයත්, ඒවා රැක දීමත් එක්සත් ජාතීන්ගේ සංවිධානයේ සහයෝගිත්වයෙන් වර්ධනය කිරීමට සාමාජික රාජ්‍ය ප්‍රතිඥා දී ඇති හෙයින් ද,"
+  specimen_32: "ජාති, වංශ, වර්ණ, ස්ත්‍රී පුරුෂ භාවය, භාෂාව, ආගම්, දේශපාලන ආදී කවර බේදයක් හෝ සමාජ, ජාතික, දේපළ, උපත ආදී කවර තත්ත්වයක විශේෂයක් හෝ නොමැතිව මේ ප්‍රකාශනයේ සඳහන් සියලු හිමිකම්වලට හා ස්වාධීනත්වයන්ට සෑම පුද්ගලයකුම උරුම වන්නේය."
+  specimen_21: "තවද යම් පුද්ගලයකු අයත්වන රටේ දේශපාලන, නීතිමය හෝ ජාත්‍යන්තර තත්ත්වයන් පිළිබඳ කිසිදු විශේෂයක් ද ඒ රටේ ස්වාධීන, භාරකාර, අස්වාධීන ආදී කවර තත්ත්වයක් පිළිබඳ විශේෂයක් ද නොමැතිව මේ හිමිකම් ඔහු සතු වන්නේය.\nසෑම පුද්ගලයෙකුටම ජීවත්වීමටත් නිදහස්ව සිතීමටත් පෞද්ගලික ආරක්ෂාවටත් හිමිකම් ඇත්තේය.\nකිසිම පුද්ගලයෙකු වහල් කමෙහි හෝ බන්ධනයෙහි (දාසත්වයෙහි) නොරැඳවිය යුතුය. සෑම ආකාරයකම වහල් වෙළඳාම හා වහල්කම තහනම් වන්නේය.\nකිසිම පුද්ගලයකු වධ හිංසාවට හෝ කෲර, අමානුෂික පහත් සැළකිල්ලකට හෝ දඬුවමකට හෝ භාජනය නොකළ යුතුය."
+  specimen_16: "සෑම අවස්ථාවකදී ම නීතිය ඉදිරියේ පුද්ගලයකු වශයෙන් පිළිගනු ලැබීමේ අයිතිය සෑම කෙනෙකුම සතුය.\nසියල්ලන්ම නීතිය ඉදිරියෙහි එකිනෙකාට සමාන වන අතර, නීතීයේ ආරක්ෂාව ලැබීමට කිසිදු විශේෂයක් නොමැතිව, සියල්ලෝම හිමිකම් ලබති, මේ ප්‍රකාශනයට පටහැනි ලෙස කෙරෙන ඕනෑම අසාධාරණයකින් ආරක්ෂා වීමේ අයිතියත් එබඳු අසාධාරණයන්ට පෙළඹවීමෙන් ආරක්ෂාවීමේ අයිතියත් සියල්ලන්ටම හිමි වේ.\nආණ්ඩුක්‍රම ව්‍යවස්ථාවලින් හෝ නීතියෙන් හෝ ප්‍රදානය වී ඇති මූලික මිනිස් අයිතිවාසිකම් උල්ලංඝනය කිරීමකදී බලධාරී ජාතික අධිකරණයකින් ප්‍රතිකර්ම යොදා ගැනීමේ හිමිකම් සෑම පුද්ගලයකු සතු වේ.\nබලහත්කාරයෙන් අත් අඩංගුවට ගැනීමට හෝ අත් අඩංගුවේ රඳා තැබීමට හෝ පිටුවහල් කිරීමට හෝ කිසිම පුද්ගලයකු භාජනය නොකළ යුතුය.\nතමන්ගේ අයිතිවාසිකම් හා යුතුකම් පිළිබඳව හෝ තම්න්ට විරුද්ධව යම් අපරාධ චෝදනාවක් පිළිබඳව හෝ නිශ්චය කිරීම සඳහා සාධාරණ වූත්, විවෘත වුත්, ස්වාධීන අපක්ෂපාත නඩු විභාගයකට සෑම තැනැත්තකුම පූර්ණ සමානත්වයෙන් යුක්තව හිමිකම් ලබයි."
+}
diff --git a/lang/languages/si/language.textproto b/lang/languages/si/language.textproto
deleted file mode 100644
index e44709b17..000000000
--- a/lang/languages/si/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "si"
-name: "Sinhala"
-preferred_name: ""
-autonym: "සිංහල"
-population: 15564656
-region: "LK"
-script: "Sinhala"
-exemplar_chars {
-  base: "අ ආ ඇ ඈ ඉ ඊ උ ඌ ඍ ඎ එ ඒ ඓ ඔ ඕ ඖ ට ඨ ඩ ඪ ණ ඬ ත ථ ද ධ න ඳ ප ඵ බ භ ම ඹ ය ර ල ව ළ ශ ෂ ස හ ෆ"
-  auxiliary: "\\u200B\\u200C\\u200D ඎ ඏ ඐ ඦ ෳ"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "අ ආ ඇ ඈ ඉ ඊ උ ඌ ඍ එ ඒ ඓ ඔ ඕ ඖ ක ඛ ග ඝ ඞ ඟ ච ඡ ජ ඣ ඥ ඤ ට ඨ ඩ ඪ ණ ඬ ත ථ ද ධ න ඳ ප ඵ බ භ ම ඹ ය ර ල ව ශ ෂ ස හ ළ ෆ"
-}
diff --git a/lang/languages/si/sampletext.textproto b/lang/languages/si/sampletext.textproto
deleted file mode 100644
index 62b94026d..000000000
--- a/lang/languages/si/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "si"
diff --git a/lang/languages/sid/language.textproto b/lang/languages/sid.textproto
similarity index 74%
rename from lang/languages/sid/language.textproto
rename to lang/languages/sid.textproto
index ee9911d95..edeff3e2b 100644
--- a/lang/languages/sid/language.textproto
+++ b/lang/languages/sid.textproto
@@ -7,3 +7,6 @@ region: "ET"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sk.textproto b/lang/languages/sk.textproto
new file mode 100644
index 000000000..fa4d8de9d
--- /dev/null
+++ b/lang/languages/sk.textproto
@@ -0,0 +1,31 @@
+id: "sk"
+name: "Slovak"
+preferred_name: ""
+autonym: "Slovenčina"
+population: 6680269
+region: "CZ"
+region: "HU"
+region: "RS"
+region: "SK"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Ä É Í Ó Ô Ú Ý Č Ď Ĺ Ľ Ň Ŕ Š Ť Ž a b c d e f g h i j k l m n o p q r s t u v w x y z á ä é í ó ô ú ý č ď ĺ ľ ň ŕ š ť ž"
+  auxiliary: "à ă â å ā æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò ŏ ö ő ø ō œ ř ù ŭ û ü ű ū ÿ"
+  marks: "◌́ ◌̂ ◌̈ ◌̌"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] § @ * / \\&"
+  index: "A Ä B C Č D Ď E F G H {CH} I J K L Ľ M N O Ô P Q R S Š T Ť U V W X Y Z Ž"
+}
+sample_text {
+  masthead_full: "VvŠš"
+  masthead_partial: "Ee"
+  tester: "Vo vedomí že uznanie prirodzenej dôstojnosti a rovnych a neodcudzite"
+  poster_sm: "že zneuznanie"
+  poster_md: "že je nutné,"
+  poster_lg: "Všetci"
+  specimen_48: "že ľud Spojených národov zdoraznil v Charte znovu svoju vieru"
+  specimen_36: "Nikto sa nesmie držať v otroctve alebo v nevoľníctve: všetky formy otroctva a obchodu s otrokmi sú zakázané."
+  specimen_32: "Každý má právo, aby mu príslušné vnútroštátne súdy poskytly účinnú ochranu proti činom porušujúcim zčkladné práva, ktoré sú mu priznávané ústavou alebo zákonom."
+  specimen_21: "Nikto nesmie byť svojvoľne zatknutý, držaný vo vazbe alebo vyhnaný do vyhnanstva.\nKaždý má úplne rovnaké právo, aby bol spravodlive a verejne vypočutý nezávislým a nestranným súdom, ktorý rozhoduje o jeho právach a povinnostiach a o každom trestnom obvinení, vznesenom proti nemu.\nNikto nesmie byť vystavený svojvoľnému zasahovaniu do súkromného života, rodiny, domova alebo korešpondencie, ani útokom na svoju česť a povesť. Každý má právo na zákonnú ochranu proti takýmto zásahom alebo útokom."
+  specimen_16: "Každý má právo na slobodu myslenia, svedomia a náboženstva; toto právo obsahuje aj voľnosť zmeniť náboženstvo alebo vieru, ako i slobodu prejavovať svoje náboženstvo alebo vieru, sám alebo společne s inými, či už verejne alebo súkromne, vyučovaním, vykonávaním náboženských úkonov, bohoslužbou a zachovávaním obradov.\nKaždý má právo na slobodu presvedčenia a prejavu: toto právo nepripúšťa, aby niekto trpel ujmu pre svoje presvedčenie a zahrňuje právo vyhľadávať, prijímať a rozširovať informácie a myšlienky hociakými prostriedkami a bez ohľadu na hranice.\nKaždý má právo na odpočinok a na zotavenie, zvlášť aj na rozumné vymedzenie pracovných hodín a na pravidelnú platenú dovolenku."
+}
diff --git a/lang/languages/sk/language.textproto b/lang/languages/sk/language.textproto
deleted file mode 100644
index d017a2767..000000000
--- a/lang/languages/sk/language.textproto
+++ /dev/null
@@ -1,18 +0,0 @@
-id: "sk"
-name: "Slovak"
-preferred_name: ""
-autonym: "Slovenčina"
-population: 6680269
-region: "HU"
-region: "CZ"
-region: "RS"
-region: "SK"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Ä É Í Ó Ô Ú Ý Č Ď Ĺ Ľ Ň Ŕ Š Ť Ž a b c d e f g h i j k l m n o p q r s t u v w x y z á ä é í ó ô ú ý č ď ĺ ľ ň ŕ š ť ž"
-  auxiliary: "à ă â å ā æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò ŏ ö ő ø ō œ ř ù ŭ û ü ű ū ÿ"
-  marks: "◌́ ◌̂ ◌̈ ◌̌"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] § @ * / \\&"
-  index: "A Ä B C Č D Ď E F G H {CH} I J K L Ľ M N O Ô P Q R S Š T Ť U V W X Y Z Ž"
-}
diff --git a/lang/languages/sk/sampletext.textproto b/lang/languages/sk/sampletext.textproto
deleted file mode 100644
index 02c49ce06..000000000
--- a/lang/languages/sk/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sk"
diff --git a/lang/languages/skr.textproto b/lang/languages/skr.textproto
new file mode 100644
index 000000000..ee71a5b8f
--- /dev/null
+++ b/lang/languages/skr.textproto
@@ -0,0 +1,24 @@
+id: "skr"
+name: "Saraiki"
+preferred_name: ""
+autonym: "سرائیکی"
+population: 21248591
+region: "PK"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "ا ب ٻ پ ت ٹ ث ج ڄ چ ح خ د ڊ ڈ ݙ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ڳ ل م ن ݨ و ہ ھ ء ی ے ي"
+  marks: "◌ٔ"
+}
+sample_text {
+  masthead_full: "سارے"
+  masthead_partial: "نز"
+  tester: "دنیا دے سارے انسان ہکو ڄئے تے نہ مکڻ والے حقوق تے ازادیاں گھن"
+  poster_sm: "اقوام متحدہ"
+  poster_md: "منشور اچ"
+  poster_lg: "سارے"
+  specimen_48: "ایں تر یخی کار نامے دے بعد اسمبلی نے سارے شریک ملکاں تے زور ڋتاجوایں"
+  specimen_36: "کیوں جو ہر انسان دی ذاتی عزت تے انساناں دے ہکو ڄئے تے نہ مکڻ وا لے حقوق کوں منڑاں دنیا وچ ازادی، انصاف تے امن دی جیاد ہے ۔"
+  specimen_32: "کیوں جو ظلم تے زیادتی دے خلاف انسان کوں بغاوت تے مجبور تھیوڻ کنوں بچاوڻ کیتے ضروری ہے جو قنون دی بالاد ستی دے ذریعے انسانی حقوق دا بچئو کیتاو بڄے"
+  specimen_21: "کیوں جواے ضروری ہے جو قوماں تے ملکاں دے درمیان دوستانہ تعلقات کوں ودھایا ونڄے ۔\nکیوں جور کن ملکاں نے اقوام متحدہ دے چارٹر وچ جیادی انسانی حقوق، انسانی عزت تے وقار، عزت نفس اتے مرداں تے عورتاں دے ہکو ڄئے حقوق اُتے آپڻے یقین دا اقرار کیتے اتے زیادہ ازادی دے محول وچ وسیب دی ترقی تے چنگے معیار زندگی دے ودھارے دا ارادہ ظاہر کیتے ۔"
+  specimen_16: "کیوں جور کن ملکاں نے اے دی وعدہ کیتے جو اقوام متحدہ دے تعاون نال پوری دنیا وچ انسانی حقوق منویسن تے جیادی ازادیاں ڋویسن ۔\nکیوں جو انہاں و عدیاں کوں پورا کرڻ کیتے ضروری ہے جو اساں حقوق تے ازادیاں کو سمجھوں ۔\nہیں کیتے ة ۔\nجنرل اسمبلی اعلان کریندی ہے جو\nانسانی حقوق دا اے عالمی منشور ساریاں قوماں تے ملکاں کیتے این مقصد دے حصول داہکو ڄیاں معیار ہو سی تاں جو ہر بندہ تے وسیب دا ہر طبقہ ایکوں آپڻے سامڻے رکھیندے ہوے تعلیم تے تدریں دے ذریعے حقوق تے ازادیاں دا احترام پیدا کرے اتے قومی تے بین الا قوامی کار گزاری دے ذریعے رکن ملکاں تے انہاں دے ماتحت علا قیاں وچ انہاں کوں منولوڻ دیاں کوششاں کرے ۔"
+}
diff --git a/lang/languages/skr/language.textproto b/lang/languages/skr/language.textproto
deleted file mode 100644
index a1585765c..000000000
--- a/lang/languages/skr/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "skr"
-name: "Saraiki"
-preferred_name: ""
-autonym: "سرائیکی"
-population: 21248591
-region: "PK"
-script: "Perso-Arabic"
-exemplar_chars {
-  base: "ا ب ٻ پ ت ٹ ث ج ڄ چ ح خ د ڊ ڈ ݙ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ڳ ل م ن ݨ و ہ ھ ء ی ے ي"
-  marks: "◌ٔ"
-}
diff --git a/lang/languages/skr/sampletext.textproto b/lang/languages/skr/sampletext.textproto
deleted file mode 100644
index 26be921d0..000000000
--- a/lang/languages/skr/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "skr"
diff --git a/lang/languages/sl.textproto b/lang/languages/sl.textproto
new file mode 100644
index 000000000..fc080afcb
--- /dev/null
+++ b/lang/languages/sl.textproto
@@ -0,0 +1,31 @@
+id: "sl"
+name: "Slovenian"
+preferred_name: ""
+autonym: "Slovenščina"
+population: 1973179
+region: "AT"
+region: "HU"
+region: "IT"
+region: "SI"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Ü Ć Č Đ Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö ü ć č đ š ž"
+  auxiliary: "á à ă â å ä ā æ ç ć đ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ q ú ù ŭ û ü ū w x y ÿ"
+  marks: "◌́ ◌̈ ◌̌"
+  numerals: ", . % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ – , ; \\: ! ? . … \' \" „ ‟ « » ( ) \\[ \\] \\{ \\} @ *"
+  index: "A B C Č Ć D Đ E F G H I J K L M N O P Q R S Š T U V W X Y Z Ž"
+}
+sample_text {
+  masthead_full: "VvSs"
+  masthead_partial: "Ii"
+  tester: "ker pomeni priznanje prirojenega človeškega dostojanstva vseh"
+  poster_sm: "ker je nujno"
+  poster_md: "ker so se"
+  poster_lg: "Vsi"
+  specimen_48: "ker je skupno razumevanje teh pravic in svoboščin največjega"
+  specimen_36: "Nihče ne sme biti podvržen mučenju ali okrutnemu, nečloveškemu ali ponižujočemu ravnanju ali kaznovanju."
+  specimen_32: "Vsakdo ima pravico do učinkovitega pravnega sredstva pri pristojnih državnih sodnih oblasteh proti dejanjem, ki kršijo temeljne pravice, priznane mu po ustavi ali zakonu."
+  specimen_21: "Nihče ne sme biti samovoljno zaprt, pridržan ali izgnan.\nVsakdo je pri odločanju o njegovih pravicah in dolžnostih in v primeru kakršnekoli kazenske obtožbe zoper njega upravičen ob polni enakosti do pravičnega in javnega obravnavanja pred neodvisnim in nepristranskim sodiščem.\nVsakdo ima pravico do počitka in prostega časa, vključno z razumno omejitvijo delovnih ur , in pravico do občasnega plačanega dopusta."
+  specimen_16: "Vsakdo je upravičen do družbenega in mednarodnega reda, v katerem se lahko v polni meri uresničujejo pravice in svoboščine, določene v tej Deklaraciji.\nNobene določbe te Deklaracije se ne sme razlagati tako, kot da iz nje izhaja za državo, skupino ali posameznika kakršnakoli pravica do kakršnegakoli delovanja ali dejanja, ki bi hotelo uničiti v njej določene pravice in svoboščine.\nker pomeni priznanje prirojenega človeškega dostojanstva vseh članov človeške družbe in njihovih enakih in neodtujljivih pravic temelj svobode, pravičnosti in miru na svetu;\nker je nujno potrebno, da se človekove pravice zavarujejo z močjo prava, da človek ne bi bil prisiljen zatekati se v skrajni sili k uporu zoper tiranijo in nasilje;"
+}
diff --git a/lang/languages/sl/language.textproto b/lang/languages/sl/language.textproto
deleted file mode 100644
index 8c92f251e..000000000
--- a/lang/languages/sl/language.textproto
+++ /dev/null
@@ -1,18 +0,0 @@
-id: "sl"
-name: "Slovenian"
-preferred_name: ""
-autonym: "Slovenščina"
-population: 1973179
-region: "HU"
-region: "SI"
-region: "AT"
-region: "IT"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Ü Ć Č Đ Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö ü ć č đ š ž"
-  auxiliary: "á à ă â å ä ā æ ç ć đ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ q ú ù ŭ û ü ū w x y ÿ"
-  marks: "◌́ ◌̈ ◌̌"
-  numerals: ", . % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ – , ; \\: ! ? . … \' \" „ ‟ « » ( ) \\[ \\] \\{ \\} @ *"
-  index: "A B C Č Ć D Đ E F G H I J K L M N O P Q R S Š T U V W X Y Z Ž"
-}
diff --git a/lang/languages/sl/sampletext.textproto b/lang/languages/sl/sampletext.textproto
deleted file mode 100644
index 6ee902d52..000000000
--- a/lang/languages/sl/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sl"
diff --git a/lang/languages/sli/language.textproto b/lang/languages/sli.textproto
similarity index 75%
rename from lang/languages/sli/language.textproto
rename to lang/languages/sli.textproto
index 75b562fda..3077a8208 100644
--- a/lang/languages/sli/language.textproto
+++ b/lang/languages/sli.textproto
@@ -7,3 +7,6 @@ region: "PL"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sly/language.textproto b/lang/languages/sly.textproto
similarity index 74%
rename from lang/languages/sly/language.textproto
rename to lang/languages/sly.textproto
index 6bda5a786..5cb95bc05 100644
--- a/lang/languages/sly/language.textproto
+++ b/lang/languages/sly.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sm.textproto b/lang/languages/sm.textproto
new file mode 100644
index 000000000..98a53f465
--- /dev/null
+++ b/lang/languages/sm.textproto
@@ -0,0 +1,25 @@
+id: "sm"
+name: "Samoan"
+preferred_name: ""
+autonym: "Sāmoa"
+population: 252716
+region: "AS"
+region: "WS"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū"
+  marks: "◌̄"
+}
+sample_text {
+  masthead_full: "OoTt"
+  masthead_partial: "Aa"
+  tester: "Ona o le taliaina aloaia o le tofi mamalu faapea aia tatau tutusa"
+  poster_sm: "Ona o le le"
+  poster_md: "Ona o lenei"
+  poster_lg: "tagata"
+  specimen_48: "Ua na faailoa aloaia mai, o lenei Tautinoga Aoao o Aia Tatau a"
+  specimen_36: "O tagata uma taitoatasi e i ai lana aia tatau e soifua ma ola ai, o lona saolotoga faapea lona malu puipuia."
+  specimen_32: "E leai se tagata e tatau ona taofia faamalosi i se faiga taufaa-pologa po o le nofo pologa; o faiga faapologa ma le faatauina o tagata pologa e tatau ona faasaina i ona tulaga uma,"
+  specimen_21: "E leai se tagata e tatau ona faataugaina pe faia i ai ni faiga saua, faiga e le tusa ma tulaga faale-tagata soifua po o le faalumaina po o le faasalaina,\nO tagata taitoatasi uma e i ai lana aia tatau e aloaia ai o ia i nofoaga uma e avea ai o ia o se tagata amanaiaina i luma o le tulafono,\nE leai se tagata e tatau ona saisaitia faapagota i se faiga saua, taofia pe faaaunuua i se isi atunuu."
+  specimen_16: "O tagata taitoatasi uma e agavaa i itu tutusa uma i se tulaga tatau e faafofogaina ai faalauaitele e se faamasinoga tutoatasi , ma le le faaituau, i le fuafuaina o ana aia tatau ma tiute tauave faapea so o se moliaga o soligatulafono e faasaga ia te ia.\nE leai se tagata e tatau ona noatia i se faiga saua e faalavelavea ai lona nofo toatasi, lona aiga, nofoaga tumau po o se nofoaga tutusa, po o le osofaia o lona tulaga faaaloalogia e lauiloa ai o ia. O tagata taitoatasi uma e i ai lana aia tatau i le puipuiga o le tulafono e faasaga agai i ia faiga e faalavelave ai po o osofaiga."
+}
diff --git a/lang/languages/sm/language.textproto b/lang/languages/sm/language.textproto
deleted file mode 100644
index 1fe41a0cc..000000000
--- a/lang/languages/sm/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "sm"
-name: "Samoan"
-preferred_name: ""
-autonym: "Sāmoa"
-population: 252716
-region: "WS"
-region: "AS"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū"
-  marks: "◌̄"
-}
diff --git a/lang/languages/sm/sampletext.textproto b/lang/languages/sm/sampletext.textproto
deleted file mode 100644
index 7d4bd96e0..000000000
--- a/lang/languages/sm/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sm"
diff --git a/lang/languages/sma/language.textproto b/lang/languages/sma.textproto
similarity index 88%
rename from lang/languages/sma/language.textproto
rename to lang/languages/sma.textproto
index c07a5152a..5d94b40a8 100644
--- a/lang/languages/sma/language.textproto
+++ b/lang/languages/sma.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Å Æ Ï Ö Ø a b c d e f g h i j k l m n o p q r s t u v w x y z ä å æ ï ö ø"
   marks: "◌̈ ◌̊"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/smj/language.textproto b/lang/languages/smj.textproto
similarity index 87%
rename from lang/languages/smj/language.textproto
rename to lang/languages/smj.textproto
index eafbc3c02..2a2ec3053 100644
--- a/lang/languages/smj/language.textproto
+++ b/lang/languages/smj.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B D E F G H I J K L M N O P R S T U V Á Ä Å Ŋ a b d e f g h i j k l m n o p r s t u v á ä å ŋ"
   marks: "◌́ ◌̈ ◌̊"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/smn/language.textproto b/lang/languages/smn.textproto
similarity index 93%
rename from lang/languages/smn/language.textproto
rename to lang/languages/smn.textproto
index a494173f0..ed3b479bd 100644
--- a/lang/languages/smn/language.textproto
+++ b/lang/languages/smn.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A Â B C Č D Đ E F G H I J K L M N Ŋ O P R S Š T U V Y Z Ž Ä Á"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sms/language.textproto b/lang/languages/sms.textproto
similarity index 90%
rename from lang/languages/sms/language.textproto
rename to lang/languages/sms.textproto
index a55f60918..480e8e4dd 100644
--- a/lang/languages/sms/language.textproto
+++ b/lang/languages/sms.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "Å Ö Ø å ö ø"
   marks: "◌̂ ◌̃ ◌̈ ◌̊ ◌̌"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sn.textproto b/lang/languages/sn.textproto
new file mode 100644
index 000000000..59cfc0ac2
--- /dev/null
+++ b/lang/languages/sn.textproto
@@ -0,0 +1,26 @@
+id: "sn"
+name: "Shona"
+preferred_name: ""
+autonym: "Chishona"
+population: 11782503
+region: "ZW"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+  auxiliary: "q x"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
+}
+sample_text {
+  masthead_full: "VvAa"
+  masthead_partial: "Nn"
+  tester: "Sezvo kucherechedza hunhu nekodzero yakayenzana yomunhu wese"
+  poster_sm: "Sezvo chiri"
+  poster_md: "Sezvo vanhu"
+  poster_lg: "Vanhu"
+  specimen_48: "Sezvo kunzwisisa pamwechete kodzero idzi norusununguko zvichikosha"
+  specimen_36: "Vanhu vese vakayenzana pamberi pomutemo uye vanekodzero, pasina rusarura, yokuchengetedzwa zvakayenzana nomutemo."
+  specimen_32: "Munhu wese anekodzero yokuzorora nokuzvivaraidza, zvichibatanidza kukamurwa kwenguva yokushanda nokuwana zororo nguva nenguva pabasa achipihwa mugove wakakwana."
+  specimen_21: "Munhu wese anofanirwa kugara muruwa nemunyika umo munozova nokucherechedzwa zvakakwana kwekodzero norusununguko sekutaurwa kwazvakaitwa mukurudziro ino.\nHapana chinhu chiri mukurudziro ino chichazotsanangurwa sechinoreva kuti chero ipi zvayo nyika, bato, kana munhu pachake, anekodzero yokuita mabasa kana zviito zvinopwanya ipi zvayo kodzero kana rusununguko zviri mukurudziro ino."
+  specimen_16: "Sezvo kucherechedza hunhu nekodzero yakayenzana yomunhu wese pasi pose iriyo mviromviro yomutongero uri pachokwadi norunyararo panyika.\nSezvo kusatevera nekusvora kodzero dzevanhu zvakamboita kuti kuve noutsinye hwakarwadza pfungwa dzevanhu pasi pose, nokuuya kwenyika inevanhu vachafadzwa norusununguko nokutaura zvavanoda zvakapikirwa sezvinangwa zvinodiwa kuvanhu vese vese.\nSezvo chiri chinhu chinokosha, kana munhu asingazomanikidzirwa kuita somukana wokupedzisira, kupandukira hutongi hwakaipa kana hudzvanyiriri, kuti, kodzero dzevanhu dzichengetedzwe nohutongi hwomutemo."
+}
diff --git a/lang/languages/sn/language.textproto b/lang/languages/sn/language.textproto
deleted file mode 100644
index b37ddbbaa..000000000
--- a/lang/languages/sn/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "sn"
-name: "Shona"
-preferred_name: ""
-autonym: "Chishona"
-population: 11782503
-region: "ZW"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-  auxiliary: "q x"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
-}
diff --git a/lang/languages/sn/sampletext.textproto b/lang/languages/sn/sampletext.textproto
deleted file mode 100644
index 43da0cdd9..000000000
--- a/lang/languages/sn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sn"
diff --git a/lang/languages/snf/language.textproto b/lang/languages/snf.textproto
similarity index 71%
rename from lang/languages/snf/language.textproto
rename to lang/languages/snf.textproto
index c8dc18248..0aaaa5199 100644
--- a/lang/languages/snf/language.textproto
+++ b/lang/languages/snf.textproto
@@ -6,3 +6,6 @@ population: 37767
 region: "SN"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/snk.textproto b/lang/languages/snk.textproto
new file mode 100644
index 000000000..a46990085
--- /dev/null
+++ b/lang/languages/snk.textproto
@@ -0,0 +1,23 @@
+id: "snk"
+name: "Soninke"
+preferred_name: ""
+autonym: "Sooninkanxanne"
+population: 1153650
+region: "ML"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U W X Y a b c d e f g h i j k l m n o p q r s t u w x y \'"
+}
+sample_text {
+  masthead_full: "HhAa"
+  masthead_partial: "Dd"
+  tester: "O ga na a faayi nan ti saran xabiilanun doronde do I taqu tinamto"
+  poster_sm: "O ga na a faayi"
+  poster_md: "O ga na a"
+  poster_lg: "Haadama"
+  specimen_48: "O ga na a faayi nan ti Duna feddi xooren da sigira xerexerente"
+  specimen_36: "O ga na a faayi ti jamaanu ku ga kafim i ga da laayidun raga nan ti i wa sikki do haadama renmun taqun koroosinden batte."
+  specimen_32: "Killen kaaran ŋa, a su nan yekka, killen na a su tangana moxo baane ke ya. Fo wo fo su do ke dantaqiye ga bogu me wure, soron su nan baana i ga i tangana. Katta ken ŋa moxo be."
+  specimen_21: "Killen ma sariyanun saaxaman ga da taqu beenu kini seren ŋa, i ga ñi a mulla i na fo bagu i ya, sere so raawa deemande muurunu kiitiraanu.\nra nta sere su ragana, na texi kaso ma na a bagandi jamaanen ŋa xafu kanma.\nI ga na fo tiifi sere ya, a nan siri i xibaaren dantaqini kiitira be ga nta saafandini, soron su jon ŋa, kiitira ke na a taqun do a waajibinun koyi ma a na ko a ga boxu noqu be."
+  specimen_16: "Sere su ra nta roono, fo koono an funen bire moxo, a kore, a kan xibaare ma na a bataaxun xara selli a ga ma an ñamari, a ra nta a roxondini xadi. Sariyan nan siri sere su tangana katta kun baqe, ken xa wa kappa sere su taqu.\nSere su raawa sinmene moxo be gan liŋo an dan ŋa, na ro diina. Ken taqe yan sigi, a ga raawa gilli ke diina katta baane tana. A raawa i diina bagandi sellan ŋa, a baane ma a do soro tanani, ma a kan noxo, a raawa a xaraŋundini, nan bati.\nSere su raawa xibaare walla moxo be gan liŋo a dan ŋa, na kun wariyu bagandi sellan ŋa. Ken wure ni ya sere su raawa wariyu kitta, na a muuru, ma na a sanqi noqu su, moxo su, i ga nta an tanpindini."
+}
diff --git a/lang/languages/snk/language.textproto b/lang/languages/snk/language.textproto
deleted file mode 100644
index c7f8356bb..000000000
--- a/lang/languages/snk/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "snk"
-name: "Soninke"
-preferred_name: ""
-autonym: "Sooninkanxanne"
-population: 1153650
-region: "ML"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U W X Y a b c d e f g h i j k l m n o p q r s t u w x y \'"
-}
diff --git a/lang/languages/snk/sampletext.textproto b/lang/languages/snk/sampletext.textproto
deleted file mode 100644
index f3fdc2814..000000000
--- a/lang/languages/snk/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "snk"
diff --git a/lang/languages/so.textproto b/lang/languages/so.textproto
new file mode 100644
index 000000000..03cf11139
--- /dev/null
+++ b/lang/languages/so.textproto
@@ -0,0 +1,29 @@
+id: "so"
+name: "Somali"
+preferred_name: ""
+autonym: "Soomaali"
+population: 16731120
+region: "DJ"
+region: "ET"
+region: "KE"
+region: "SO"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+  auxiliary: "a e i o p u v z"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "B C D F G H J K L M N Q R S T W X Y"
+}
+sample_text {
+  masthead_full: "AaDd"
+  masthead_partial: "Nn"
+  tester: "Iyadoo aqoonsiga sharafta uu ku dhashay iyo xuquuqda maguurtada"
+  poster_sm: "Iyadoo aqoonsi"
+  poster_md: "Iyadoo ay"
+  poster_lg: "Aadanaha"
+  specimen_48: "Iyadoo ay tahay lagama maarmaan in sare loo qaado horumarinta"
+  specimen_36: "Ma jiro qof loo hoysan karo addoon, addoonsiga iyo ka ganacsiga addoonta way reebanyihiin cayn kasta ay ku yimaadaan."
+  specimen_32: "Qof kasta wuxuu xaq u leeyahay inuu helo Maxkamadaha ku hawsha leh ee dalkiisa cawin celin dhab ah marka lagu xad-gudbo xuquuqda asaasiga ah oo uu dastuurka ama sharciga siiyay."
+  specimen_21: "Qofna looma xiri karo, looma hayn karo, ama looma masaafurin karo si sharci darro ah.\nQof Kastaa wuxuu xaq u leeyahay inuu helo sinnaan buuxda Maxkamad Caadil ah horteed marka la gaynayo xuquuqdiisa iyo waajibaadkiisa iyo marka ay dhacdo in loo haysto dacwo ciqaab ah.\nQof kasta wuxuu xaq u leeyahay nasasho oo ay ku jirto waqti kooban oo macquul ah oo laga jaro saacadaha shaqada iyo xilliyo fasax oo uu mushaar u socdo."
+  specimen_16: "Qof kastaa wuxuu xaq u leeyaday inuu helo nidaam bulsho iyo hab caalami ah oo xuquuqda iyo xorriyaadka lagu tilmaamay Baaqan si buuxda loogu dhaqan gelin karo.\nBaaqan kuma jiraan wax loo fasiri karo in micnahoodu yahay in Dawlad, koox ama qof xaq u leeyahay inuu ku kaco fal ama falal loola jeedo in lagu burburiyo xuquuqda ama xorriyaadka lagu qoray Baaqan.\nIyadoo aqoonsiga sharafta uu ku dhashay iyo xuquuqda maguurtada ah ee ay u siman-yihiin dadweynaha adduunku uu yahay saldhigga xorriyada, caddaaladda iyo nabadda dunida.\nIyadoo ay tahay lagama maarmaan in xuquuqda aadanuhu ay noqdaan kuwo sharcigu dhowro, si uusan qofku, ugu dambeynta, ugu baahan inuu xoog kaga soo horjeesto cadaadiska."
+}
diff --git a/lang/languages/so/language.textproto b/lang/languages/so/language.textproto
deleted file mode 100644
index 070afc6ce..000000000
--- a/lang/languages/so/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "so"
-name: "Somali"
-preferred_name: ""
-autonym: "Soomaali"
-population: 16731120
-region: "ET"
-region: "SO"
-region: "KE"
-region: "DJ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-  auxiliary: "a e i o p u v z"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "B C D F G H J K L M N Q R S T W X Y"
-}
diff --git a/lang/languages/so/sampletext.textproto b/lang/languages/so/sampletext.textproto
deleted file mode 100644
index a62598a20..000000000
--- a/lang/languages/so/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "so"
diff --git a/lang/languages/sou/language.textproto b/lang/languages/sou.textproto
similarity index 75%
rename from lang/languages/sou/language.textproto
rename to lang/languages/sou.textproto
index 521352c71..244c9792a 100644
--- a/lang/languages/sou/language.textproto
+++ b/lang/languages/sou.textproto
@@ -7,3 +7,6 @@ region: "TH"
 script: "Thai"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "th"
+}
diff --git a/lang/languages/sq/language.textproto b/lang/languages/sq.textproto
similarity index 94%
rename from lang/languages/sq/language.textproto
rename to lang/languages/sq.textproto
index 11a340c5c..fb67af818 100644
--- a/lang/languages/sq/language.textproto
+++ b/lang/languages/sq.textproto
@@ -3,13 +3,13 @@ name: "Albanian"
 preferred_name: ""
 autonym: "Shqip"
 population: 6791906
-region: "MK"
-region: "GR"
-region: "TR"
-region: "RS"
-region: "XK"
 region: "AL"
+region: "GR"
 region: "ME"
+region: "MK"
+region: "RS"
+region: "TR"
+region: "XK"
 script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç Ë a b c d e f g h i j k l m n o p q r s t u v w x y z ç ë"
@@ -19,3 +19,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” « » ( ) \\[ \\] § @ * / \\& # ′ ″ ~"
   index: "A B C Ç D {DH} E Ë F G {GJ} H I J K L {LL} M N {NJ} O P Q R {RR} S {SH} T {TH} U V X {XH} Y Z {ZH}"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/sr/language.textproto b/lang/languages/sr.textproto
similarity index 94%
rename from lang/languages/sr/language.textproto
rename to lang/languages/sr.textproto
index fde21c2f6..ce30028fb 100644
--- a/lang/languages/sr/language.textproto
+++ b/lang/languages/sr.textproto
@@ -3,10 +3,10 @@ name: "Serbian"
 preferred_name: ""
 autonym: "Српски"
 population: 7452738
+region: "BA"
+region: "ME"
 region: "RS"
 region: "XK"
-region: "ME"
-region: "BA"
 script: "Cyrillic"
 script: "Latin"
 exemplar_chars {
@@ -17,3 +17,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] \\{ \\} * #"
   index: "А Б В Г Д Ђ Е Ж З И Ј К Л Љ М Н Њ О П Р С Т Ћ У Ф Х Ц Ч Џ Ш"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/sr_Latn/language.textproto b/lang/languages/sr_Latn.textproto
similarity index 93%
rename from lang/languages/sr_Latn/language.textproto
rename to lang/languages/sr_Latn.textproto
index df835b158..e2ae08026 100644
--- a/lang/languages/sr_Latn/language.textproto
+++ b/lang/languages/sr_Latn.textproto
@@ -4,12 +4,12 @@ preferred_name: ""
 autonym: ""
 population: 8085593
 region: "BA"
-region: "RU"
-region: "TR"
+region: "ME"
 region: "RO"
 region: "RS"
+region: "RU"
+region: "TR"
 region: "XK"
-region: "ME"
 script: "Cyrillic"
 script: "Latin"
 exemplar_chars {
@@ -19,3 +19,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – , ; \\: ! ? . … ‘ ‚ “ „ ( ) \\[ \\] \\{ \\} * #"
   index: "A B C Č Ć D {DŽ} E F G H I J K L {LJ} M N {NJ} O P Q R S Š T U V W X Y Z Ž"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/srn/language.textproto b/lang/languages/srn.textproto
similarity index 87%
rename from lang/languages/srn/language.textproto
rename to lang/languages/srn.textproto
index b0025b0ae..0e4bf6490 100644
--- a/lang/languages/srn/language.textproto
+++ b/lang/languages/srn.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z È Ò a b c d e f g h i j k l m n o p q r s t u v w x y z è ò"
   marks: "◌̀"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/srr.textproto b/lang/languages/srr.textproto
new file mode 100644
index 000000000..1ce64bfb5
--- /dev/null
+++ b/lang/languages/srr.textproto
@@ -0,0 +1,24 @@
+id: "srr"
+name: "Serer"
+preferred_name: ""
+autonym: "Seereer"
+population: 1731004
+region: "SN"
+script: "Latin"
+exemplar_chars {
+  base: "A B Ɓ C Ƈ D Ɗ E F G H I J K L M N Ñ Ŋ O P Ƥ Q R S T Ƭ U W X Y Ƴ a b ɓ c ƈ d ɗ e f g h i j k l m n ñ ŋ o p ƥ q r s t ƭ u w x y ƴ \'"
+  marks: "◌̃"
+}
+sample_text {
+  masthead_full: "WwIi"
+  masthead_partial: "Nn"
+  tester: "No andiɗ i jom le wiin fop a mbogna, fa ke warna den too te mbod"
+  poster_sm: "No ñak o and"
+  poster_md: "No Ke moƴna,"
+  poster_lg: "Wiin"
+  specimen_48: "No ke moƴna, ten ref ndamir a paax too moƴ o saƭkand ngaariit"
+  specimen_36: "O xuu refna a wara lay ke ɗomuuna ne ta jegitna boo fop a nain no xate and boo xaa-xate we a cooɗin i ɓur mbaat o ɓurel."
+  specimen_32: "O xuu refna a ware o waas foo yiif um fa diina um. Na ne te bugitna, boo yaa ta bugna joosoox na diina fa lakas la waasel a laywaa, fi\'waa boo yaa le ñaapaa waa ndeefuuna teen."
+  specimen_21: "O xuu refna a wara was fa xalaat um a layin, waree jeg teen o njaaxid o leng, tam nuu te bugna ta nanel fat a layin kam saax le fa kataa saax.\nO kiin mu refna o ñoowaa kam ngentand um a ware aar a maakooyel no ñoow\'um no jeg um. Na aada um no ngentand um baa waag o andiɗ xooxum kam saax le.\nO xuu refna a wara o ñootnooxaa, a ñootin yiifum na ngap o mbodu yaa da njalna baa nger."
+  specimen_16: "Oxuu refna a wara o gay kam saax le mbaat kam adna fee kaa taxna boo jam a jegaa kom ne yeegnit neene ɓistiiduuna.\nKe yeegnit neeke a ɓisiidna, waraand o ɓakand ni saax leng mbaat i mbokatoor, leng mbaat o kiino leng boo te tax ta fesooraa naa te warteerna ni ke warna jeg.\nNo andiɗ i jom le wiin fop a mbogna, fa ke warna den too te mbod teen keen fetu jam na adna fee,\nNo ñak o and fo o yeesandaa ke warna in, naa ɓisiidaa fitna, fa yiif a peƭaru no ñoow in too adna faynwiin we a layaa o ngalaat dan, taamaala matee den fo ñak keen refu ke wiin we a moƴ na o mbug no ñoow,"
+}
diff --git a/lang/languages/srr/language.textproto b/lang/languages/srr/language.textproto
deleted file mode 100644
index 8f7f9fb7c..000000000
--- a/lang/languages/srr/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "srr"
-name: "Serer"
-preferred_name: ""
-autonym: "Seereer"
-population: 1731004
-region: "SN"
-script: "Latin"
-exemplar_chars {
-  base: "A B Ɓ C Ƈ D Ɗ E F G H I J K L M N Ñ Ŋ O P Ƥ Q R S T Ƭ U W X Y Ƴ a b ɓ c ƈ d ɗ e f g h i j k l m n ñ ŋ o p ƥ q r s t ƭ u w x y ƴ \'"
-  marks: "◌̃"
-}
diff --git a/lang/languages/srr/sampletext.textproto b/lang/languages/srr/sampletext.textproto
deleted file mode 100644
index 1ce00a3b3..000000000
--- a/lang/languages/srr/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "srr"
diff --git a/lang/languages/srx/language.textproto b/lang/languages/srx.textproto
similarity index 75%
rename from lang/languages/srx/language.textproto
rename to lang/languages/srx.textproto
index 71ef893d8..9a7b1aa97 100644
--- a/lang/languages/srx/language.textproto
+++ b/lang/languages/srx.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/ss.textproto b/lang/languages/ss.textproto
new file mode 100644
index 000000000..8d1609493
--- /dev/null
+++ b/lang/languages/ss.textproto
@@ -0,0 +1,25 @@
+id: "ss"
+name: "Swati"
+preferred_name: ""
+autonym: "Siswati"
+population: 2212379
+region: "LS"
+region: "SZ"
+region: "ZA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "BbOo"
+  masthead_partial: "Nn"
+  tester: "kwatiswa ngekubakhona ngekwemvelo kwesitfunti sebuntfu, nekulingana"
+  poster_sm: ", kunganaki"
+  poster_md: "Nanjengoba"
+  poster_lg: "Bonkhe"
+  specimen_48: "kwekutsi lomunye umuntfu akufanele kutsi aze aphoceleleke kubalekela"
+  specimen_36: "Wonkhe umuntfu unelilungelo lekutsi abonakale kuyo yonkhe indzawo atsatfwe njengentfo lehamba embili kunemtsetfo."
+  specimen_32: "Kute namunye umuntfu longaphatfwa ngekuvisa buhlungu noma aphatfwe ngelunya, noma ngendlela lengenabo buntfu noma ngekumehlisa sitfunti noma ngekumjezisa."
+  specimen_21: "Njengoba\nkwatiswa ngekubakhona ngekwemvelo kwesitfunti sebuntfu, nekulingana lokufananako, nangekuba nemalungelo langenakwemukwa noma langenakutsatfwa kulelo nalelo lilunga lelingumndeni webuntfu, konkhe loku‐ke kungumgogodla noma kusisekelo senkhululeko, sekwenta lokulungile nesekuba nekuthula emhlabeni wonkhe jikelele,"
+  specimen_16: "Njengoba\nkwatiswa ngekubakhona ngekwemvelo kwesitfunti sebuntfu, nekulingana lokufananako, nangekuba nemalungelo langenakwemukwa noma langenakutsatfwa kulelo nalelo lilunga lelingumndeni webuntfu, konkhe loku‐ke kungumgogodla noma kusisekelo senkhululeko, sekwenta lokulungile nesekuba nekuthula emhlabeni wonkhe jikelele,\nNanjengoba\n, kunganaki nekwedzelela emalungelo ebuntfu kugcine sekudale tento letinelunya nebulwane kwabuye futsi kwatfukutselisa nembeza wesintfu sonkhe, kwashabalalisa sifiso nekulobitela kwekutsi etikhatsini letitako sintfu sitawutfokotela kuba nenkhululeko yekukhuluma, nekukholwa, nenkhululeko yekuhlala ngaphandle kokwesaba nekweswela, konkhe loku‐ke sekumenyetelwe njengetifiso letimcoka kabi eluntfwini,"
+}
diff --git a/lang/languages/ss/language.textproto b/lang/languages/ss/language.textproto
deleted file mode 100644
index fc8f2d3ad..000000000
--- a/lang/languages/ss/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "ss"
-name: "Swati"
-preferred_name: ""
-autonym: "Siswati"
-population: 2212379
-region: "LS"
-region: "ZA"
-region: "SZ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/ss/sampletext.textproto b/lang/languages/ss/sampletext.textproto
deleted file mode 100644
index bb44d4e61..000000000
--- a/lang/languages/ss/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ss"
diff --git a/lang/languages/ssy/language.textproto b/lang/languages/ssy.textproto
similarity index 74%
rename from lang/languages/ssy/language.textproto
rename to lang/languages/ssy.textproto
index c8fd914bb..f7a4cdbaa 100644
--- a/lang/languages/ssy/language.textproto
+++ b/lang/languages/ssy.textproto
@@ -7,3 +7,6 @@ region: "ER"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/st.textproto b/lang/languages/st.textproto
new file mode 100644
index 000000000..9f89efb61
--- /dev/null
+++ b/lang/languages/st.textproto
@@ -0,0 +1,25 @@
+id: "st"
+name: "Southern Sotho"
+preferred_name: ""
+autonym: "Sesotho"
+population: 6390567
+region: "LS"
+region: "ZA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á É È Ē Ō Ò Š a b c d e f g h i j k l m n o p q r s t u v w x y z à á é è ē ō ò š"
+  marks: "◌̀ ◌́ ◌̄ ◌̌"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Tt"
+  tester: "Ka hona he, ho amohela seriti seo motho a tswalwang le sona ha"
+  poster_sm: "Ka hona he,"
+  poster_md: "Seboka se"
+  poster_lg: "Batho"
+  specimen_48: "Se phatlalatsa Totobatso e Akaretsang ya Ditokelo tsa Botho e"
+  specimen_36: "Ha ho motho ya tla etswa lekgoba kapa mohlanka ; bokgoba le kgwebo ya makgoba di tla hanelwa ka hohlehohle."
+  specimen_32: "Motho e mong le e mong o na le tokelo ya phomolo le boikgathollo, ho kenyelletswa le dihora tsa mosebetsi tse beetsweng meedi, ha mmoho le matsatsi a phomolo a lefellwang."
+  specimen_21: "Motho e mong le e mong o lokelwa ke tokelo ya setjhaba le matjhaba eo ho yona ditokelo le bolokolohi, tse hlahang Phatlalatsong ena, di fumanehang ka botlalo.\nHa ho letho Phatlalatsong ena le tshwanetseng ho hlalosa hore naha efeng kapa efeng, batho kapa motho, ba na le tokelo ya ho itshunya kapa ho etsa ketso efeng kapa efeng eo sepheo sa yona e leng ho heletsa ditokelo le bolokolohi bofeng kapa bofeng bo ngotsweng mona."
+  specimen_16: "Ka hona he, ho amohela seriti seo motho a tswalwang le sona ha mmoho le ditokelo tse lekanang tseo motho a ke keng a di amohuwa tsa batho bohle, ke mohlodi wa tokoloho, toka le kgotso lefatsheng.\nKa hona he, ho se natse le ho tella ditokelo tsa botho, ho tswetse diketso tsa bohlaha tse tamukantseng letswalo la batho, mme tsena di entse hore ho labalabelwe lefatshe leo ho lona batho ba tlang ho thabela bolokolohi ba ho bua le tumelo, le bolokolohi ditlamong tsa matswalo le bohloki. Tsena he ho thwe ke tabatabelo e hodimodimo ya batho ka kakaretso.\nKa hona he, taba ya bohlokwa ke ho kgothallesta ntshetsopele ya dikamano tsa setwalle matjhabeng."
+}
diff --git a/lang/languages/st/language.textproto b/lang/languages/st/language.textproto
deleted file mode 100644
index 7fe8be485..000000000
--- a/lang/languages/st/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "st"
-name: "Southern Sotho"
-preferred_name: ""
-autonym: "Sesotho"
-population: 6390567
-region: "LS"
-region: "ZA"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á É È Ē Ō Ò Š a b c d e f g h i j k l m n o p q r s t u v w x y z à á é è ē ō ò š"
-  marks: "◌̀ ◌́ ◌̄ ◌̌"
-}
diff --git a/lang/languages/st/sampletext.textproto b/lang/languages/st/sampletext.textproto
deleted file mode 100644
index 1d51fdd8c..000000000
--- a/lang/languages/st/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "st"
diff --git a/lang/languages/stq/language.textproto b/lang/languages/stq.textproto
similarity index 75%
rename from lang/languages/stq/language.textproto
rename to lang/languages/stq.textproto
index 0fc3a0327..b67bddcc5 100644
--- a/lang/languages/stq/language.textproto
+++ b/lang/languages/stq.textproto
@@ -7,3 +7,6 @@ region: "DE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/su.textproto b/lang/languages/su.textproto
new file mode 100644
index 000000000..8456007f4
--- /dev/null
+++ b/lang/languages/su.textproto
@@ -0,0 +1,28 @@
+id: "su"
+name: "Sundanese"
+preferred_name: ""
+autonym: "Basa Sunda"
+population: 32043120
+region: "ID"
+script: "Latin"
+exemplar_chars {
+  base: "ᮊ ᮌ ᮍ ᮎ ᮏ ᮑ ᮒ ᮓ ᮔ ᮕ ᮘ ᮙ ᮚ ᮛ ᮜ ᮝ ᮞ ᮠ ᮖ ᮋ ᮗ ᮟ ᮐ ᮃ ᮆ ᮄ ᮇ ᮅ ᮈ ᮉ"
+  auxiliary: "ᮮ ᮯ ᮻ ᮼ ᮽ ᮾ ᮿ"
+  marks: "◌ᮀ ◌ᮁ ◌ᮂ ◌ᮡ ◌ᮢ ◌ᮣ ◌ᮤ ◌ᮥ ◌ᮦ ◌ᮧ ◌ᮨ ◌ᮩ ◌᮪ ◌ᮬ ◌ᮭ"
+  numerals: "᮱ ᮲ ᮳ ᮴ ᮵ ᮶ ᮷ ᮸ ᮹ ᮰ 1 2 3 4 5 6 7 8 9 0"
+  punctuation: "᳀ ᳁ ᳂ ᳃ ᳄ ᳅ ᳆ ᳇"
+  index: "A B C D E É F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "SsAa"
+  masthead_partial: "Kk"
+  tester: "Dumasar ku ayana timbangan yen pangakuan kana ayana martabat"
+  poster_sm: "ku jalan ieu"
+  poster_md: "PERNYATAAN"
+  poster_lg: "Sakumna"
+  specimen_48: "Salaku standar umum hiji-hijina pikeun ngahasilkeun sakumna bangsa"
+  specimen_36: "Ku ayana timbangan yen dina ngabina hubungan duduluran di antara nagara-nagara perlu dironjatkeun.\nMAJELIS UMUM"
+  specimen_32: "Ku ayana timbangan yen hak-hak manusa teh perlu ditangtayungan ku aturan hukum sangkan ulah milih cara anu kapaksa dina ngalawan nu lalim jeung anu resep ngajajah."
+  specimen_21: "Dumasar ku ayana timbangan yen pangakuan kana ayana martabat alamiah katut hak-hak anu sarua ti sakumna anggota kulawarga manusa nu dasarna kamerdikaan, kaadilan jeung perdamaian di dunya.\nKu ayana timbangan yen hak-hak manusa teh perlu ditangtayungan ku aturan hukum sangkan ulah milih cara anu kapaksa dina ngalawan nu lalim jeung anu resep ngajajah."
+  specimen_16: "Dumasar ku ayana timbangan yen pangakuan kana ayana martabat alamiah katut hak-hak anu sarua ti sakumna anggota kulawarga manusa nu dasarna kamerdikaan, kaadilan jeung perdamaian di dunya.\nKu ayana timbangan yen ngalelewodehkeun katut nganggap enteng kana hak-hak manusa teh geus nyiptakeun polah - polah bengis anu nimbulkeun kaceuceub kana nurani manusa tur ngawangun hiji dunya tempat manusa ngasaan nikmatna kabebasan nyarita jeung ngagem agama sarta bebas tina kasieun jeung katuna, geus ditembrakkeun salaku cita-cita luhung ti rahayat biasa.\nKu ayana timbangan yen hak-hak manusa teh perlu ditangtayungan ku aturan hukum sangkan ulah milih cara anu kapaksa dina ngalawan nu lalim jeung anu resep ngajajah."
+}
diff --git a/lang/languages/su/language.textproto b/lang/languages/su/language.textproto
deleted file mode 100644
index e1af5d614..000000000
--- a/lang/languages/su/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "su"
-name: "Sundanese"
-preferred_name: ""
-autonym: "Basa Sunda"
-population: 32043120
-region: "ID"
-script: "Latin"
-exemplar_chars {
-  base: "ᮊ ᮌ ᮍ ᮎ ᮏ ᮑ ᮒ ᮓ ᮔ ᮕ ᮘ ᮙ ᮚ ᮛ ᮜ ᮝ ᮞ ᮠ ᮖ ᮋ ᮗ ᮟ ᮐ ᮃ ᮆ ᮄ ᮇ ᮅ ᮈ ᮉ"
-  auxiliary: "ᮮ ᮯ ᮻ ᮼ ᮽ ᮾ ᮿ"
-  marks: "◌ᮀ ◌ᮁ ◌ᮂ ◌ᮡ ◌ᮢ ◌ᮣ ◌ᮤ ◌ᮥ ◌ᮦ ◌ᮧ ◌ᮨ ◌ᮩ ◌᮪ ◌ᮬ ◌ᮭ"
-  numerals: "᮱ ᮲ ᮳ ᮴ ᮵ ᮶ ᮷ ᮸ ᮹ ᮰ 1 2 3 4 5 6 7 8 9 0"
-  punctuation: "᳀ ᳁ ᳂ ᳃ ᳄ ᳅ ᳆ ᳇"
-  index: "A B C D E É F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/su/sampletext.textproto b/lang/languages/su/sampletext.textproto
deleted file mode 100644
index d372483e4..000000000
--- a/lang/languages/su/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "su"
diff --git a/lang/languages/suk.textproto b/lang/languages/suk.textproto
new file mode 100644
index 000000000..a6d7d9d3a
--- /dev/null
+++ b/lang/languages/suk.textproto
@@ -0,0 +1,23 @@
+id: "suk"
+name: "Sukuma"
+preferred_name: ""
+autonym: "Kɪsukuma"
+population: 5094093
+region: "TZ"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z Ɪ a b c d e f g h i j k l m n o p r s t u v w y z \' ɪ"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Nn"
+  tester: "GUNGUNO yimanyikile giki ikujo lya ng’wa munhu na sekge ya banhu"
+  poster_sm: "GUNGUNO nsi"
+  poster_md: "HUNA LULU"
+  poster_lg: "Banhu"
+  specimen_48: "Il’Ibilinga lya Mahanga lyayomba giki, buli munhu alimane, alikuje"
+  specimen_36: "Nduhu munhu adakilililwe kusolwa busese; ubusese nu Busuluja bo basese bo mbika jose bulemegije gete umumahanga agose."
+  specimen_32: "Buli munhu adakililwe gwambilijiwa mu kajile k ‘ Ilagilo lihanga lyakwe mu shito josejose ishoshiling’wima mhangilo jakwe ijifumile ngw’Ihane na Jilagilo ja nsi."
+  specimen_21: "Nduhu munhu uyo adugije gutung’wa (gutulwa mkandulumu) ku nzila yoseyose hanze ya Jilagilo ja nsi.\nBuli munhu adakililwe gudegelekwa mu mhangilo na bulenganila habutongi ya kajile ka nsi akatinabusolonhya umukajile kabo nulu umu mihayo ya minala.\nNduhu munhu uyo adakililwe kwingililwa sagala mu mbisila yakwe yoseyose, budugu, kaya yakwe na nduhu munhu uyo adugije kwingijiwa ikujo lyakwe ilo alinalyo. Buli munhu adakililwe gulanghanwa na Jilagilo ja nsi atizingililwa sheniko."
+  specimen_16: "Buli munhu alinayo Sekge ya gwiganika na gubi na kiganikile ga miganiko ayo alikola g’wenekili nulu mu Luganda. Alinayo Sekge ya gugalucha wiganiki bokwe munhu alinayo Sekge ya guleka wiganiki nulu kahayile kakwe na buzunya bokwe, yaya gwingililwa.\nBuli munhu alinayo Sekge ya kubi na gufunya miganiko gakwe na gugayomba miganiko genayo na nduhu gwingililwa. Munhu alinayo Sekge ya gwinhwa miganiko ga bangi gubitila mu bandiki na bahayi ba mihayo.\nBuli munhu abize na wisunhya mu milimo yakwe na manongho gakwe apandike mu wisunhya bokwe.\nbuli munhu alinyo Sekge ya sele mu Luganda lokwe na mahanga agose."
+}
diff --git a/lang/languages/suk/language.textproto b/lang/languages/suk/language.textproto
deleted file mode 100644
index 161105636..000000000
--- a/lang/languages/suk/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "suk"
-name: "Sukuma"
-preferred_name: ""
-autonym: "Kɪsukuma"
-population: 5094093
-region: "TZ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z Ɪ a b c d e f g h i j k l m n o p r s t u v w y z \' ɪ"
-}
diff --git a/lang/languages/suk/sampletext.textproto b/lang/languages/suk/sampletext.textproto
deleted file mode 100644
index 783c4d2ea..000000000
--- a/lang/languages/suk/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "suk"
diff --git a/lang/languages/sus.textproto b/lang/languages/sus.textproto
new file mode 100644
index 000000000..72d4f6192
--- /dev/null
+++ b/lang/languages/sus.textproto
@@ -0,0 +1,23 @@
+id: "sus"
+name: "Susu"
+preferred_name: ""
+autonym: "Sosoxi"
+population: 1378014
+region: "GN"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E Ɛ F G H I K X L M N Ɲ O Ɔ P R S T U W Y a b d e ɛ f g h i k x l m n ɲ o ɔ p r s t u w y"
+}
+sample_text {
+  masthead_full: "AaDd"
+  masthead_partial: "Mm"
+  tester: "A kolon fera, ibunadama xa lasiriya nun axa adamaya xafe rafalɛ"
+  poster_sm: "A kolon fera,"
+  poster_md: "A kolon fera"
+  poster_lg: "Adamadie"
+  specimen_48: "A kolon fera a birin lanmafe nara yi sariyɛe nun yi yɛtɛra lui"
+  specimen_36: "Awayibiyaxi ibunadama xafe xa yaxandi alaxinɛra, alankɛnɛmaya kiti banxi tinxinyira, ayo nun ayalagi waxan naba."
+  specimen_32: "A kolon fera, ibunadama xa lasiriya nun axa adamaya xafe rafalɛ non findixi yɛtɛralui tigitigira, a bara masen won bɛ, a tinxinyi nun bɔɲɛ sa bara sɛnbɛ sɔtɔ dunuya birin kui."
+  specimen_21: "A kolon fera, ibunadama xa lasiriya nun axa adamaya xafe rafalɛ non findixi yɛtɛralui tigitigira, a bara masen won bɛ, a tinxinyi nun bɔɲɛ sa bara sɛnbɛ sɔtɔ dunuya birin kui.\nA kolon fera, adamaya xafe sariyɛe mu mabanbanxi han to i bunadama yira, nafe naniɲɛ xi funmalaya, gere, gbaloe nun misikinɛ ya mu ɲɔnma. Kɔnɔ xabirin bara na sariyɛe ratinmɛ, gbaloe ɲɔnmanɛ, gere ɲɔn, funmalaya nun misikinɛ ya ɲɔn. I bunadamaya bara rasabati natɛ mui."
+  specimen_16: "A kolon fera, ibunadama xa lasiriya nun axa adamaya xafe rafalɛ non findixi yɛtɛralui tigitigira, a bara masen won bɛ, a tinxinyi nun bɔɲɛ sa bara sɛnbɛ sɔtɔ dunuya birin kui.\nA kolon fera, adamaya xafe sariyɛe mu mabanbanxi han to i bunadama yira, nafe naniɲɛ xi funmalaya, gere, gbaloe nun misikinɛ ya mu ɲɔnma. Kɔnɔ xabirin bara na sariyɛe ratinmɛ, gbaloe ɲɔnmanɛ, gere ɲɔn, funmalaya nun misikinɛ ya ɲɔn. I bunadamaya bara rasabati natɛ mui.\nA kolon fera, adamaya xafe rafalɛ sariyɛe rasabatife findixi fe fanyi nan na, alanma ibunadamaya xun xa magaga mangɛ sanyi sariyɛla yira."
+}
diff --git a/lang/languages/sus/language.textproto b/lang/languages/sus/language.textproto
deleted file mode 100644
index 832ced78d..000000000
--- a/lang/languages/sus/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "sus"
-name: "Susu"
-preferred_name: ""
-autonym: "Sosoxi"
-population: 1378014
-region: "GN"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E Ɛ F G H I K X L M N Ɲ O Ɔ P R S T U W Y a b d e ɛ f g h i k x l m n ɲ o ɔ p r s t u w y"
-}
diff --git a/lang/languages/sus/sampletext.textproto b/lang/languages/sus/sampletext.textproto
deleted file mode 100644
index 9db046f80..000000000
--- a/lang/languages/sus/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sus"
diff --git a/lang/languages/sv.textproto b/lang/languages/sv.textproto
new file mode 100644
index 000000000..59998be56
--- /dev/null
+++ b/lang/languages/sv.textproto
@@ -0,0 +1,31 @@
+id: "sv"
+name: "Swedish"
+preferred_name: ""
+autonym: "Svenska"
+population: 12932871
+region: "AX"
+region: "DK"
+region: "FI"
+region: "SE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Ä Å É Ë Ö Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à á ä å é ë ö ü"
+  auxiliary: "á â ã ā ç è ë í î ï ī ñ ó ú ÿ ü æ ø"
+  marks: "◌̀ ◌́ ◌̈ ◌̊"
+  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö"
+}
+sample_text {
+  masthead_full: "AaLl"
+  masthead_partial: "Mm"
+  tester: "Enär erkännandet av det inneboende värdet hos alla medlemmar"
+  poster_sm: "enär det är"
+  poster_md: "enär det"
+  poster_lg: "Alla"
+  specimen_48: "enär Förenta Nationernas folk i stadgan ånyo uttryckt sin tro"
+  specimen_36: "enär det är väsentligt att främja utvecklandet av vänskapliga förbindelser mellan nationerna,\nkungör\nGENERALFÖRSAMLINGEN"
+  specimen_32: "Enär erkännandet av det inneboende värdet hos alla medlemmar av människosläktet och av deras lika och oförytterliga rättigheter är grundvalen för frihet, rättvisa och fred i världen,"
+  specimen_21: "Enär erkännandet av det inneboende värdet hos alla medlemmar av människosläktet och av deras lika och oförytterliga rättigheter är grundvalen för frihet, rättvisa och fred i världen,\nenär ringaktning och förakt för de mänskliga rättigheterna lett till barbariska gärningar, som upprört mänsklighetens samvete, och enär skapandet av en värld, där människorna åtnjuta yttrandefrihet, trosfrihet samt frihet från fruktan och nöd, kungjorts som folkens högsta strävan,"
+  specimen_16: "Enär erkännandet av det inneboende värdet hos alla medlemmar av människosläktet och av deras lika och oförytterliga rättigheter är grundvalen för frihet, rättvisa och fred i världen,\nenär ringaktning och förakt för de mänskliga rättigheterna lett till barbariska gärningar, som upprört mänsklighetens samvete, och enär skapandet av en värld, där människorna åtnjuta yttrandefrihet, trosfrihet samt frihet från fruktan och nöd, kungjorts som folkens högsta strävan,\nenär det är väsentligt för att icke människan skall tvingas att som en sista utväg tillgripa uppror mot tyranni och förtryck, att de mänskliga rättigheterna skyddas genom lagens överhöghet,"
+}
diff --git a/lang/languages/sv/language.textproto b/lang/languages/sv/language.textproto
deleted file mode 100644
index acd14c1ea..000000000
--- a/lang/languages/sv/language.textproto
+++ /dev/null
@@ -1,18 +0,0 @@
-id: "sv"
-name: "Swedish"
-preferred_name: ""
-autonym: "Svenska"
-population: 12932871
-region: "FI"
-region: "SE"
-region: "DK"
-region: "AX"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Ä Å É Ë Ö Ü a b c d e f g h i j k l m n o p q r s t u v w x y z à á ä å é ë ö ü"
-  auxiliary: "á â ã ā ç è ë í î ï ī ñ ó ú ÿ ü æ ø"
-  marks: "◌̀ ◌́ ◌̈ ◌̊"
-  numerals: "  , % ‰ + − 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö"
-}
diff --git a/lang/languages/sv/sampletext.textproto b/lang/languages/sv/sampletext.textproto
deleted file mode 100644
index 04b2c6157..000000000
--- a/lang/languages/sv/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sv"
diff --git a/lang/languages/sw.textproto b/lang/languages/sw.textproto
new file mode 100644
index 000000000..59f5ec6c4
--- /dev/null
+++ b/lang/languages/sw.textproto
@@ -0,0 +1,35 @@
+id: "sw"
+name: "Swahili"
+preferred_name: "Swahili"
+autonym: "Kiswahili"
+population: 171610296
+region: "BI"
+region: "CD"
+region: "KE"
+region: "MZ"
+region: "SO"
+region: "TZ"
+region: "UG"
+region: "YT"
+region: "ZA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z a b c d e f g h i j k l m n o p r s t u v w y z"
+  auxiliary: "c q x"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ , ; \\: ! ? . \' \" ( ) \\[ \\] \\{ \\}"
+  index: "A B {CH} D E F G H I J K L M N O P R S T U V W Y Z"
+}
+sample_text {
+  masthead_full: "WwAa"
+  masthead_partial: "Tt"
+  tester: "Kwa kuwa kukiri heshima ya asili na haki sawa kwa binadamu wote"
+  poster_sm: "Kwa kuwa ni"
+  poster_md: "Kwa kuwa"
+  poster_lg: "Watu"
+  specimen_48: "Kwa kuwa watu wa Umoja wa Mataifa wamethibitisha tena katika"
+  specimen_36: "Watu wote wamezaliwa huru, hadhi na haki zao ni sawa. Wote wamejaliwa akili na dhamiri, hivyo yapasa watendeane kindugu."
+  specimen_32: "Kila mtu ana haki ya kupumzika na kufanya kazi kwa kiasi cha saa zinazostahili. Pia ana haki ya kupata likizo, kwa vipindi, na kupokea mshahara kama vile angekuwa kazini."
+  specimen_21: "Ni haki kila mtu alindwe na taratibu au kanuni za jamii na zinazohusu mataifa mbalimbali ambazo ndani yake uhuru na haki zilizoelezwa katika Taarifa hii zinaweza kuhifadhiwa barabara.\nHakuna maneno yo yote katika Taarifa hii yanayoweza kubashiriwa kwamba yanaruhusu nchi yo yote, kikundi cha watu au mtu fulani kufanya au kushughulika na jambo lo lote ambalo nia yake ni kuharibu uhuru haki zilizoelezwa humu."
+  specimen_16: "Kwa kuwa kukiri heshima ya asili na haki sawa kwa binadamu wote ndio msingi wa uhuru, haki na amani duniani,\nKwa kuwa kutojali na kudharau haki za binadamu kumeletea vitendo vya kishenzi ambavyo vimeharibu dhamiri ya binadamu na kwa sababu taarifa ya ulimwengu ambayo itawafanya binadamu wafurahie uhuru wao wa kusema, kusadiki na wa kutoogopa cho chote imekwisha kutangazwa kwamba ndio hamu kuu ya watu wote,\nKwa kuwa ni lazima, ili mtu asishurutizwe kuomba msaada kutokana na maasi ya kupinga dhuluma na uonevu, kwamba haki za binadamu ziwe chini ya ulinzi wa sheria,"
+}
diff --git a/lang/languages/sw/language.textproto b/lang/languages/sw/language.textproto
deleted file mode 100644
index 3d1f72143..000000000
--- a/lang/languages/sw/language.textproto
+++ /dev/null
@@ -1,22 +0,0 @@
-id: "sw"
-name: "Swahili"
-preferred_name: "Swahili"
-autonym: "Kiswahili"
-population: 171610296
-region: "UG"
-region: "SO"
-region: "KE"
-region: "TZ"
-region: "BI"
-region: "MZ"
-region: "YT"
-region: "ZA"
-region: "CD"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z a b c d e f g h i j k l m n o p r s t u v w y z"
-  auxiliary: "c q x"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ , ; \\: ! ? . \' \" ( ) \\[ \\] \\{ \\}"
-  index: "A B {CH} D E F G H I J K L M N O P R S T U V W Y Z"
-}
diff --git a/lang/languages/sw/sampletext.textproto b/lang/languages/sw/sampletext.textproto
deleted file mode 100644
index 1e1d063d7..000000000
--- a/lang/languages/sw/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "sw"
diff --git a/lang/languages/swb.textproto b/lang/languages/swb.textproto
new file mode 100644
index 000000000..11fa8a068
--- /dev/null
+++ b/lang/languages/swb.textproto
@@ -0,0 +1,24 @@
+id: "swb"
+name: "Comorian"
+preferred_name: ""
+autonym: "شِكُمُرِ"
+population: 170720
+region: "YT"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z a b c d e f g h i j k l m n o p r s t u v w y z"
+  marks: "◌َ ◌ُ ◌ِ ◌ّ"
+}
+sample_text {
+  masthead_full: "WwAa"
+  masthead_partial: "Nn"
+  tester: "Ha uwafiki amba mukuɓalio wa sheo wahuswiana na watru piya wapanga"
+  poster_sm: "Ha uwafiki"
+  poster_md: "Liɓaraza"
+  poster_lg: "Wanadamu"
+  specimen_48: "Wanadamu piya udzalwa huru tsena sawa ha ufahari na ha haki. Na"
+  specimen_36: "Kavhusi mutru atsopatsiwawo zitriko, wala udziro au maendreleo mbovu, maendreleo tsi ya shi ɓinadamu au ya udili."
+  specimen_32: "Kula mutru ana haki ya uvumuzi na ya malangadzo,  hususwani haki ya mupaka wasitahiki wapatana  nyakati za hazi, na haki ya uvumuzi wa muda ulivishihao."
+  specimen_21: "Kula mutru ana haki ya ufanya namna ata vhuɓuhe maendreleo yatsotawalao, hari mwa uvhandre wa  udjama, na uvhandre wa shi ulemengu, ile zihaki  zinafasi zavumbulwa hari mwa Mutekelezeo unu zishindre zipare ɓandza.\nKavhusi ata tartiɓu moja ya Mutekelezeo unu  ifasiriwe uvandre wa Daula, shikao, au  mauri idzitria hari mwa haki itsokao yotsi ya udzivha  hazi au ya ufanya shitendrwa ikao amba  yayo ɗe ukomoa zihaki na zinafasi zadhukurulwa moni vhanu."
+  specimen_16: "Ha uwafiki amba mukuɓalio wa sheo wahuswiana na watru piya wapanga udjama wa shi ɓinadamu, na wa zihaki zao zilio sawa wala kazitriliha rahani, urendreha ɗe musingi wa unafasi,na wa haki, na wa amani hari mwa lidunia ;\nHa uwafiki amba muharalio na mupuzisio wa zihaki za mwanadamu zitsongesha mufanyishio wa zitrendrwa za shi ukatili zikao amba zitsotso fikira ya unadamu, arudi mujilio wa ulemengu ukao amba ziumbe ɓinadamu watsokana nafasi ya ulagua na ya uamini, amba wapukamana na trisidzo na usikini, ɓasi mujilio uwo utrangiziwa mauri ɗe mataradjio maɓole kaɓisa ya mwanadamu ;"
+}
diff --git a/lang/languages/swb/language.textproto b/lang/languages/swb/language.textproto
deleted file mode 100644
index aaaca6ac0..000000000
--- a/lang/languages/swb/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "swb"
-name: "Comorian"
-preferred_name: ""
-autonym: "شِكُمُرِ"
-population: 170720
-region: "YT"
-script: "Perso-Arabic"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z a b c d e f g h i j k l m n o p r s t u v w y z"
-  marks: "◌َ ◌ُ ◌ِ ◌ّ"
-}
diff --git a/lang/languages/swb/sampletext.textproto b/lang/languages/swb/sampletext.textproto
deleted file mode 100644
index 6d7b4b127..000000000
--- a/lang/languages/swb/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "swb"
diff --git a/lang/languages/swg/language.textproto b/lang/languages/swg.textproto
similarity index 74%
rename from lang/languages/swg/language.textproto
rename to lang/languages/swg.textproto
index edf848fff..6b810b96f 100644
--- a/lang/languages/swg/language.textproto
+++ b/lang/languages/swg.textproto
@@ -7,3 +7,6 @@ region: "DE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/swv/language.textproto b/lang/languages/swv.textproto
similarity index 76%
rename from lang/languages/swv/language.textproto
rename to lang/languages/swv.textproto
index 98a813c29..c1cf27633 100644
--- a/lang/languages/swv/language.textproto
+++ b/lang/languages/swv.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/sxn/language.textproto b/lang/languages/sxn.textproto
similarity index 74%
rename from lang/languages/sxn/language.textproto
rename to lang/languages/sxn.textproto
index 45751024d..0e70fed66 100644
--- a/lang/languages/sxn/language.textproto
+++ b/lang/languages/sxn.textproto
@@ -7,3 +7,6 @@ region: "ID"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/syl/language.textproto b/lang/languages/syl.textproto
similarity index 76%
rename from lang/languages/syl/language.textproto
rename to lang/languages/syl.textproto
index 682ed4a88..23b1f0ba8 100644
--- a/lang/languages/syl/language.textproto
+++ b/lang/languages/syl.textproto
@@ -8,3 +8,6 @@ region: "GB"
 script: "Bangla"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "bn"
+}
diff --git a/lang/languages/syr/language.textproto b/lang/languages/syr.textproto
similarity index 76%
rename from lang/languages/syr/language.textproto
rename to lang/languages/syr.textproto
index 640f45ede..29b4cee09 100644
--- a/lang/languages/syr/language.textproto
+++ b/lang/languages/syr.textproto
@@ -8,3 +8,6 @@ region: "SY"
 script: "Syriac"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "syr"
+}
diff --git a/lang/languages/szl/language.textproto b/lang/languages/szl.textproto
similarity index 89%
rename from lang/languages/szl/language.textproto
rename to lang/languages/szl.textproto
index 95085d3c2..c79c42338 100644
--- a/lang/languages/szl/language.textproto
+++ b/lang/languages/szl.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ć Č Ń Ř Ś Š Ů Ź Ż Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ć č ń ř ś š ů ź ż ž"
   marks: "◌́ ◌̇ ◌̊ ◌̌"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ta.textproto b/lang/languages/ta.textproto
new file mode 100644
index 000000000..86573940c
--- /dev/null
+++ b/lang/languages/ta.textproto
@@ -0,0 +1,33 @@
+id: "ta"
+name: "Tamil"
+preferred_name: ""
+autonym: "தமிழ்"
+population: 83327102
+region: "IN"
+region: "LK"
+region: "MU"
+region: "MY"
+region: "RE"
+region: "SG"
+script: "Tamil"
+exemplar_chars {
+  base: "அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ ஃ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன ஜ ஶ ஷ ஸ ஹ"
+  auxiliary: "\\u200C\\u200D"
+  marks: "◌ா ◌ி ◌ீ ◌ு ◌ூ ◌ெ ◌ே ◌ை ◌் ◌ௗ"
+  numerals: "0 ௧ ௨ ௩ ௪ ௫ ௬ ௭ ௮ ௯ ௰ ௱ ௲ 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன"
+}
+sample_text {
+  masthead_full: "மனதப"
+  masthead_partial: "றவ"
+  tester: "மனிதக் குடும்பத்தினைச் சேர்ந்த யாவரதும் உள்ளார்ந்த மரியாதையையும், அவர்கள் யாவரதும் சமமான, மாற்றத்திற்குட்படுத்த"
+  poster_sm: "நாடுகளிடையேயான நட்புறவை"
+  poster_md: "ஐக்கிய நாடுகள்"
+  poster_lg: "மனிதப்"
+  specimen_48: "மனித உரிமைகள், அடிப்படைச் சுதந்திரங்களுக்கான உலக மதிப்பையும், அவற்றைப் பின்பற்றுதலை மேம்படுத்தலையும்,"
+  specimen_36: "எவரும், அடிமையாக வைத்திருக்கப்படுதலோ அல்லது அடிமைப்பட்ட நிலையில் வைத்திருக்கப்படுதலோ ஆகாது; அடிமை நிலையும் அடிமை வியாபாரமும் அவற்றில் எல்லா வகைகளிலும் தடைசெய்யப்படுதல் வேண்டும்."
+  specimen_32: "அவர்களது உரிமைகள், கடப்பாடுகள் பற்றியும் அவர்களுக்கெதிராகவுள்ள குற்றவியல் குற்றச்சாட்டுக்கள் பற்றியும் தீர்மானிப்பதற்குச் சார்பற்ற நடுநிலை தவறாத தீர்ப்பாயத்தினால் செய்யப்படும் நடுநிலையான வெளிப்படையான விசாரணைக்கு ஒவ்வொருவரும் உரிமையுடையவர்களாவர்."
+  specimen_21: "ஒவ்வொருவரும் அவ்வவரது தனிமைத்துவம், குடும்பம், வீடு அல்லது தொடர்புகள் என்பவை சம்பந்தமாக, ஒருதலைப்பட்ட மனப்போக்கான வகையில் தலையிடப்படுவதற்கோ அல்லது அவரது மரியாதை, நன்மதிப்பு என்பவற்றின் மீதான தாக்குதல்களுக்கோ உட்படுத்தலாகாது. அத்தகைய தலையீட்டுக்கு அல்லது தாக்குதல்களுக்கெதிராக ஒவ்வொருவரும் சட்டப் பாதுகாப்புக்கு உரிமையுடையவராவர்.\nசிந்தனைச் சுதந்திரம், மனச்சாட்சிச் சுதந்திரம், மதச் சுதந்திரம் என்பவற்றுக்கு ஒவ்வொருவருக்கும் உரிமையுண்டு. இவ்வுரிமையினுள் ஒருவர் தமது மதத்தை அல்லது நம்பிக்கையை மாற்றுவதற்கான சுதந்திரமும், போதனை, பயில்நெறி, வழிபாடு, பின்பற்றுதல் என்பன மூலமும் தத்தமது மதத்தை அல்லது நம்பிக்கையைத் தனியாகவும், வேறொருவருடன் கூடியும், வெளிப்படையாகவும் தனிப்பட்ட முறையிலும் வெளிப்படுத்துவதற்கான சுதந்திரமும் அடங்கும்."
+  specimen_16: "கருத்துச் சுதந்திரத்துக்கும் பேச்சுச் சுதந்திரத்துக்கும் எவருக்கும் உரிமையுண்டு. இவ்வுரிமையானது தலையீடின்றிக் கருத்துகளைக் கொண்டிருத்தற்கும், எவ்வூடகம் மூலமும் எல்லைகளைப் பொருட்படுத்தாமலும் தகவலையும் கருத்துக்களையும் நாடுவதற்கும் பெறுவதற்கும் பரப்புவதற்குமான சுதந்திரத்தையும் உள்ளடக்கும்.\nசமுதாயத்தின் உறுப்பினர் என்ற முறையில் ஒவ்வொருவரும் சமூகப் பாதுகாப்புக்கு உரிமையுடையவர். அத்துடன் நாடளாவிய முயற்சி மூலமும் சர்வதேச ஒத்துழைப்பு மூலமும் ஒவ்வொரு நாட்டினதும் அமைப்பு முறைக்கும் வளங்களுக்கும் இயைவான வகையில் ஒவ்வொருவரும் தத்தம் மதிப்புக்கும் தத்தம் ஆளுமையைச் சுதந்திரமான முறையில் வளர்ப்பதற்கும் இன்றியமையாதனவாக வேண்டப்பெறும் பொருளாதார சமூக பண்பாட்டு உரிமைகளைப் பெறுவதற்கும் உரித்துடையவராவர்.\nஇளைப்பாறுகைக்கும், ஓய்விற்கும் ஒவ்வொருவரும் உரிமையுடையர். இதனுள் வேலை நேர வரையறை, ஊதியத்துடனான முறைப்பட்ட விடுமுறைகள் அடங்கும்.\nஇப்பிரகடனத்தில் எடுத்துக் காட்டப்பட்டுள்ள உரிமைகளும் சுதந்திரங்களும் முழுமையாக எய்தப்படக்கூடிய சமூக, சர்வதேச அமைப்பு முறைமைக்கு ஒவ்வொருவரும் உரித்துடையவராவர்."
+}
diff --git a/lang/languages/ta/language.textproto b/lang/languages/ta/language.textproto
deleted file mode 100644
index 69e0c0548..000000000
--- a/lang/languages/ta/language.textproto
+++ /dev/null
@@ -1,20 +0,0 @@
-id: "ta"
-name: "Tamil"
-preferred_name: ""
-autonym: "தமிழ்"
-population: 83327102
-region: "MU"
-region: "MY"
-region: "RE"
-region: "LK"
-region: "SG"
-region: "IN"
-script: "Tamil"
-exemplar_chars {
-  base: "அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ ஃ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன ஜ ஶ ஷ ஸ ஹ"
-  auxiliary: "\\u200C\\u200D"
-  marks: "◌ா ◌ி ◌ீ ◌ு ◌ூ ◌ெ ◌ே ◌ை ◌் ◌ௗ"
-  numerals: "0 ௧ ௨ ௩ ௪ ௫ ௬ ௭ ௮ ௯ ௰ ௱ ௲ 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன"
-}
diff --git a/lang/languages/ta/sampletext.textproto b/lang/languages/ta/sampletext.textproto
deleted file mode 100644
index deb5ebd2c..000000000
--- a/lang/languages/ta/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ta"
diff --git a/lang/languages/taj/language.textproto b/lang/languages/taj.textproto
similarity index 91%
rename from lang/languages/taj/language.textproto
rename to lang/languages/taj.textproto
index 6b186e715..7a74614a4 100644
--- a/lang/languages/taj/language.textproto
+++ b/lang/languages/taj.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "༠ ༡ ༢ ༣ ༤ ༥ ༦ ༧ ༨ ༩"
   punctuation: "༄ ༈ ་ ། ༎ ༔ ༺ ༻"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/tbw/language.textproto b/lang/languages/tbw.textproto
similarity index 74%
rename from lang/languages/tbw/language.textproto
rename to lang/languages/tbw.textproto
index d781c9a67..8ac19fdef 100644
--- a/lang/languages/tbw/language.textproto
+++ b/lang/languages/tbw.textproto
@@ -7,3 +7,6 @@ region: "PH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/tcy/language.textproto b/lang/languages/tcy.textproto
similarity index 74%
rename from lang/languages/tcy/language.textproto
rename to lang/languages/tcy.textproto
index 73b25e2a6..483c84581 100644
--- a/lang/languages/tcy/language.textproto
+++ b/lang/languages/tcy.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Kannada"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "kn"
+}
diff --git a/lang/languages/tdd/language.textproto b/lang/languages/tdd.textproto
similarity index 74%
rename from lang/languages/tdd/language.textproto
rename to lang/languages/tdd.textproto
index 735b4e33d..a67020174 100644
--- a/lang/languages/tdd/language.textproto
+++ b/lang/languages/tdd.textproto
@@ -7,3 +7,6 @@ region: "CN"
 script: "Tai Le"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "tdd"
+}
diff --git a/lang/languages/tdg/language.textproto b/lang/languages/tdg.textproto
similarity index 76%
rename from lang/languages/tdg/language.textproto
rename to lang/languages/tdg.textproto
index 0dcad36e7..b27bbde30 100644
--- a/lang/languages/tdg/language.textproto
+++ b/lang/languages/tdg.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/tdh/language.textproto b/lang/languages/tdh.textproto
similarity index 75%
rename from lang/languages/tdh/language.textproto
rename to lang/languages/tdh.textproto
index ead500e0b..a19293b94 100644
--- a/lang/languages/tdh/language.textproto
+++ b/lang/languages/tdh.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/te.textproto b/lang/languages/te.textproto
new file mode 100644
index 000000000..443b1e8c5
--- /dev/null
+++ b/lang/languages/te.textproto
@@ -0,0 +1,28 @@
+id: "te"
+name: "Telugu"
+preferred_name: ""
+autonym: "తెలుగు"
+population: 95478480
+region: "IN"
+script: "Telugu"
+exemplar_chars {
+  base: "అ భ ఇ ఉ ఋ ఌ ఎ ఐ ఒ ఔ ఆ ఈ ఊ ౠ ౡ ఏ ఓ క ఖ గ ఘ ఙ చ ఛ జ ఝ ఞ ట ఠ డ ఢ ణ త థ ద ధ న ప ఫ బ మ య ర ల వ ళ శ ష స హ ఱ"
+  auxiliary: "\\u200C\\u200D ౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯"
+  marks: "◌ఁ ◌ం ◌ః ◌ా ◌ి ◌ీ ◌ు ◌ూ ◌ృ ◌ౄ ◌ె ◌ే ◌ొ ◌ో ◌ౌ ◌్ ◌ౖ ◌ౢ ◌ౣ"
+  numerals: "౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯ ౸ ౹ ౺ ౻ ౼ ౽ ౾"
+  punctuation: "\\- ‑ , ; \\: ! ? . \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\}"
+  index: "అ ఆ ఇ ఈ ఉ ఊ ఋ ౠ ఎ ఏ ఐ ఒ ఓ ఔ క ఖ గ ఘ ఙ చ ఛ జ ఝ ఞ ట ఠ డ ఢ ణ త థ ద ధ న ప ఫ బ భ మ య ర ఱ ల వ శ ష స హ ళ"
+}
+sample_text {
+  masthead_full: "పరతస"
+  masthead_partial: "వమ"
+  tester: "మానవకుటంబమునందలి వ్యక్తులందరికిని గల ఆజన్మసిద్ధమైన ప్రతిపత్తిని, అనన్యాక్రాంతములగు సమానస్వత్వములను"
+  poster_sm: "మానవజాతి అంతఃకరణమును"
+  poster_md: "రాష్ట్రముల మధ్య"
+  poster_lg: "విషయమున"
+  specimen_48: "మానవుల మూలస్వత్వముల యందును, వ్యక్తుల ప్రతిపత్తి యోగ్యతలయందును, స్త్రీపురుషులకు గల సమాన స్వత్వములయందును,"
+  specimen_36: "సంవిధానముచే గాని విధిచే గాని యోసగబడిన మూలస్వత్వములను వ్యతిక్రమించు కార్యముల విషయమున, సమర్థమగు రాష్ట్రీయ న్యాయాధికరణ సభచే ఫలప్రదమగు ప్రతిక్రియను పొందుటకు, ప్రతి వ్యక్తికిని హక్కు గలదు."
+  specimen_32: "ప్రతి వ్యక్తికిని, అతని స్వత్వములయోక్కయు ఆభారముయొక్కయు నిర్ణయమునందును, అతనిపైనున్న ఏ దోషారోపణయొక్క నిర్ణయమునందును, స్వతంత్రము, నిష్పక్షపాతమునగు న్యాయాధికరణ సభ యెదుట, న్యాయము, బహిరంగము నగు విచారణను పొందుటకు సమానమగు సమగ్రస్వత్వము కలదు."
+  specimen_21: "ఆంతరంగిక, కుటుంబ, గృహ, లేఖావ్యవహారములలో, విధి విరుద్ధమయిన జోక్యమునకుగాని, గౌరవప్రతిష్థలను భంగపరచు ప్రచారములకుగాని యెవరిని గురిచేయరాదు. అట్టి జోక్యము నుండియు, ఆ ప్రచారముల నుండియు విధి ద్వారా పరిరక్షింపబడుటకు ప్రతి యొక్కరికిని హక్కు గలదు.\nప్రతి వ్యక్తికిని భావస్వాతంత్ర్య, అంతఃకరణస్వాతంత్ర్య, మతస్వాతంత్ర్యములకు హక్కు గలదు. తన మతమును ప్రత్యయమును మార్చుకొనుటయును, ఒంటరిగ గాని, సాంఘికముగ గాని, బహిరంగముగను, ఆంతరంగికముగను ఉపదేశ, అనుష్ఠాన, ఆరాధన, ఆచరణలచే తన మతప్రత్యయములను వ్యక్తీకరించుటయును, ఈ హక్కులో నిమిదియున్నవి."
+  specimen_16: "ప్రతి వ్యక్తికిని అభిప్రాయస్వాతంత్ర్యమునకును, భావ ప్రకటన స్వాతంత్ర్యమునకును, హక్కు గలదు. పరుల జోక్యము లేక, స్వాభిప్రాయమును గలిగియుండుటకు స్వాతంత్ర్యమును, రాజ్యసీమానిరపేక్షముగా, నెట్టి మధ్యస్థ మార్గముననైన సమాచార, సంసూచనలను అన్వేషించుటకు, పొందుటకు, ఉపపాదించుటకు, స్వాతంత్ర్యమును ఈ హక్కులో నిమిదియున్నవి.\nసంఘమునందలి సభ్యుడుగా, ప్రతి వ్యక్తికిని సామాజిక రక్షకు హక్కు గలదు. రాష్ట్రీయ ప్రయత్న, అంతర్ రాష్ట్రీయ సహకారముల ద్వారా, ప్రతి రాజ్యముయొక్కయు వ్యవస్థాపనా సాధన సామగ్రి ననుసరించి, తన ప్రతిపత్తికిని తన వ్యక్తిత్వముయొక్క స్వేచ్ఛాభివృద్ధికిని అత్యావశ్యకములయిన, ఆర్థిక , సాంఘిక, సాంస్కృతిక స్వత్వముల సంపాదనకు అతనికి అధికారము గలదు.\nపని కాలము యొక్క యుక్తపరిమితత్వమునకును, వేతన సహితములగు నియతకాలికములయిన సెలవు దినములకును, విశ్రాంతి విరామములకును, ప్రతి వ్యక్తికిని హక్కు గలదు.\nఈ ప్రకటన యందు పొందుపరుపబడియున్న స్వత్వ స్వాతంత్ర్యములు సంపూర్ణముగా సిద్ధింపగల ఒక సాంఘిక అంతర్ -రాష్ట్రీయవ్యవస్థకు, ప్రతి వ్యక్తికి నధికారము గలదు."
+}
diff --git a/lang/languages/te/language.textproto b/lang/languages/te/language.textproto
deleted file mode 100644
index 92bc5d6bf..000000000
--- a/lang/languages/te/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "te"
-name: "Telugu"
-preferred_name: ""
-autonym: "తెలుగు"
-population: 95478480
-region: "IN"
-script: "Telugu"
-exemplar_chars {
-  base: "అ భ ఇ ఉ ఋ ఌ ఎ ఐ ఒ ఔ ఆ ఈ ఊ ౠ ౡ ఏ ఓ క ఖ గ ఘ ఙ చ ఛ జ ఝ ఞ ట ఠ డ ఢ ణ త థ ద ధ న ప ఫ బ మ య ర ల వ ళ శ ష స హ ఱ"
-  auxiliary: "\\u200C\\u200D ౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯"
-  marks: "◌ఁ ◌ం ◌ః ◌ా ◌ి ◌ీ ◌ు ◌ూ ◌ృ ◌ౄ ◌ె ◌ే ◌ొ ◌ో ◌ౌ ◌్ ◌ౖ ◌ౢ ◌ౣ"
-  numerals: "౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯ ౸ ౹ ౺ ౻ ౼ ౽ ౾"
-  punctuation: "\\- ‑ , ; \\: ! ? . \' ‘ ’ \" “ ” ( ) \\[ \\] \\{ \\}"
-  index: "అ ఆ ఇ ఈ ఉ ఊ ఋ ౠ ఎ ఏ ఐ ఒ ఓ ఔ క ఖ గ ఘ ఙ చ ఛ జ ఝ ఞ ట ఠ డ ఢ ణ త థ ద ధ న ప ఫ బ భ మ య ర ఱ ల వ శ ష స హ ళ"
-}
diff --git a/lang/languages/te/sampletext.textproto b/lang/languages/te/sampletext.textproto
deleted file mode 100644
index 336512381..000000000
--- a/lang/languages/te/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "te"
diff --git a/lang/languages/tem.textproto b/lang/languages/tem.textproto
new file mode 100644
index 000000000..2110e3e70
--- /dev/null
+++ b/lang/languages/tem.textproto
@@ -0,0 +1,23 @@
+id: "tem"
+name: "Timne"
+preferred_name: ""
+autonym: "KʌThemnɛ"
+population: 1722481
+region: "SL"
+script: "Latin"
+exemplar_chars {
+  base: "A Ʌ B D E Ɛ Ə F G H I K L M N Ŋ O Ɔ P R S T U W a ʌ b d e ɛ ə f g h i k l m n ŋ o ɔ p r s t u w"
+}
+sample_text {
+  masthead_full: "AaKk"
+  masthead_partial: "Oo"
+  tester: "Ɔwa ta salata kʌsɔthnɛ ʌyiki a komʌnɛ aŋ fəm akəpet, ɔwa yi ʌmari"
+  poster_sm: "Ɔwa, kʌ kʌlʌ"
+  poster_md: "Ɔwa a yi"
+  poster_lg: "kom"
+  specimen_48: "Ɔwa rokɔm kati bɛ tʌthɔf ʌte yi ka ʌŋnənki aŋe, təsɔnɛ kəpa, tʌ"
+  specimen_36: "Wuni o wuni ɔ ba ʌmari kʌmʌ a thonkanɛ kɔ ta bepi wuni o wuni ɔ kʌthi kɔ ʌmari mɔŋ ka rəwuni kəpet kətaŋʌnɛ ka ʌŋ thɔ."
+  specimen_32: "A yi təkə sɔŋ wuni o wuni ʌfɛrɛ ʌthənʌnɛ suʌ kɔ ɛləŋs ka ʌŋbare ŋa ʌŋthonkas gberkethe mə te yɔ ʌgbʌy ka kʌgbɛngbɛn ʌmari mɔŋ yi ʌŋgbɛthɛ ŋɔŋ, yi mʌləs thalɔm tʌləs a pa tɔ yɔ‐e."
+  specimen_21: "A yɛ təkə bot kəsəŋ ka ʌŋgbundu, ʌŋbɔnshɔ, mʌyirʌ thalɔm ʌte mɔ gbal, ɔwa kəsambos ayiki tɔŋ yi ʌŋes ŋɔ ʌfinɔ. Ɔwa wuni o wuni ba ʌmari ma kʌ yɔ ʌŋthɔ ʌŋ chimʌ kɔ ka ʌŋe mə bot kɔ kəsəŋ‐e.\nWuni o wuni ɔ ba ʌmari ma rʌwankom ra kʌtəmtəmnɛ to ɔ yema, ɛnanɛ yɔŋ yi ʌŋdina ɔ yema wop‐e. Wa ɔ ba ʌmari ma kʌshinkar ʌŋdina ɔ yema, yi mʌlanɛ mɔŋ. Ɔwa ɔ ba rʌwankom ra kʌthəksʌ, kʌbʌtho, kʌtaŋʌŋɛ yi kəthəksʌ mʌlanɛ mɔŋ pəyi kɔŋ son‐o, ka ʌkələŋ kələŋ yi afəm alɔm‐o, dɛr ɔgberkethe‐o, thalɔm ka ʌŋ gbundu ŋɔŋ."
+  specimen_16: "Wuni o wuni ɔ ba rʌwankom ra ʌte ɔ təmʌ yi kʌfɔf ʌte ɔ yema‐e. Ɔwa rʌwankom ʌre ɔ ba ri təkə bət ʌte ɔ nanɛ kə tə bot kɔ kə səŋ yi kəthɛns, thalɔm kəsakəthi təra yi ɛtəmtəmnɛ də roŋ o roŋ kə təkəlɛnɛ ro ɔ yi‐e.\nƆwa mʌ pəyi wuni o wuni ɔ yi kətɔŋ ka aŋfəm ʌkəpet‐e, ɔ ba ʌmari ma kʌmʌranɛ kɔ kʌmʌ pəfisa kɔ kətʌŋ ka ɛmar ya aŋthɔf, ɛmar ya tʌthɔf tətel, kətʌŋʌnɛ ka mɔ to ɔ gbəli təmʌ ukolo yi yiki kətɔŋ ka aŋkos ŋɔŋ.\nWuni o wuni ɔ ba ʌmari ma kʌfothanɛ kəwur kʌyɔ mʌpanth to ɔ yema. Ɔwa ɔ ba ʌmari ma kʌsɔŋ kɔ ʌlɔkɔ mɔ fothanɛ ʌlɔkɔ o lɔkɔ.\nƆwa wuni o wuni ɔ ba ʌmari ma kʌtʌŋʌnɛ ʌŋe ɔ yema pəyi ka aŋthɔf ŋɔŋ rəkor‐o, thaɔm rə təthof tətel ro mɔ gbəli sɔthɔ ʌŋfɛrɛ ŋa ka sɔthɔ mʌtʌy ʌme bɛ a gbal ka mʌsekrʌnɛ ʌme ka rʌwʌnkom rɔŋ kəyankaŋ."
+}
diff --git a/lang/languages/tem/language.textproto b/lang/languages/tem/language.textproto
deleted file mode 100644
index ea7949e98..000000000
--- a/lang/languages/tem/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "tem"
-name: "Timne"
-preferred_name: ""
-autonym: "KʌThemnɛ"
-population: 1722481
-region: "SL"
-script: "Latin"
-exemplar_chars {
-  base: "A Ʌ B D E Ɛ Ə F G H I K L M N Ŋ O Ɔ P R S T U W a ʌ b d e ɛ ə f g h i k l m n ŋ o ɔ p r s t u w"
-}
diff --git a/lang/languages/tem/sampletext.textproto b/lang/languages/tem/sampletext.textproto
deleted file mode 100644
index ad6f57a93..000000000
--- a/lang/languages/tem/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tem"
diff --git a/lang/languages/teo/language.textproto b/lang/languages/teo.textproto
similarity index 88%
rename from lang/languages/teo/language.textproto
rename to lang/languages/teo.textproto
index 0b9246ada..9ee8c5c28 100644
--- a/lang/languages/teo/language.textproto
+++ b/lang/languages/teo.textproto
@@ -3,11 +3,14 @@ name: "Teso"
 preferred_name: ""
 autonym: "Ateso"
 population: 2082973
-region: "UG"
 region: "KE"
+region: "UG"
 script: "Latin"
 exemplar_chars {
   base: "A B C D E G H I J K L M N O P R S T U V W X Y Ŋ a b c d e g h i j k l m n o p r s t u v w x y ŋ"
   auxiliary: "F Q Z f q z"
   index: "A B C D E G H I J K L M N O P R S T U V W X Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/tet.textproto b/lang/languages/tet.textproto
new file mode 100644
index 000000000..8dea77e15
--- /dev/null
+++ b/lang/languages/tet.textproto
@@ -0,0 +1,24 @@
+id: "tet"
+name: "Tetum"
+preferred_name: ""
+autonym: "Lia Tetun"
+population: 816394
+region: "TL"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ Á Ó É Í a b c d e f g h i j k l m n o p q r s t u v w x y z ñ á ó é í"
+  marks: "◌́ ◌̃"
+}
+sample_text {
+  masthead_full: "EeMm"
+  masthead_partial: "Aa"
+  tester: "Hanesan hatene tuir dignidade ho direitu ema hotu hanesan membru"
+  poster_sm: "Hanesan la"
+  poster_md: "Hanesan ne\'e"
+  poster_lg: "Ema"
+  specimen_48: "Hanesan importante tebes atu promove desenvolvimentu relasoens"
+  specimen_36: "Ema hotu iha direitu atu simu husin tribunal nasaun nia ha haluk nebe halu at nia direitus, tuir lei ka konstituisaun."
+  specimen_32: "Ema hotu iha direitu hanesan ba tuir julgamentu iha tribunal atu rona ka tesi lian, tribunal tenki independente no mos imparsial, hare nia direitu ho obrigasoens, sala nebe hasoru nia."
+  specimen_21: "Ema ida labele iha interferensia arbitraria ho nia privasidade, familia, uma, corespondensia, ka hatete at ninia onra ho reputasaun. Ema hotu iha direitu atu hetan satan husin lei hasoru iha interferensia ka halu at.\nEma hotu iha direitu ba liberdade ho hanoin, neon ho relijaun, nia direitu iha mos liberdade atu troka nia relijaun, nia fiar, liberdade mesak ka ho komunidade iha publiku ka privadu, hatudu nia relijaun nia fiar iha hanorin, hahaluk loro loron, harohan nor tuir loron bot."
+  specimen_16: "Ema hotu iha direitu ba liberdade ho nia opiniaun, espresaun; direitu ida ne\'e liberdade atu rai nia opiniaun la iha interferensia, atu buka simu, fo informasaun, hanoin, iha media lalika hare ba fatin hela nebe.\nEma hotu hanesan membru sosiedade nia, iha direitu ba seguransa sosial iha realizasaun, husi nasaun nia forsa ka coperasaun internasional, tuir organizasaun ho riku rai idak nia, iha ekonomia, sosial ho direitus kulturais, ba nia dignidade nos mos livre desenvolvimentu ba nia personalidade.\nEma hotu iha direitu atu deskansa ho halimar, tuir oras ba serbisu nia, loron ferias nia ho selu."
+}
diff --git a/lang/languages/tet/language.textproto b/lang/languages/tet/language.textproto
deleted file mode 100644
index f3005ef25..000000000
--- a/lang/languages/tet/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "tet"
-name: "Tetum"
-preferred_name: ""
-autonym: "Lia Tetun"
-population: 816394
-region: "TL"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ Á Ó É Í a b c d e f g h i j k l m n o p q r s t u v w x y z ñ á ó é í"
-  marks: "◌́ ◌̃"
-}
diff --git a/lang/languages/tet/sampletext.textproto b/lang/languages/tet/sampletext.textproto
deleted file mode 100644
index a646026b1..000000000
--- a/lang/languages/tet/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tet"
diff --git a/lang/languages/tg.textproto b/lang/languages/tg.textproto
new file mode 100644
index 000000000..4aaaa6359
--- /dev/null
+++ b/lang/languages/tg.textproto
@@ -0,0 +1,30 @@
+id: "tg"
+name: "Tajik"
+preferred_name: ""
+autonym: "Тоҷикӣ"
+population: 8873670
+region: "TJ"
+script: "Cyrillic"
+script: "Latin"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ч Ш Ъ Э Ю Я Ё Ғ Қ Ҳ Ҷ Ӣ Ӯ а б в г д е ж з и й к л м н о п р с т у ф х ч ш ъ э ю я ё ғ қ ҳ ҷ ӣ ӯ"
+  auxiliary: "ц щ ы ь"
+  marks: "◌̄ ◌̆ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "А Б В Г Ғ Д Е Ё Ж З И Ӣ Й К Қ Л М Н О П Р С Т У Ӯ Ф Х Ҳ Ч Ҷ Ш Ъ Э Ю Я"
+}
+sample_text {
+  masthead_full: "ТтАа"
+  masthead_partial: "Мм"
+  tester: "Бо дарназардошти ин, ки этирофи қадру қимат ба ҳамаи аҳли башар"
+  poster_sm: "Ассамблеяи"
+  poster_md: "давлатҳо"
+  poster_lg: "Тамоми"
+  specimen_48: "Тамоми одамон озод ва аз лиҳози шарафу ҳуқуқ ба ҳам баробар ба"
+  specimen_36: "Ҳеҷ кас набояд дар ғуломӣ ё ҳолати маҷбурӣ нигоҳ дошта шавад; ғуломӣ ва ғуломфурӯшӣ дар ҳамаи навъҳои онҳо маън аст."
+  specimen_32: "Ҳар як инсон дар сурати поймол гардидани ҳуқуқҳои асосии ӯ, ки бо Конститутсия ё қонун пешбинӣ шудаанд, барои барқарорсозии пурраи онҳо аз тарафи судҳои босалоҳияти миллӣ ҳақ дорад."
+  specimen_21: "Ҳеҷ касро худсарона дастгир, ҳабс ё бадарға кардан мумкин нест.\nҲар як инсон барои муайян намудани ҳуқуқу ӯхдадориҳояш ва муқаррар кардани асоснокии айбномаи ҷинояте, ки ба дӯши ӯ гузошта шудааст, ба таври баробарии комил ҳуқуқ дорад, ки парванди ӯро суди мустақилу бетараф ошкоро ва бо риояи талаботи адолат баррасӣ намояд."
+  specimen_16: "Ба ҳаёти шахсӣ ва оилавии ҳеҷ як фард дахолати худсарона намудан ва ба дахлнопазирии манзил, сирри мукотибот, шараф ва обрӯи ӯ худсарона сӯиқасд кардан мумкин нест. Ҳар як инсон ҳуқуқ дорад, ки дар мавриди чунин мудохила ё сӯиқасд аз ҳимояи қонун истифода намояд.\nҲар як инсон ба озодии фикр, виҷдон ва дин ҳуқуқ дорад; ин ҳуқуқ аз тағйири озодонаи дин ва эътиқод, пайравии озодонаи дин ё эътиқоди худ чи бо тартиби инфиродӣ ва чи якҷоя бо дигарон, ба таври оммавӣ ё хусусӣ, дар таълим гирифтан, ибодат намудан ва расму оинҳои динӣ ва маросимиро иҷро кардан иборат аст."
+}
diff --git a/lang/languages/tg/language.textproto b/lang/languages/tg/language.textproto
deleted file mode 100644
index c32230bca..000000000
--- a/lang/languages/tg/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "tg"
-name: "Tajik"
-preferred_name: ""
-autonym: "Тоҷикӣ"
-population: 8873670
-region: "TJ"
-script: "Perso-Arabic"
-script: "Cyrillic"
-script: "Latin"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ч Ш Ъ Э Ю Я Ё Ғ Қ Ҳ Ҷ Ӣ Ӯ а б в г д е ж з и й к л м н о п р с т у ф х ч ш ъ э ю я ё ғ қ ҳ ҷ ӣ ӯ"
-  auxiliary: "ц щ ы ь"
-  marks: "◌̄ ◌̆ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "А Б В Г Ғ Д Е Ё Ж З И Ӣ Й К Қ Л М Н О П Р С Т У Ӯ Ф Х Ҳ Ч Ҷ Ш Ъ Э Ю Я"
-}
diff --git a/lang/languages/tg/sampletext.textproto b/lang/languages/tg/sampletext.textproto
deleted file mode 100644
index 140b6feba..000000000
--- a/lang/languages/tg/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tg"
diff --git a/lang/languages/tg_Arab/language.textproto b/lang/languages/tg_Arab.textproto
similarity index 80%
rename from lang/languages/tg_Arab/language.textproto
rename to lang/languages/tg_Arab.textproto
index f7d6786b8..2ee395b72 100644
--- a/lang/languages/tg_Arab/language.textproto
+++ b/lang/languages/tg_Arab.textproto
@@ -4,8 +4,11 @@ preferred_name: ""
 autonym: ""
 population: 770553
 region: "PK"
-script: "Perso-Arabic"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/th.textproto b/lang/languages/th.textproto
new file mode 100644
index 000000000..d50936522
--- /dev/null
+++ b/lang/languages/th.textproto
@@ -0,0 +1,28 @@
+id: "th"
+name: "Thai"
+preferred_name: ""
+autonym: "ภาษาไทย"
+population: 55181920
+region: "TH"
+script: "Thai"
+exemplar_chars {
+  base: "ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ล ว ศ ษ ส ห ฬ อ ฮ ะ า เ โ ใ ไ ฤ ๅ ฦ"
+  auxiliary: "\\u200B"
+  marks: "◌̍ ◌̎ ◌ั ◌ิ ◌ุ ◌ู ◌็ ◌ํ"
+  numerals: "๐ ๑ ๒ ๓ ๔ ๕ ๖ ๗ ๘ ๙ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "๏ ๛"
+  index: "ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ"
+}
+sample_text {
+  masthead_full: "มนษย"
+  masthead_partial: "ทง"
+  tester: "โดยที่การยอมรับศักดิ์ศรีแต่กำเนิด และสิทธิที่เท่าเทียมกันและที่ไม่อาจเพิกถอนได้ของสมาชิกทั้งมวลแห่งครอบครัวมนุษยชาติ"
+  poster_sm: "โดยที่เป็นการจำเป"
+  poster_md: "ฉะนั้น บัดนี้"
+  poster_lg: "อาทิ"
+  specimen_48: "มนุษย์ทั้งปวงเกิดมามีอิสระและเสมอภาคกันในศักดิ์ศรีและสิทธิ ต่างในตนมีเหตุผลและมโนธรรม"
+  specimen_36: "ทุกคนมีสิทธิที่จะได้รับการเยียวยาอันมีประสิทธิผลจากศาลที่มีอำนาจแห่งรัฐต่อการกระทำอันล่วงละเมิดสิทธิขั้นพื้นฐาน ซึ่งตนได้รับตามรัฐธรรมนูญหรือกฎหมาย"
+  specimen_32: "ทุกคนย่อมมีสิทธิในความเสมอภาคอย่างเต็มที่ในการได้รับการพิจารณาคดีที่เป็นธรรมและเปิดเผยจากศาลที่อิสระและไม่ลำเอียง ในการพิจารณากำหนดสิทธิและหน้าที่ของตนและข้อกล่าวหาอาญาใดต่อตน"
+  specimen_21: "บุคคลใดจะถูกแทรกแซงตามอำเภอใจในความเป็นส่วนตัว ครอบครัว ที่อยู่อาศัย หรือการสื่อสาร หรือจะถูกลบหลู่เกียรติยศและชื่อเสียงไม่ได้ ทุกคนมีสิทธิที่จะได้รับความคุ้มครองของกฎหมายต่อการแทรกแซงสิทธิหรือการลบหลู่ดังกล่าวนั้น\nทุกคนมีสิทธิในอิสรภาพแห่งความคิด มโนธรรม และศาสนา ทั้งนี้ สิทธินี้รวมถึงอิสรภาพในการเปลี่ยนศาสนาหรือความเชื่อ และอิสรภาพในการแสดงออกทางศาสนาหรือความเชื่อถือของตนในการสอน การปฏิบัติ การสักการะบูชา และการประกอบพิธีกรรม ไม่ว่าจะโดยลำพังหรือในชุมชนร่วมกับผู้อื่น และในที่สาธารณะหรือส่วนบุคคล"
+  specimen_16: "ทุกคนมีสิทธิในอิสรภาพแห่งความเห็นและการแสดงออก ทั้งนี้ สิทธินี้รวมถึงอิสรภาพที่จะถือเอาความเห็นโดยปราศจากการแทรกแซง และที่จะแสวงหา รับและส่งข้อมูลข่าวสารและข้อคิดผ่านสื่อใด และโดยไม่คำนึงถึงพรมแดน\nทุกคน ในฐานะสมาชิกของสังคม มีสิทธิในหลักประกันทางสังคม และย่อมมีสิทธิในการบรรลุสิทธิทางเศรษฐกิจ สังคม และวัฒนธรรม อันจำเป็นยิ่งสำหรับศักดิ์ศรีของตน และการพัฒนาบุคลิกภาพของตนอย่างอิสระ ผ่านความพยายามของรัฐและความร่วมมือระหว่างประเทศ และตามการจัดการและทรัพยากรของแต่ละรัฐ\nทุกคนมีสิทธิในการพักผ่อนและการผ่อนคลายยามว่าง รวมทั้งจำกัดเวลาทำงานตามสมควร และวันหยุดเป็นครั้งคราวโดยได้รับค่าจ้าง\nทุกคนย่อมมีสิทธิในระเบียบทางสังคมและระหว่างประเทศ ซึ่งจะเป็นกรอบให้บรรลุสิทธิและอิสรภาพที่กำหนดไว้ในปฏิญญานี้อย่างเต็มที่"
+}
diff --git a/lang/languages/th/language.textproto b/lang/languages/th/language.textproto
deleted file mode 100644
index 455aa5769..000000000
--- a/lang/languages/th/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "th"
-name: "Thai"
-preferred_name: ""
-autonym: "ภาษาไทย"
-population: 55181920
-region: "TH"
-script: "Thai"
-exemplar_chars {
-  base: "ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ล ว ศ ษ ส ห ฬ อ ฮ ะ า เ โ ใ ไ ฤ ๅ ฦ"
-  auxiliary: "\\u200B"
-  marks: "◌̍ ◌̎ ◌ั ◌ิ ◌ุ ◌ู ◌็ ◌ํ"
-  numerals: "๐ ๑ ๒ ๓ ๔ ๕ ๖ ๗ ๘ ๙ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "๏ ๛"
-  index: "ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ"
-}
diff --git a/lang/languages/th/sampletext.textproto b/lang/languages/th/sampletext.textproto
deleted file mode 100644
index b3ce2bbf3..000000000
--- a/lang/languages/th/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "th"
diff --git a/lang/languages/thl/language.textproto b/lang/languages/thl.textproto
similarity index 76%
rename from lang/languages/thl/language.textproto
rename to lang/languages/thl.textproto
index c449292a7..991af3051 100644
--- a/lang/languages/thl/language.textproto
+++ b/lang/languages/thl.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/thq/language.textproto b/lang/languages/thq.textproto
similarity index 76%
rename from lang/languages/thq/language.textproto
rename to lang/languages/thq.textproto
index 962790fd6..70acc1ca1 100644
--- a/lang/languages/thq/language.textproto
+++ b/lang/languages/thq.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/thr/language.textproto b/lang/languages/thr.textproto
similarity index 75%
rename from lang/languages/thr/language.textproto
rename to lang/languages/thr.textproto
index df937807c..753350b46 100644
--- a/lang/languages/thr/language.textproto
+++ b/lang/languages/thr.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/ti.textproto b/lang/languages/ti.textproto
new file mode 100644
index 000000000..fc6a469a8
--- /dev/null
+++ b/lang/languages/ti.textproto
@@ -0,0 +1,28 @@
+id: "ti"
+name: "Tigrinya"
+preferred_name: ""
+autonym: "ትግርኛ"
+population: 10145910
+region: "ER"
+region: "ET"
+region: "IL"
+script: "Ethiopic"
+exemplar_chars {
+  base: "ሀ ሁ ሂ ሃ ሄ ህ ሆ ኰ ኲ ኳ ኴ ኵ ለ ሉ ሊ ላ ሌ ል ሎ ዀ ዂ ዃ ዄ ዅ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ወ ዉ ዊ ዋ ዌ ው ዎ መ ሙ ሚ ማ ሜ ም ሞ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ረ ሩ ሪ ራ ሬ ር ሮ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ሰ ሱ ሲ ሳ ሴ ስ ሶ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ሸ ሹ ሺ ሻ ሼ ሽ ሾ የ ዩ ዪ ያ ዬ ይ ዮ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ደ ዱ ዲ ዳ ዴ ድ ዶ ቈ ቊ ቋ ቌ ቍ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ገ ጉ ጊ ጋ ጌ ግ ጎ ቘ ቚ ቛ ቜ ቝ ጐ ጒ ጓ ጔ ጕ በ ቡ ቢ ባ ቤ ብ ቦ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ተ ቱ ቲ ታ ቴ ት ቶ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ቸ ቹ ቺ ቻ ቼ ች ቾ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ነ ኑ ኒ ና ኔ ን ኖ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ፈ ፉ ፊ ፋ ፌ ፍ ፎ አ ኡ ኢ ኣ ኤ እ ኦ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ከ ኩ ኪ ካ ኬ ክ ኮ ቨ ቩ ቪ ቫ ቬ ቭ ቮ"
+  auxiliary: "᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሇ ⶀ ᎀ ᎁ ᎂ ᎃ ⶁ ⶂ ⶃ ⶄ ቇ ᎄ ᎅ ᎆ ᎇ ⶅ ⶆ ⶇ ኇ ⶈ ⶉ ⶊ ኯ ዏ ⶋ ዯ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ⶎ ጏ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ⶏ ⶐ ⶑ ᎈ ᎉ ᎊ ᎋ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ"
+  numerals: "፩ ፪ ፫ ፬ ፭ ፮ ፯ ፰ ፱ ፲ ፳ ፴ ፵ ፶ ፷ ፸ ፹ ፺ ፻"
+  index: "ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ ቐ ቘ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ዀ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ"
+}
+sample_text {
+  masthead_full: "ብመንፅ"
+  masthead_partial: "ርክ"
+  tester: "ኦብ ዓለም ንናይ ኩሎም ሰባት ተፈጥሮኦዊ ክብሪትን ንማዕሪን ዘይገሃሱን ሰብኦዊ መሰላትን ምቕባል"
+  poster_sm: "ንሰብኦዊ መሰላት"
+  poster_md: "ወዲ ሰብ ምልኪን"
+  poster_lg: "ብመንፅር"
+  specimen_48: "ህዝብታት ውድብ ሕቡራት መንግስታት ኦብ ቻርተር ውድብ ሕቡራት መንግስታት ንመሰሪታዊ ሰብኦዊ መሰላት፣"
+  specimen_36: "ኦባል መንግስታት ምስ ውድብ ሕቡራት መንግስታት ብምትሕግጋዝ ሰብኦዊ መሰላትን መሰሪታዊ ነፃነታትን ዓለምለኻዊ ጠመተን ሓለዋን ምእንቲ ክሪኽቡ ንምፅዓር ዝጠልቡ ስለዝኾነ፣"
+  specimen_32: "ሕድሕድ ሰብ ብዘርኢ፣ ብቀለም፣ ብፆታ፣ ብቋንቋ፣ ብሃይማኖት፣ ብፖለቲካ ወይ ብካልኦት ኦሪኦእያታት፣ ብብሄር ወይ ብማሕበራዊ መበቈል፣ ብሃብቲ፣ ብትውልዲ ወይ ብካልኦት ደሪጃታት ኦድልዎ እንተይተገብሪሉ ኦብዚ ድንጋገ እዚ ናይ ዝሰፈሩ ኩሎም መሰላትን ነፃነታትን ተጠኝሚ እዩ፡፡"
+  specimen_21: "ብተወሳኺ ሓደ ዜጋ፣ ሃገሩ ነፃ ግዝኦት፣ ብሞግዚት ዝመሓደር፣ ዓርሰ ምምሕዳር ዘይብሉ ወይ ኦብ ትሕቲ ዝኾነ ይኹን ሉኦላዊ ገደብ ዝርከብ እንተኾነ’ውን ብምኽንያት ናይ ሃገሩ ፖለቲካዊ፣ ሕጋዊ ስልጣን ወይ ዓለምለኻዊ ደሪጃ ኦድልዎ ኦይፍፀሞን፡፡\nሕድሕድ ሰብ ብህይወት ናይ ምንባር፣ ናይ ነፃነትን ድሕንነትን መሰል ኦለዎ፡፡\nሕድሕድ ሰብ ብባርነት ወይ ብጊልያነት ክግዛእ የብሉን፡፡ ባርነትን ናይ ባርያ ንግድን ብዝኾነ ይኹን መልክዑ ክልኩል እዩ፡፡\nሕድሕድ ሰብ ከቢድ ስቓይ ዘውርድ፣ ጭካነ ዝመልኦ፣ ኢሰብኦዊ ወይ ሰብኦዊ ክብሩ ዘዋርድ ኦተሓሕዛ ወይ መቕፃዕቲ ኦይፍፀሞን፣"
+  specimen_16: "ሕድሕድ ሰብ ኦብ ዝኾነ ይኹን ቦታ ኦብ ቅድሚ ሕጊ ብሰብኦዊ መንነቱ ንክፍለጥ መሰል ኦለዎ፡፡\nኩሎም ሰባት ኦብ ቅድሚ ሕጊ ማዕሪ ኦብ ልዕሊ ምዃኖም ብዘይ ኦፈላላይ ናይ ሕጊ ማዕሪ ሓለዋ ክግበሪሎም መሰል ኦለዎም፡፡ ኩሎም ሰባት ነዚ ድንጋገ’ዚ ብምጥሓስን ነዚ ድንጋገ’ዚ ንምጥሓስ ብዝግበሩ ምልዕዓላትን ካብ ዝበፅሖም ኦድልዎ ሓለዋ ናይ ምርካብ ማዕሪ መሰል ኦለዎም፡፡\nሕድሕድ ሰብ ብሕገ መንግስቲ ወይ ብሕጊ ዝተፈቐዱሉ መሰሪታዊ መሰላት እንትጠሓስዎ ስልጣን ብዘለዎ ሃገራዊ ቤት ፍርዲ ግቡእ ካሕሳ ናይ ምርካብ መሰል ኦለዎ፡፡\nሕድሕድ ሰብ ብሕጊ ካብ ዝተደንገገ ስርዓት ወፃኢ ኦይእሰርን፣ ኦይተሓዝን ወይ ኦይሕየርን፡፡\nሕድሕድ ሰብ መሰሉን ግቡእን፣ ከምኡ’ውን ንዝቐርበሉ ዝኾነ ይኹን ገበናዊ ክሲ ዝምልከቱ ጉዳያት ንምውሳን ኦብ ነፃን ዘይኦድላውን ቤት ፍርዲ ብፍትሓውን ዕላውን መንገዲ ንክራኦዩሉ ምሉእ ማዕርነት ኦለዎ፡፡\nሕድሕድ ሰብ ብሕጊ ካብ ዝተደንገገ ስርዓት ወፃኢ ኦብ ልዕሊ ውልቀ ህይወቱ ፣ ቤተሰቡ፣ ገዝኡ ወይ ኦብ ርክባቱ ጣልኝ ዝኦትዎ ኦይህልውን፡፡ ኦብ ልዕሊ ክብሩን ዝንኡን በደል ኦይፍፀሞን፡፡ ዝኾነ ይኹን ሰብ ከምዚኦም ካብ ዝኦመሰሉ ኢድ ኦእታውነት ወይ ከዓ በደል ዝከላኸለሉ ውሕስነት ሕጊ ናይ ምርካብ መሰል ኦለዎ፡፡"
+}
diff --git a/lang/languages/ti/language.textproto b/lang/languages/ti/language.textproto
deleted file mode 100644
index 112b0cd70..000000000
--- a/lang/languages/ti/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "ti"
-name: "Tigrinya"
-preferred_name: ""
-autonym: "ትግርኛ"
-population: 10145910
-region: "ET"
-region: "ER"
-region: "IL"
-script: "Ethiopic"
-exemplar_chars {
-  base: "ሀ ሁ ሂ ሃ ሄ ህ ሆ ኰ ኲ ኳ ኴ ኵ ለ ሉ ሊ ላ ሌ ል ሎ ዀ ዂ ዃ ዄ ዅ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ወ ዉ ዊ ዋ ዌ ው ዎ መ ሙ ሚ ማ ሜ ም ሞ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ረ ሩ ሪ ራ ሬ ር ሮ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ሰ ሱ ሲ ሳ ሴ ስ ሶ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ሸ ሹ ሺ ሻ ሼ ሽ ሾ የ ዩ ዪ ያ ዬ ይ ዮ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ደ ዱ ዲ ዳ ዴ ድ ዶ ቈ ቊ ቋ ቌ ቍ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ቐ ቑ ቒ ቓ ቔ ቕ ቖ ገ ጉ ጊ ጋ ጌ ግ ጎ ቘ ቚ ቛ ቜ ቝ ጐ ጒ ጓ ጔ ጕ በ ቡ ቢ ባ ቤ ብ ቦ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ተ ቱ ቲ ታ ቴ ት ቶ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ቸ ቹ ቺ ቻ ቼ ች ቾ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ነ ኑ ኒ ና ኔ ን ኖ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ፈ ፉ ፊ ፋ ፌ ፍ ፎ አ ኡ ኢ ኣ ኤ እ ኦ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ከ ኩ ኪ ካ ኬ ክ ኮ ቨ ቩ ቪ ቫ ቬ ቭ ቮ"
-  auxiliary: "᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሇ ⶀ ᎀ ᎁ ᎂ ᎃ ⶁ ⶂ ⶃ ⶄ ቇ ᎄ ᎅ ᎆ ᎇ ⶅ ⶆ ⶇ ኇ ⶈ ⶉ ⶊ ኯ ዏ ⶋ ዯ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ⶎ ጏ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ⶏ ⶐ ⶑ ᎈ ᎉ ᎊ ᎋ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ"
-  numerals: "፩ ፪ ፫ ፬ ፭ ፮ ፯ ፰ ፱ ፲ ፳ ፴ ፵ ፶ ፷ ፸ ፹ ፺ ፻"
-  index: "ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ ቐ ቘ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ዀ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ"
-}
diff --git a/lang/languages/ti/sampletext.textproto b/lang/languages/ti/sampletext.textproto
deleted file mode 100644
index baf907e24..000000000
--- a/lang/languages/ti/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ti"
diff --git a/lang/languages/tig/language.textproto b/lang/languages/tig.textproto
similarity index 75%
rename from lang/languages/tig/language.textproto
rename to lang/languages/tig.textproto
index a17050d50..e20d83777 100644
--- a/lang/languages/tig/language.textproto
+++ b/lang/languages/tig.textproto
@@ -7,3 +7,6 @@ region: "ER"
 script: "Ethiopic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "am"
+}
diff --git a/lang/languages/tiv.textproto b/lang/languages/tiv.textproto
new file mode 100644
index 000000000..6aa4aacc5
--- /dev/null
+++ b/lang/languages/tiv.textproto
@@ -0,0 +1,24 @@
+id: "tiv"
+name: "Tiv"
+preferred_name: ""
+autonym: "Tiv"
+population: 3424448
+region: "NG"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O Ô P R S T U V W Y Z a b c d e f g h i j k l m n o ô p r s t u v w y z"
+  marks: "◌̂"
+}
+sample_text {
+  masthead_full: "IiMm"
+  masthead_partial: "Aa"
+  tester: "Er i fe er, icivir man mkpeiyol u ior mba ken tsombor u umace"
+  poster_sm: "Er se fe ser,"
+  poster_md: "Er i doo"
+  poster_lg: "mar"
+  specimen_48: "Er i lu semakwagh u kenden a mzehemen u mtem u bem bem u ityar"
+  specimen_36: "Er mkav u mbamkpeiyol mban man mbamlu mba ken kpan shio i lu kwagh u injaa u vesen sha cii u mfe u ityendezwa yô,"
+  specimen_32: "I mar maor ken kpan ga, nan ngu a icivir man mbamkpeiyol cii. I na nan mhen man ishima i kaven kwagh; nahan gba keng u nana tema a orgen ken mtem u angbian a angbian."
+  specimen_21: "Hanmaor cii doo u a er a nan sha inja sha awaishima u dedoo, cii je yô, i soo er, i de nzughul a orumace er nan ngu kwase, shin nomsor, shin zwa u nan kaha, shin kwaghaôndo u nan civir ngu kposo, shin mer pati u nan man imo i nan i nan sha kwagh kaha ga, shi i de tôôn ape i mar nan shin mlu a kwagh shin ibanave shin tsombor, shin indi shin isheer i nan hen ityô i nzughul a nan ga."
+  specimen_16: "U zan hemen yô, a faityô u van a mpav sha ityôkyaa i pati, mkor u tar, shin mlu u tar la a ityar igen u or la nan lu ker ga, aluer tar la ua lu sha tseeneke u u, shin sha ikyev i ugen, shin ua lu a tahav u hemen iyol i u ga shin sha hanma myina u lun a tahav iyol i u cii.\nHanmaor nan ngu a ian u lun uma, eren kwagh a mkighir shio man mkor u sha iyol i nan kpaa.\nI venda kpan u kôron, shi u kighir or er, nana shile orgen tom; kpan-kôron man kpan-teen cii i yange gbindigh gbindigh.\nI venda u eren or ican tsung, shin kôron nan ihom. Hanmakwagh u a er a orumace er, nan hingir ishôso cii i yange, aluer nan er kwaghbo u tsahan nan je kpaa, i tsaha nan er, nana hee ga yô."
+}
diff --git a/lang/languages/tiv/language.textproto b/lang/languages/tiv/language.textproto
deleted file mode 100644
index 9abdda179..000000000
--- a/lang/languages/tiv/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "tiv"
-name: "Tiv"
-preferred_name: ""
-autonym: "Tiv"
-population: 3424448
-region: "NG"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O Ô P R S T U V W Y Z a b c d e f g h i j k l m n o ô p r s t u v w y z"
-  marks: "◌̂"
-}
diff --git a/lang/languages/tiv/sampletext.textproto b/lang/languages/tiv/sampletext.textproto
deleted file mode 100644
index caa6ac935..000000000
--- a/lang/languages/tiv/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tiv"
diff --git a/lang/languages/tk/language.textproto b/lang/languages/tk.textproto
similarity index 94%
rename from lang/languages/tk/language.textproto
rename to lang/languages/tk.textproto
index f53d63bba..97167b836 100644
--- a/lang/languages/tk/language.textproto
+++ b/lang/languages/tk.textproto
@@ -6,9 +6,9 @@ population: 6870838
 region: "AF"
 region: "IR"
 region: "TM"
-script: "Perso-Arabic"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ç Ö Ü Ý Ň Ş Ž Ș a b c d e f g h i j k l m n o p q r s t u v w x y z ä ç ö ü ý ň ş ž ș"
   auxiliary: "c q v x"
@@ -17,3 +17,6 @@ exemplar_chars {
   punctuation: "\\- ‑ – — , ; \\: ! ? . … \" “ ” ( ) \\[ \\] \\{ \\} § @ * #"
   index: "A B Ç D E Ä F G H I J Ž K L M N Ň O Ö P R S Ş T U Ü W Y Ý Z"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/tkl/language.textproto b/lang/languages/tkl.textproto
similarity index 85%
rename from lang/languages/tkl/language.textproto
rename to lang/languages/tkl.textproto
index 4e0f04363..560eab06b 100644
--- a/lang/languages/tkl/language.textproto
+++ b/lang/languages/tkl.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A E I O U F G K L M N P H T V Ā Ē Ī Ō Ū a e i o u f g k l m n p h t v ā ē ī ō ū"
   marks: "◌̄"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/tkr/language.textproto b/lang/languages/tkr.textproto
similarity index 89%
rename from lang/languages/tkr/language.textproto
rename to lang/languages/tkr.textproto
index 4e24e7415..91f7b3184 100644
--- a/lang/languages/tkr/language.textproto
+++ b/lang/languages/tkr.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   auxiliary: "Ä ä"
   marks: "◌̆ ◌̇ ◌̈ ◌̧"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/tkt/language.textproto b/lang/languages/tkt.textproto
similarity index 76%
rename from lang/languages/tkt/language.textproto
rename to lang/languages/tkt.textproto
index 629b9c191..28399cccd 100644
--- a/lang/languages/tkt/language.textproto
+++ b/lang/languages/tkt.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/tly.textproto b/lang/languages/tly.textproto
new file mode 100644
index 000000000..e5f935d93
--- /dev/null
+++ b/lang/languages/tly.textproto
@@ -0,0 +1,28 @@
+id: "tly"
+name: "Talysh"
+preferred_name: ""
+autonym: "Tolışi"
+population: 1000168
+region: "AZ"
+script: "Cyrillic"
+script: "Latin"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ј Ғ Ҹ Ҝ Һ Ә Ы а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш ј ғ ҹ ҝ һ ә ы"
+  auxiliary: "Ä ä"
+  marks: "◌̆"
+  numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
+}
+sample_text {
+  masthead_full: "HhƏə"
+  masthead_partial: "Mm"
+  tester: "Bə insoni avlodon həmməy xasbıə ləyoğətə fikfamon iyən çəvon"
+  poster_sm: "Bə insoni həxon"
+  poster_md: "İnsoni bə"
+  poster_lg: "Həmmə"
+  specimen_48: "Xəlğon arədə mehribanə munasibəton oko dastək doy vacibəti bə"
+  specimen_36: "Hiç kəs bənə kolə (nokə) ya şıkrə vəziyyətədə oğəte əbıni; ğuldorəti iyən ğulə hıriyemon həmməy formondə ğədəğən kardə bedə."
+  specimen_32: "Har qılə şəxsi Konstitusiyə ya ğanuni bəy doə həxon dəcvoniyə vaxtədə səlohiyətinə milliyə məhkəmon tərəfiku ıştə həxon mıdafıə karde həxış heste."
+  specimen_21: "Hiç kəs ıştənbəsə bə həbs, bo qəte ya bə kuçovnə məruz mande əzıni.\nHar qılə şəxsi çəy həx iyən vəzlfon təyin kardeyo iyən bəyo handə bıə cinoyətə ittihomon əsosin be mıəyyən kardeyo, bəçəy koy mıstəğılə, bitərəfə məhkəmədə tam bərobərəti əsasədə, de oşkoəti iyən çı ədoləti həmməy tələbon çəş karde şəraitədə diyə kay həxış heste."
+  specimen_16: "Hiç qılə şəxs bə şəxsiyə, xeyzonə mıdaxilə, kə-bə ənəqıniyəti, bəyəndı məktub nıvışte nunəkıliyəti, bəştə şərəfi iyən nufuzi ıştənbəsə ğəsdi məruz be əzıni. Har kəsi bə joğo mıdaxilə iyən ğəsdi çı ğanuni tərəfiku mıdafiə bey həxış heste.\nHar qılə şəxsi fikir, vicdon iyən din ozodəti həxış heste. Bı həxe ıştə dini iyən etiğati dəqış karde ozodəti, bəştə dini iyən bovə kardəyon təhsil, dıvo kay, dini iyən ritualə ayinon icro kay vaxti colinə, ya de cokəson bə ico, oşko ya fərdi şikilədə etiğad kay daxile.\nHar qılə şəxsi əğıdə iyən əy sərbəst ifadə karde ozodətiş heste; bı həxe be maneə bə əğıdə malikbe iyən informasiyon ya ideyaon devləti sərhədiku bə şıkrə nıbə de dılipiyə vasitəon nəve, ya bə dast varde, pevılo kay ozodəti daxile."
+}
diff --git a/lang/languages/tly/language.textproto b/lang/languages/tly/language.textproto
deleted file mode 100644
index 295f92049..000000000
--- a/lang/languages/tly/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "tly"
-name: "Talysh"
-preferred_name: ""
-autonym: "Tolışi"
-population: 1000168
-region: "AZ"
-script: "Perso-Arabic"
-script: "Cyrillic"
-script: "Latin"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ј Ғ Ҹ Ҝ Һ Ә Ы а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш ј ғ ҹ ҝ һ ә ы"
-  auxiliary: "Ä ä"
-  marks: "◌̆"
-  numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
-}
diff --git a/lang/languages/tly/sampletext.textproto b/lang/languages/tly/sampletext.textproto
deleted file mode 100644
index aa2e34986..000000000
--- a/lang/languages/tly/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tly"
diff --git a/lang/languages/tmh/language.textproto b/lang/languages/tmh.textproto
similarity index 76%
rename from lang/languages/tmh/language.textproto
rename to lang/languages/tmh.textproto
index 268151a83..b9438da57 100644
--- a/lang/languages/tmh/language.textproto
+++ b/lang/languages/tmh.textproto
@@ -8,3 +8,6 @@ region: "NE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/tn.textproto b/lang/languages/tn.textproto
new file mode 100644
index 000000000..cb4166784
--- /dev/null
+++ b/lang/languages/tn.textproto
@@ -0,0 +1,27 @@
+id: "tn"
+name: "Tswana"
+preferred_name: ""
+autonym: "Setswana"
+population: 6113428
+region: "BW"
+region: "NA"
+region: "ZA"
+region: "ZW"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ê Ô Š a b c d e f g h i j k l m n o p q r s t u v w x y z ê ô š"
+  marks: "◌̂ ◌̌"
+}
+sample_text {
+  masthead_full: "BbAa"
+  masthead_partial: "Tt"
+  tester: "Go ntse jalo gore kamogelo ya tlhago ya seriti le tekatekano"
+  poster_sm: "Go ntse jalo"
+  poster_md: "JAANONG KA"
+  poster_lg: "Batho"
+  specimen_48: "E goeletsa Maipolelo a, a Boditšhabatšhaba a Ditshwanelo tsa Botho"
+  specimen_36: "Go ntse jalo gore go botlhokwa go tsweletsa kgolo ya dikgalologano tsa botsalano fa gare ga ditšhaba."
+  specimen_32: "Batho botlhe ba tsetswe ba gololosegile le go lekalekana ka seriti le ditshwanelo. Ba abetswe go akanya le maikutlo, mme ba tshwanetse go direlana ka mowa wa bokaulengwe."
+  specimen_21: "Go ntse jalo gore kamogelo ya tlhago ya seriti le tekatekano le ditshwanelo tse di sa amologanngweng tsa ditokololo tsotlhe tsa losika lwa motho ke motheo wa kgololosego, bosiamisi le kagiso mo lefatseng.\nGo ntse jalo gore go botlhokwa, fa motho a sa patelesege go tsaya tsela esele, jaaka ona mokgwa wa bofelo, go ema kgatlhanong le bagagapa le kgatelelo, gore ditshwanelo tsa botho di sirelediwe ke puso ya molao."
+  specimen_16: "Go ntse jalo gore kamogelo ya tlhago ya seriti le tekatekano le ditshwanelo tse di sa amologanngweng tsa ditokololo tsotlhe tsa losika lwa motho ke motheo wa kgololosego, bosiamisi le kagiso mo lefatseng.\nGo ntse jalo gore go itlhokomolosa le go nyatsa ditshwanelo tsa botho go tlhotse ditiragalo tsa bolalome tse di šsakgaditseng maikutlo a batho mo tshimologong ya lefatshe le mo go lona batho ba itumelelang kgololosego ya go bua le tumedi, le kgololosego mo go boifeng le go eletseng, di goeleditswe jaaka dikeletso tse di kwa godimo tsa batho botlhe."
+}
diff --git a/lang/languages/tn/language.textproto b/lang/languages/tn/language.textproto
deleted file mode 100644
index 0fb339fac..000000000
--- a/lang/languages/tn/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "tn"
-name: "Tswana"
-preferred_name: ""
-autonym: "Setswana"
-population: 6113428
-region: "ZA"
-region: "ZW"
-region: "BW"
-region: "NA"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ê Ô Š a b c d e f g h i j k l m n o p q r s t u v w x y z ê ô š"
-  marks: "◌̂ ◌̌"
-}
diff --git a/lang/languages/tn/sampletext.textproto b/lang/languages/tn/sampletext.textproto
deleted file mode 100644
index 0a9d7002e..000000000
--- a/lang/languages/tn/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tn"
diff --git a/lang/languages/tnr/language.textproto b/lang/languages/tnr.textproto
similarity index 71%
rename from lang/languages/tnr/language.textproto
rename to lang/languages/tnr.textproto
index 132eaa943..5d90d455e 100644
--- a/lang/languages/tnr/language.textproto
+++ b/lang/languages/tnr.textproto
@@ -6,3 +6,6 @@ population: 3304
 region: "SN"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/to.textproto b/lang/languages/to.textproto
new file mode 100644
index 000000000..19814f0c9
--- /dev/null
+++ b/lang/languages/to.textproto
@@ -0,0 +1,28 @@
+id: "to"
+name: "Tongan"
+preferred_name: ""
+autonym: "Faka Tonga"
+population: 100790
+region: "TO"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Á Ē É Ī Í Ō Ó Ū Ú a b c d e f g h i j k l m n o p q r s t u v w x y z ā á ē é ī í ō ó ū ú"
+  auxiliary: "à ă â å ä æ b c ç d è ĕ ê ë g ì ĭ î ï j ñ ò ŏ ô ö ø œ q r ù ŭ û ü w x y ÿ z"
+  marks: "◌́ ◌̄"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A E F H I K L M N {NG} O P S T U V ʻ"
+}
+sample_text {
+  masthead_full: "KkOo"
+  masthead_partial: "Ee"
+  tester: "Ko e me’a ‘i he mahino ko e ngeia fakaenatula pea mo e tatau mo"
+  poster_sm: "Peako e me’a"
+  poster_md: "Peakoe’uhi"
+  poster_lg: "kotoa"
+  specimen_48: "Peakoe’uhi kuo tukupa ‘a e ngaahi Pule’anga Memipa ke nau ngaue"
+  specimen_36: "Peakoe’uhi ‘e toki kavekavea’u ‘a e tukupa ni ‘okapau ‘e hu’ufa taha ‘a e a’usia ‘o e ngaahi totonu mo e ngaahi tau’ataina ni,"
+  specimen_32: "‘E ‘ikai ke ngofua ke nofo popula pe hopoate ha taha; kuopau ke ta’ofi ‘a e nofo popula pea mo e fefakatau’aki ‘o e kau popula ‘i hono ngaahi fotunga kotoa pe."
+  specimen_21: "‘E ‘ikai ke ngofua ke fakamamahi’i pe ngaahi kovi’i ha taha hange ha monumanu, pe tautea’i mo tamalaki ‘i ha tukunga ta’e’ofa fau.\n‘Oku ‘i ai ‘a e totonu ‘a e tokotaha kotoa pe ke lau mo tokangekina’i ‘i he potu kotoa pe ko e tangata pe fefine, ‘i he ‘ao ‘o e lao.\n‘Oku ‘i ai ‘a e totonu ‘a e tokotaha kotoa pe ki ha totongi huhu’i ‘oku taau mei ha ngaahi fakamaau’anga fe’unga fakalotofonua koe’uhi ko ha ngaue ta’etaau na’e fai ki ai ‘o fakafe’atungia’i e ngaahi tefito’i totonu kuo foaki ma’ana ‘e he konisitutone pe ko e lao."
+  specimen_16: "‘E ‘ikai ke ngofua ke puke pe fakahu pilisone ta’efakalao, tauhi pilisone ta’efakalao pe fakahee’i ta’efakalao ha taha.\n‘Oku ‘a e tokotaha kotoa pe ‘a e totonu tatau ki ha fakamaau’i ‘oku taau mo ‘ilo ki ai ‘a e kakai ‘i ha fakamaau’anga ‘oku tau’ataina mo ta’efilifilimanako ‘a ‘ene ngaue ki hono fakapapau’i ‘a ‘ene ngaahi totonu mo hono ngaahi ngafa pea pehe ki he ngaahi hia kuo faka’ilo kiai ‘ehe pule’anga.\n‘E ‘ikai ke ngofua ke fai ha kaunoa pe fakamalohi ta’efakalao ki ha tokotaha, ‘i ha’ane me’a fakafo’ituitui, pe ko hono famili, hono ‘api, ‘ene fetu’utaki, pe ko hono fakamele’i hono langilangi mo hono ongoongo. ‘Oku ‘i ai ‘a e totonu ‘a e tokotaha kotoa pe ke malu’i ia ‘ehe lao mei he ngaahi kaunoa pe fakamalohi pehe ni."
+}
diff --git a/lang/languages/to/language.textproto b/lang/languages/to/language.textproto
deleted file mode 100644
index 128cc72d5..000000000
--- a/lang/languages/to/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "to"
-name: "Tongan"
-preferred_name: ""
-autonym: "Faka Tonga"
-population: 100790
-region: "TO"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Á Ē É Ī Í Ō Ó Ū Ú a b c d e f g h i j k l m n o p q r s t u v w x y z ā á ē é ī í ō ó ū ú"
-  auxiliary: "à ă â å ä æ b c ç d è ĕ ê ë g ì ĭ î ï j ñ ò ŏ ô ö ø œ q r ù ŭ û ü w x y ÿ z"
-  marks: "◌́ ◌̄"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A E F H I K L M N {NG} O P S T U V ʻ"
-}
diff --git a/lang/languages/to/sampletext.textproto b/lang/languages/to/sampletext.textproto
deleted file mode 100644
index 05cb6b1ed..000000000
--- a/lang/languages/to/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "to"
diff --git a/lang/languages/tog/language.textproto b/lang/languages/tog.textproto
similarity index 75%
rename from lang/languages/tog/language.textproto
rename to lang/languages/tog.textproto
index f2b478657..145c7e652 100644
--- a/lang/languages/tog/language.textproto
+++ b/lang/languages/tog.textproto
@@ -7,3 +7,6 @@ region: "MW"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/tpi.textproto b/lang/languages/tpi.textproto
new file mode 100644
index 000000000..c461080b8
--- /dev/null
+++ b/lang/languages/tpi.textproto
@@ -0,0 +1,23 @@
+id: "tpi"
+name: "Tok Pisin"
+preferred_name: ""
+autonym: "Tok Pisin"
+population: 5154216
+region: "PG"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "YyUu"
+  masthead_partial: "Mm"
+  tester: "Long luksave olsem olgeta manmeri mas igat respek, na olgeta manmeri"
+  poster_sm: "Long ol hap"
+  poster_md: "Long wanem"
+  poster_lg: "Yumi"
+  specimen_48: "Long wanem, em i gutpela stret long strongim pasin bilong kamapim"
+  specimen_36: "Long dispela, olgeta manmeri mas save long raits na fridoms em i wanpela bikpela samting tru bilong wanwan manmeri."
+  specimen_32: "Maski yu wanem kain man o meri, yumi olgeta igat wankain raits tasol long lo. Sapos lo ino luksave long yumi wankain, yumi gat rait long tokaut long lo."
+  specimen_21: "Olgeta manmeri igat rait long kot, long sanap long kot na kisim kompensesen sapos narapela manmeri o gavman i no bihainim Mama Lo bilong kantri bilong yumi.\nNogat wanpela man o meri o polis igat pawa long holim yu nating o rausim yu long haus bilong yu o long rot na kalabusim yu long rumgat o rausim yu go stap long narapela ples o kantri."
+  specimen_16: "Ol manmeri igat rait long sanap na harim kot long ples klia, na husat i harim kot i mas stap fri long ol kainkain tingting long wokim gutpela tingting.\nNogat wanpela man o meri igat rait long go insait long haus bilong narapela man o meri, o nogat rait long lukim pas bilong narapela man o meri, o holim o lukim samting bilong narapela man o meri. Na tu i nogat man o meri igat rait long bagarapim nem bilong narapela man o meri o daunim nem bilong em. Na lo mas stap long banisim dispela kain ol hevi o pasin olsem.\nYumi olgeta igat rait long tingting na tokaut, na narapela man o meri nogat rait long stopim yu. Na tu, yumi gat rait long putim tingting long niuspepa, radio na tv."
+}
diff --git a/lang/languages/tpi/language.textproto b/lang/languages/tpi/language.textproto
deleted file mode 100644
index 6ab9028e4..000000000
--- a/lang/languages/tpi/language.textproto
+++ /dev/null
@@ -1,10 +0,0 @@
-id: "tpi"
-name: "Tok Pisin"
-preferred_name: ""
-autonym: "Tok Pisin"
-population: 5154216
-region: "PG"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/tpi/sampletext.textproto b/lang/languages/tpi/sampletext.textproto
deleted file mode 100644
index edf0c7544..000000000
--- a/lang/languages/tpi/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tpi"
diff --git a/lang/languages/tr.textproto b/lang/languages/tr.textproto
new file mode 100644
index 000000000..ec414bf41
--- /dev/null
+++ b/lang/languages/tr.textproto
@@ -0,0 +1,37 @@
+id: "tr"
+name: "Turkish"
+preferred_name: ""
+autonym: "Türkçe"
+population: 80191488
+region: "BG"
+region: "CY"
+region: "DE"
+region: "GR"
+region: "MK"
+region: "NL"
+region: "RO"
+region: "TR"
+region: "UA"
+region: "UZ"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Ç Î Ö Û Ü Ğ Ș a b c d e f g h i j k l m n o p q r s t u v w x y z â ç î ö û ü ğ İ ı ș"
+  auxiliary: "á à ă â å ä ã ā æ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ø ō œ q ß ú ù ŭ û ū w x ÿ"
+  marks: "◌̂ ◌̆ ◌̇ ◌̈ ◌̦ ◌̧"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A B C Ç D E F G H I İ J K L M N O Ö P Q R S Ş T U Ü V W X Y Z"
+}
+sample_text {
+  masthead_full: "BbÜü"
+  masthead_partial: "Tt"
+  tester: "İnsanlık ailesinin bütün üyelerinde bulunan haysiyetin ve bunların"
+  poster_sm: "İnsanin zulüm"
+  poster_md: "Birleşmiş"
+  poster_lg: "Bütün"
+  specimen_48: "Üye devletlerin, Birleşmiş Milletler Teşkilatı ile işbirliği ederek"
+  specimen_36: "Hiç kimse kölelik veya kulluk altında bulundurulamaz; kölelik ve köle ticareti her türlü şekliyle yasaktır."
+  specimen_32: "Her şahsın kendine anayasa veya kanun ile tanınan ana haklara aykırı muamelelere karşı fiilli netice verecek şekilde milli mahkemelere müracaat hakkı vardır."
+  specimen_21: "Hiç kimse keyfi olarak tutuklanamaz, alıkonulanamaz veya sürülemez.\nHerkes, haklarının, vecibelerinin veya kendisine karşı cezai mahiyette herhangi bir isnadın tespitinde, tam bir eşitlikle, davasının bağımsız ve tarafsız bir mahkeme tarafından adil bir şekilde ve açık olarak görülmesi hakkına sahiptir.\nHer şahsın dinlenmeye, eğlenmeye, bilhassa çalışma müddetinin makul surette sınırlandırılmasına ve muayyen devrelerde ücretli tatillere hakkı vardır."
+  specimen_16: "Herkesin, işbu Beyannamede derpiş edilen hak ve hürriyetlerin tam tatbikini sağlayacak bir sosyal ve milletlerarası nizama hakkı vardır.\nİşbu Beyannamenin hiçbir hükmü, herhangi bir devlete, zümreye ya da ferde, bu Beyannamede ilan olunan hak ve hürriyetleri yoketmeye yönelik bir faaliyete girişme ya da eylemde bulunma hakkını verir şekilde yorumlanamaz.\nİnsanlık ailesinin bütün üyelerinde bulunan haysiyetin ve bunların eşit ve devir kabul etmez haklarının tanınması hususunun, hürriyetin, adaletin ve dünya barışının temeli olmasına,\nİnsanin zulüm ve baskıya karşı son çare olarak ayaklanmaya mecbur kalmaması için insan haklarının bir hukuk rejimi ile korunmasının esaslı bir zaruret olmasına,"
+}
diff --git a/lang/languages/tr/language.textproto b/lang/languages/tr/language.textproto
deleted file mode 100644
index fa1c27f6a..000000000
--- a/lang/languages/tr/language.textproto
+++ /dev/null
@@ -1,24 +0,0 @@
-id: "tr"
-name: "Turkish"
-preferred_name: ""
-autonym: "Türkçe"
-population: 80191488
-region: "MK"
-region: "GR"
-region: "CY"
-region: "TR"
-region: "RO"
-region: "BG"
-region: "UZ"
-region: "NL"
-region: "UA"
-region: "DE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Ç Î Ö Û Ü Ğ Ș a b c d e f g h i j k l m n o p q r s t u v w x y z â ç î ö û ü ğ İ ı ș"
-  auxiliary: "á à ă â å ä ã ā æ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ø ō œ q ß ú ù ŭ û ū w x ÿ"
-  marks: "◌̂ ◌̆ ◌̇ ◌̈ ◌̦ ◌̧"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A B C Ç D E F G H I İ J K L M N O Ö P Q R S Ş T U Ü V W X Y Z"
-}
diff --git a/lang/languages/tr/sampletext.textproto b/lang/languages/tr/sampletext.textproto
deleted file mode 100644
index 525336f4f..000000000
--- a/lang/languages/tr/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tr"
diff --git a/lang/languages/tru/language.textproto b/lang/languages/tru.textproto
similarity index 74%
rename from lang/languages/tru/language.textproto
rename to lang/languages/tru.textproto
index 8dfd45c35..8acc7dbf5 100644
--- a/lang/languages/tru/language.textproto
+++ b/lang/languages/tru.textproto
@@ -7,3 +7,6 @@ region: "TR"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/trv/language.textproto b/lang/languages/trv.textproto
similarity index 74%
rename from lang/languages/trv/language.textproto
rename to lang/languages/trv.textproto
index 05224310f..c7f5c5c20 100644
--- a/lang/languages/trv/language.textproto
+++ b/lang/languages/trv.textproto
@@ -7,3 +7,6 @@ region: "TW"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/trw/language.textproto b/lang/languages/trw.textproto
similarity index 75%
rename from lang/languages/trw/language.textproto
rename to lang/languages/trw.textproto
index 26311b719..556c264ce 100644
--- a/lang/languages/trw/language.textproto
+++ b/lang/languages/trw.textproto
@@ -7,3 +7,6 @@ region: "PK"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/ts.textproto b/lang/languages/ts.textproto
new file mode 100644
index 000000000..69989e9f6
--- /dev/null
+++ b/lang/languages/ts.textproto
@@ -0,0 +1,25 @@
+id: "ts"
+name: "Tsonga"
+preferred_name: ""
+autonym: "Xitsonga"
+population: 4880932
+region: "MZ"
+region: "SZ"
+region: "ZA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+}
+sample_text {
+  masthead_full: "VvAa"
+  masthead_partial: "Nn"
+  tester: "Tanihileswi ku tekeriwaka enhlokweni xindzhuti xa ntumbuluko"
+  poster_sm: "Tanihileswi"
+  poster_md: "Hikokwalaho"
+  poster_lg: "Vanhu"
+  specimen_48: "Tanihi xipimelo xa mani na mani lexi fikelelekaka xa vanhu hinkwavo"
+  specimen_36: "Tanihileswi swi nga swa nkoka ku tlakuseta nhluvuko wa vuxaka bya vunghana exikarhi ka matiko,\nNhlengeletanonkulu"
+  specimen_32: "Tanihileswi ku twisisa ka mani na mani ka tifanelo leti na mitshunxeko ya nkoka ya masungulo swi nga ni nkoka wukulu ku tlurisa leswaku ku tiboha loku ku fikeleleka,"
+  specimen_21: "Tanihileswi ku tekeriwaka enhlokweni xindzhuti xa ntumbuluko na tifanelo leti nga susekiki eka munhu un’wana na un’wana leswi ku nga swona tshaku kumbe masungulo ya ntshuxeko, vululami na ku rhula emisaveni,\nTanihileswi swi nga swa nkoka loko munhu a nga heteleli a sindzisiwile hi xiyimo ku va a hlawula ku pfukela mfumo wa tihanyi na ntshikelelo, kambe tifanelo ta ximunhu ti fanele ku sirheleriwa hi mfumo wa xinawu,"
+  specimen_16: "Tanihileswi ku tekeriwaka enhlokweni xindzhuti xa ntumbuluko na tifanelo leti nga susekiki eka munhu un’wana na un’wana leswi ku nga swona tshaku kumbe masungulo ya ntshuxeko, vululami na ku rhula emisaveni,\nTanihileswi ku nga ni ku honisiwaka na ku nyadziwa ka tifanelo ta ximunhu leswi tiseke mitirho ya tihanyi leyi onheke miehleketo ya rixaka ra vanhu emikarhini leyi ehansi ka misava, laha vanhu va faneleke ku tiphina hi ntshuxeko wo vulavula leswi va swi lavaka na ripfumelo leri va tihlawulelaka rona na ntshuxeko wo kala ku chavisetiwa ni wa swinavelo swi twarisiwile tanihi xinavelo lexikulukumba ngopfu eka xitshungu,"
+}
diff --git a/lang/languages/ts/language.textproto b/lang/languages/ts/language.textproto
deleted file mode 100644
index 41080fd47..000000000
--- a/lang/languages/ts/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "ts"
-name: "Tsonga"
-preferred_name: ""
-autonym: "Xitsonga"
-population: 4880932
-region: "MZ"
-region: "ZA"
-region: "SZ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-}
diff --git a/lang/languages/ts/sampletext.textproto b/lang/languages/ts/sampletext.textproto
deleted file mode 100644
index 4c696a5c5..000000000
--- a/lang/languages/ts/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ts"
diff --git a/lang/languages/tsd/language.textproto b/lang/languages/tsd.textproto
similarity index 74%
rename from lang/languages/tsd/language.textproto
rename to lang/languages/tsd.textproto
index 0f33087a4..a5e1f6c39 100644
--- a/lang/languages/tsd/language.textproto
+++ b/lang/languages/tsd.textproto
@@ -7,3 +7,6 @@ region: "GR"
 script: "Greek"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "el"
+}
diff --git a/lang/languages/tsg/language.textproto b/lang/languages/tsg.textproto
similarity index 74%
rename from lang/languages/tsg/language.textproto
rename to lang/languages/tsg.textproto
index 2532ff54c..358868c22 100644
--- a/lang/languages/tsg/language.textproto
+++ b/lang/languages/tsg.textproto
@@ -7,3 +7,6 @@ region: "PH"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/tsj/language.textproto b/lang/languages/tsj.textproto
similarity index 75%
rename from lang/languages/tsj/language.textproto
rename to lang/languages/tsj.textproto
index b90ac40ae..b8318e400 100644
--- a/lang/languages/tsj/language.textproto
+++ b/lang/languages/tsj.textproto
@@ -7,3 +7,6 @@ region: "BT"
 script: "Tibetan"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "bo"
+}
diff --git a/lang/languages/tt.textproto b/lang/languages/tt.textproto
new file mode 100644
index 000000000..6bcb99abb
--- /dev/null
+++ b/lang/languages/tt.textproto
@@ -0,0 +1,27 @@
+id: "tt"
+name: "Tatar"
+preferred_name: ""
+autonym: "Татарча"
+population: 1984108
+region: "RU"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Җ Ң Ү Һ Ә Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё җ ң ү һ ә ө"
+  auxiliary: "ғ қ"
+  marks: "◌̆ ◌̈"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # ′ ″"
+  index: "А Ә Б В Г Д Е Ё Ж Җ З И Й К Л М Н Ң О Ө П Р С Т У Ү Ф Х Һ Ц Ч Ш Щ Ъ Ы Ь Э Ю Я"
+}
+sample_text {
+  masthead_full: "БбАа"
+  masthead_partial: "Рр"
+  tester: "Кешелек гаиләсенең бөтен әгъзаларына хас булган тигез һәм аерылгысыз"
+  poster_sm: "җәберләүгә"
+  poster_md: "Кешенең төп"
+  poster_lg: "Барлык"
+  specimen_48: "Берләшкен Милләтләр Оешмасы әгъзасы булган дәүләтләрнең кеше"
+  specimen_36: "әлеге хокукларны һәм ирекләрне анлау бу йөкләмәләрне тулысынча үтәүдә бик зур әһәмияткә ия булуын истә тотып,"
+  specimen_32: "Конституция яки закон биргән тон хокуклардан мәхрүм ителгән очракта, һәр кешенең ул хокукларын компетентлы милли судлар аша кире кайтарылып бирелүен таләп итәргә хокукы бар."
+  specimen_21: "Беркем дә нигезсез рәвештә кулга алынуга, тоткарлануга, куылуга дучар ителергә тиеш түгел.\nҺәр кешенең үз хокукларын һәм бурычларын билгеләр очен һәм аны җинаять җаваплылыгына тартуның нигезле булуын ачыклар очен, туды титезлелек нигезендә үз эшенең ачык рәвештә, мөстәкыйль, гадел һәм бәйсез суд аша каралуын таләп итәргә хокукы бар."
+  specimen_16: "Бер кеше дә шәхси һәм гаилә тормышына, торак иминлегенә кагылуга, язышү, хәбәрләшү серенә, абруена һәм намусына нигезсез катиашуга дучар ителергә тиеш түгел.  Шундый кысулардан, яисә дучар ителүләрдән һәр кешенең закон белән якланырга хокукы бар.\nҺәр кешенең фикер, вөҗдан һәм дин ирегенә хокукы бар; бу хокук Аллага табынуны, йола куша торган дини тәртипләрне үгәүне эченә ала, һәр кешенең бер үзе генә яисә башкалар белән бергәлән аерым рәвештә яки ачыктан-ачык үз карашларын, үз динен алыштырырга аки тотарга хокукы бар.\nҺәр кеше ялга хокуклы һәм эш көнең тиешле чикләрдә кыскартуны да кертен, ел саси түләүле ял алырга, эштән буш вакытка хокукы бар."
+}
diff --git a/lang/languages/tt/language.textproto b/lang/languages/tt/language.textproto
deleted file mode 100644
index f8fdf7d05..000000000
--- a/lang/languages/tt/language.textproto
+++ /dev/null
@@ -1,14 +0,0 @@
-id: "tt"
-name: "Tatar"
-preferred_name: ""
-autonym: "Татарча"
-population: 1984108
-region: "RU"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Җ Ң Ү Һ Ә Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё җ ң ү һ ә ө"
-  auxiliary: "ғ қ"
-  marks: "◌̆ ◌̈"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # ′ ″"
-  index: "А Ә Б В Г Д Е Ё Ж Җ З И Й К Л М Н Ң О Ө П Р С Т У Ү Ф Х Һ Ц Ч Ш Щ Ъ Ы Ь Э Ю Я"
-}
diff --git a/lang/languages/tt/sampletext.textproto b/lang/languages/tt/sampletext.textproto
deleted file mode 100644
index 90b5ab98f..000000000
--- a/lang/languages/tt/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tt"
diff --git a/lang/languages/ttj/language.textproto b/lang/languages/ttj.textproto
similarity index 74%
rename from lang/languages/ttj/language.textproto
rename to lang/languages/ttj.textproto
index 156de263c..8d4064ba6 100644
--- a/lang/languages/ttj/language.textproto
+++ b/lang/languages/ttj.textproto
@@ -7,3 +7,6 @@ region: "UG"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/tts/language.textproto b/lang/languages/tts.textproto
similarity index 76%
rename from lang/languages/tts/language.textproto
rename to lang/languages/tts.textproto
index ff8afd852..083c3d08c 100644
--- a/lang/languages/tts/language.textproto
+++ b/lang/languages/tts.textproto
@@ -7,3 +7,6 @@ region: "TH"
 script: "Thai"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "th"
+}
diff --git a/lang/languages/ttt/language.textproto b/lang/languages/ttt.textproto
similarity index 89%
rename from lang/languages/ttt/language.textproto
rename to lang/languages/ttt.textproto
index 0fddd0cf3..327a550be 100644
--- a/lang/languages/ttt/language.textproto
+++ b/lang/languages/ttt.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   auxiliary: "Ä ä"
   marks: "◌̆ ◌̇ ◌̈ ◌̧"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/tum/language.textproto b/lang/languages/tum.textproto
similarity index 85%
rename from lang/languages/tum/language.textproto
rename to lang/languages/tum.textproto
index cd299ab28..90d7b9051 100644
--- a/lang/languages/tum/language.textproto
+++ b/lang/languages/tum.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/tvl/language.textproto b/lang/languages/tvl.textproto
similarity index 90%
rename from lang/languages/tvl/language.textproto
rename to lang/languages/tvl.textproto
index b0dd97875..d64ddfb73 100644
--- a/lang/languages/tvl/language.textproto
+++ b/lang/languages/tvl.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Á À Ǎ Ē É È Ě Ī Í Ì Ǐ Ō Ó Ò Ǒ Ū Ú Ù Ǔ a b c d e f g h i j k l m n o p q r s t u v w x y z ā á à ǎ ē é è ě ī í ì ǐ ō ó ò ǒ ū ú ù ǔ ’"
   marks: "◌̀ ◌́ ◌̄ ◌̌"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/twq/language.textproto b/lang/languages/twq.textproto
similarity index 91%
rename from lang/languages/twq/language.textproto
rename to lang/languages/twq.textproto
index e972f0bb4..62168ae31 100644
--- a/lang/languages/twq/language.textproto
+++ b/lang/languages/twq.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E F G H I J K L M N O P Q R S T U W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ty.textproto b/lang/languages/ty.textproto
new file mode 100644
index 000000000..20a4f9c05
--- /dev/null
+++ b/lang/languages/ty.textproto
@@ -0,0 +1,24 @@
+id: "ty"
+name: "Tahitian"
+preferred_name: ""
+autonym: "Reo Tahiti"
+population: 91487
+region: "PF"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū"
+  marks: "◌̄"
+}
+sample_text {
+  masthead_full: "EeFf"
+  masthead_partial: "Aa"
+  tester: "I te fa\'ari\'i i te fa\'ati\'amā o te ihomana tumu o te mau mero tā\'āto\'a"
+  poster_sm: "I te fa\'ari\'i"
+  poster_md: "I te fa\'ari\'i,"
+  poster_lg: "fanauhia"
+  specimen_48: "I te fa\'ari\'i i te \'opuara\'a\'amui a te mau Hau Mero e a te Fa\'anahora\'a"
+  specimen_36: "I te fa\'ari\'i i te fa\'ati\'amā o te ihomana tumu o te mau mero tā\'āto\'a o te nuna\'a ta\'ata e i to ratou ato\'a ti\'amanara\'a"
+  specimen_32: "E fanauhia te tā\'āto\'ara\'a o te ta\'ata-tupu ma te ti\'amā e te ti\'amanara\'a \'aifaito. Ua \'ī te mana\'o pa\'ari e i te manava e ma te \'a\'au taea\'e \'oia ta ratou ha\'a i rotopū ia ratou iho, e ti\'a ai;"
+  specimen_21: "I te fa\'ari\'i i te fa\'ati\'amā o te ihomana tumu o te mau mero tā\'āto\'a o te nuna\'a ta\'ata e i to ratou ato\'a ti\'amanara\'a \'aifaito e te tūtu\'u-mana-\'ore \'ei papa no te orara\'ati\'amā, no te orara\'a-\'aifaro e no te hau i roto i teie nei ao, e ti\'a ai,\nI te fa\'afaufa\'a i te paruru i te ti\'amanara\'a o te ta\'ata ma te hō\'ē fa\'aterera\'a-ture, ia \'ore \'oia te ta\'ata ia hepohia, i te hope\'a, i te hepo-\'orure-hau i te fa\'atītīra\'a e te fa\'afaora\'a a te taehae, e tia ai,"
+  specimen_16: "I te fa\'ari\'i i te fa\'ati\'amā o te ihomana tumu o te mau mero tā\'āto\'a o te nuna\'a ta\'ata e i to ratou ato\'a ti\'amanara\'a \'aifaito e te tūtu\'u-mana-\'ore \'ei papa no te orara\'ati\'amā, no te orara\'a-\'aifaro e no te hau i roto i teie nei ao, e ti\'a ai,\nI te fa\'ari\'i e no te ha\'apa\'o\'ore, e no te fa\'afaufa\'a\'ore i te mau ti\'amanara\'a o te ta\'ata, i tupu ai te mau peu \'oviri i fa\'ati\'arepu i te manava o te tā\'āto\'ara\'a o te ao; i te fa\'ari\'i i te ti\'aoroara\'ahia \'ei a\'e nui no te ta\'ata te hitira\'a mai o te hō\'ē ao iti i reira te mau ta\'ata, i ora mai mai roto mai i te taiā e te veve, e \'aparaparau noa ai ma te ti\'aturi fa\'ahou, e ti\'a ai,"
+}
diff --git a/lang/languages/ty/language.textproto b/lang/languages/ty/language.textproto
deleted file mode 100644
index b9d4c5669..000000000
--- a/lang/languages/ty/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "ty"
-name: "Tahitian"
-preferred_name: ""
-autonym: "Reo Tahiti"
-population: 91487
-region: "PF"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū"
-  marks: "◌̄"
-}
diff --git a/lang/languages/ty/sampletext.textproto b/lang/languages/ty/sampletext.textproto
deleted file mode 100644
index 23001218c..000000000
--- a/lang/languages/ty/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ty"
diff --git a/lang/languages/tyv.textproto b/lang/languages/tyv.textproto
new file mode 100644
index 000000000..c1ab606ea
--- /dev/null
+++ b/lang/languages/tyv.textproto
@@ -0,0 +1,24 @@
+id: "tyv"
+name: "Tuvinian"
+preferred_name: ""
+autonym: "Тыва"
+population: 184238
+region: "RU"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ң Ү Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ң ү ө"
+  marks: "◌̆ ◌̈"
+}
+sample_text {
+  masthead_full: "БбҮү"
+  masthead_partial: "Гг"
+  tester: "Кижи төрелгетен аймааның бүгү кежигүннериниң  кижи мөзүзүн, оларның"
+  poster_sm: "чоннар аразынга"
+  poster_md: "Каттышкан"
+  poster_lg: "Бүгү"
+  specimen_48: "кежигүн-күрүнелерниң Каттышкан Нациялар Организациязы-биле кады"
+  specimen_36: "Кым-даа кулданыгга азы хостуг эвес байдалга туттунмас ужурлуг; кулданыгның болгаш кул садарының бүгү хевирлери хоруглуг."
+  specimen_32: "Кижи бүрүзү дыштанылгага база хостуг үеге эргелиг, ооң иштинде  ажыл хүнүн  шын кызыгаарлаарынга база  өйлеп-өйлеп  бээр төлевирлиг  шөлээге  эргелиг."
+  specimen_21: "Кижи бүрүзү ук Угуулгада айыттынган эргелер болгаш хосталгаларны долузу-биле хандырып турар социал болгаш улустар аразының корум-чурумунга эргелиг.\nУк Угуулгада чүү-даа чүве кайы-бир күрүнеге, бөлүкке азы тус кижилерге ук Угуулгада айыттынган эргелер болгаш хосталгаларны узуткаарынче угланган ажылдар чорударынга азы кылдыныглар кылырынга эрге берип турар деп  тайылбырлаттынып болбас."
+  specimen_16: "Кижи төрелгетен аймааның бүгү кежигүннериниң  кижи мөзүзүн, оларның дең болгаш казып болбас эргелерин хүлээп көөрү хосталганың, чөптүг чоруктуң база бүгү-ниити тайбыңның үндезини болурун кичээнгейге албышаан; база\nкижиниң эргелеринге тоомча чок болгаш көөр хөөн чок чоруктуң кижи төрелгетенниң сагыжын аартып дүвүреткен дерзии үүлгедиглерге чедиргенин база кижилер  сөстүң болгаш үзелдерниң   хосталгазынга эргелиг, коргуушкун болгаш түрегделден хостуг  делегейни тургузары кижилерниң бедик чүткүлү кылдыр чарлаттынганын  кичээнгейге албышаан; база\nчоннар аразынга эп-найыралдыг харылзааларның сайзыралын деткиириниң эргежок чугулазын кичээнгейге албышаан; база"
+}
diff --git a/lang/languages/tyv/language.textproto b/lang/languages/tyv/language.textproto
deleted file mode 100644
index 8d3a20be6..000000000
--- a/lang/languages/tyv/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "tyv"
-name: "Tuvinian"
-preferred_name: ""
-autonym: "Тыва"
-population: 184238
-region: "RU"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ң Ү Ө а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ң ү ө"
-  marks: "◌̆ ◌̈"
-}
diff --git a/lang/languages/tyv/sampletext.textproto b/lang/languages/tyv/sampletext.textproto
deleted file mode 100644
index 0e853f616..000000000
--- a/lang/languages/tyv/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "tyv"
diff --git a/lang/languages/tzm/language.textproto b/lang/languages/tzm.textproto
similarity index 92%
rename from lang/languages/tzm/language.textproto
rename to lang/languages/tzm.textproto
index 33b670c5c..dd132b3e8 100644
--- a/lang/languages/tzm/language.textproto
+++ b/lang/languages/tzm.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D Ḍ E Ɛ F G Ɣ H Ḥ I J K L M N Q R Ṛ S Ṣ T Ṭ U W X Y Z"
 }
+sample_text {
+  fallback_language: "tzm"
+}
diff --git a/lang/languages/udm/language.textproto b/lang/languages/udm.textproto
similarity index 90%
rename from lang/languages/udm/language.textproto
rename to lang/languages/udm.textproto
index dfa38c7d8..f2e118730 100644
--- a/lang/languages/udm/language.textproto
+++ b/lang/languages/udm.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӝ Ӟ Ӥ Ӧ Ӵ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӝ ӟ ӥ ӧ ӵ"
   marks: "◌̆ ◌̈"
 }
+sample_text {
+  fallback_language: "ru"
+}
diff --git a/lang/languages/ug/language.textproto b/lang/languages/ug.textproto
similarity index 93%
rename from lang/languages/ug/language.textproto
rename to lang/languages/ug.textproto
index 09c8a93de..7105934a1 100644
--- a/lang/languages/ug/language.textproto
+++ b/lang/languages/ug.textproto
@@ -5,8 +5,8 @@ autonym: "Уйғур"
 population: 7670114
 region: "AF"
 region: "CN"
-script: "Perso-Arabic"
 script: "Cyrillic"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U W X Y Z Ë Ö Ü a b c d e f g h i j k l m n o p q r s t u w x y z ë ö ü"
   auxiliary: "\\u200E\\u200F ئ"
@@ -14,3 +14,6 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "{ئا} {ئه} {ئو} {ئۇ} {ئۆ} {ئۈ} {ئې} {ئى} ا ە ب پ ت ج چ خ د ر ز ژ س ش غ ف ق ك گ ڭ ل م ن ھ و ۇ ۆ ۈ ۋ ې ى ي"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/ug_Cyrl/language.textproto b/lang/languages/ug_Cyrl.textproto
similarity index 80%
rename from lang/languages/ug_Cyrl/language.textproto
rename to lang/languages/ug_Cyrl.textproto
index 3c0a7050c..6883b6550 100644
--- a/lang/languages/ug_Cyrl/language.textproto
+++ b/lang/languages/ug_Cyrl.textproto
@@ -5,7 +5,10 @@ autonym: ""
 population: 382851
 region: "KZ"
 region: "MN"
-script: "Perso-Arabic"
 script: "Cyrillic"
+script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/uk.textproto b/lang/languages/uk.textproto
new file mode 100644
index 000000000..3ffef44f9
--- /dev/null
+++ b/lang/languages/uk.textproto
@@ -0,0 +1,32 @@
+id: "uk"
+name: "Ukrainian"
+preferred_name: ""
+autonym: "Українська"
+population: 29273587
+region: "MD"
+region: "PL"
+region: "RS"
+region: "SK"
+region: "UA"
+script: "Cyrillic"
+exemplar_chars {
+  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ь Э Ю Я Є І Ї Ґ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ь э ю я є і ї ґ ’"
+  auxiliary: "А́ Е́ И́ О́ У́ Ы́ Э́ ю́ я́ а́ е́ и́ о́ у́ ы́ э́ ю́ я́"
+  marks: "◌̆ ◌̈ ◌́"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ – , ; \\: ! ? . \' ’ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\\\ №"
+  index: "А Б В Г Ґ Д Е Є Ж З И І Ї Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я"
+}
+sample_text {
+  masthead_full: "ВвСс"
+  masthead_partial: "Іі"
+  tester: "Беручи до уваги, що визнання гідності, яка властива всім членам"
+  poster_sm: "беручи до уваги,"
+  poster_md: "беручи до"
+  poster_lg: "Всі"
+  specimen_48: "беручи до уваги, що необхідно сприяти розвиткові дружніх відносин"
+  specimen_36: "Ніхто не повинен бути в рабстві або у підневільному стані; рабство і работоргівля забороняються в усіх їх видах."
+  specimen_32: "Кожна людина має право на ефективне поновлення у правах компетентними національними судами в разі порушення її основних прав, наданих їй конституцією або законом."
+  specimen_21: "Ніхто не може зазнавати безпідставного арешту, затримання або вигнання.\nКожна людина, для визначення її прав і обов\'язків і для встановлення обґрунтованості пред\'явленого їй кримінального обвинувачення, має право, на основі повної рівності, на те, щоб її справа була розглянута прилюдно і з додержанням усіх вимог справедливості незалежним і безстороннім судом."
+  specimen_16: "Ніхто не може зазнавати безпідставного втручання у його особисте і сімейне життя, безпідставного посягання на недоторканність його житла, таємницю його кореспонденції або на його честь і репутацію. Кожна людина має право на захист закону від такого втручання або таких посягань.\nКожна людина має право на свободу думки, совісті і релігії; це право включає свободу змінювати свою релігію або переконання і свободу сповідувати свою релігію або переконання як одноособово, так і разом з іншими, прилюдним або приватним порядком в ученні, богослужінні і виконанні релігійних та ритуальних обрядів."
+}
diff --git a/lang/languages/uk/language.textproto b/lang/languages/uk/language.textproto
deleted file mode 100644
index 4d7483d75..000000000
--- a/lang/languages/uk/language.textproto
+++ /dev/null
@@ -1,19 +0,0 @@
-id: "uk"
-name: "Ukrainian"
-preferred_name: ""
-autonym: "Українська"
-population: 29273587
-region: "SK"
-region: "MD"
-region: "PL"
-region: "UA"
-region: "RS"
-script: "Cyrillic"
-exemplar_chars {
-  base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ь Э Ю Я Є І Ї Ґ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ь э ю я є і ї ґ ’"
-  auxiliary: "А́ Е́ И́ О́ У́ Ы́ Э́ ю́ я́ а́ е́ и́ о́ у́ ы́ э́ ю́ я́"
-  marks: "◌̆ ◌̈ ◌́"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ – , ; \\: ! ? . \' ’ \" “ „ « » ( ) \\[ \\] \\{ \\} § @ * / \\\\ №"
-  index: "А Б В Г Ґ Д Е Є Ж З И І Ї Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я"
-}
diff --git a/lang/languages/uk/sampletext.textproto b/lang/languages/uk/sampletext.textproto
deleted file mode 100644
index 1c4a8d6ce..000000000
--- a/lang/languages/uk/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "uk"
diff --git a/lang/languages/uli/language.textproto b/lang/languages/uli.textproto
similarity index 74%
rename from lang/languages/uli/language.textproto
rename to lang/languages/uli.textproto
index e0360fdaa..4424af638 100644
--- a/lang/languages/uli/language.textproto
+++ b/lang/languages/uli.textproto
@@ -7,3 +7,6 @@ region: "FM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/umb.textproto b/lang/languages/umb.textproto
new file mode 100644
index 000000000..c8302b87e
--- /dev/null
+++ b/lang/languages/umb.textproto
@@ -0,0 +1,24 @@
+id: "umb"
+name: "Umbundu"
+preferred_name: ""
+autonym: "Úmbúndú"
+population: 9431467
+region: "AO"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P R S T U V W Y Ã Ẽ Õ Ú Ũ a b c d e f g h i j k l m n o p r s t u v w y ã ẽ õ ú ũ"
+  marks: "◌́ ◌̃"
+}
+sample_text {
+  masthead_full: "OoMm"
+  masthead_partial: "Aa"
+  tester: "Okukolela ukulihiso ekalo lityamela kovimata mata vyepata lyomanu"
+  poster_sm: "Okukolela eci"
+  poster_md: "Okukolela"
+  poster_lg: "Omanu"
+  specimen_48: "Olukolela okuti vukanda owiñgi wofokeka vyalikongela, wasapula"
+  specimen_36: "Okukolela okuti omunga yimwe yolomoko evi kwenda ayovo lyavelapo vali kesilivilo kokusumbila etyamêlo eli."
+  specimen_32: "Omunu eye omunu okwete omoko yeci avyala, kesokiyo lyowiñgi kwenda kesokiyo lyolwali, ocihandeleko cimwe ndeci omoko kwenda ombembwa yipopiwa vukanda owu mupita eci calingiwa."
+  specimen_21: "Lalimwe ekalo lyukande owu litava okuti lilombolwiwa, okuti likatangisa uvyali, elyongolwilo limwe ale omunu umwe, omoko yimwe yañgo yokutyamêla kupange umwe ale okutelisa elinga limwe lyokunyõla olomoko kwenda eyovo, vyatumiwa ndeti mulo.\nOkukolela ukulihiso ekalo lityamela kovimata mata vyepata lyomanu kwenda omoko yasoka kwavosi. Kwenda yesunga yilinga ombembwa yimwe yapana yesunga kwenda yombembwa v’olwali."
+  specimen_16: "Okukolela ukulihiso ekalo lityamela kovimata mata vyepata lyomanu kwenda omoko yasoka kwavosi. Kwenda yesunga yilinga ombembwa yimwe yapana yesunga kwenda yombembwa v’olwali.\nOkukolela eci kacakulihiwile kwenda esepwiso lyomoko yomunu, lyatwala kokuponda, okungwalisa olondunge vyowiñgi kwenda ekalu lyolwali lumwe muna vakwamwenyo vakaliyela okuvangula kwenda okulitava, vayovoka kusumba kwenda kusuka , yalombolwiwa ndeyi yavelapo hayo yalelapo vali keswimo liwa lyomunu.\nOkukolela okuti cavelapo okweca ulongo kokwamako okulyeca kukamba wolofeka.\nOkukolela okuti olofeka vyalityamela vyatyamela okukwata, okulikwatisako l’elisokiyo lyolofeka vilikwete omunga, esumbilo lyolwali kwenda owingi womoko yulume kwenda ayovo avelapo."
+}
diff --git a/lang/languages/umb/language.textproto b/lang/languages/umb/language.textproto
deleted file mode 100644
index b0f1e83ac..000000000
--- a/lang/languages/umb/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "umb"
-name: "Umbundu"
-preferred_name: ""
-autonym: "Úmbúndú"
-population: 9431467
-region: "AO"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P R S T U V W Y Ã Ẽ Õ Ú Ũ a b c d e f g h i j k l m n o p r s t u v w y ã ẽ õ ú ũ"
-  marks: "◌́ ◌̃"
-}
diff --git a/lang/languages/umb/sampletext.textproto b/lang/languages/umb/sampletext.textproto
deleted file mode 100644
index a00fb3bf5..000000000
--- a/lang/languages/umb/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "umb"
diff --git a/lang/languages/und.textproto b/lang/languages/und.textproto
new file mode 100644
index 000000000..381d4afe5
--- /dev/null
+++ b/lang/languages/und.textproto
@@ -0,0 +1,25 @@
+id: "und"
+name: "Unknown language"
+preferred_name: ""
+autonym: ""
+population: 323
+region: "AQ"
+region: "BV"
+region: "CP"
+region: "GS"
+region: "HM"
+exemplar_chars {
+}
+sample_text {
+  masthead_full: "사람들이"
+  masthead_partial: "세계"
+  tester: "인권을 무시함과 모욕함이 야만은 극악으로 되였고, 이 극악들이 인류의 양심을 오염 하였고, 전체 사람 모두 연설과"
+  poster_sm: "사람들이 폭력과 억압으로"
+  poster_md: "모든 나라의 좋은"
+  poster_lg: "사람들이"
+  specimen_48: "련합국의 모든 회원국의 인민이 련합국헌장에서 기본인권, 사람의 존엄과 가치하고 남녀평등권에 신념을 중신하였고, 큰"
+  specimen_36: "사람들이 법으로 평등하고, 법의 평등하는 보호를 받고, 모든 차별을 받않는권리가 있는다, 이 선언을 위반하는 모든 차별과 이 차별을 선동하는 행동의 위험을 피로 사람들이 평등하는 보호를 받는 권리가 있는다."
+  specimen_32: "인류의 전체 성원의 고윤 존엄과 평등과 변하지 않는 권리를 승인함이 세계의 자유, 정의하고 화평의 기초이다,\n인권을 무시함과 모욕함이 야만은 극악으로 되였고, 이 극악들이 인류의 양심을 오염 하였고, 전체 사람 모두 연설과 신앙자유가 있고 공구하고 빈곤이 없는 세계 옴이 보통은 인민의 가장 높은 소원으로 발표받였다,"
+  specimen_21: "인류의 전체 성원의 고윤 존엄과 평등과 변하지 않는 권리를 승인함이 세계의 자유, 정의하고 화평의 기초이다,\n인권을 무시함과 모욕함이 야만은 극악으로 되였고, 이 극악들이 인류의 양심을 오염 하였고, 전체 사람 모두 연설과 신앙자유가 있고 공구하고 빈곤이 없는 세계 옴이 보통은 인민의 가장 높은 소원으로 발표받였다,\n사람들이 폭력과 억압으로 반변으로 끝의 수단을 하지 않으러, 법치로 언권을 보호하는 필요함이 있는다,\n모든 나라의 좋은 관계의 개발을 촉진하는 필요함이 있는다,\n련합국의 모든 회원국의 인민이 련합국헌장에서 기본인권, 사람의 존엄과 가치하고 남녀평등권에 신념을 중신하였고, 큰 자유에서 사회진보하고 살는 수평의 개선 함을 촉진하기로 결심하였다,"
+  specimen_16: "인류의 전체 성원의 고윤 존엄과 평등과 변하지 않는 권리를 승인함이 세계의 자유, 정의하고 화평의 기초이다,\n인권을 무시함과 모욕함이 야만은 극악으로 되였고, 이 극악들이 인류의 양심을 오염 하였고, 전체 사람 모두 연설과 신앙자유가 있고 공구하고 빈곤이 없는 세계 옴이 보통은 인민의 가장 높은 소원으로 발표받였다,\n사람들이 폭력과 억압으로 반변으로 끝의 수단을 하지 않으러, 법치로 언권을 보호하는 필요함이 있는다,\n모든 나라의 좋은 관계의 개발을 촉진하는 필요함이 있는다,\n련합국의 모든 회원국의 인민이 련합국헌장에서 기본인권, 사람의 존엄과 가치하고 남녀평등권에 신념을 중신하였고, 큰 자유에서 사회진보하고 살는 수평의 개선 함을 촉진하기로 결심하였다,\n모든 회원국이 련합국과 협력함으로 인원과 기본자유에 보편존중과 준행을 촉진함을 맹세하였다,\n이 권리들과 자유들을 보편으로 알음이 이 맹세를 충분으로 실현음에 큰 중요성이 있는다,\n이에 지금,\n련합국대회,\n모든 사람과 모든 나라가 노력으로 실현는 공동표준을 하고, 모든 사람과 사회기구가 늘 이 선언을 기억하고, 노력으로 교회하고 교육으로 권리하고 자유에 존중을 족진하고, 나라의하고 국제의 점진하는 조시로, 이 권리들과 자유들에 모든 회원국 자신의 인민과 관할하받는 땅의 인민에게서 보변과 효과이 있는 승인과 준행을 얻게 한으로, 이 세계인권선언을 발 포하는다,"
+}
diff --git a/lang/languages/und/language.textproto b/lang/languages/und/language.textproto
deleted file mode 100644
index 34d5c4234..000000000
--- a/lang/languages/und/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "und"
-name: "Unknown language"
-preferred_name: ""
-autonym: ""
-population: 323
-region: "GS"
-region: "BV"
-region: "AQ"
-region: "CP"
-region: "HM"
-exemplar_chars {
-}
diff --git a/lang/languages/und/sampletext.textproto b/lang/languages/und/sampletext.textproto
deleted file mode 100644
index 75c422e28..000000000
--- a/lang/languages/und/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "und"
diff --git a/lang/languages/unr/language.textproto b/lang/languages/unr.textproto
similarity index 77%
rename from lang/languages/unr/language.textproto
rename to lang/languages/unr.textproto
index 45b7bce32..664eeb51d 100644
--- a/lang/languages/unr/language.textproto
+++ b/lang/languages/unr.textproto
@@ -8,3 +8,6 @@ script: "Bangla"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "unr"
+}
diff --git a/lang/languages/unr_Deva/language.textproto b/lang/languages/unr_Deva.textproto
similarity index 79%
rename from lang/languages/unr_Deva/language.textproto
rename to lang/languages/unr_Deva.textproto
index 403983a86..5ea4905c5 100644
--- a/lang/languages/unr_Deva/language.textproto
+++ b/lang/languages/unr_Deva.textproto
@@ -8,3 +8,6 @@ script: "Bangla"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "unr"
+}
diff --git a/lang/languages/unx/language.textproto b/lang/languages/unx.textproto
similarity index 77%
rename from lang/languages/unx/language.textproto
rename to lang/languages/unx.textproto
index cab5e5855..6050afe80 100644
--- a/lang/languages/unx/language.textproto
+++ b/lang/languages/unx.textproto
@@ -8,3 +8,6 @@ script: "Bangla"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "unr"
+}
diff --git a/lang/languages/ur.textproto b/lang/languages/ur.textproto
new file mode 100644
index 000000000..c58d8f50e
--- /dev/null
+++ b/lang/languages/ur.textproto
@@ -0,0 +1,30 @@
+id: "ur"
+name: "Urdu"
+preferred_name: ""
+autonym: "اُردُو"
+population: 288202177
+region: "IN"
+region: "MU"
+region: "PK"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "ء ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ل م ن و ٹ پ چ ڈ ڑ ژ ک گ ں ھ ہ ی"
+  auxiliary: "؀؁؂؃\\u200C\\u200D\\u200E\\u200F \\u064B \\u064C \\u064D \\u064E \\u064F \\u0650 \\u0651 \\u0652 \\u0654 \\u0656 \\u0657 \\u0658 \\u0670 أ آ ں ؤ ۂ ۃ ئ ٻ ة ٺ ټ ٽ ه ي"
+  marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٰ"
+  numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "، ؍ ٫ ٬ ؛ \\: ؟ . ۔ ( ) \\[ \\]"
+  index: "ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ہ ھ ء ی ے"
+}
+sample_text {
+  masthead_full: "تمان"
+  masthead_partial: "سآ"
+  tester: "چونکہ ہر انسان کی ذاتی عزت اور حرمت اور انسانوں کے مساوی اور"
+  poster_sm: "چونکہ انسانی"
+  poster_md: "چونکہ یہ"
+  poster_lg: "تمام"
+  specimen_48: "چونکہ یہ ضروری ہے کہ قوموں کے درمیان دوستانہ تعلقات کو بڑھایا"
+  specimen_36: "کوئی شخص غلام یا لونڈی بنا کر نہ رکھا جا سکے گا۔ غلامی اور بَردہ فروشی، چاہے اس کی کوئی شکل بھی ہو، ممنوع قرار دی جائے گی۔"
+  specimen_32: "ہر شخص کو ایسے افعال کے خلاف جو آئین یا قانون میں دیے گئے بنیادی حقوق کو تلف کرتے ہوں، بااختیار قومی عدالتوں میں موثّر طریقے سے چارہ جوئی کرنے کا پورا حق حاصل ہے۔"
+  specimen_21: "کسی شخص کو محض حاکم کی مرضی پر گرفتار، نظربند، یا جلاوطن نہیں کیا جائے گا۔\nہر ایک شخص کو یکساں طور پر حق حاصل ہے کہ اس کے حقوق و فرائض کا تعین یا اس کے خلاف کسی عائد کردہ جرم کے بارے میں مقدمے کی سماعت آزاد اور غیر جانبدار عدالت کے کھلے اجلاس میں منصفانہ طریقے سے ہو۔\nکسی شخص کی نجی زندگی، خانگی زندگی، گھربار، یا خط و کتابت میں من مانے طریقے پر مداخلت نہ کی جائے گی اور نہ ہی اس کی عزت اور نیک نامی پر حملے کیے جائیں گے۔ ہر شخص کو حق حاصل ہے کہ قانون اسے حملے یا مداخلت سے محفوظ رکھے۔"
+  specimen_16: "ہر انسان کو آزادیٔ فکر، آزادیٔ ضمیر، اور آزادیٔ مذہب کا پورا حق حاصل ہے۔ اس حق میں مذہب یا عقیدے کو تبدیل کرنے اور کُھلے عام یا نجی طور پر، تنہا یا دوسروں کے ساتھ مل جل کر عقیدے کی تبلیغ، عمل، عبادت، اور مذہبی رسمیں پوری کرنے کی آزادی بھی شامل ہے۔\nہر شخص کو اپنی رائے رکھنے اور اظہارِ رائے کی آزادی کا حق حاصل ہے۔ اس حق میں یہ امر بھی شامل ہے کہ وہ آزادی کے ساتھ اپنی رائے قائم کرے اور سرحدوں کا خیال کیے بغیر جس ذریعے سے چاہے علم اور خیالات کی تلاش کرے، انہیں حاصل کرے، اور ان کی تبلیغ کرے۔\nمعاشرے کے رکن کی حیثیت سے ہر شخص کو معاشرتی تحفّظ کا حق حاصل ہے اور یہ حق بھی کہ وہ ملک کے نظام اور وسائل کے مطابق قومی کوشش اور بین الاقوامی تعاون سے ایسے اقتصادی، معاشرتی، اور ثقافتی حقوق کو حاصل کرے، جو اس کی عزت اور شخصیت کی آزادانہ نشوونما کے لیے لازم ہیں۔"
+}
diff --git a/lang/languages/ur/language.textproto b/lang/languages/ur/language.textproto
deleted file mode 100644
index ee6d8b77d..000000000
--- a/lang/languages/ur/language.textproto
+++ /dev/null
@@ -1,17 +0,0 @@
-id: "ur"
-name: "Urdu"
-preferred_name: ""
-autonym: "اُردُو"
-population: 288202177
-region: "MU"
-region: "PK"
-region: "IN"
-script: "Perso-Arabic"
-exemplar_chars {
-  base: "ء ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ل م ن و ٹ پ چ ڈ ڑ ژ ک گ ں ھ ہ ی"
-  auxiliary: "؀؁؂؃\\u200C\\u200D\\u200E\\u200F \\u064B \\u064C \\u064D \\u064E \\u064F \\u0650 \\u0651 \\u0652 \\u0654 \\u0656 \\u0657 \\u0658 \\u0670 أ آ ں ؤ ۂ ۃ ئ ٻ ة ٺ ټ ٽ ه ي"
-  marks: "◌َ ◌ُ ◌ِ ◌ْ ◌ٰ"
-  numerals: "۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "، ؍ ٫ ٬ ؛ \\: ؟ . ۔ ( ) \\[ \\]"
-  index: "ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ہ ھ ء ی ے"
-}
diff --git a/lang/languages/ur/sampletext.textproto b/lang/languages/ur/sampletext.textproto
deleted file mode 100644
index 3df579087..000000000
--- a/lang/languages/ur/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ur"
diff --git a/lang/languages/uz/language.textproto b/lang/languages/uz.textproto
similarity index 95%
rename from lang/languages/uz/language.textproto
rename to lang/languages/uz.textproto
index dc0987fc7..71de5a67d 100644
--- a/lang/languages/uz/language.textproto
+++ b/lang/languages/uz.textproto
@@ -3,12 +3,12 @@ name: "Uzbek"
 preferred_name: ""
 autonym: "O‘zbekcha"
 population: 26480135
-region: "UZ"
-region: "TR"
 region: "TM"
-script: "Perso-Arabic"
+region: "TR"
+region: "UZ"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я Ё Ӯ Ғ Қ Ҳ а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ё ӯ ғ қ ҳ"
   auxiliary: "á à ă â å ä ã ā æ c ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū w ÿ"
@@ -17,3 +17,6 @@ exemplar_chars {
   punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
   index: "A B D E F G H I J K L M N O P Q R S T U V X Y Z {Oʻ} {Gʻ} {Sh} {Ch}"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/uz_Arab/language.textproto b/lang/languages/uz_Arab.textproto
similarity index 94%
rename from lang/languages/uz_Arab/language.textproto
rename to lang/languages/uz_Arab.textproto
index 916bf1243..3eb5e28c2 100644
--- a/lang/languages/uz_Arab/language.textproto
+++ b/lang/languages/uz_Arab.textproto
@@ -4,9 +4,9 @@ preferred_name: ""
 autonym: "وزبیکی"
 population: 1722258
 region: "AF"
-script: "Perso-Arabic"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "ء ئ ا ب ت ج ح خ د ر ز س ش غ ف ق ك ل م ن ه و ى ي پ چ ژ ڭ گ ھ ۇ ۋ ې ک ی"
   auxiliary: "\\u200C\\u200D\\u200E\\u200F ټ ځ څ ډ ړ ږ ښ ګ ڼ ي ۍ ې"
@@ -14,3 +14,6 @@ exemplar_chars {
   numerals: "\\u200E \\- ‑ , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹"
   index: "ء آ أ ؤ ئ ا ب پ ة ت ث ټ ج چ ح خ ځ څ د ذ ډ ر ز ړ ږ ژ س ش ښ ص ض ط ظ ع غ ف ق ک ګ گ ل م ن ڼ ه و ۇ ۉ ي ی ۍ ې"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/uz_Cyrl/language.textproto b/lang/languages/uz_Cyrl.textproto
similarity index 92%
rename from lang/languages/uz_Cyrl/language.textproto
rename to lang/languages/uz_Cyrl.textproto
index f7fcb9fbf..51219cccb 100644
--- a/lang/languages/uz_Cyrl/language.textproto
+++ b/lang/languages/uz_Cyrl.textproto
@@ -3,14 +3,17 @@ name: "Uzbek (Cyrillic)"
 preferred_name: ""
 autonym: ""
 population: 4590386
-region: "UZ"
 region: "CN"
-script: "Perso-Arabic"
+region: "UZ"
 script: "Cyrillic"
 script: "Latin"
+script: "Perso-Arabic"
 exemplar_chars {
   base: "а б в г ғ д е ё ж з и й к қ л м н о п р с т у ў ф х ҳ ч ш ъ э ю я"
   auxiliary: "ц щ ы ь"
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "А Б В Г Ғ Д Е Ж З И Й К Қ Л М Н О П Р С Т У Ў Ф Х Ҳ Ч Ш Ъ Э Ю Я"
 }
+sample_text {
+  fallback_language: "uz"
+}
diff --git a/lang/languages/vai.textproto b/lang/languages/vai.textproto
new file mode 100644
index 000000000..972dae6b3
--- /dev/null
+++ b/lang/languages/vai.textproto
@@ -0,0 +1,26 @@
+id: "vai"
+name: "Vai"
+preferred_name: ""
+autonym: "ꕙꔤ"
+population: 131905
+region: "LR"
+script: "Latin"
+script: "Vai"
+exemplar_chars {
+  base: "ꔀ ꔁ ꔂ ꔃ ꔄ ꔅ ꔆ ꔇ ꔈ ꔉ ꔊ ꔋ ꔌ ꔍ ꔎ ꔏ ꔐ ꔑ ꔒ ꔓ ꔔ ꔕ ꔖ ꔗ ꔘ ꔙ ꔚ ꔛ ꔜ ꔝ ꔞ ꔟ ꔠ ꔡ ꔢ ꔣ ꔤ ꔥ ꔦ ꔧ ꔨ ꔩ ꔪ ꔫ ꔬ ꔭ ꔮ ꔯ ꔰ ꔱ ꔲ ꔳ ꔴ ꔵ ꔶ ꔷ ꔸ ꔹ ꔺ ꔻ ꔼ ꔽ ꔾ ꔿ ꕀ ꕁ ꕂ ꕃ ꕄ ꕅ ꕆ ꕇ ꕈ ꕉ ꕊ ꕋ ꕌ ꕍ ꕎ ꕏ ꕐ ꕑ ꕒ ꕓ ꕔ ꕕ ꕖ ꕗ ꕘ ꕙ ꕚ ꕛ ꕜ ꕝ ꕞ ꕟ ꕠ ꕡ ꕢ ꕣ ꕤ ꕥ ꕦ ꕧ ꕨ ꕩ ꕪ ꕫ ꕬ ꕭ ꕮ ꕯ ꕰ ꕱ ꕲ ꕳ ꕴ ꕵ ꕶ ꕷ ꕸ ꕹ ꕺ ꕻ ꕼ ꕽ ꕾ ꕿ ꖀ ꖁ ꖂ ꖃ ꖄ ꖅ ꖆ ꖇ ꖈ ꖉ ꖊ ꖋ ꖌ ꖍ ꖎ ꖏ ꖐ ꖑ ꖒ ꖓ ꖔ ꖕ ꖖ ꖗ ꖘ ꖙ ꖚ ꖛ ꖜ ꖝ ꖞ ꖟ ꖠ ꖡ ꖢ ꖣ ꖤ ꖥ ꖦ ꖧ ꖨ ꖩ ꖪ ꖫ ꖬ ꖭ ꖮ ꖯ ꖰ ꖱ ꖲ ꖳ ꖴ ꖵ ꖶ ꖷ ꖸ ꖹ ꖺ ꖻ ꖼ ꖽ ꖾ ꖿ ꗀ ꗁ ꗂ ꗃ ꗄ ꗅ ꗆ ꗇ ꗈ ꗉ ꗊ ꗋ ꗌ ꗍ ꗎ ꗏ ꗐ ꗑ ꗒ ꗓ ꗔ ꗕ ꗖ ꗗ ꗘ ꗙ ꗚ ꗛ ꗜ ꗝ ꗞ ꗟ ꗠ ꗡ ꗢ ꗣ ꗤ ꗥ ꗦ ꗧ ꗨ ꗩ ꗪ ꗫ ꗬ ꗭ ꗮ ꗯ ꗰ ꗱ ꗲ ꗳ ꗴ ꗵ ꗶ ꗷ ꗸ ꗹ ꗺ ꗻ ꗼ ꗽ ꗾ ꗿ ꘀ ꘁ ꘂ ꘃ ꘄ ꘅ ꘆ ꘇ ꘈ ꘉ ꘊ ꘋ ꘌ ꘍ ꘎ ꘏ ꘐ ꘑ ꘒ ꘓ ꘔ ꘕ ꘖ ꘗ ꘘ ꘙ ꘚ ꘛ ꘜ ꘝ ꘞ ꘟ ꘠ ꘡ ꘢ ꘣ ꘤ ꘥ ꘦ ꘧ ꘨ ꘩ ꘪ ꘫ"
+  auxiliary: "ꘓ ꘔ ꘕ ꘖ ꘗ ꘘ ꘙ ꘚ ꘛ ꘜ ꘝ ꘞ ꘟ"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+}
+sample_text {
+  masthead_full: "ꕉꕜꕮꔔ"
+  masthead_partial: "ꘋꖸ"
+  tester: "ꕪꘋ ꖷ ꗞꔧ ꕀꔤ ꔻꔤ ꔤ ꗃꗡ ꖸꕊ ꗪꗡ ꔻꔤꘂ ꕮ, ꘃꖷ ꕉ ꗋꘋ ꕉꕜꕮ ꔔꘋ, ꔧ ꘃꖷ ꗞꗢ ꗬꗡ ꗏ ꕪꘋꔕ"
+  poster_sm: "ꕪꘋ ꖷ ꗞ ꕮ ꗛꖺ"
+  poster_md: "ꕪꘋ ꖷ ꕉ ꗪ"
+  poster_lg: "ꕉꕜꕮ"
+  specimen_48: "ꕪꘋ ꖷ ꖕꕯꔤꗳ ꔢꗔꘋ ꗞꗢ ꖸꕊ ꕢꕌꔳꘂ ꘀꗡꕩ ꗏ ꕉꕌ ꕞ ꔷꔤ ꕉꖸꕊ ꕔꕢꘋꗣ ꕮ ꔖꔜ ꗋꖺꕰꕊ ꘈꗢꖸ"
+  specimen_36: "ꗞ ꔰ ꕞ ꗋꖺꕰꕊ ꖷ ꘃꖷ ꕢꕎꕌ ꕃꔳ ꕢ ꗞꖻ ꕚꘋꔕ ꖸꔧ ꕉꕌ ꖏꔀ ꗏ ꗱꗡ ꕎꕌꔳ ꖷ ꔰ ꗞ ꕞ ꕉꕌ ꗋꖺꕒꕌ ꖃꘋꔕꔀ ꕉ ꕞ ꗓꔒ ꗪ ꕢꕎꕌ ꔖꔜꕯ ꖷ ꖸ ꕸꖃꔀ ꕞꕌꖸ ꕢ ꗞ ꔰ ꕞ ꖴꕮ ꗱꗡ ꖏꕎ."
+  specimen_32: "ꗞ ꔇꔀ ꔱꔷ ꗏꖺ ꘃ ꗞ ꕚ ꖏ ꗏ, ꖺ ꗞ ꕚ ꖴꖕꘂ ꗏ ꖏ ꗏ, ꖺ ꗞ ꕚ ꔞꘋ ꖝ ꗏ ꖏ ꗏ. ꕉꖷ ꗞ ꕮ ꗓ ꔎꘋ ꕉ ꗃꗡ ꕚ ꗪꗡ ꔻꔤꘂ ꕞ ꕉꖷ ꗞ ꕮ ꕉ ꗃ ꕮ ꕧꕴ. ꕢꕎꕌ ꕮꔧ ꕕ ꖷ ꕉꔤ ꗞꗢ ꗬꗡ ꖸꕊ ꗋꖺꕰꕊ ꖴꕮ ꗱꗡ ꕸꖃ ꔱꔷ ꖏ ꗏ ꖺ ꕞꔎ ꕔꕴ ꗷꔤ ꔫꖸ ꖸ ꕸꖃ."
+  specimen_21: "ꗞ ꔰ ꗋꖺꕰꕊꔒ ꖷ ꕉꔤ ꖴꘋꗒ ꕃꔤ ꕮ ꕉ ꕎꕬ ꕞ ꖏꕎ, ꕉ ꕘꕞꕌ ꕩꕌ ꘈꔧ ꕉꖷ ꕉꔤ ꔳ ꕉ ꕘꕞꕮꔧ ꔵꘉꗢ ꗏ. ꕉꕌ ꗋꖺꕰꕊ ꘈꗢ ꗪ ꕉ ꗉꕯ ꘃ ꕉ ꖴꘋ ꔵꘉ ꗏ ꕘꕞꘋꕡ, ꔧ ꕉ ꕢꕌ ꖏ ꖷ ꕞ, ꕉꖷ ꖏ ꔇꔀ ꕉ ꕮꔧ ꔧ ꕉ ꗏꔇꘋ ꖺ ꕉ ꗪ ꗞ ꖸ ꗻꗡꕩꕌ ꕮ ꕉꖸ ꕒꕒꔤ ꖺ ꕒꔤ ꗏ ꕉ ꕩꕌꖸꕊ ꔵꘉꗢ ꕧ ꕀꕩ ꖺ ꕉ ꕢꕌ ꖏ ꖷ ꕞ. ꕉ ꖴꘋ ꕪꕌ ꘃ ꔇꔀꕩ, ꕉ ꖴꘋ ꖏ ꕚꕌꘂ ꕃꔤ ꕧ ꕀꕩꕉꕌ, ꕉ ꖴꘋ ꕪꘋꕓ ꖢꔒꕩ ꕉꖷ ꕉꔤ ꔵꘉ ꖏ ꕮ.\nꗞ ꔰ ꗋꖺꕰꕊꔒ ꖷ ꕉꔤ ꖏ ꘀꗫ ꗷꔤ ꖷ ꕉ ꕴꕱꕎ ꕉꖷ ꕉ ꕩꕌ ꕚꕌ ꗉ ꖏ ꗏ; ꕉꖷ ꗋꖺꕰꕊ ꘈꗢ ꗱ, ꕉ ꖴꘋ ꗞ ꖸ ꗻꗡꕩꕌ ꕮ ꖴꘋꗒ ꕪ ꔇꔀ ꖏꕎ ꕉꖷ ꗞ ꖷ ꕚ ꔇꔀ ꖏ ꔫꔤ ꗏ ꕉ ꕮ ꘃ ꖸ. ꕉꖷ ꕉ ꖴꘋ ꕀꔤ ꕮ ꗓ ꗏꖺꕎ, ꕉꔤ ꕀꔤ ꕮ ꗓ ꔬꕩ, ꕉꖷ ꕉꔤ ꕀꔤ ꕮ ꗓ ꗪ ꘈꔧ ꔇꔀ ꕃꕞ ꗷꔤ ꔰ ꗱ ꕉꖷ ꗞ ꕮ ꕸꖃ ꔉꕖ ꕉ ꕧꕌ."
+  specimen_16: "ꗞ ꔰ ꕸꖃꔀ ꗏ, ꕕ ꖷ ꕒꕢ ꕢꕯꕈꕰꔒꔤ ꔳ ꕉꕌ ꖏꕎ ꕉꕌ ꗞ ꕒꕧ ꕎꕌꔳꘂ ꗪ ꗋꖺ ꕎꕌꔳ ꕞ ꖏꕎ. ꕉꖷ ꕕ ꖷ ꕃꕞꔤ ꔳ ꘃ ꖷ ꕉ ꕸꖃꔤ ꖴꘋ ꖏ ꖸ ꕮꔧ ꕸꖃꔀ ꕞ ꕒꕢꕌ ꗱ ꖺ ꕸꖃ ꖴꘋ ꕮꔕꔀ ꖸ ꗳꕮꕊ ꗏ ꕒꕢꕌ ꗱ ꔧ ꗷꔤ ꖷ ꕸꖃ ꗏꗒ ꔰ ꕩꕌ ꗪꗡ ꕯꕧꕌ ꖸ ꖴꘋ ꔻꔤꕩ ꘃꖷ ꗋꖺꕰꕊ ꗷꔤ ꖷ ꖸ ꗞ ꔇꔀ ꖴꘋ ꗞ ꖸ ꕮ ꕒꔤꕩ ꕉꖸ ꕞ, ꕉꖸꔧ ꔳ ꗞꗢ ꖸ ꕸꖃ ꕮ ꕉꖸꕊ ꗪꗡ ꔻ ꔤꘂ ꕞ ꖏꕎ ꔧ ꘃꖷ ꕉꖸ ꖴꘋ ꕚꕌ ꕧꕌ ꗱꗡꕩ ꕉꖸꕊ ꗪ ꕃꔤꘂ ꖸ ꗏ. ꕉꖸ ꕞ ꗓꔒ ꗪ ꔱꕩ ꗃꗡ ꕞ ꕔꔤꘂ ꖸ ꕞ, ꔧ ꖏꔀ ꘃꖷ ꖸ ꔳꕩ ꕒꕢꕮ ꖏ ꖸ ꖏ ꔱꕩ ꗃꗡ ꕞ ꖏꕎ, ꔧ ꕞꕡ ꖏ.\nꗞ ꔰ ꗋꖺꕰꕊꔒ ꖷ ꕉꔤ ꔱꕩ ꗃ ꗓ ꘃꗡ ꗏ, ꖺ ꕎꕌꔳꔤ ꔳ ꕉ ꔝ ꕉꔤ ꔱꕩ ꗃꗡ ꕞ ꕔꔤ ꕢ ꖏ ꖸ ꕮ. ꕉꖷ ꕉꕌ ꗓ ꘃ ꕎꕌꔳꘂ ꗱ ꕮ ꕧꘋꕨꕌ, ꕉꖷ ꗓ ꘃ ꔎꔒ ꕒ ꖸꔧ ꔳ ꕒꕡ ꖷ ꖸ ꕉꔤ ꕐꕌꕎ ꗱꗡ ꔎꔒꔀ ꕞ ꖏꕎ ꗪꖷꗨꗡ ꕉꔤ ꔱꕩ ꗃꕎ ꗓ ꘃꗡ ꗏ.\nꗞ ꔰ ꗋꖺꕰꕊꔒ ꖷ ꕉꔤ ꔳ ꖴꗷ ꕢꕮ ꗏ ꕉ ꗃꗡ ꖸ ꕞ ꔧ ꕸꖃ ꖴꘋꗣ ꖸ ꕮ ꗷꔤ ꕞ ꘃꖷ ꗋꖺꕰꕊ ꗪ ꖴꕮ ꕪ ꖷ ꖸ ꕮꕞꘋꔕ ꗪ ꕺ ꖃ ꘈꗢ ꗏ, ꕉꖸ ꖴꘋ ꔳꕩ ꗞ ꖸꕊ ꖏꕎ ꗯꗷꘋ."
+}
diff --git a/lang/languages/vai/language.textproto b/lang/languages/vai/language.textproto
deleted file mode 100644
index 18435a68a..000000000
--- a/lang/languages/vai/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "vai"
-name: "Vai"
-preferred_name: ""
-autonym: "ꕙꔤ"
-population: 131905
-region: "LR"
-script: "Latin"
-script: "Vai"
-exemplar_chars {
-  base: "ꔀ ꔁ ꔂ ꔃ ꔄ ꔅ ꔆ ꔇ ꔈ ꔉ ꔊ ꔋ ꔌ ꔍ ꔎ ꔏ ꔐ ꔑ ꔒ ꔓ ꔔ ꔕ ꔖ ꔗ ꔘ ꔙ ꔚ ꔛ ꔜ ꔝ ꔞ ꔟ ꔠ ꔡ ꔢ ꔣ ꔤ ꔥ ꔦ ꔧ ꔨ ꔩ ꔪ ꔫ ꔬ ꔭ ꔮ ꔯ ꔰ ꔱ ꔲ ꔳ ꔴ ꔵ ꔶ ꔷ ꔸ ꔹ ꔺ ꔻ ꔼ ꔽ ꔾ ꔿ ꕀ ꕁ ꕂ ꕃ ꕄ ꕅ ꕆ ꕇ ꕈ ꕉ ꕊ ꕋ ꕌ ꕍ ꕎ ꕏ ꕐ ꕑ ꕒ ꕓ ꕔ ꕕ ꕖ ꕗ ꕘ ꕙ ꕚ ꕛ ꕜ ꕝ ꕞ ꕟ ꕠ ꕡ ꕢ ꕣ ꕤ ꕥ ꕦ ꕧ ꕨ ꕩ ꕪ ꕫ ꕬ ꕭ ꕮ ꕯ ꕰ ꕱ ꕲ ꕳ ꕴ ꕵ ꕶ ꕷ ꕸ ꕹ ꕺ ꕻ ꕼ ꕽ ꕾ ꕿ ꖀ ꖁ ꖂ ꖃ ꖄ ꖅ ꖆ ꖇ ꖈ ꖉ ꖊ ꖋ ꖌ ꖍ ꖎ ꖏ ꖐ ꖑ ꖒ ꖓ ꖔ ꖕ ꖖ ꖗ ꖘ ꖙ ꖚ ꖛ ꖜ ꖝ ꖞ ꖟ ꖠ ꖡ ꖢ ꖣ ꖤ ꖥ ꖦ ꖧ ꖨ ꖩ ꖪ ꖫ ꖬ ꖭ ꖮ ꖯ ꖰ ꖱ ꖲ ꖳ ꖴ ꖵ ꖶ ꖷ ꖸ ꖹ ꖺ ꖻ ꖼ ꖽ ꖾ ꖿ ꗀ ꗁ ꗂ ꗃ ꗄ ꗅ ꗆ ꗇ ꗈ ꗉ ꗊ ꗋ ꗌ ꗍ ꗎ ꗏ ꗐ ꗑ ꗒ ꗓ ꗔ ꗕ ꗖ ꗗ ꗘ ꗙ ꗚ ꗛ ꗜ ꗝ ꗞ ꗟ ꗠ ꗡ ꗢ ꗣ ꗤ ꗥ ꗦ ꗧ ꗨ ꗩ ꗪ ꗫ ꗬ ꗭ ꗮ ꗯ ꗰ ꗱ ꗲ ꗳ ꗴ ꗵ ꗶ ꗷ ꗸ ꗹ ꗺ ꗻ ꗼ ꗽ ꗾ ꗿ ꘀ ꘁ ꘂ ꘃ ꘄ ꘅ ꘆ ꘇ ꘈ ꘉ ꘊ ꘋ ꘌ ꘍ ꘎ ꘏ ꘐ ꘑ ꘒ ꘓ ꘔ ꘕ ꘖ ꘗ ꘘ ꘙ ꘚ ꘛ ꘜ ꘝ ꘞ ꘟ ꘠ ꘡ ꘢ ꘣ ꘤ ꘥ ꘦ ꘧ ꘨ ꘩ ꘪ ꘫ"
-  auxiliary: "ꘓ ꘔ ꘕ ꘖ ꘗ ꘘ ꘙ ꘚ ꘛ ꘜ ꘝ ꘞ ꘟ"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-}
diff --git a/lang/languages/vai/sampletext.textproto b/lang/languages/vai/sampletext.textproto
deleted file mode 100644
index 37ec4736f..000000000
--- a/lang/languages/vai/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "vai"
diff --git a/lang/languages/vai_Latn/language.textproto b/lang/languages/vai_Latn.textproto
similarity index 90%
rename from lang/languages/vai_Latn/language.textproto
rename to lang/languages/vai_Latn.textproto
index 7cd961d57..4fba5144a 100644
--- a/lang/languages/vai_Latn/language.textproto
+++ b/lang/languages/vai_Latn.textproto
@@ -11,3 +11,6 @@ exemplar_chars {
   numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B Ɓ C D Ɗ E Ɛ F G H I J K L M N Ŋ O Ɔ P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "vai"
+}
diff --git a/lang/languages/ve.textproto b/lang/languages/ve.textproto
new file mode 100644
index 000000000..d4d4439a5
--- /dev/null
+++ b/lang/languages/ve.textproto
@@ -0,0 +1,25 @@
+id: "ve"
+name: "Venda"
+preferred_name: ""
+autonym: "Tshivenḓa"
+population: 1391759
+region: "ZA"
+region: "ZW"
+script: "Latin"
+exemplar_chars {
+  base: "A B D Ḓ E F G H I K L Ḽ M N Ṋ Ṅ O P R S T Ṱ U V W X Y Z a b d ḓ e f g h i k l ḽ m n ṋ ṅ o p r s t ṱ u v w x y z"
+  marks: "◌̇ ◌̭"
+}
+sample_text {
+  masthead_full: "VvHh"
+  masthead_partial: "Aa"
+  tester: "Sa izwo u ḓivhea ha u dzhiela nṱha lwa mvele ya tshirunzi tsha"
+  poster_sm: "Sa izwo zwi"
+  poster_md: "Sa izwo u"
+  poster_lg: "Vhathu"
+  specimen_48: "sa tshone tshikalo tshine tsha nga shumiswa nga nnyi na nnyi"
+  specimen_36: "Sa izwo u pfeseswa ha pfanelo idzi na mbofholowo zwi zwa ndeme khulwane kha uri mbofho iyi i bveledzwe nga vhuḓalo,"
+  specimen_32: "Sa izwo u ḓivhea ha u dzhiela nṱha lwa mvele ya tshirunzi tsha muthu na ndingano na pfanelo dza vhathu vhoṱhe zwi murango wa mbofholowo, vhulamukanyi na mulalo ḽifhasini,"
+  specimen_21: "Sa izwo u ḓivhea ha u dzhiela nṱha lwa mvele ya tshirunzi tsha muthu na ndingano na pfanelo dza vhathu vhoṱhe zwi murango wa mbofholowo, vhulamukanyi na mulalo ḽifhasini,\nSa izwo u dzhielwa fhasi na u tsikeledzwa ha pfanelo dza vhathu ho bveledza zwiito zwa vhuveveru vhu fhandulaho luvalo lwa muthu, na u ḓa ha shango ḽine khaḽo vhathu vha ḓo ḓiphina nga mbofholowo ya u amba na u tenda kha zwine vha funa, na u vhofholowa kha nyofho na zwo dzhiiwa sa dzangalelo ḽihulwane ḽa vhathu zwavho,"
+  specimen_16: "Sa izwo u ḓivhea ha u dzhiela nṱha lwa mvele ya tshirunzi tsha muthu na ndingano na pfanelo dza vhathu vhoṱhe zwi murango wa mbofholowo, vhulamukanyi na mulalo ḽifhasini,\nSa izwo u dzhielwa fhasi na u tsikeledzwa ha pfanelo dza vhathu ho bveledza zwiito zwa vhuveveru vhu fhandulaho luvalo lwa muthu, na u ḓa ha shango ḽine khaḽo vhathu vha ḓo ḓiphina nga mbofholowo ya u amba na u tenda kha zwine vha funa, na u vhofholowa kha nyofho na zwo dzhiiwa sa dzangalelo ḽihulwane ḽa vhathu zwavho,\nSa izwo zwi zwa ndeme, arali muthu a sa ḓo kombetshedzwa nga u shaya iṅwe nḓila, u vutshela vhutambudzi na vhutsikeledzi, uri pfanelo dza vhuthu dzi tsireledzwe nga u shumisa mulayo,"
+}
diff --git a/lang/languages/ve/language.textproto b/lang/languages/ve/language.textproto
deleted file mode 100644
index b75c584d0..000000000
--- a/lang/languages/ve/language.textproto
+++ /dev/null
@@ -1,12 +0,0 @@
-id: "ve"
-name: "Venda"
-preferred_name: ""
-autonym: "Tshivenḓa"
-population: 1391759
-region: "ZA"
-region: "ZW"
-script: "Latin"
-exemplar_chars {
-  base: "A B D Ḓ E F G H I K L Ḽ M N Ṋ Ṅ O P R S T Ṱ U V W X Y Z a b d ḓ e f g h i k l ḽ m n ṋ ṅ o p r s t ṱ u v w x y z"
-  marks: "◌̇ ◌̭"
-}
diff --git a/lang/languages/ve/sampletext.textproto b/lang/languages/ve/sampletext.textproto
deleted file mode 100644
index a951d2191..000000000
--- a/lang/languages/ve/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "ve"
diff --git a/lang/languages/vec.textproto b/lang/languages/vec.textproto
new file mode 100644
index 000000000..00508c368
--- /dev/null
+++ b/lang/languages/vec.textproto
@@ -0,0 +1,24 @@
+id: "vec"
+name: "Venetian"
+preferred_name: ""
+autonym: "Vèneto"
+population: 811235
+region: "IT"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Ç È É Ì Í Ò Ó Ù Ł Ž a b c d e f g h i j k l m n o p q r s t u v w x y z à á ç è é ì í ò ó ù ł ž"
+  marks: "◌̀ ◌́ ◌̌ ◌̧"
+}
+sample_text {
+  masthead_full: "TtUu"
+  masthead_partial: "Ii"
+  tester: "Considarà che el reconosimento de ła dinjità inerente a tuti"
+  poster_sm: "Considarà che"
+  poster_md: "Considarà"
+  poster_lg: "Tuti"
+  specimen_48: "Considarà ch’A ze indespensàbiłe promóvar el dezviłupo de raporti"
+  specimen_36: "Nesun el podarà èsar tenjù da sciavo o da servo; ła sciavitù e el marcà de sciavi i sarà proibìi in tute łe maniere."
+  specimen_32: "Onjun el ga el derito a na efetiva posibiłità de recorso a tribunałi conpetenti, contro de ati che no i respeta i só deriti fondamentałi reconosùi da ła costitusion o da ła łeze."
+  specimen_21: "Nesun el podarà èsar arestà, inprezonà o eziłià par arbitrio.\nOnjun el ga el derito, in condision conpanja par tuti, a na udiensa justa e pùblega davanti de un tribunałe independente e inparsiałe, par ła detarminasion de i só deriti, de i só doveri e anca de onji acuzasion criminałe contro de łu.\nOnjun el ga el derito de sponsar e de straviarse, ciapà rento donca anca na łimitasion rasionałe de łe ore de łaoro e ferie pariòdeghe pagàe."
+  specimen_16: "Onjun el ga el derito a un órdene sosiałe e intarnasionałe ndo’ che i deriti e łe łibartà prezentài inte ’sta Declarasion i pose èsar reałizài in pien.\nNjente rento de ’sta Declarasion el pol èsar intarpretà inte’l senso de conportar un derito de un Stato, grupo o parsona ch’A se voje, de ezersitar na atività o de conpir un ato mirà a ła destrusion de calchedun de i deriti e de łe łibartà cusì declarài.\nConsidarà che el reconosimento de ła dinjità inerente a tuti i menbri de ła fameja umana e de i só deriti, conpanji e inałienàbiłi, el costituise el fondamento de ła łibartà, de ła justisia e de ła paze inte’l mondo;"
+}
diff --git a/lang/languages/vec/language.textproto b/lang/languages/vec/language.textproto
deleted file mode 100644
index a0cdf0d71..000000000
--- a/lang/languages/vec/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "vec"
-name: "Venetian"
-preferred_name: ""
-autonym: "Vèneto"
-population: 811235
-region: "IT"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Ç È É Ì Í Ò Ó Ù Ł Ž a b c d e f g h i j k l m n o p q r s t u v w x y z à á ç è é ì í ò ó ù ł ž"
-  marks: "◌̀ ◌́ ◌̌ ◌̧"
-}
diff --git a/lang/languages/vec/sampletext.textproto b/lang/languages/vec/sampletext.textproto
deleted file mode 100644
index a0de78057..000000000
--- a/lang/languages/vec/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "vec"
diff --git a/lang/languages/vep.textproto b/lang/languages/vep.textproto
new file mode 100644
index 000000000..f87e9f559
--- /dev/null
+++ b/lang/languages/vep.textproto
@@ -0,0 +1,24 @@
+id: "vep"
+name: "Veps"
+preferred_name: ""
+autonym: "Vepsä"
+population: 3543
+region: "RU"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Ü Č Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö ü č š ž"
+  marks: "◌̈ ◌̌"
+}
+sample_text {
+  masthead_full: "KkAa"
+  masthead_partial: "Ii"
+  tester: "Ottes homaitusehe, miše mez’kundan kaikiden ühtnikoiden arvokahuden"
+  poster_sm: "ezitab necen"
+  poster_md: "Kaik mehed"
+  poster_lg: "Kaik"
+  specimen_48: "Tariž, miše jogahižel mehel oližiba kaik oiktuded i valdad, miččed"
+  specimen_36: "Nikeda ei sa kovasüdaimelišesti mokita, kovin ustavzoitta, tehta mugomid tegoid, kudambad alenzoitaižiba hänen arvokahuden."
+  specimen_32: "Jogahižel mehel om oiktuz’ mugoižehe socialižehe i rahvazkeskeižehe järgendusehe, konz neciš deklaracijas ezitadud oiktuded i valdad voiba täudes todenzoittas."
+  specimen_21: "Nimidä neciš deklaracijas ei sa el’geta muga, miše mitte-ni valdkund, mehiden grupp vai üks’ mez’ voib oiktuziden pohjal tehta mugomid tegoid, kudambad om oigetud heitmaha ezitadud neciš deklaracijas oiktuzid i valdoid.\nOttes homaitusehe, miše mez’kundan kaikiden ühtnikoiden arvokahuden i ühthižiden oiktuziden tundustamine oma valdan, oiktuden, mirun alandusen; i"
+  specimen_16: "Ottes homaitusehe, miše mez’kundan kaikiden ühtnikoiden arvokahuden i ühthižiden oiktuziden tundustamine oma valdan, oiktuden, mirun alandusen; i\nottes homaitusehe, miše hondostamine i kacmatomuz’ mehen oiktuzihe tob varvaroiden tegoid, kudambad käregoitas mez’kundan mel’tundod, i mehiden suren tahton i takaindan om mugoman mirun tegend, kudambas mehil linneb sanavald, kacmusiden vald, ei linne varaidust i mairišt; i\nottes homaitusehe, miše tarbiž mehiden oiktuded kaita zakonan valdal, sen täht, miše mehele ei pidaiži lopuks libuda tiranijan i ahthištusen vasthapäi; i"
+}
diff --git a/lang/languages/vep/language.textproto b/lang/languages/vep/language.textproto
deleted file mode 100644
index 2dadc1547..000000000
--- a/lang/languages/vep/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "vep"
-name: "Veps"
-preferred_name: ""
-autonym: "Vepsä"
-population: 3543
-region: "RU"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ö Ü Č Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä ö ü č š ž"
-  marks: "◌̈ ◌̌"
-}
diff --git a/lang/languages/vep/sampletext.textproto b/lang/languages/vep/sampletext.textproto
deleted file mode 100644
index 1e396d4e5..000000000
--- a/lang/languages/vep/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "vep"
diff --git a/lang/languages/vi.textproto b/lang/languages/vi.textproto
new file mode 100644
index 000000000..31a0d7a90
--- /dev/null
+++ b/lang/languages/vi.textproto
@@ -0,0 +1,29 @@
+id: "vi"
+name: "Vietnamese"
+preferred_name: ""
+autonym: "Tiếng Việt"
+population: 86038260
+region: "CN"
+region: "US"
+region: "VN"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â Ã È É Ê Ì Í Ò Ó Ô Õ Ù Ú Ý Ă Đ Ĩ Ũ Ơ Ư Ạ Ả Ấ Ầ Ẩ Ẫ Ậ Ắ Ằ Ẳ Ẵ Ặ Ẹ Ẻ Ẽ Ế Ề Ể Ễ Ệ Ỉ Ị Ọ Ỏ Ố Ồ Ổ Ỗ Ộ Ớ Ờ Ở Ỡ Ợ Ụ Ủ Ứ Ừ Ử Ữ Ự Ỳ Ỵ Ỷ Ỹ a b c d e f g h i j k l m n o p q r s t u v w x y z à á â ã è é ê ì í ò ó ô õ ù ú ý ă đ ĩ ũ ơ ư ạ ả ấ ầ ẩ ẫ ậ ắ ằ ẳ ẵ ặ ẹ ẻ ẽ ế ề ể ễ ệ ỉ ị ọ ỏ ố ồ ổ ỗ ộ ớ ờ ở ỡ ợ ụ ủ ứ ừ ử ữ ự ỳ ỵ ỷ ỹ"
+  marks: "◌̀ ◌́ ◌̂ ◌̃ ◌̆ ◌̉ ◌̛ ◌̣"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
+  index: "A Ă Â B C D Đ E Ê F G H I J K L M N O Ô Ơ P Q R S T U Ư V W X Y Z"
+}
+sample_text {
+  masthead_full: "TtÂâ"
+  masthead_partial: "Cc"
+  tester: "Việc thừa nhận nhân phẩm vốn có, các quyền bình đẳng và không"
+  poster_sm: "Sự xâm phạm"
+  poster_md: "Nhân quyền"
+  poster_lg: "Tất"
+  specimen_48: "Cần phải khuyến khích việc phát triển quan hệ bằng hữu giữa các"
+  specimen_36: "Không ai phải làm nô lệ hay bị cưỡng bức làm việc như nô lệ; mọi hình thức nô lệ và buôn bán nô lệ đều bị ngăn cấm."
+  specimen_32: "Mọi người đều có quyền được các toà án quốc gia có thẩm quyền bênh vực theo pháp luật trước những hành vi vi phạm các quyền cơ bản do hiến pháp hay luật pháp quy định."
+  specimen_21: "Không ai bị bắt, giam giữ hay đày đi nơi khác một cách độc đoán.\nMọi người, với tư cách bình đẳng về mọi phương diện, đều có quyền được một toà án độc lập và vô tư phân xử công bằng và công khai để xác định quyền, nghĩa vụ hoặc bất cứ một lời buộc tội nào đối với người đó.\nMọi người đều có quyền nghỉ ngơi và giải trí, kể cả quyền được hạn chế hợp lý về số giờ làm việc và hưởng những ngày nghỉ định kỳ được trả lương."
+  specimen_16: "Mọi người đều có quyền được hưởng trật tự xã hội và trật tự quốc tế trong đó các quyền và tự do nêu trong Bản tuyên ngôn này có thể được thực hiện đầy đủ.\nKhông được phép diễn giải bất kỳ điều khoản nào trong Bản tuyên ngôn này theo hướng ngầm ý cho phép bất kỳ quốc gia, nhóm người hay cá nhân nào được quyền tham gia vào bất kỳ hoạt động nào hay thực hiện bất kỳ hành vi nào nhằm phá hoại bất kỳ quyền và tự do nào nêu trong Bản tuyên ngôn này.\nVới nhận thức rằng:\nViệc thừa nhận nhân phẩm vốn có, các quyền bình đẳng và không thể tách rời của mọi thành viên trong gia đình nhân loại là cơ sở cho tự do, công bằng và hoà bình trên thế giới,"
+}
diff --git a/lang/languages/vi/language.textproto b/lang/languages/vi/language.textproto
deleted file mode 100644
index 8bbafd655..000000000
--- a/lang/languages/vi/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "vi"
-name: "Vietnamese"
-preferred_name: ""
-autonym: "Tiếng Việt"
-population: 86038260
-region: "US"
-region: "VN"
-region: "CN"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Á Â Ã È É Ê Ì Í Ò Ó Ô Õ Ù Ú Ý Ă Đ Ĩ Ũ Ơ Ư Ạ Ả Ấ Ầ Ẩ Ẫ Ậ Ắ Ằ Ẳ Ẵ Ặ Ẹ Ẻ Ẽ Ế Ề Ể Ễ Ệ Ỉ Ị Ọ Ỏ Ố Ồ Ổ Ỗ Ộ Ớ Ờ Ở Ỡ Ợ Ụ Ủ Ứ Ừ Ử Ữ Ự Ỳ Ỵ Ỷ Ỹ a b c d e f g h i j k l m n o p q r s t u v w x y z à á â ã è é ê ì í ò ó ô õ ù ú ý ă đ ĩ ũ ơ ư ạ ả ấ ầ ẩ ẫ ậ ắ ằ ẳ ẵ ặ ẹ ẻ ẽ ế ề ể ễ ệ ỉ ị ọ ỏ ố ồ ổ ỗ ộ ớ ờ ở ỡ ợ ụ ủ ứ ừ ử ữ ự ỳ ỵ ỷ ỹ"
-  marks: "◌̀ ◌́ ◌̂ ◌̃ ◌̆ ◌̉ ◌̛ ◌̣"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″"
-  index: "A Ă Â B C D Đ E Ê F G H I J K L M N O Ô Ơ P Q R S T U Ư V W X Y Z"
-}
diff --git a/lang/languages/vi/sampletext.textproto b/lang/languages/vi/sampletext.textproto
deleted file mode 100644
index 3e992d50c..000000000
--- a/lang/languages/vi/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "vi"
diff --git a/lang/languages/vic/language.textproto b/lang/languages/vic.textproto
similarity index 77%
rename from lang/languages/vic/language.textproto
rename to lang/languages/vic.textproto
index 4081f0bff..b3a0d106c 100644
--- a/lang/languages/vic/language.textproto
+++ b/lang/languages/vic.textproto
@@ -7,3 +7,6 @@ region: "SX"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/vls/language.textproto b/lang/languages/vls.textproto
similarity index 75%
rename from lang/languages/vls/language.textproto
rename to lang/languages/vls.textproto
index 9e3f6ce3f..ca84a1186 100644
--- a/lang/languages/vls/language.textproto
+++ b/lang/languages/vls.textproto
@@ -7,3 +7,6 @@ region: "BE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/vmf/language.textproto b/lang/languages/vmf.textproto
similarity index 76%
rename from lang/languages/vmf/language.textproto
rename to lang/languages/vmf.textproto
index c49f20302..f4a097069 100644
--- a/lang/languages/vmf/language.textproto
+++ b/lang/languages/vmf.textproto
@@ -7,3 +7,6 @@ region: "DE"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/vmw.textproto b/lang/languages/vmw.textproto
new file mode 100644
index 000000000..51d8ab587
--- /dev/null
+++ b/lang/languages/vmw.textproto
@@ -0,0 +1,24 @@
+id: "vmw"
+name: "Makhuwa"
+preferred_name: ""
+autonym: "Emakhuwa"
+population: 3912766
+region: "MZ"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À È Ì Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à è ì ò ù"
+  marks: "◌̀"
+}
+sample_text {
+  masthead_full: "AaTt"
+  masthead_partial: "Hh"
+  tester: "Okhala wira osaamiha n’edignidade ya kunla pinatamu n’editeito"
+  poster_sm: "Okhala wira"
+  poster_md: "Okhala wi"
+  poster_lg: "Atthu"
+  specimen_48: "Okhala wi v’alupale okhaviherya makhalelo amurettele ni ilapo"
+  specimen_36: "Okhala wi moota onsuwelehu edireito n’eliberdade iya etthu yuplupale wira naakhule saana epaphelo yasinanrehu;"
+  specimen_32: "Atthu othene aniyaria oolikana ni owilamula moota ontthunaya okhala, variyari v’edignidade ni edireito. Akhalanne esaria ni otthokelela, ahaana akhalasaka othene saya vamurettele."
+  specimen_21: "Atthu othene poti othyawelela edireito n’eliberdade silempwe mupapheloni mu ahithanliaka yakhala wira atthu ooripa walaa oottela, nnakhala muthiyana walaa mulopwana, opuro onkhala’we, oninlompa’we muluku, epoliitika entthara’we, muthajiri walaa musikhini.\nNenna vaa, khavo onrowa othanliwa mwaha wa epoliitika entthara’we, elapo awe, walaa nttetthe oyariwa’we, okhalana ni wihikhalana elapo yupum’we omantariwa n’atthu ookhopela."
+  specimen_16: "Wakunla pinatamu ohaana edireito ya ekumi, eliberdade ni wakiha erutthu awe.\nKhavo onrowa okhalihiwa epottha, makhalelo ya epottha, ni moota owakaliha epottha atthu enakhottihiya.\nKhavo onrowa ohoosiwa, nnakhala okhalihiwa moota wonanara.\nWakunla mutthu ohaana edireito yosaamihia makhalelo awe wakunla opuro onkhala’we.\nAtthu othene t’olikana variyari va elei, n’atthu othene attitthimihiweke n’elei. Atthu othene ahaana akhaviheriwaka, mwaha wale ahin’tthuna ottitthimiha edeklarasau ila.\nWakunla mutthu ohaana edireito yotthyawelela elei ya elapo enkhalawe wi akihiwe yakhala wira edireito sawe silempwe mwa elei yelapo awe kisettin’he saana."
+}
diff --git a/lang/languages/vmw/language.textproto b/lang/languages/vmw/language.textproto
deleted file mode 100644
index cc725eafe..000000000
--- a/lang/languages/vmw/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "vmw"
-name: "Makhuwa"
-preferred_name: ""
-autonym: "Emakhuwa"
-population: 3912766
-region: "MZ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À È Ì Ò Ù a b c d e f g h i j k l m n o p q r s t u v w x y z à è ì ò ù"
-  marks: "◌̀"
-}
diff --git a/lang/languages/vmw/sampletext.textproto b/lang/languages/vmw/sampletext.textproto
deleted file mode 100644
index c7b30ffcd..000000000
--- a/lang/languages/vmw/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "vmw"
diff --git a/lang/languages/vot/language.textproto b/lang/languages/vot.textproto
similarity index 73%
rename from lang/languages/vot/language.textproto
rename to lang/languages/vot.textproto
index 3c58a9cb1..e4f13741c 100644
--- a/lang/languages/vot/language.textproto
+++ b/lang/languages/vot.textproto
@@ -7,3 +7,6 @@ region: "RU"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/vro/language.textproto b/lang/languages/vro.textproto
similarity index 88%
rename from lang/languages/vro/language.textproto
rename to lang/languages/vro.textproto
index e6170d189..bfa99d9f5 100644
--- a/lang/languages/vro/language.textproto
+++ b/lang/languages/vro.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Õ Ö Ü Š Ž a b c d e f g h i j k l m n o p q r s t u v w x y z ä õ ö ü š ž \'"
   marks: "◌̃ ◌̈ ◌̌"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/vun/language.textproto b/lang/languages/vun.textproto
similarity index 86%
rename from lang/languages/vun/language.textproto
rename to lang/languages/vun.textproto
index d0fde6716..16d5fb836 100644
--- a/lang/languages/vun/language.textproto
+++ b/lang/languages/vun.textproto
@@ -10,3 +10,6 @@ exemplar_chars {
   auxiliary: "q x"
   index: "A B C D E F G H I J K L M N O P R S T U V W Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/wa.textproto b/lang/languages/wa.textproto
new file mode 100644
index 000000000..0ab77ff79
--- /dev/null
+++ b/lang/languages/wa.textproto
@@ -0,0 +1,24 @@
+id: "wa"
+name: "Walloon"
+preferred_name: ""
+autonym: "Walon"
+population: 679800
+region: "BE"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Å Ç È É Ê Î Ô Û a b c d e f g h i j k l m n o p q r s t u v w x y z â å ç è é ê î ô û"
+  marks: "◌̀ ◌́ ◌̂ ◌̊ ◌̧"
+}
+sample_text {
+  masthead_full: "TtOo"
+  masthead_partial: "Ss"
+  tester: "Qui l\'fondemint dè-l\'lîbèté, dè-l djustice èt dè-l\'påye tot-avå l\'monde,"
+  poster_sm: "Qui l\'fêt\' dè"
+  poster_md: "Qui l\'pus"
+  poster_lg: "Tos"
+  specimen_48: "Qui lès dreûts d\'l\'ome divèt-èsse ptotéjés d\'on rèdjime di dreût"
+  specimen_36: "Qu\'ine minme îdèye di cès dreûts èt d\'cès lîbèrtés-chal èst dè-l\'pus hôte importance po poleûr tini vrêmint ciste ègadj\'mint-la."
+  specimen_32: "Nolu n\'sèrè t\'nou come èsclåve ou ovrî sins salêre, l\'èclavadje di tote sôrt, tot come dè fé martichî dès-èsclåves di tot l\'minme quéle manîre sont disfindous."
+  specimen_21: "Nolu n\'pôrèt-èsse må trêti, mètou a-l\'torteûre, ou rabahi avou dès cruwélès ponnes nin dègnes d\'in-ome.\nChaskeun\' a l\'dreût d\'èsse rik\'nohou tot-avå po çou qu\'il èst sorlon si lwè tot come sès dreûts.\nChaskeun\' a l\'dreût d\'s\'aler plinde èt d\'èsse ètindou po d\'bon dè-l\'justice compétinte di s\'payis, di tot çou qu\'sèreût fêt po mète a må lès mêsses dreûts qu\'lî sont rik\'nohous dè-l\'constitucion ou bin dès lwès."
+  specimen_16: "Nolu n\'pout-èsse sins rêzon tchoûki è-l\'pote, tinou èprîh\'né ou tchèssi foû di s\'payis.\nChaskeun\' a l\'dreût d\'èsse ètindou d\'ine minme manîre, divant tot l\'monde èt sins totès fêtès-îdèyes, divant on tribunål indépendant èt djusse qui dècid\'ré d\'sès dreûts ou bin d\'sès d\'vwérs, tot come lî r\'vint l\'dreût di s\'disfinde di çou qu\'on lî r\'proche ou bin d\'çou qu\'on l\'acuse.\nNouk ni pôrê aler hèrer s\'narène divins l\'vicårèye, li famile d\'in-ôte, brokî ê s\'mohone ou bin nahî d\'vins sès lètes èt sès papîs, ni l\'ac\'sûre divins si-oneûr ou s\'réputåcion. Chaskeun\'a l\'dreût d\'èsse protéjé dès lwès disconte dès s\'fêtès manîres."
+}
diff --git a/lang/languages/wa/language.textproto b/lang/languages/wa/language.textproto
deleted file mode 100644
index 0fc5592b3..000000000
--- a/lang/languages/wa/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "wa"
-name: "Walloon"
-preferred_name: ""
-autonym: "Walon"
-population: 679800
-region: "BE"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Â Å Ç È É Ê Î Ô Û a b c d e f g h i j k l m n o p q r s t u v w x y z â å ç è é ê î ô û"
-  marks: "◌̀ ◌́ ◌̂ ◌̊ ◌̧"
-}
diff --git a/lang/languages/wa/sampletext.textproto b/lang/languages/wa/sampletext.textproto
deleted file mode 100644
index 738269ef5..000000000
--- a/lang/languages/wa/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "wa"
diff --git a/lang/languages/wae/language.textproto b/lang/languages/wae.textproto
similarity index 94%
rename from lang/languages/wae/language.textproto
rename to lang/languages/wae.textproto
index 1d6d5d8a0..705aa0910 100644
--- a/lang/languages/wae/language.textproto
+++ b/lang/languages/wae.textproto
@@ -3,8 +3,8 @@ name: "Walser"
 preferred_name: ""
 autonym: "Walscher"
 population: 11376
-region: "LI"
 region: "CH"
+region: "LI"
 script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Á Ã Ä É Í Ó Õ Ö Ú Ü Č Š Ũ a b c d e f g h i j k l m n o p q r s t u v w x y z á ã ä é í ó õ ö ú ü č š ũ"
@@ -13,3 +13,6 @@ exemplar_chars {
   numerals: "\\- ‑ , ’ % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/wal/language.textproto b/lang/languages/wal.textproto
similarity index 75%
rename from lang/languages/wal/language.textproto
rename to lang/languages/wal.textproto
index 06e2528d0..8ada57465 100644
--- a/lang/languages/wal/language.textproto
+++ b/lang/languages/wal.textproto
@@ -7,3 +7,6 @@ region: "ET"
 script: "Ethiopic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "am"
+}
diff --git a/lang/languages/war.textproto b/lang/languages/war.textproto
new file mode 100644
index 000000000..5661d8c98
--- /dev/null
+++ b/lang/languages/war.textproto
@@ -0,0 +1,24 @@
+id: "war"
+name: "Waray"
+preferred_name: ""
+autonym: "Waray-Waray"
+population: 3166249
+region: "PH"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z ñ"
+  marks: "◌̃"
+}
+sample_text {
+  masthead_full: "NnGg"
+  masthead_partial: "Aa"
+  tester: "Tungod han pagkilal-a nga an tiunay nga dignidad ug katpong ngan"
+  poster_sm: "Tungod han"
+  poster_md: "Tungod nga"
+  poster_lg: "Nga"
+  specimen_48: "Tungod nga kinahanglanon gud an pagpaudway han nagtutubo nga"
+  specimen_36: "Tungod nga an paggisinabtanay hini nga mga katungod importante gud kaupay basi matuman ini nga panaad;"
+  specimen_32: "An kada tagsa may katadungan hin pagpahuway ug pagpahalibway, kaupod in pagtakon han iya mga oras hin pagtrabaho ug ha mga panahon nga adlaw nga mga lu-an nga binaydan."
+  specimen_21: "An kada tagsa may katadungan ngada hin kahimtang nga sosyal of internasyonal diin an mga katadungan ug katal-wasa dida hin nga Deklarasyon mahihimo katuman.\nWaray hini dinhi nga Deklarasyon in intyendihon nga naghahatag ngada hin bisan ano nga Gobyerno, hugpo o tawo hin katadungan pagbuhat hin bisan ano nga makakabungkag hin ano dida nga katadungan ug katalwasan nga nailagda dinhi"
+  specimen_16: "Tungod han pagkilal-a nga an tiunay nga dignidad ug katpong ngan diri-maiwasan nga mga katungod hadton mga kaapihan kanan tawo pamilya amo an pinatatamakan han katalwasan, hustisya kalinawan han kalibutan;\nTungod han pagpasibaya ug pagbiay-biaya han kanan mga tawo katungod nga nahingadto hin mga magpakarima-dima nga mga buhat ug nakapahangit han katawhan, ug dumangat han pag-abot hin bag-o nga panahaon diin an mga katawhan magpapahimulos han ira katadungan pagyakan ug pagtuo hin waray ikahahadlok ug an katalwas tikang hin mga kabaraka ug pahingulang iginsaysay nga amo an pinakahitaas nga hingyap han mga molupyo;"
+}
diff --git a/lang/languages/war/language.textproto b/lang/languages/war/language.textproto
deleted file mode 100644
index c41efb3ac..000000000
--- a/lang/languages/war/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "war"
-name: "Waray"
-preferred_name: ""
-autonym: "Waray-Waray"
-population: 3166249
-region: "PH"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ñ a b c d e f g h i j k l m n o p q r s t u v w x y z ñ"
-  marks: "◌̃"
-}
diff --git a/lang/languages/war/sampletext.textproto b/lang/languages/war/sampletext.textproto
deleted file mode 100644
index f532c3047..000000000
--- a/lang/languages/war/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "war"
diff --git a/lang/languages/wbp/language.textproto b/lang/languages/wbp.textproto
similarity index 85%
rename from lang/languages/wbp/language.textproto
rename to lang/languages/wbp.textproto
index e2436dfbc..167887596 100644
--- a/lang/languages/wbp/language.textproto
+++ b/lang/languages/wbp.textproto
@@ -8,3 +8,6 @@ script: "Latin"
 exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/wbq/language.textproto b/lang/languages/wbq.textproto
similarity index 74%
rename from lang/languages/wbq/language.textproto
rename to lang/languages/wbq.textproto
index 459f5a269..b202a9fa8 100644
--- a/lang/languages/wbq/language.textproto
+++ b/lang/languages/wbq.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Telugu"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "te"
+}
diff --git a/lang/languages/wbr/language.textproto b/lang/languages/wbr.textproto
similarity index 75%
rename from lang/languages/wbr/language.textproto
rename to lang/languages/wbr.textproto
index 66f440404..eeebc5ee7 100644
--- a/lang/languages/wbr/language.textproto
+++ b/lang/languages/wbr.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/wls/language.textproto b/lang/languages/wls.textproto
similarity index 87%
rename from lang/languages/wls/language.textproto
rename to lang/languages/wls.textproto
index c0a4d2a00..489b7e54d 100644
--- a/lang/languages/wls/language.textproto
+++ b/lang/languages/wls.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ā Ē Ī Ō Ū a b c d e f g h i j k l m n o p q r s t u v w x y z ā ē ī ō ū ʻ"
   marks: "◌̄"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/wni/language.textproto b/lang/languages/wni.textproto
similarity index 76%
rename from lang/languages/wni/language.textproto
rename to lang/languages/wni.textproto
index fb959e64f..1126c2358 100644
--- a/lang/languages/wni/language.textproto
+++ b/lang/languages/wni.textproto
@@ -7,3 +7,6 @@ region: "KM"
 script: "Perso-Arabic"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ar"
+}
diff --git a/lang/languages/wo.textproto b/lang/languages/wo.textproto
new file mode 100644
index 000000000..b31bf395e
--- /dev/null
+++ b/lang/languages/wo.textproto
@@ -0,0 +1,29 @@
+id: "wo"
+name: "Wolof"
+preferred_name: ""
+autonym: "Wolof"
+population: 11025493
+region: "MR"
+region: "SN"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Ã É Ë Ñ Ó Ŋ a b c d e f g h i j k l m n o p q r s t u v w x y z à ã é ë ñ ó ŋ"
+  auxiliary: "ã h v z"
+  marks: "◌̀ ◌́ ◌̃ ◌̈"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}"
+  index: "A B C D E F G H I J K L M N Ŋ O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "DdOo"
+  masthead_partial: "Mm"
+  tester: "Ñu jàpp te nangu ne sagu doomi aadama ak sañ-sañam yépp-dañu yam"
+  poster_sm: "Ñu jàpp ne"
+  poster_md: "Ndaje mu"
+  poster_lg: "Doomi"
+  specimen_48: "Ñu lawal sañ-sañ yeek taawfeex yi jël aymatukaay ci biirak bitim"
+  specimen_36: "Ñu nangu te di doxal fépp ci anam gu wér ci biir xeet yi sosoo ci réew i bokk ci mbootaay gi ak gox yi bootu ci ñoom."
+  specimen_32: "Doomi aadama yépp danuy juddu, yam ci tawfeex ci sag ak sañ-sañ. Nekk na it ku xam dëgg te ànd na ak xelam, te war naa jëflante ak nawleen, te teg ko ci wàllu mbokk."
+  specimen_21: "Ku ne mën naa wax ne am na ay sañ-sañ ak ay tawfeex yu sosoo ci bataaxal bii te amul xeej ak seen, rawatina ci wàllu xeet, melo, awra, làkk, diiné, peete ci wàllu politig, xalaat, réew mbaa askan woo mën ti sosoo, ci it wàllu juddu alal ak lu mu mën ti doon.\nRax sa dolli amul xeej ak seen ci politig, yoon, mbaa doxalin wu aju ci bitim réew mbaa suuf soo xamne nit ki fa la cosaanoo; réew moomu mbaa suuf soosu moom na boppam walla deet, mbaa ñu yamale yengu-yëngoom."
+  specimen_16: "Nit kune war naa dund ci tawfeex ak kaaraange.\nWaruñoo def kenn jaam mbaa mbindaan. Njaam ak njaayum jaam nanguwunu ko ci anam gu mu mën ti doon.\nWaruñoo mbugal, tutal, mbaa teg kenn lu metti lool lu yelloo wul ak doomu aadama.\nNit ku ne am na sañ-sañ ñu war kaa nangul darajaam ci wàllu yoon.\nNépp a yam ci kanamu yoon. Te it amul xeej ak seen, ku ne yoon woowu war na laa aar. Népp war nañu leen aar ci luy jalgati liñu tënk ci bataaxal bii ak bepp yëngu-gëngu buy indi par-parloo.\nNit ku ne am na sañ-sañ dem ci berebi àtte kaay yi ci reewam saa yoo xamne sañ-sañam yooyu dëppook sàrti réewam mba yoon jalgati nañu ko."
+}
diff --git a/lang/languages/wo/language.textproto b/lang/languages/wo/language.textproto
deleted file mode 100644
index b20aa3aef..000000000
--- a/lang/languages/wo/language.textproto
+++ /dev/null
@@ -1,16 +0,0 @@
-id: "wo"
-name: "Wolof"
-preferred_name: ""
-autonym: "Wolof"
-population: 11025493
-region: "SN"
-region: "MR"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z À Ã É Ë Ñ Ó Ŋ a b c d e f g h i j k l m n o p q r s t u v w x y z à ã é ë ñ ó ŋ"
-  auxiliary: "ã h v z"
-  marks: "◌̀ ◌́ ◌̃ ◌̈"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}"
-  index: "A B C D E F G H I J K L M N Ŋ O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/wo/sampletext.textproto b/lang/languages/wo/sampletext.textproto
deleted file mode 100644
index 15920fa53..000000000
--- a/lang/languages/wo/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "wo"
diff --git a/lang/languages/wtm/language.textproto b/lang/languages/wtm.textproto
similarity index 75%
rename from lang/languages/wtm/language.textproto
rename to lang/languages/wtm.textproto
index a7a1eb7fd..257aa40e4 100644
--- a/lang/languages/wtm/language.textproto
+++ b/lang/languages/wtm.textproto
@@ -7,3 +7,6 @@ region: "IN"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/wuu/language.textproto b/lang/languages/wuu.textproto
similarity index 68%
rename from lang/languages/wuu/language.textproto
rename to lang/languages/wuu.textproto
index 92111a4fd..d0353054e 100644
--- a/lang/languages/wuu/language.textproto
+++ b/lang/languages/wuu.textproto
@@ -10,3 +10,16 @@ exemplar_chars {
   auxiliary: "乒 乓 仂 仓 伞 侣 傈 傣 僳 冥 凉 刨 匕 卑 卞 厘 厦 厨 吕 呣 唇 啤 啮 喱 嗅 噘 噢 坝 堤 墟 奎 妆 婴 媚 宅 寺 尬 尴 屑 屿 巽 巾 弓 彗 惊 戟 扔 扰 扳 抛 挂 捂 摇 撅 撤 杆 杖 柜 柱 栗 栽 桶 棍 棕 棺 楔 楠 榈 槟 橙 洒 浆 涌 淇 滕 滚 滩 灾 烛 烟 焰 煎 犬 猫 瑚 瓢 甫 皱 盆 盔 盲 眨 眯 瞌 矿 碑 祈 祭 祷 禄 稻 竿 笼 筒 篷 粟 粮 纠 纬 缆 缎 耸 脚 舔 舵 艇 艮 芽 苜 苞 菇 菱 葫 葵 蒸 蓿 蔽 薯 蘑 蚂 蛛 蜗 蜘 蜡 蝎 蝴 螃 裹 谍 谬 豚 账 跤 踪 躬 轴 辐 迹 郁 鄙 酢 钉 钥 钮 钯 铂 铅 铛 锄 锑 锚 锤 镑 闺 阱 隧 雕 霾 靴 靶 鞠 颠 馏 驼 骆 髦 魁 鲤 鲸 鳄 鸽"
   numerals: "% + - . 0 1 2 3 4 5 6 7 8 9 ‰ 〇"
 }
+sample_text {
+  masthead_full: "人生而自"
+  masthead_partial: "由拉"
+  tester: "鉴于人权个无视脱仔侮蔑已发展为野蛮暴行，掰眼暴行玷污了人类个良心，而一个人人侪有言论脱仔信仰自由并勿有恐惧脱匮乏个世界个来临"
+  poster_sm: "发布掰个世界人权宣言"
+  poster_md: "人人有权享有生命"
+  poster_lg: "人人生而自由"
+  specimen_48: "法律之前人人平等，并有权享受法律个平等保护，勿受任何歧视。人人有权享受平等保护，以免受违反掰个宣言个任何歧视行为脱仔煽动掰排里歧视个任何行为个害"
+  specimen_36: "鉴于人类社会个成员侪有个固有尊严脱仔平等个脱仔勿移个权利承认，是世界自由、正义脱仔和平个基础，\n鉴于人权个无视脱仔侮蔑已发展为野蛮暴行，掰眼暴行玷污了人类个良心，而一个人人侪有言论脱仔信仰自由并勿有恐惧脱匮乏个世界个来临，已被宣布为普通人民个着着高愿望，"
+  specimen_32: "鉴于人类社会个成员侪有个固有尊严脱仔平等个脱仔勿移个权利承认，是世界自由、正义脱仔和平个基础，\n鉴于人权个无视脱仔侮蔑已发展为野蛮暴行，掰眼暴行玷污了人类个良心，而一个人人侪有言论脱仔信仰自由并勿有恐惧脱匮乏个世界个来临，已被宣布为普通人民个着着高愿望，\n鉴于为使人类勿至于迫勿得已铤而走险暴政脱仔压迫进行反叛，有必要使人权受法治个保护，"
+  specimen_21: "鉴于人类社会个成员侪有个固有尊严脱仔平等个脱仔勿移个权利承认，是世界自由、正义脱仔和平个基础，\n鉴于人权个无视脱仔侮蔑已发展为野蛮暴行，掰眼暴行玷污了人类个良心，而一个人人侪有言论脱仔信仰自由并勿有恐惧脱匮乏个世界个来临，已被宣布为普通人民个着着高愿望，\n鉴于为使人类勿至于迫勿得已铤而走险暴政脱仔压迫进行反叛，有必要使人权受法治个保护，\n鉴于有必要促进各国间友好关系个发展，\n鉴于各联合国国家个人民已拉联合国宪章中重申伊拉对基本人权、人格尊严和价值以及男女平等权利个信念，并决心促成较大自由中个社会进步脱仔生活水平个改善，\n鉴于各会员国业已誓愿同联合国合作以促进对人权脱仔基本自由个普遍尊重脱仔遵行，\n鉴于对掰眼权利脱仔自由个普遍了解对于掰个誓愿个充分实现有蛮大个重要性，"
+  specimen_16: "鉴于人类社会个成员侪有个固有尊严脱仔平等个脱仔勿移个权利承认，是世界自由、正义脱仔和平个基础，\n鉴于人权个无视脱仔侮蔑已发展为野蛮暴行，掰眼暴行玷污了人类个良心，而一个人人侪有言论脱仔信仰自由并勿有恐惧脱匮乏个世界个来临，已被宣布为普通人民个着着高愿望，\n鉴于为使人类勿至于迫勿得已铤而走险暴政脱仔压迫进行反叛，有必要使人权受法治个保护，\n鉴于有必要促进各国间友好关系个发展，\n鉴于各联合国国家个人民已拉联合国宪章中重申伊拉对基本人权、人格尊严和价值以及男女平等权利个信念，并决心促成较大自由中个社会进步脱仔生活水平个改善，\n鉴于各会员国业已誓愿同联合国合作以促进对人权脱仔基本自由个普遍尊重脱仔遵行，\n鉴于对掰眼权利脱仔自由个普遍了解对于掰个誓愿个充分实现有蛮大个重要性，\n因此葛歇，\n大会，\n发布掰个世界人权宣言，作为所有人民脱仔所有国家努力实现个共同标准，以期每一个人脱仔社会机构经常思量掰个宣言，努力通过教诲脱仔教育促进对权利脱仔自由个尊重，并通过国家个脱仔国际个渐进措施，使掰眼权利脱仔自由拉各会员国本身人民脱仔拉伊拉管辖下领土个人民中得到普遍脱仔有效个承认脱仔遵行；\n人人生而自由，拉尊严脱仔权利上一律平等。伊拉有理性脱仔良心，并应以兄弟关系个精神相对待。\n人人有资格享有本宣言所载个一切权利脱仔自由，勿分种族、肤色、性别、语言、宗教、政治或其他见解、国籍或社会出身、财产、出生或其他身分等任何区别。"
+}
diff --git a/lang/languages/wuu/sampletext.textproto b/lang/languages/wuu/sampletext.textproto
deleted file mode 100644
index 5cbad8d36..000000000
--- a/lang/languages/wuu/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "wuu"
diff --git a/lang/languages/xav/language.textproto b/lang/languages/xav.textproto
similarity index 88%
rename from lang/languages/xav/language.textproto
rename to lang/languages/xav.textproto
index fe872645a..5a455c3e3 100644
--- a/lang/languages/xav/language.textproto
+++ b/lang/languages/xav.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ã É Ẽ Ô Õ Ö Ĩ a b c d e f g h i j k l m n o p q r s t u v w x y z ã é ẽ ô õ ö ĩ ’"
   marks: "◌́ ◌̂ ◌̃ ◌̈"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/xh.textproto b/lang/languages/xh.textproto
new file mode 100644
index 000000000..50dc522a7
--- /dev/null
+++ b/lang/languages/xh.textproto
@@ -0,0 +1,26 @@
+id: "xh"
+name: "Xhosa"
+preferred_name: ""
+autonym: "isiXhosa"
+population: 10182944
+region: "LS"
+region: "ZA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+  auxiliary: ""
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "BbOo"
+  masthead_partial: "Nn"
+  tester: "Njengoko iimfanelo zesidima soluntu semvelo kunye neemfanelo"
+  poster_sm: "Kwananjalo"
+  poster_md: "Njengokuba"
+  poster_lg: "Bonke"
+  specimen_48: "Njengoko uluntu Lwezizwe Ezimanyeneyo luthe lwaqinisekisa kukubaluleka"
+  specimen_36: "Njengoko iimvisiswano zesidima soluntu nenkululeko yoluntu zibalulekile ukuze kuzuzwe esi sithembiso,"
+  specimen_32: "Bonke abantu bazalwa bekhululekile belingana ngesidima nangokweemfanelo. Bonke abantu banesiphiwo sesazela nesizathu sokwenza isenzo ongathanda ukuba senziwe kumzalwane wakho."
+  specimen_21: "Wonke umntu unamalungelo kwiimfanelo nenkululeko eziqulathwe kule nkcazelo, ngaphandle kokwahlulwa ngobuhlanga, ibala, ubuni, ulwimi, inkolo, ezopolitiko nezinye izimvo, ezesizwe okanye ezentlalo, ezokuzalwa okanye namanye amawonga.\nNgaphezu koko, akukho mahluko unokwenziwa usekelwe kwezopolitiko, ulawulo lwezobulungisa okanye amawonga ezizwe nezizwana okanye ummandla apho umntu akhoyo, nokuba uzimele, ukuthembeka, urhulumente ongazimelanga okanye nokuba zeziphi indlela zokunciphisa ulawulo lobukumkani."
+  specimen_16: "Wonke umntu unelungelo lokuphila, inkululeko kunye nokhuseleko.\nAkukho namnye oya kugcinwa ebukhobokeni nakukhuselo lomnye umntu, kanti urhwebo ngamakhoboka aluvumelekanga nangayiphina indlela.\nAkukho namnye oyakuphathwa gadalala, ngenkohlakalo, ngokungenabuntu okanye ngempatho eluhlazo okanye isohlwayo.\nWonke umntu unelungelo lokwamkelwa yonke indawo njengomntu phambi komthetho.\nBonke abantu bayalingana phambi komthetho kwaye benamalungelo ngaphandle kocalu‐calulo ngokulinganayo kukhuseleko lomthetho. Bonke abantu banelungelo lokhuselo olulinganayo oluchasene naluphina ucalu‐calulo olwaphula le nkcazelo, nangokuchasene neendlela zothelekiso kucalu‐calulo."
+}
diff --git a/lang/languages/xh/language.textproto b/lang/languages/xh/language.textproto
deleted file mode 100644
index d610d2b96..000000000
--- a/lang/languages/xh/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "xh"
-name: "Xhosa"
-preferred_name: ""
-autonym: "isiXhosa"
-population: 10182944
-region: "LS"
-region: "ZA"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-  auxiliary: ""
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/xh/sampletext.textproto b/lang/languages/xh/sampletext.textproto
deleted file mode 100644
index 86ac66902..000000000
--- a/lang/languages/xh/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "xh"
diff --git a/lang/languages/xmf/language.textproto b/lang/languages/xmf.textproto
similarity index 75%
rename from lang/languages/xmf/language.textproto
rename to lang/languages/xmf.textproto
index 24af2e1e8..986ba7e2d 100644
--- a/lang/languages/xmf/language.textproto
+++ b/lang/languages/xmf.textproto
@@ -7,3 +7,6 @@ region: "GE"
 script: "Georgian"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "ka"
+}
diff --git a/lang/languages/xnr/language.textproto b/lang/languages/xnr.textproto
similarity index 93%
rename from lang/languages/xnr/language.textproto
rename to lang/languages/xnr.textproto
index 8fe93f231..1a35f511b 100644
--- a/lang/languages/xnr/language.textproto
+++ b/lang/languages/xnr.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "० १ २ ३ ४ ५ ६ ७ ८ ९ 0 1 2 3 4 5 6 7 8 9"
   punctuation: "। ॥ ॰"
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/xog/language.textproto b/lang/languages/xog.textproto
similarity index 87%
rename from lang/languages/xog/language.textproto
rename to lang/languages/xog.textproto
index 83073fccc..797bc7fed 100644
--- a/lang/languages/xog/language.textproto
+++ b/lang/languages/xog.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/xsr/language.textproto b/lang/languages/xsr.textproto
similarity index 75%
rename from lang/languages/xsr/language.textproto
rename to lang/languages/xsr.textproto
index f1d114069..ce9297845 100644
--- a/lang/languages/xsr/language.textproto
+++ b/lang/languages/xsr.textproto
@@ -7,3 +7,6 @@ region: "NP"
 script: "Devanagari"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "hi"
+}
diff --git a/lang/languages/yao.textproto b/lang/languages/yao.textproto
new file mode 100644
index 000000000..3df30c4da
--- /dev/null
+++ b/lang/languages/yao.textproto
@@ -0,0 +1,24 @@
+id: "yao"
+name: "Yao"
+preferred_name: ""
+autonym: "chiYao"
+population: 722356
+region: "MZ"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E G H I J K L M N O P S T U W Ŵ Y a b c d e g h i j k l m n o p s t u w ŵ y"
+  marks: "◌̂"
+}
+sample_text {
+  masthead_full: "WwAa"
+  masthead_partial: "Nn"
+  tester: "Aga ni maufulu gakasapagwa nago mundu jwalijose gigalembekwe"
+  poster_sm: "Pa 10 December,"
+  poster_md: "Chiwanja"
+  poster_lg: "Wandu"
+  specimen_48: "Wandu wosope akwete maufulu gachitatuile gagali gakupagwa nago."
+  specimen_36: "Mundu akasakamulikwa ukaidi pamagongo gangalumbana nambo soni akasatoposyekwa mchilambo pa magongo gangamanyika chenene."
+  specimen_32: "Mundu akwete ufulu wakwimbikwa magambo panganya jijili jakulumbana mwangalola ngope mwakuwanjilana ni ufulu wa mundujo, ulemwa wakwe ni yindu yine yakusosekwa kuti mundujo ayigose."
+  specimen_21: "Mundu akole ufulu wakutama mwangasokonesyekwa pewasa lyakwe ni panyumba jakwe. Ikalata yakwe soni ikasiiunguligwa ni wandu wane. Mundu amsunjile uchimbichimbi wakwe ndawi syosope, m\'yoyo mundu atetelekwe ni malamusi kuti yindu yeleyi ikasiyitendekwaga.\nMundu akwete ufulu wakupumula nambo soni ng\'anda. Mundujo soni, akasakamuliskwa masengo ndawi jajilewu mnope. Akoleje soni ndawi jakupumula jajilewu (Holiday), mundawi jeleji mundujo apocheleje soni malipilo."
+  specimen_16: "Mundu jwalijose akwete ufulu wakutama mchilambo mwamtendele kuti akomboleche kuwa ni maufulu gagali mumkamulano awu.\nMkamulunano awu ngaukupeleka ufulu kwa chilambo chine chilichose, likuga, kapena mundu jwalijose wakutenda chindu chine chilichose chimpaka chayochesye wandu maufulu gawo gagali mumkamulanowu.\nAga ni maufulu gakasapagwa nago mundu jwalijose gigalembekwe ni chiwanja cha United Nations mumkamulano wakolanjikwa Universal Declaration of Human Rights.\nWandu wosope akasapagwa ni ufulu ni uchimbichimbi wakulandana. Asapagwa ni lunda, niwakupakombola ganisya, m\'yoyo kukusosekwa kuti mundu jwalijose am\'woneje mundu jwimwe mpela mlongomjakwe."
+}
diff --git a/lang/languages/yao/language.textproto b/lang/languages/yao/language.textproto
deleted file mode 100644
index a5a3c313b..000000000
--- a/lang/languages/yao/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "yao"
-name: "Yao"
-preferred_name: ""
-autonym: "chiYao"
-population: 722356
-region: "MZ"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E G H I J K L M N O P S T U W Ŵ Y a b c d e g h i j k l m n o p s t u w ŵ y"
-  marks: "◌̂"
-}
diff --git a/lang/languages/yao/sampletext.textproto b/lang/languages/yao/sampletext.textproto
deleted file mode 100644
index 118370f5a..000000000
--- a/lang/languages/yao/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "yao"
diff --git a/lang/languages/yap.textproto b/lang/languages/yap.textproto
new file mode 100644
index 000000000..ef8f452de
--- /dev/null
+++ b/lang/languages/yap.textproto
@@ -0,0 +1,24 @@
+id: "yap"
+name: "Yapese"
+preferred_name: ""
+autonym: "Waab"
+population: 6555
+region: "FM"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ë Ö a b c d e f g h i j k l m n o p q r s t u v w x y z ä ë ö"
+  marks: "◌̈"
+}
+sample_text {
+  masthead_full: "GgUu"
+  masthead_partial: "Bb"
+  tester: "Bochan ni ngan nang ni gubine gidii mabee mabay mattʼawen, meere"
+  poster_sm: "Bochan ni yara"
+  poster_md: "Bochan ni"
+  poster_lg: "Gubine"
+  specimen_48: "Bochan ni battʼuf maba gaafan ni ngan obneg ziline pinam ni gubin"
+  specimen_36: "Bochan ni bagaa fan nge angin ni nge gubin e gidii menang fan nge morngaagen e tin mattʼawey nge tin bapuf rogoy ngay,"
+  specimen_32: "Gubine gidii mani gargeleg nga faileng nibapuf mattʼawen nge rogon. Bay laniyan nipii e nam, ere ngauda ted mattʼaawen e chaa niba chugur ngoded nimod walag dad."
+  specimen_21: "Gubine gidii maba puf mattʼawen nimod nibayu lan gazon ere ngi Garcheg ney, madariy rogon nga ramaen douey, miti gidii, ppin fa pumoon, zin, taliw, am, gyog, nam, ara likʼegal kubee, ngin gargeleg bee riiʼ, fa yuguboch banʼen.\nMakueritay ni dab ni page mazil nga zilin barbaa e am nge barbaa, ggangin ara mazil u gibine nam nitin baachig nge tin gagangʼ ni ngin bee fachaa riy, mademutrug fare nam ko fire bamil suwon ir ngak, ara bamil suwon ngakʼ rebo nam fa gaangin e mti motochiyel ko fare nam."
+  specimen_16: "Gubine gidii mabay mattʼawen ko birokʼe pagofan, talin, nge kanowaen i ayuweg fir.\nDab nikel beeʼ ngantay nimod e sib, mange maze folchuway ko gidii ni gubin.\nDab ni gafgou nege lem ara doungin bee, fani gechig neg ni gazi miti gechig ni yama pii ko gidii.\nGubine gidii mabay mattʼawen ni ngan nang gidii u bang u monʼutan e motochiyel.\nGubin e gidii mada taareb mattʼawen lane motochiyel makueritay ni dezilzil e ayuw ko motochiyel kubee nge bee. Magubin e gidii makueritay nibay mattʼawen ni tab ayuw e yaratay ngakʼ u lane motochiyel, makuran gechig neg ni ku taareb rogon ni gomanga kepig chel bee kepilyeg bayang ko ngi Garcheg ney ara marwee ngadaken ngawuruuʼ e kanowaʼ."
+}
diff --git a/lang/languages/yap/language.textproto b/lang/languages/yap/language.textproto
deleted file mode 100644
index 0430446c2..000000000
--- a/lang/languages/yap/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "yap"
-name: "Yapese"
-preferred_name: ""
-autonym: "Waab"
-population: 6555
-region: "FM"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ä Ë Ö a b c d e f g h i j k l m n o p q r s t u v w x y z ä ë ö"
-  marks: "◌̈"
-}
diff --git a/lang/languages/yap/sampletext.textproto b/lang/languages/yap/sampletext.textproto
deleted file mode 100644
index 6be343e84..000000000
--- a/lang/languages/yap/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "yap"
diff --git a/lang/languages/yav/language.textproto b/lang/languages/yav.textproto
similarity index 92%
rename from lang/languages/yav/language.textproto
rename to lang/languages/yav.textproto
index 72c9167e4..7c9c801e5 100644
--- a/lang/languages/yav/language.textproto
+++ b/lang/languages/yav.textproto
@@ -12,3 +12,6 @@ exemplar_chars {
   numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
   index: "A B C D E Ɛ F H I K L M N Ŋ O Ɔ P S T U V W Y"
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/ybb/language.textproto b/lang/languages/ybb.textproto
similarity index 74%
rename from lang/languages/ybb/language.textproto
rename to lang/languages/ybb.textproto
index 82a83ade1..00f5d40a5 100644
--- a/lang/languages/ybb/language.textproto
+++ b/lang/languages/ybb.textproto
@@ -7,3 +7,6 @@ region: "CM"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/yi.textproto b/lang/languages/yi.textproto
new file mode 100644
index 000000000..a097ee879
--- /dev/null
+++ b/lang/languages/yi.textproto
@@ -0,0 +1,33 @@
+id: "yi"
+name: "Yiddish"
+preferred_name: ""
+autonym: "ייִדיש"
+population: 1046399
+region: "CA"
+region: "GB"
+region: "IL"
+region: "SE"
+region: "UA"
+region: "US"
+script: "Hebrew"
+exemplar_chars {
+  base: "ו י א ב ג ד ה ז ח ט כ ך ל מ ם נ ן ס ע פ ף צ ץ ק ר ש ת"
+  auxiliary: "\\u200E\\u200F"
+  marks: "◌ְ ◌ֱ ◌ֲ ◌ֳ ◌ִ ◌ֵ ◌ֶ ◌ַ ◌ָ ◌ֹ ◌ֻ ◌ּ ◌ׁ ◌ׂ"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . ׳ \' \" ( ) \\[ \\] / ״ ־"
+  index: "\\u05C2 \\u05BC \\u05BF א ב ג ד ה ו ז ח ט י כ ל מ נ ס ע פ צ ק ר ש ת"
+}
+sample_text {
+  masthead_full: "יעדר"
+  masthead_partial: "מנ"
+  tester: "היות װי דער סאַמער גרונט פֿון פֿרײַהײט, יושר, און שלום אױף דער גאָרער"
+  poster_sm: "היות װי געזעץ"
+  poster_md: "היות װי די"
+  poster_lg: "יעדער"
+  specimen_48: "היות װי די פֿעלקער מיטגלידער האָבן געטאָן אַ נדר מיטצואַרבעטן מיט"
+  specimen_36: "קײנעם טאָר מען ניט פּײַניקן אָדער אױסשטעלן אױף אַ שטראָף װאָס זאָל זײַן אוממענטשלעך, אַחזוריותדיק, אָדער דעגראַדירנדיק."
+  specimen_32: "יעדער האָט אַ רעכט אױף אַ געזעלשאַפֿטלעכער און אינטערנאַציאָנאַלער אָרדנונג מיט װעלכער די רעכט און פֿרײַהײטן פֿאַרצײכנט אין אָט דער דעקלאַראַציע זאָלן האָבן אַ פֿולשטענדיקן קיום."
+  specimen_21: "גאָרניט אין דער דאָזיקער דעקלאַראַציע טאָר מען ניט טײַטשן מיט דער אימפּליקאַציע, אַז װאָסער־ניט־איז מלוכה, גרופּע, צי מענטש האָט אַ רעכט אױף פֿאַרנעמען זיך מיט װאָסער־ניט־איז אַקטיװיטעט, אָדער אױספֿירן װאָסער־ניט־איז אַקט, װאָס איז געצילט אױף דער צעשטערונג פֿון װעלכן־ניט־איז פֿון די רעכט און פֿרײַהײטן װאָס זײַנען פֿאַרצײכנט דאָ אױבן.\nהיות װי דער סאַמער גרונט פֿון פֿרײַהײט, יושר, און שלום אױף דער גאָרער װעלט באַשטײט פֿון אָנערקענען דעם תּוכיקן כּבֿוד און די גלײַכע און ניט־איבערטראָגלעכע רעכט פֿון אַלע מיטגלידער פֿון דער מענטשישער משפּחה,"
+  specimen_16: "היות װי דער סאַמער גרונט פֿון פֿרײַהײט, יושר, און שלום אױף דער גאָרער װעלט באַשטײט פֿון אָנערקענען דעם תּוכיקן כּבֿוד און די גלײַכע און ניט־איבערטראָגלעכע רעכט פֿון אַלע מיטגלידער פֿון דער מענטשישער משפּחה,\nהיות װי איגנאָרירן און ביטול צו די מענטשנרעכט האָבן גורם געװען באַרבאַרישע אַקטן װאָס האָבן אָנגעװאָרפֿן אַ גרױל אױף אַלע מענטשן, און היות װי די העכסטע האָפֿנונג פֿון די אומות העולם איז אַז די צײַט זאָל אָנקומען װען מענטשן זאָלן געניסן פֿון פֿרײַהײט, אי פֿון רעדן אי פֿון גלױבן, און קײנער זאָל ניט לײַדן פֿון קײן מורא אָדער נױט,\nהיות װי געזעץ און יושר מוזן פֿאַרטײדיקן מענטשנרעכט, טאָמער מען װעט זיך אין נױט נעמען רעבעלירן קעגן טיראַניע און באַדריקונג,"
+}
diff --git a/lang/languages/yi/language.textproto b/lang/languages/yi/language.textproto
deleted file mode 100644
index 938e0f9a4..000000000
--- a/lang/languages/yi/language.textproto
+++ /dev/null
@@ -1,20 +0,0 @@
-id: "yi"
-name: "Yiddish"
-preferred_name: ""
-autonym: "ייִדיש"
-population: 1046399
-region: "US"
-region: "GB"
-region: "CA"
-region: "SE"
-region: "UA"
-region: "IL"
-script: "Hebrew"
-exemplar_chars {
-  base: "ו י א ב ג ד ה ז ח ט כ ך ל מ ם נ ן ס ע פ ף צ ץ ק ר ש ת"
-  auxiliary: "\\u200E\\u200F"
-  marks: "◌ְ ◌ֱ ◌ֲ ◌ֳ ◌ִ ◌ֵ ◌ֶ ◌ַ ◌ָ ◌ֹ ◌ֻ ◌ּ ◌ׁ ◌ׂ"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . ׳ \' \" ( ) \\[ \\] / ״ ־"
-  index: "\\u05C2 \\u05BC \\u05BF א ב ג ד ה ו ז ח ט י כ ל מ נ ס ע פ צ ק ר ש ת"
-}
diff --git a/lang/languages/yi/sampletext.textproto b/lang/languages/yi/sampletext.textproto
deleted file mode 100644
index 0ec891fac..000000000
--- a/lang/languages/yi/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "yi"
diff --git a/lang/languages/yo.textproto b/lang/languages/yo.textproto
new file mode 100644
index 000000000..f9d044d3a
--- /dev/null
+++ b/lang/languages/yo.textproto
@@ -0,0 +1,28 @@
+id: "yo"
+name: "Yoruba"
+preferred_name: ""
+autonym: "Èdè Yorùbá"
+population: 28685568
+region: "BJ"
+region: "NG"
+script: "Latin"
+exemplar_chars {
+  base: "A B D E F G H I J K L M N O P R S T U W Y À Á Ā È É Ē Ẹ Ì Í Ī Ò Ó Ō Ọ Ù Ú Ū Ṣ a b d e f g h i j k l m n o p r s t u w y à á ā è é ē ẹ ì í ī ò ó ō ọ ù ú ū ṣ"
+  auxiliary: "Ɔ Ɛ ɔ ɛ"
+  marks: "◌̀ ◌́ ◌̄ ◌̣"
+  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) @ * / \\& # † ‡ ′ ″"
+  index: "A B D E F G H I J K L M N O P R S T U W Y"
+}
+sample_text {
+  masthead_full: "GgBb"
+  masthead_partial: "Oo"
+  tester: "Bí ó ti jé̩ pé s̩ís̩e àkíyèsí iyì tó jé̩ àbímó̩ fún è̩dá àti ìdó̩gba"
+  poster_sm: "Bí ó ti jé̩"
+  poster_md: "Àpapò̩ ìgbìmò̩"
+  poster_lg: "Gbogbo"
+  specimen_48: "Gbogbo ènìyàn ni a bí ní òmìnira; iyì àti è̩tó̩ kò̩ò̩kan sì dó̩gba."
+  specimen_36: "A kò gbo̩dò̩ mú e̩niké̩ni ní e̩rú tàbí kí a mú un sìn; e̩rú níní àti ò wò e̩rú ni a gbo̩dò̩ fi òfin dè ní gbogbo ò̩nà."
+  specimen_32: "E̩nì kò̩ò̩kan lórílè̩‐èdè, ló ní è̩tó̩ sí àtúns̩e tó jo̩jú ní ilé‐e̩jó̩ fún ìwà tó lòdì sí è̩tó̩ o̩mo̩nìyàn, tó jé̩ kò‐s̩eé‐má‐nìí gé̩gé̩ bó s̩e wà lábé̩ òfin àti bí òfin‐ìpìlè̩ s̩e là á sílè̩."
+  specimen_21: "A kò gbo̩dò̩ s̩àdédé fi òfin mú ènìyàn tàbí kí a kàn gbé ènìyàn tì mó̩lé, tàbí kí a lé ènìyàn jáde ní ìlú láìnídìí.\nE̩nì kò̩ò̩kan tí a bá fi è̩sùn kàn ló ní è̩tó̩ tó dó̩gba, tó sì kún, láti s̩àlàyé ara rè̩ ní gban̄gba, níwájú ilé‐e̩jó̩ tí kò s̩ègbè, kí wo̩n lè s̩e ìpinnu lórí è̩tó̩ àti ojús̩e rè̩ nípa irú è̩sùn ò̩ràn dídá tí a fi kàn án."
+  specimen_16: "E̩nì kò̩ò̩kan ló ní è̩tó̩ pé kí a má s̩àdédé s̩e àyo̩júràn sí ò̩rò̩ ìgbésí ayé rè̩, tàbí sí ò̩rò̩e̩bí rè̩ tàbí sí ò̩rò̩ ìdílé rè̩ tàbí ìwé tí a ko̩ sí i; a kò sì gbo̩dò̩ ba iyì àti orúko̩ rè̩ jé̩. E̩nì kò̩ò̩kan ló ní è̩tó̩ sí ààbò lábé̩ òfin kúrò ló̩wó̩ irú àyo̩júràn tàbí ìbanijé̩ bé̩è̩.\nE̩nì kò̩ò̩kan ló ní è̩tó̩ sí òmìnira èrò, òmìnira è̩rí‐o̩kàn àti òmìnira e̩ sìn. E̩tó̩ yìí sì gbani láàyè láti pààrò̩ e̩ sìn tàbí ìgbàgbó̩ e̩ni. Ó sì fún e̩yo̩ e̩nì kan tàbí àkójo̩pò̩ ènìyàn láàyè láti s̩e è̩sìn wo̩n àti ìgbàgbó̩ wo̩n bó s̩e je̩ mó̩ ti ìkó̩ni, ìs̩esí, ìjó̩sìn àti ìmús̩e ohun tí wó̩n gbàgbó̩ yálà ní ìkò̩kò̩ tàbí ní gban̄gba.\nE̩nì kò̩ò̩kan ló ní è̩tó̩ sí ìsinmi àti fàájì pè̩lú àkókò tí kò pò̩ jù lé̩nu is̩é̩ àti àsìkò ìsinmi lé̩nu is̩é̩ láti ìgbà dé ìgbà tí a ó sanwó fún."
+}
diff --git a/lang/languages/yo/language.textproto b/lang/languages/yo/language.textproto
deleted file mode 100644
index 46eac8831..000000000
--- a/lang/languages/yo/language.textproto
+++ /dev/null
@@ -1,15 +0,0 @@
-id: "yo"
-name: "Yoruba"
-preferred_name: ""
-autonym: "Èdè Yorùbá"
-population: 28685568
-region: "NG"
-region: "BJ"
-script: "Latin"
-exemplar_chars {
-  base: "A B D E F G H I J K L M N O P R S T U W Y À Á Ā È É Ē Ẹ Ì Í Ī Ò Ó Ō Ọ Ù Ú Ū Ṣ a b d e f g h i j k l m n o p r s t u w y à á ā è é ē ẹ ì í ī ò ó ō ọ ù ú ū ṣ"
-  auxiliary: "Ɔ Ɛ ɔ ɛ"
-  marks: "◌̀ ◌́ ◌̄ ◌̣"
-  punctuation: "\\- ‐ ‑ – — , ; \\: ! ? . … \' ‘ ’ \" “ ” ( ) @ * / \\& # † ‡ ′ ″"
-  index: "A B D E F G H I J K L M N O P R S T U W Y"
-}
diff --git a/lang/languages/yo/sampletext.textproto b/lang/languages/yo/sampletext.textproto
deleted file mode 100644
index 41f0ce1c5..000000000
--- a/lang/languages/yo/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "yo"
diff --git a/lang/languages/yrl/language.textproto b/lang/languages/yrl.textproto
similarity index 74%
rename from lang/languages/yrl/language.textproto
rename to lang/languages/yrl.textproto
index 4830ba2c7..22d2a6996 100644
--- a/lang/languages/yrl/language.textproto
+++ b/lang/languages/yrl.textproto
@@ -7,3 +7,6 @@ region: "BR"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/yua.textproto b/lang/languages/yua.textproto
new file mode 100644
index 000000000..24e08fe58
--- /dev/null
+++ b/lang/languages/yua.textproto
@@ -0,0 +1,24 @@
+id: "yua"
+name: "Yucateco"
+preferred_name: ""
+autonym: "Màaya t\'àan"
+population: 861955
+region: "MX"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E I J K L M N O P R S T U W X Y Á À É È Ó Ò Ú Ù a b c d e i j k l m n o p r s t u w x y \' á à é è ó ò ú ù"
+  marks: "◌̀ ◌́"
+}
+sample_text {
+  masthead_full: "TtUu"
+  masthead_partial: "Ll"
+  tester: "Tumeen u kuxtal wíinik x‐maʼa palitzilil, u chíimpoltaʼal yetel"
+  poster_sm: "Tumeen yóoʼlal"
+  poster_md: "Tumeen tun"
+  poster_lg: "Tuláakal"
+  specimen_48: "Tumeen ku tukultaʼal xan jach kʼaʼabet u kaxantaʼal bix uchak"
+  specimen_36: "Tumeen ku tukultaʼal xan jach kʼaʼabet u kaxantaʼal bix uchak u bisikuba maʼalob tuláakal u kaajiloʼob yóokʼol kaab,"
+  specimen_32: "Tumeen u kʼajóoltaʼal le Najmal Sijnal yetel wíinik yetel bix uchak u kuxtal x‐maʼa palitzilil jach táanil yaan tiʼal kaʼa béeyak u dzoʼokbesaʼal le Mok Tʼaanaʼ,"
+  specimen_21: "Tumeen u kuxtal wíinik x‐maʼa palitzilil, u chíimpoltaʼal yetel u chaʼabal u kuxtal yóokʼol kaab ich jedz óolal, tiʼ ku taal tu chíimpoltaʼal u noʼojaʼanil kuxtal sijnal yetel wíinik bey jeʼex xan sijnal u najmalmajil keet kuxtal, mixmáak unaj u luʼsik tiʼ tuláakal u wíinikil yóokʼol kaabeʼ,\nTumeen tun le najmal sijnal yetel wíinik jach kʼaʼabet u boʼoybesaʼal tu yáanal jumpʼéel Noj Aʼalmaj Tʼaan, u tiʼal maʼ u beetaʼal u líikʼil wíinik baʼateʼel tumeen u talamil kuxtal yetel u nuunsaʼal,"
+  specimen_16: "Tumeen u kuxtal wíinik x‐maʼa palitzilil, u chíimpoltaʼal yetel u chaʼabal u kuxtal yóokʼol kaab ich jedz óolal, tiʼ ku taal tu chíimpoltaʼal u noʼojaʼanil kuxtal sijnal yetel wíinik bey jeʼex xan sijnal u najmalmajil keet kuxtal, mixmáak unaj u luʼsik tiʼ tuláakal u wíinikil yóokʼol kaabeʼ,\nTumeen yóoʼlal maʼ ojeltaʼan ku beetik u mixbaʼalkuunsaʼal u najmalil u kuxtal wíinik, dzoʼok u beetik u yúuchul seen kʼaakʼas baʼaloʼob tu táan u noʼajaʼanil u tuukul wíinik; yetel tumeen dzoʼok u yaʼalaʼal u jach nojochil baʼax ku dzíiboltik wíinikeʼ, u kajtal yóokʼol kaab tuʼux kaʼa kuxlak lukʼaʼan u sajakil yetel x‐maʼa óotzilil, kaʼa béeyak u yaʼalik baʼax ku tukultik yetel u kiliʼichkuunsik jeʼe máakalmáak Yumtzilil u kʼáateʼ,"
+}
diff --git a/lang/languages/yua/language.textproto b/lang/languages/yua/language.textproto
deleted file mode 100644
index 670af76b8..000000000
--- a/lang/languages/yua/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "yua"
-name: "Yucateco"
-preferred_name: ""
-autonym: "Màaya t\'àan"
-population: 861955
-region: "MX"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E I J K L M N O P R S T U W X Y Á À É È Ó Ò Ú Ù a b c d e i j k l m n o p r s t u w x y \' á à é è ó ò ú ù"
-  marks: "◌̀ ◌́"
-}
diff --git a/lang/languages/yua/sampletext.textproto b/lang/languages/yua/sampletext.textproto
deleted file mode 100644
index 84403116c..000000000
--- a/lang/languages/yua/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "yua"
diff --git a/lang/languages/yue/language.textproto b/lang/languages/yue.textproto
similarity index 70%
rename from lang/languages/yue/language.textproto
rename to lang/languages/yue.textproto
index 93c649945..1e137fa61 100644
--- a/lang/languages/yue/language.textproto
+++ b/lang/languages/yue.textproto
@@ -13,3 +13,16 @@ exemplar_chars {
   punctuation: "‾ ﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \\- － ﹣ ‐ ‑ – ︲ — ﹘ ︱ , ， ﹐ 、 ﹑ ; ； ﹔ \\: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ \" ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \\[ ［ \\] ］ \\{ ｛ ﹛ ︷ \\} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ § @ ＠ ﹫ * ＊ ﹡ / ／ \\\\ ＼ ﹨ \\& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ † ‡ ‧ ′ ″ ‵ 〃 ※"
   index: "一 丁 丈 不 且 丞 並 串 乘 乾 亂 亭 傀 僎 僵 儐 償 儳 儷 儻 叢 嚴 囌 囑 廳"
 }
+sample_text {
+  masthead_full: "人生而平"
+  masthead_partial: "等喺"
+  tester: "鉴于对人权嘅无视同埋侮蔑经已发展成为野蛮暴行，呢些暴行玷污咗人类嘅良心，而一个人人都有言论同埋信仰自由而且冇惊冇穷嘅世界嘅嚟临"
+  poster_sm: "发布呢个世界人权宣言"
+  poster_md: "人人有权享有生命"
+  poster_lg: "人人生而平等"
+  specimen_48: "法律嘅前人人平等，并有权享受法律嘅平等保护，唔受任何歧视。人人有权享受平等保护，以免受违反本宣言嘅任何歧视行为同埋煽动呢种歧视嘅任何行为嘅害"
+  specimen_36: "鉴于对人类家庭所有嘅成员固有尊严同埋佢哋嘅平等嘅兼不移嘅权利嘅承认，係世界自由、正义同埋和平嘅基础，\n鉴于为咗使人类唔至迫不得已铤而走险对暴政同埋迫害进行反叛，有必要使人权受到法治嘅保护，\n鉴于有必要促进各国友好关系嘅发展，"
+  specimen_32: "鉴于对人类家庭所有嘅成员固有尊严同埋佢哋嘅平等嘅兼不移嘅权利嘅承认，係世界自由、正义同埋和平嘅基础，\n鉴于对人权嘅无视同埋侮蔑经已发展成为野蛮暴行，呢些暴行玷污咗人类嘅良心，而一个人人都有言论同埋信仰自由而且冇惊冇穷嘅世界嘅嚟临，经已俾宣布係普通人民嘅最高心愿，\n鉴于为咗使人类唔至迫不得已铤而走险对暴政同埋迫害进行反叛，有必要使人权受到法治嘅保护，"
+  specimen_21: "鉴于对人类家庭所有嘅成员固有尊严同埋佢哋嘅平等嘅兼不移嘅权利嘅承认，係世界自由、正义同埋和平嘅基础，\n鉴于对人权嘅无视同埋侮蔑经已发展成为野蛮暴行，呢些暴行玷污咗人类嘅良心，而一个人人都有言论同埋信仰自由而且冇惊冇穷嘅世界嘅嚟临，经已俾宣布係普通人民嘅最高心愿，\n鉴于为咗使人类唔至迫不得已铤而走险对暴政同埋迫害进行反叛，有必要使人权受到法治嘅保护，\n鉴于有必要促进各国友好关系嘅发展，\n鉴于各联合国国家嘅人民经已喺联合国宪章内重申佢哋对基本人权、人格尊严同埋价值同埋男女平等嘅信念，而且决定促成较大自由内嘅社会进步同埋生活水平嘅改善，\n鉴于各会员国经已誓愿共联合国合作以促进对人权同埋基本自由嘅普遍尊重兼遵行，\n鉴于对呢啲权利兼自由嘅普遍了解对于呢个誓愿嘅充分实现有好大嘅重要性，"
+  specimen_16: "鉴于对人类家庭所有嘅成员固有尊严同埋佢哋嘅平等嘅兼不移嘅权利嘅承认，係世界自由、正义同埋和平嘅基础，\n鉴于对人权嘅无视同埋侮蔑经已发展成为野蛮暴行，呢些暴行玷污咗人类嘅良心，而一个人人都有言论同埋信仰自由而且冇惊冇穷嘅世界嘅嚟临，经已俾宣布係普通人民嘅最高心愿，\n鉴于为咗使人类唔至迫不得已铤而走险对暴政同埋迫害进行反叛，有必要使人权受到法治嘅保护，\n鉴于有必要促进各国友好关系嘅发展，\n鉴于各联合国国家嘅人民经已喺联合国宪章内重申佢哋对基本人权、人格尊严同埋价值同埋男女平等嘅信念，而且决定促成较大自由内嘅社会进步同埋生活水平嘅改善，\n鉴于各会员国经已誓愿共联合国合作以促进对人权同埋基本自由嘅普遍尊重兼遵行，\n鉴于对呢啲权利兼自由嘅普遍了解对于呢个誓愿嘅充分实现有好大嘅重要性，\n因此依家，\n大会，\n发布呢个世界人权宣言，作为所有人民共所有国家努力实现嘅共同标准，希望每一个人共社会机构成日谂起呢个宣言，努力通过教诲同埋教育促进对权利同埋自由嘅尊重，并通过国家嘅共国际嘅渐进措施，使呢啲权利同埋自由喺各会员国本身人民共佢哋管辖下嘅人民中得到普遍共有效嘅承认共遵行：\n人人生而平等，喺尊严同埋权利上一律平等。佢哋有理性同埋良心，而且应当以兄弟关系嘅精神相对待。\n人人有资格享有呢宣言所载嘅一切权利同埋自由，唔分种族、肤色、性别、语言、宗教、政治或其他见解、国籍或社会出身、财产、出生或其他身分等任何区别。"
+}
diff --git a/lang/languages/yue/sampletext.textproto b/lang/languages/yue/sampletext.textproto
deleted file mode 100644
index cd4da21dc..000000000
--- a/lang/languages/yue/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "yue"
diff --git a/lang/languages/yue_Hans/language.textproto b/lang/languages/yue_Hans.textproto
similarity index 99%
rename from lang/languages/yue_Hans/language.textproto
rename to lang/languages/yue_Hans.textproto
index 8da310c1c..81c7d4f3f 100644
--- a/lang/languages/yue_Hans/language.textproto
+++ b/lang/languages/yue_Hans.textproto
@@ -13,3 +13,6 @@ exemplar_chars {
   punctuation: "﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \\- － ﹣ ‐ ‑ – — ︱ ― , ， ﹐ 、 ﹑ ; ； ﹔ \\: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ \" ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \\[ ［ \\] ］ \\{ ｛ ﹛ ︷ \\} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ 〖 〗 ‖ § @ ＠ ﹫ * ＊ ﹡ / ／ \\\\ ＼ ﹨ \\& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ ′ ″ ‵ 〃 ※"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "zh"
+}
diff --git a/lang/languages/za.textproto b/lang/languages/za.textproto
new file mode 100644
index 000000000..37413ae00
--- /dev/null
+++ b/lang/languages/za.textproto
@@ -0,0 +1,22 @@
+id: "za"
+name: "Zhuang"
+preferred_name: ""
+autonym: ""
+population: 4321462
+region: "CN"
+script: "Latin"
+exemplar_chars {
+}
+sample_text {
+  masthead_full: "BbOo"
+  masthead_partial: "Uu"
+  tester: "Aenvih roxnyinh vunz lajmbwn bonilaiz couh miz naj caeuq mboujbienq"
+  poster_sm: "Aenvih yawjsiuj"
+  poster_md: "Aenvih bwh"
+  poster_lg: "Boux"
+  specimen_48: "Aenvih daengx lenzhozgoz guekgya dih yinzminz gaenq youq ndaw"
+  specimen_36: "Aenvih gak veiyenzgoz gaenq siq nyuenh caeuq lenzhozgoz hozcoz, cuzcin yawjnaek, cinhhingz yinzgenz caeuq gijbwnj cwyouz,"
+  specimen_32: "Boux boux ma daengz lajmbwn couh miz cwyouz, cinhyenz caeuq genzli bouxboux Bingzdaengj. gyoengq vunz miz lijsing caeuq liengzsim, wngdang daih gyoengq de lumj beixnuengx ityiengh."
+  specimen_21: "Boux boux miz cwhgwz yiengjsou Seiqgyaiq Senhyenz senhbu dih genzli caeuq cwyouz, mboujlwnh cungjcuz, fuhswz, singbez, yijyenz,cunghgyau,cingci roxnaeuz gengaij gijwnq,gozciz roxnaeuz sevei cuzsinh,caizcanj, cuzsaengh roxnaeuz gizdah sinhfwn.\nLij mbouj ndeij aenvih boux vunz guekgya roxnaeuz lingjduj di cingqciq, hingz cingq roxnaeuz gozci mbouj ityiengh couh yawjsiuj de, hix mboujlwnh gaiq lingjduj neix duzliz lingjduj, dozguenj lingjdu, feih cwci lingjdu roxnaeuz cijgenz gij wnq."
+  specimen_16: "Boux boux miz sengmingh, cwyouz caeuq yinzsinh nganhcienz.\nBoux lawz hix mbouj ndeij deng bienqbaenz noz baenz hoiq, gakcungj nuzli cidu caeuq nuzli gaicawx, hix wngqdang gingcij.\nBoux lawz hix mbouj ndeij deng yoengh guzhingz, roxnaeuz yoengh canznyinj , mbouj yinzdau roxnaeuz ujyuz dih daiyi roxnaeuz hingzfaz.\nBoux boux youq gizlawz cungj miz naj fazliz dih yinzgwz.\nYouq naj fazliz vunzvunz bingzdaengj,lij miz genz yiengjsou fazliz dih bingzdaengj baujhu, mbouj deng gijmaz yawjsiuj. vunzvunz miz genz yiengjsou bingzdaengj baujhu, mienx deng veizfanj bwnj senhyenz dih yinhoz gizsi hingzveiz caeuq yaekyoux gij gizsi haenx sienghaih."
+}
diff --git a/lang/languages/za/language.textproto b/lang/languages/za/language.textproto
deleted file mode 100644
index 90612bdef..000000000
--- a/lang/languages/za/language.textproto
+++ /dev/null
@@ -1,9 +0,0 @@
-id: "za"
-name: "Zhuang"
-preferred_name: ""
-autonym: ""
-population: 4321462
-region: "CN"
-script: "Latin"
-exemplar_chars {
-}
diff --git a/lang/languages/za/sampletext.textproto b/lang/languages/za/sampletext.textproto
deleted file mode 100644
index 6101a4d56..000000000
--- a/lang/languages/za/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "za"
diff --git a/lang/languages/zag/language.textproto b/lang/languages/zag.textproto
similarity index 74%
rename from lang/languages/zag/language.textproto
rename to lang/languages/zag.textproto
index 8015d3136..e28ab0e1d 100644
--- a/lang/languages/zag/language.textproto
+++ b/lang/languages/zag.textproto
@@ -7,3 +7,6 @@ region: "SD"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/zdj.textproto b/lang/languages/zdj.textproto
new file mode 100644
index 000000000..72531a13a
--- /dev/null
+++ b/lang/languages/zdj.textproto
@@ -0,0 +1,24 @@
+id: "zdj"
+name: "Ngazidja Comorian"
+preferred_name: ""
+autonym: "شِكُمُرِ"
+population: 313123
+region: "KM"
+script: "Perso-Arabic"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z a b c d e f g h i j k l m n o p r s t u v w y z"
+  marks: "◌َ ◌ُ ◌ِ ◌ّ"
+}
+sample_text {
+  masthead_full: "WwOo"
+  masthead_partial: "Aa"
+  tester: "1- Ha mwakinisho ukaya ho ukubali ye sheo shaho wo ubinadamu piya"
+  poster_sm: "2- Ha mwakinisho"
+  poster_md: "Wo wanadamu"
+  poster_lg: "wanadamu"
+  specimen_48: "Hayna mwanadamu gudjo djuwa udjinasbisha ne zehaki ne ze nyihuria"
+  specimen_36: "Kapvatsi ruhusa ya wu uonndowa mwanadamu, hau umfanyiliya zitrendwa zapewu zakinyama hau za upvanguwa wo ubinadamu hahahe."
+  specimen_32: "Haina mwanadamu ngena haki yauhundra maredjeyi yakweli usoni mwa yeze mahakama zalazimu haudayi zehaki mshindzi yakubaliwa zo ne shariya mshindzi hau ze shariya mbali na mbali."
+  specimen_21: "Kapvatsi mwanadamu udjodjuwa ubaliliwa, ya fungwa hau yatolwa sistani hadji layezi.\nHaina mdru ngena haki, harumwa usawa watimiya yayishiliwa ha uandilifu harumwa trengwe ni mahakama yalona uhuriya pvatisna pendzeleya. Mahakama yadjo utekeleza yese haki ne ze wadjibu zahahe, hau yadjo uwonesa wo ukweli wahe yizo yatuhumlwa nizo harumwa upande wamahakama ya zitrendwa zidziro."
+  specimen_16: "Kapvatsi ruhusa ya mwnadamu udjilwa kiyigozi sha mvuu harumwa yemayesha ya ndani yahahe, yahe fami yahahe ne ledaho lahahe hau yemawaswiliyano yahahe ha upulwa sheo na sharafu. Haina mdru ngena haki ya hifadhwilwa ne shariya ha upukana na zitrendwa djezi.\nHaina mwanadamu ngena uhuriya wa fikira, na hisi, na wa dini. Wo uhuriya uwo utsanganya wo mdru udjuwa ubadili dini hau yakini pvamwedja na utekeleza yedini hau ye yakini yahahe wayetche hau pvamwedja na wandru, harumwa trengwe hau ho ndani hahe, msomo na zitrendwa, na utekeleza ze nguzo zahayo na ne zedasturi."
+}
diff --git a/lang/languages/zdj/language.textproto b/lang/languages/zdj/language.textproto
deleted file mode 100644
index 3af22d3cd..000000000
--- a/lang/languages/zdj/language.textproto
+++ /dev/null
@@ -1,11 +0,0 @@
-id: "zdj"
-name: "Ngazidja Comorian"
-preferred_name: ""
-autonym: "شِكُمُرِ"
-population: 313123
-region: "KM"
-script: "Perso-Arabic"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P R S T U V W Y Z a b c d e f g h i j k l m n o p r s t u v w y z"
-  marks: "◌َ ◌ُ ◌ِ ◌ّ"
-}
diff --git a/lang/languages/zdj/sampletext.textproto b/lang/languages/zdj/sampletext.textproto
deleted file mode 100644
index b3c9897c3..000000000
--- a/lang/languages/zdj/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "zdj"
diff --git a/lang/languages/zea/language.textproto b/lang/languages/zea.textproto
similarity index 75%
rename from lang/languages/zea/language.textproto
rename to lang/languages/zea.textproto
index b2f1ea1ae..ae0753920 100644
--- a/lang/languages/zea/language.textproto
+++ b/lang/languages/zea.textproto
@@ -7,3 +7,6 @@ region: "NL"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/zgh.textproto b/lang/languages/zgh.textproto
new file mode 100644
index 000000000..5c4def81f
--- /dev/null
+++ b/lang/languages/zgh.textproto
@@ -0,0 +1,26 @@
+id: "zgh"
+name: "Standard Moroccan Tamazight"
+preferred_name: ""
+autonym: "ⵜⴰⵎⴰⵣⵉⵖⵜ"
+population: 7823574
+region: "MA"
+script: "Tifinagh"
+exemplar_chars {
+  base: "A B G D Ḍ E F K H Ḥ X Q I J L M N U R Ṛ S Ṣ C T Ṭ W Ɣ Z Ẓ a b g d ḍ e f k h ḥ x q i j l m n u r ṛ s ṣ c t ṭ w ɣ z ẓ"
+  marks: "◌̣"
+  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  index: "ⴰ ⴱ ⴳ ⴷ ⴹ ⴻ ⴼ ⴽ ⵀ ⵃ ⵄ ⵅ ⵇ ⵉ ⵊ ⵍ ⵎ ⵏ ⵓ ⵔ ⵕ ⵖ ⵙ ⵚ ⵛ ⵜ ⵟ ⵡ ⵢ ⵣ ⵥ"
+}
+sample_text {
+  masthead_full: "ⴰⵔⴷⵜ"
+  masthead_partial: "ⵍⵏ"
+  tester: "ⵍⵍⵉⵖ ⵜⴳⴰ ⵜⵓⴽⵣⴰ ⵏ ⵓⵍⵍⴰⵍⵓ ⵏ ⴽⴰⵢⴳⴰⵜ ⵢⴰⵏ ⵖ ⵜⴰⵡⵊⴰ ⵜⴰⵏⴰⴼⴳⴰⵏⵜ ⴷ ⵓⵎⴳⵉⴷⴷⵉ"
+  poster_sm: "ⵜⴳ ⵜⴰⵎⵜⵜⴰⵡⵜ"
+  poster_md: "ⴷ ⵍⵍⵉⵖ ⵉⴳⴰ"
+  poster_lg: "ⵜⵜⵍⴰⵍⴰⵏ"
+  specimen_48: "ⴷ ⵍⵍⵉⵖ ⵉⵍⵍⴰ ⴳ ⵜⵏⵜⵜⴰⵎⵜ ⵉⴷ ⵉⴳⴷⵓⴷⵏ ⵏ ⵜⵎⵜⵜⴰ ⵉⵎⵓⵏⵏ ⵏⵏⴰⵏ ⴷⵉⵖ ⵜⴰⴼⵍⵙⵜ"
+  specimen_36: "ⴽⵓ ⵢⴰⵏ ⵉⵍⵍⴰ ⴷⴰⵔⵙ ⵓⵣⵔⴼ ⴰⴷ ⵉⴼⵜⵓ ⵙ ⵜⵉⵏⴼⴳⴰⵔⵉⵏ ⵜⵉⵏⴰⵎⵓⵔⵉⵏ ⵉⵖ ⵉⵍⵍⴰ ⴽⵔⴰ ⵓⵣⴳⴳⴰⵍ ⵖ ⵉⵣⵔⴼⴰⵏ ⵏⵏⵙ ⵍⵍⵉ ⵢⴰⵙ ⵉⴼⴽⴰ ⵓⵍⵓⴳⵏ."
+  specimen_32: "ⵓⵔ ⵉⵅⵚⵚⴰ ⴰⴷ ⵢⵉⵍⵉ ⴽⵔⴰ ⵓⴽⵛⵛⵎ ⵉⵅⵛⵛⵏ ⵖ ⵜⵓⴷⵔⵜ ⵉⵥⵍⵉⵏ ⵙ ⴽⵔⴰ ⵏ ⵢⴰⵏ ⵏⵖⴷ ⵜⵉⵏ ⵜⵡⵊⴰ ⵏⵏⵙ ⵏⵖⴷ ⴰⵣⴷⴷⵓⵖ ⵏⵏⵙ ⵏⵖⴷ ⵉⵎⵢⴰⵡⴰⴹⵏ ⵏⵏⵙ ⵖⴷ ⴰⴷⴷⵓⵔ ⵏⵏⵙ. ⵢⵉⵍⵉ ⴷⴰⵔ ⴽⵓ ⵢⴰⵏ ⵓⵣⵔⴼ ⵏ ⵓⵃⵟⵟⵓ ⵏ ⵓⵍⵓⴳⵏ ⵖ ⵣⵓⵏⴷ ⴰⴽⵛⵛⵓⵎ ⴰⴷ."
+  specimen_21: "ⴽⵓ ⵢⴰⵏ ⵉⵍⵍⴰ ⴷⴰⵔⵙ ⵓⵣⵔⴼ ⵏ ⴳ ⵜⴷⵔⴼⵉⵜ ⵏ ⵓⵙⵡⵉⵏⴳⵎ ⴷ ⵜⵉⵏ ⵜⴰⵏⵏⴰⵢⵜ, ⴷ ⵜⵉⵏ ⵓⵙⴳⴷ ⵖⵉⵍⵍⴰ ⵉⵍⵍⴰ ⵓⵣⵔⴼ ⴰⴷ ⵉⵙⵏⴼ ⴰⵙⴳⵖⵏⵏⵙ, ⵢⵉⵍⵍⵉ ⴷⴰⵔⵙ ⴰⵡⴷ ⵓⵣⵔⴼ ⵏ ⵜⵡⵏⵏⵉⵜ ⵜⴰⵏⴼⵔⵓⵜ ⵙ ⴽⵔⴰ ⵉⴳⴰⵜ ⴰⵏⴰ ⵏⵏⵙ.\nⴽⵓ ⵢⴰⵏ ⵉⵍⵍⴰ ⴷⴰⵔⵙ ⵓⵣⵔⴼ ⵏ ⵜⴷⵔⴼⵉⵜ ⵏ ⵜⴰⵏⵏⴰⵢⵜ ⴷ ⵜⵡⵏⵏⵉⵜ, ⴰⴷ ⵉⵜⵜⵉⴽⵚⵓⴹ ⵅⴼ ⵜⴰⵏⵏⴰⵢⵉⵏ ⵏⵏⵙ ⵓⵍⴰ ⴰⵔⵣⵣⵓ ⵏⵏⵙ ⴰⴷ ⵢⴰⵎⵥ ⵏⵖ ⴰⴷ ⵉⵣⵓⵣⵣⵔ, ⴰⴱⵍⴰ ⵉⵡⵜⵜⴰ, ⵉⵏⵖⵎⵉⵙⵏ ⴷ ⵜⵡⵏⴳⵉⵎⵉⵏ ⵙ ⴰⴽⵯ ⵉⵎⴰⵙⵙⵏ  ⵓⵙⵓⵙⵙⵏ."
+  specimen_16: "ⴽⵓ ⵢⴰⵏ ⵉⵍⵍⴰ, ⵖⵉⴽⵍⵍⵉ ⵉⴳⴰ ⵢⴰⵏ ⵓⴼⵔⴷⵉⵙ ⵖ ⵡⴰⵎⵓⵏ, ⴷⴰⵔⵙ ⴰⵣⵔⴼ ⵖ ⵓⵏⴼⵔⵓ ⴰⵏⴰⵎⵓⵏ :ⴰⵣⵔⴼ ⴰⴷ ⵉⴱⴷⴷⴰ ⵅⴼ ⵃⵎⴰ ⴰⴷ ⵜⵉⵍⵉ ⵜⵓⵎⵔⵜ ⵏ ⵉⵣⵔⴼⴰⵏ ⵉⴷⴰⵎⵙⴰⵏⵏ, ⵉⵏⴰⵎⵓⵏⵏ ⴷ ⵉⴷⵍⵙⴰⵏⵏ ⵉⵥⵍⵉⵏ ⵙ ⴰⴷⴷⵓⵔ ⵏⵏⵙ ⴷ ⵓⵙⴱⵓⵖⵍⵓ ⵏ ⵡⵓⴷⵎ ⵏⵏⵙ, ⴰⵢⴰⴷ ⵙ ⵜⴷⵓⵙⵉ ⵜⴰⵏⴰⵎⵓⵔⵜ ⴷ ⵜⵡⵉⵙⵉ ⵜⴰⴳⵔⴰⵖⵍⴰⵏⵜ, ⵏⵏⴰ ⵉⵙⵏⵏⴷⵏ ⵅⴼ ⵓⵙⵏⵎⴰⵍⴰ ⴷ ⵉⵙⵓⴳⵉⵎ ⵏ ⴽⵓ ⵜⴰⵎⵓⵔⵜ.\nⴽⵓ ⵢⴰⵏ ⵉⵍⵍⴰ ⴷⴰⵔⵙ ⵓⵣⵔⴼ ⵏ ⵓⵙⵙⵓⵏⴼⵓ, ⵖ ⵜⵉⵣⵉ ⵍⵍⵉ ⵉⵅⵡⴰⵏ, ⴷ ⵎⵏⵛⴽ ⵏ ⵜⵙⵔⴰⴳⵉⵏ ⵏ ⵜⵡⵓⵔⵉ ⴷ ⵓⵙⵙⵏⴼⵓ ⵉⵎⵓⵏ ⴷ ⵜⵖⵔⴰⴷ.\nⴽⵓ ⵢⴰⵏ ⵉⵍⵍⴰ ⴷⴰⵔⵙ ⵓⵣⵔⴼ ⴰⴷ ⵉⵙⴼⴰⵢⴷ ⵖ ⵓⵖⴰⵡⴰⵙ ⴰⵏⴰⵎⵓⵏ ⴰⴳⵔⴰⵖⵍⴰⵏ ⵍⵍⵉⵖ ⵍⵍⴰⵏ ⵉⵣⵔⴼⴰⵏ ⴷ ⵜⴷⵔⴼⵉⵢⵉⵏ ⵍⵍⵉ ⴷ ⵢⵓⵛⴽⴰⵏ ⵖ ⴰⵍⵖⵓ ⴰⴷ.\nⵓⵔ ⵉⵍⵍⵉ ⵖ ⵓⵍⵖⵓ ⴰⴷ ⴽⵔⴰ ⵏ ⵓⴹⵕⵉⵚ ⴰⴼⴰⴷ ⴰⴷ ⵉⵙⵎⴷⵢⴰ ⴽⵔⴰ ⵏ ⵓⵡⴰⵏⴽ ⵏⵖⴷ ⴽⵔⴰ ⵏ ⵓⴳⴷⵓⴷ ⵏⵖⴷ ⵓⴼⴳⴰⵏ ⵙ ⵖⵉⴽⵍⵍⵉ ⵉⵔⴰ ⴷ ⵓⵔ ⴷⴰⵔⵙ ⴽⵔⴰ ⵏ ⵓⵣⵔⴼ ⴰⴼⴰⴷ ⵉⵙⴽⵔ ⵜⴰⵡⵔⵉ ⵏⵏⴰ ⵉⵔⴰ ⵍⵍⵉ ⵉⵜⵜⵔⵥⵥⴰⵏ ⵉⵣⵔⴼⴰⵏ ⴷ ⵜⴷⵔⴼⵢⵉⵏ ⵍⵍⵉ ⴷ ⵢⵉⵡⵉ ⵖ ⵓⵍⵖⵓ ⴰⴷ."
+}
diff --git a/lang/languages/zgh/language.textproto b/lang/languages/zgh/language.textproto
deleted file mode 100644
index 6700f0477..000000000
--- a/lang/languages/zgh/language.textproto
+++ /dev/null
@@ -1,13 +0,0 @@
-id: "zgh"
-name: "Standard Moroccan Tamazight"
-preferred_name: ""
-autonym: "ⵜⴰⵎⴰⵣⵉⵖⵜ"
-population: 7823574
-region: "MA"
-script: "Tifinagh"
-exemplar_chars {
-  base: "A B G D Ḍ E F K H Ḥ X Q I J L M N U R Ṛ S Ṣ C T Ṭ W Ɣ Z Ẓ a b g d ḍ e f k h ḥ x q i j l m n u r ṛ s ṣ c t ṭ w ɣ z ẓ"
-  marks: "◌̣"
-  numerals: "  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  index: "ⴰ ⴱ ⴳ ⴷ ⴹ ⴻ ⴼ ⴽ ⵀ ⵃ ⵄ ⵅ ⵇ ⵉ ⵊ ⵍ ⵎ ⵏ ⵓ ⵔ ⵕ ⵖ ⵙ ⵚ ⵛ ⵜ ⵟ ⵡ ⵢ ⵣ ⵥ"
-}
diff --git a/lang/languages/zgh/sampletext.textproto b/lang/languages/zgh/sampletext.textproto
deleted file mode 100644
index 38b535c42..000000000
--- a/lang/languages/zgh/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "zgh"
diff --git a/lang/languages/zh/language.textproto b/lang/languages/zh.textproto
similarity index 97%
rename from lang/languages/zh/language.textproto
rename to lang/languages/zh.textproto
index bf30cd00c..ac76e4949 100644
--- a/lang/languages/zh/language.textproto
+++ b/lang/languages/zh.textproto
@@ -3,12 +3,12 @@ name: "Chinese"
 preferred_name: ""
 autonym: "普通话 / 汉语"
 population: 1265387866
+region: "CN"
 region: "HK"
 region: "MN"
+region: "MO"
 region: "MY"
 region: "SG"
-region: "MO"
-region: "CN"
 script: "Simplified Han"
 script: "Traditional Han"
 exemplar_chars {
@@ -19,3 +19,6 @@ exemplar_chars {
   punctuation: "﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \\- － ﹣ ‐ ‑ – — ︱ ― , ， ﹐ 、 ﹑ ; ； ﹔ \\: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ \" ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \\[ ［ \\] ］ \\{ ｛ ﹛ ︷ \\} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ 〖 〗 ‖ § @ ＠ ﹫ * ＊ ﹡ / ／ \\\\ ＼ ﹨ \\& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ ′ ″ ‵ 〃 ※"
   index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
 }
+sample_text {
+  fallback_language: "zh"
+}
diff --git a/lang/languages/zh_Hant/language.textproto b/lang/languages/zh_Hant.textproto
similarity index 99%
rename from lang/languages/zh_Hant/language.textproto
rename to lang/languages/zh_Hant.textproto
index 855f42961..3c2b18e87 100644
--- a/lang/languages/zh_Hant/language.textproto
+++ b/lang/languages/zh_Hant.textproto
@@ -3,21 +3,21 @@ name: "Chinese (Traditional)"
 preferred_name: ""
 autonym: ""
 population: 38770383
-region: "HK"
-region: "VN"
-region: "BN"
-region: "US"
-region: "PA"
-region: "GB"
-region: "SR"
-region: "GF"
-region: "TW"
 region: "AU"
-region: "MO"
+region: "BN"
+region: "GB"
+region: "GF"
+region: "HK"
 region: "ID"
-region: "PH"
+region: "MO"
+region: "PA"
 region: "PF"
+region: "PH"
+region: "SR"
 region: "TH"
+region: "TW"
+region: "US"
+region: "VN"
 script: "Simplified Han"
 script: "Traditional Han"
 exemplar_chars {
@@ -27,3 +27,6 @@ exemplar_chars {
   punctuation: "‾ ﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \\- － ﹣ ‐ ‑ – ︲ — ﹘ ︱ , ， ﹐ 、 ﹑ ; ； ﹔ \\: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ \" ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \\[ ［ \\] ］ \\{ ｛ ﹛ ︷ \\} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ § @ ＠ ﹫ * ＊ ﹡ / ／ \\\\ ＼ ﹨ \\& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ † ‡ ‧ ′ ″ ‵ 〃 ※"
   index: "一 丁 丈 不 且 丞 並 串 乘 乾 亂 亭 傀 僎 僵 儐 償 儳 儷 儻 叢 嚴 囌 囑 廳"
 }
+sample_text {
+  fallback_language: "zh"
+}
diff --git a/lang/languages/zmi/language.textproto b/lang/languages/zmi.textproto
similarity index 76%
rename from lang/languages/zmi/language.textproto
rename to lang/languages/zmi.textproto
index b89c461b5..f774243a9 100644
--- a/lang/languages/zmi/language.textproto
+++ b/lang/languages/zmi.textproto
@@ -7,3 +7,6 @@ region: "MY"
 script: "Latin"
 exemplar_chars {
 }
+sample_text {
+  fallback_language: "en"
+}
diff --git a/lang/languages/zu.textproto b/lang/languages/zu.textproto
new file mode 100644
index 000000000..8d7eb5d96
--- /dev/null
+++ b/lang/languages/zu.textproto
@@ -0,0 +1,31 @@
+id: "zu"
+name: "Zulu"
+preferred_name: ""
+autonym: "isiZulu"
+population: 13973829
+region: "LS"
+region: "MW"
+region: "MZ"
+region: "SZ"
+region: "ZA"
+script: "Latin"
+exemplar_chars {
+  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
+  auxiliary: "á à ă â å ä ã ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ"
+  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
+  punctuation: "\\- ‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}"
+  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+}
+sample_text {
+  masthead_full: "BbOo"
+  masthead_partial: "Nn"
+  tester: "Ngokunjalo ukwamukelwa ngokuzuzwa kwesithunzi samalungelo alinganayo"
+  poster_sm: "Ngokunjalo"
+  poster_md: "Bonke abantu"
+  poster_lg: "Bonke"
+  specimen_48: "Wonke umuntu kumele awathole wonke lamalungelo nenkululeko ebhalwe"
+  specimen_36: "Ngokunjalo kudingekile ukuba kwenyuswe ukuthuthukiswa kobungane nobudlelwane phakathi kwezizwe,\nMANJE, NGAKHOKE"
+  specimen_32: "Ngokunjalo ukwamukelwa ngokuzuzwa kwesithunzi samalungelo alinganayo najwayelekile awowonke amalunga omndeni wesintu kuyisisekelo senkululeko, sobulungiswa noxolo emhlabeni,"
+  specimen_21: "Ngokunjalo ukwamukelwa ngokuzuzwa kwesithunzi samalungelo alinganayo najwayelekile awowonke amalunga omndeni wesintu kuyisisekelo senkululeko, sobulungiswa noxolo emhlabeni,\nNgokunjalo ukunganakwa nokwedelelwa kwamalungelo esintu kube nomphumela wezenzo zobuqaba eseziqede unembeza kubantu, kanye nomhlaba obhekwe isintu ukuba senamele inkululeko yokukhuluma nokukholwa, inkululeko yokungesabi futhi nokufuna kugunyazwe ugqozi kubobonke abantu,"
+  specimen_16: "Ngokunjalo ukwamukelwa ngokuzuzwa kwesithunzi samalungelo alinganayo najwayelekile awowonke amalunga omndeni wesintu kuyisisekelo senkululeko, sobulungiswa noxolo emhlabeni,\nNgokunjalo ukunganakwa nokwedelelwa kwamalungelo esintu kube nomphumela wezenzo zobuqaba eseziqede unembeza kubantu, kanye nomhlaba obhekwe isintu ukuba senamele inkululeko yokukhuluma nokukholwa, inkululeko yokungesabi futhi nokufuna kugunyazwe ugqozi kubobonke abantu,\nNgokunjalo kudingekile, uma umuntu engenakuphoqwa ukulandela umgudu othize, njengendlela yokugcina, avukele ababusi nabacindezeli, ukuze amalungelo esintu avikelwe ngokubusa ngomthetho,"
+}
diff --git a/lang/languages/zu/language.textproto b/lang/languages/zu/language.textproto
deleted file mode 100644
index b8fc0a7d4..000000000
--- a/lang/languages/zu/language.textproto
+++ /dev/null
@@ -1,18 +0,0 @@
-id: "zu"
-name: "Zulu"
-preferred_name: ""
-autonym: "isiZulu"
-population: 13973829
-region: "MW"
-region: "LS"
-region: "SZ"
-region: "MZ"
-region: "ZA"
-script: "Latin"
-exemplar_chars {
-  base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z"
-  auxiliary: "á à ă â å ä ã ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ"
-  numerals: "\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9"
-  punctuation: "\\- ‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}"
-  index: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
-}
diff --git a/lang/languages/zu/sampletext.textproto b/lang/languages/zu/sampletext.textproto
deleted file mode 100644
index d2faa9379..000000000
--- a/lang/languages/zu/sampletext.textproto
+++ /dev/null
@@ -1 +0,0 @@
-language: "zu"
diff --git a/lang/languages/zza/language.textproto b/lang/languages/zza.textproto
similarity index 88%
rename from lang/languages/zza/language.textproto
rename to lang/languages/zza.textproto
index 79fd0e32c..34233ed77 100644
--- a/lang/languages/zza/language.textproto
+++ b/lang/languages/zza.textproto
@@ -9,3 +9,6 @@ exemplar_chars {
   base: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Ç Ê Î Û Ü Ş Ǧ a b c d e f g h i j k l m n o p q r s t u v w x y z ç ê î û ü İ ı ş ǧ"
   marks: "◌̂ ◌̇ ◌̈ ◌̌ ◌̧"
 }
+sample_text {
+  fallback_language: "en"
+}