diff --git a/client/src/locale/server.tok.json b/client/src/locale/server.tok.json
index fea9c0170..ff6b659db 100644
--- a/client/src/locale/server.tok.json
+++ b/client/src/locale/server.tok.json
@@ -17,13 +17,13 @@
     "Animals": "soweli",
     "Kids": "jan lili",
     "Food": "moku",
-    "Attribution": "",
-    "Attribution - Share Alike": "",
-    "Attribution - No Derivatives": "",
-    "Attribution - Non Commercial": "",
-    "Attribution - Non Commercial - Share Alike": "",
-    "Attribution - Non Commercial - No Derivatives": "",
-    "Public Domain Dedication": "",
+    "Attribution": "o toki e nimi pi jan pali",
+    "Attribution - Share Alike": "o toki e nimi pi jan pali - o pana sama",
+    "Attribution - No Derivatives": "o toki e nimi pi jan pali - o ante ala",
+    "Attribution - Non Commercial": "o toki e nimi pi jan pali - o kepeken ala tawa mani",
+    "Attribution - Non Commercial - Share Alike": "o toki e nimi pi jan pali - o kepeken ala tawa mani - o pana sama",
+    "Attribution - Non Commercial - No Derivatives": "o toki e nimi pi jan pali - o kepeken ala tawa mani - o ante ala",
+    "Public Domain Dedication": "ken ale a",
     "Public": "pana tawa ale",
     "Unlisted": "pana tawa jan sona taso",
     "Private": "pana tawa jan pi wile mi",
@@ -58,12 +58,12 @@
     "Unknown": "toki pi sona ala",
     "Afar": "",
     "Abkhazian": "",
-    "Afrikaans": "toki Apikan",
+    "Afrikaans": "toki Apikan (Afrikaans)",
     "Akan": "",
     "Amharic": "",
-    "Arabic": "toki Alapi",
+    "Arabic": "toki Alapi (اَلْعَرَبِيَّةُ)",
     "Aragonese": "",
-    "American Sign Language": "toki luka Mewika",
+    "American Sign Language": "toki luka Mewika (American Sign Language)",
     "Assamese": "",
     "Avaric": "",
     "Kotava": "",
@@ -72,72 +72,72 @@
     "Bashkir": "",
     "Bambara": "",
     "Belarusian": "",
-    "Bengali": "toki Panla",
-    "British Sign Language": "toki luka Piten",
+    "Bengali": "toki Panla (Bangla)",
+    "British Sign Language": "toki luka Piten (British Sign Language)",
     "Bislama": "",
     "Tibetan": "",
-    "Bosnian": "toki Posan",
-    "Breton": "toki Peson",
-    "Bulgarian": "toki Pokasi",
+    "Bosnian": "toki Posan (bosanski / босански)",
+    "Breton": "toki Peson (brezhoneg)",
+    "Bulgarian": "toki Pokasi (български)",
     "Brazilian Sign Language": "",
     "Catalan": "",
-    "Czech": "toki Seki",
+    "Czech": "toki Seki (čeština)",
     "Chamorro": "",
     "Chechen": "",
     "Chuvash": "",
     "Cornish": "",
     "Corsican": "",
     "Cree": "",
-    "Czech Sign Language": "toki luka Seki",
-    "Chinese Sign Language": "toki luka Sonko",
-    "Welsh": "toki Kinla",
-    "Danish": "toki Tansi",
-    "German": "toki Tosi",
+    "Czech Sign Language": "toki luka Seki (český znakový jazyk)",
+    "Chinese Sign Language": "toki luka Sonko (中国手语)",
+    "Welsh": "toki Kinla (Cymraeg)",
+    "Danish": "toki Tansi (dansk)",
+    "German": "toki Tosi (Deutsch)",
     "Dhivehi": "",
     "Danish Sign Language": "",
     "Dzongkha": "",
-    "Greek": "toki Elena",
-    "English": "toki Inli",
-    "Esperanto": "toki Epelanto",
-    "Estonian": "toki Esi",
-    "Basque": "toki Esuka",
+    "Greek": "toki Elena (ελληνικά)",
+    "English": "toki Inli (English)",
+    "Esperanto": "toki Epelanto (Esperanto)",
+    "Estonian": "toki Esi (eesti keel)",
+    "Basque": "toki Esuka (euskara)",
     "Ewe": "",
     "Faroese": "",
     "Persian": "",
     "Fijian": "",
-    "Finnish": "toki Sumi",
-    "French": "toki Kanse",
+    "Finnish": "toki Sumi (suomi)",
+    "French": "toki Kanse (français)",
     "Western Frisian": "",
-    "French Sign Language": "toki luka Kanse",
+    "French Sign Language": "toki luka Kanse (langue des signes française)",
     "Fulah": "",
     "Scottish Gaelic": "",
     "Irish": "",
     "Galician": "",
     "Manx": "",
     "Guarani": "",
-    "German Sign Language": "toki luka Tosi",
+    "German Sign Language": "toki luka Tosi (Deutsche Gebärdensprache)",
     "Gujarati": "",
-    "Haitian": "toki Awisi",
-    "Hausa": "toki Awasa",
+    "Haitian": "toki Awisi (kreyòl ayisyen)",
+    "Hausa": "toki Awasa (Harshen Hausa / هَرْشَن هَوْسَ)",
     "Serbo-Croatian": "",
-    "Hebrew": "toki Iwisi",
+    "Hebrew": "toki Iwisi (עִבְרִית / Ivrit)",
     "Herero": "",
-    "Hindi": "toki Insi",
+    "Hindi": "toki Insi (हिन्दी / Hindi)",
     "Hiri Motu": "",
-    "Croatian": "toki Lowasi",
-    "Hungarian": "toki Mosijo",
+    "Croatian": "toki Lowasi (hrvatski)",
+    "Hungarian": "toki Mosijo (magyar)",
     "Armenian": "",
-    "Igbo": "toki Ipo",
+    "Igbo": "toki Ipo (Ìgbò)",
     "Sichuan Yi": "",
     "Inuktitut": "",
-    "Indonesian": "toki Intonesija",
+    "Indonesian": "toki Intonesija (bahasa Indonesia)",
     "Inupiaq": "",
-    "Icelandic": "toki Isilan",
-    "Italian": "toki Italija",
+    "Icelandic": "toki Isilan (íslenska)",
+    "Italian": "toki Italija (italiano)",
     "Javanese": "",
-    "Lojban": "toki Losupan",
-    "Japanese": "toki Nijon",
-    "Japanese Sign Language": "toki luka Nijon",
+    "Lojban": "toki Losupan (la .lojban.)",
+    "Japanese": "toki Nijon (日本語)",
+    "Japanese Sign Language": "toki luka Nijon (日本手話)",
     "Kabyle": "",
     "Kalaallisut": "",
     "Kannada": "",
@@ -155,7 +155,7 @@
     "Kuanyama": "",
     "Kurdish": "",
     "Lao": "",
-    "Latin": "toki Lasina",
+    "Latin": "toki Lasina (lingua latīna)",
     "Latvian": "",
     "Limburgan": "",
     "Lingala": "",
@@ -168,7 +168,7 @@
     "Marathi": "",
     "Macedonian": "",
     "Malagasy": "",
-    "Maltese": "toki Mata",
+    "Maltese": "toki Mata (Malti)",
     "Mongolian": "",
     "Maori": "",
     "Malay (macrolanguage)": "",
@@ -180,9 +180,9 @@
     "Ndonga": "",
     "Nepali (macrolanguage)": "",
     "Dutch": "",
-    "Norwegian Nynorsk": "toki Nosiki sin",
-    "Norwegian Bokmål": "toki Nosiki lipu",
-    "Norwegian": "toki Nosiki",
+    "Norwegian Nynorsk": "toki Nosiki sin (nynorsk)",
+    "Norwegian Bokmål": "toki Nosiki lipu (bokmål)",
+    "Norwegian": "toki Nosiki (norsk)",
     "Nyanja": "",
     "Occitan": "",
     "Ojibwa": "",
@@ -191,15 +191,15 @@
     "Ossetian": "",
     "Panjabi": "",
     "Pakistan Sign Language": "",
-    "Polish": "toki Posuka",
-    "Portuguese": "toki Potuke",
+    "Polish": "toki Posuka (polski)",
+    "Portuguese": "toki Potuke (português)",
     "Pushto": "",
     "Quechua": "",
     "Romansh": "",
-    "Romanian": "toki Lomani",
-    "Russian Sign Language": "toki Losi luka",
+    "Romanian": "toki Lomani (limba română)",
+    "Russian Sign Language": "toki Losi luka (Русский Жестовый Язык)",
     "Rundi": "",
-    "Russian": "toki Losi",
+    "Russian": "toki Losi (русский)",
     "Sango": "",
     "Saudi Arabian Sign Language": "",
     "South African Sign Language": "",
@@ -212,10 +212,10 @@
     "Sindhi": "",
     "Somali": "",
     "Southern Sotho": "",
-    "Spanish": "toki Epanja",
+    "Spanish": "toki Epanja (español)",
     "Albanian": "",
     "Sardinian": "",
-    "Serbian": "toki Sopisi",
+    "Serbian": "toki Sopisi (српски језик / srpski jezik)",
     "Swati": "",
     "Sundanese": "",
     "Swahili (macrolanguage)": "",
@@ -229,15 +229,15 @@
     "Tagalog": "",
     "Thai": "",
     "Tigrinya": "",
-    "Klingon": "toki Sinan",
+    "Klingon": "toki Sinan (tlhIngan Hol)",
     "Tonga (Tonga Islands)": "",
     "Tswana": "",
     "Tsonga": "",
     "Turkmen": "",
-    "Turkish": "toki Tuki",
+    "Turkish": "toki Tuki (Türkçe)",
     "Twi": "",
     "Uighur": "",
-    "Ukrainian": "toki Ukawina",
+    "Ukrainian": "toki Ukawina (украї́нська мо́ва)",
     "Urdu": "",
     "Uzbek": "",
     "Venda": "",
@@ -248,9 +248,9 @@
     "Yiddish": "",
     "Yoruba": "",
     "Zhuang": "",
-    "Chinese": "toki Sonko",
+    "Chinese": "toki Sonko (汉语)",
     "Zulu": "",
     "No linguistic content": "toki ala",
-    "Simplified Chinese": "toki Sonko pona",
-    "Traditional Chinese": "toki Sonko majuna"
+    "Simplified Chinese": "toki Sonko pona (简化字)",
+    "Traditional Chinese": "toki Sonko majuna (正體字)"
 }