3 files changed, 33 insertions, 69 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08b4c053..314505c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,6 +281,7 @@ endif ()
 
 # Target.
 add_executable (app ${SOURCES} ${RESOURCES})
+set_property (TARGET app PROPERTY C_STANDARD 11)
 if (TARGET ext-deps)
     add_dependencies (app ext-deps)
 endif ()
diff --git a/po/en.po b/po/en.po
index 24fed59f..80fee8ae 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1050,87 +1050,50 @@ msgstr "From:"
 msgid "dlg.translate.to"
 msgstr "To:"
 
+# A language choice in the Translation dialog.
 msgid "lang.ar"
 msgstr "Arabic"
 
+# A language choice in the Translation dialog.
 msgid "lang.zh"
 msgstr "Chinese"
 
-msgid "lang.zh.hans"
-msgstr "Chinese (Simplified)"
-
-msgid "lang.zh.hant"
-msgstr "Chinese (Traditional)"
-
+# A language choice in the Translation dialog.
 msgid "lang.de"
 msgstr "German"
 
+# A language choice in the Translation dialog.
 msgid "lang.en"
 msgstr "English"
 
-msgid "lang.ia"
-msgstr "Interlingua"
-
-msgid "lang.ie"
-msgstr "Interlingue"
-
-msgid "lang.fi"
-msgstr "Finnish"
-
+# A language choice in the Translation dialog.
 msgid "lang.fr"
 msgstr "French"
 
-msgid "lang.gl"
-msgstr "Galician"
-
+# A language choice in the Translation dialog.
 msgid "lang.hi"
 msgstr "Hindi"
 
+# A language choice in the Translation dialog.
 msgid "lang.it"
 msgstr "Italian"
 
+# A language choice in the Translation dialog.
 msgid "lang.ja"
 msgstr "Japanese"
 
-msgid "lang.pl"
-msgstr "Polish"
-
+# A language choice in the Translation dialog.
 msgid "lang.pt"
 msgstr "Portuguese"
 
+# A language choice in the Translation dialog.
 msgid "lang.ru"
 msgstr "Russian"
 
-msgid "lang.hu"
-msgstr "Hungarian"
-
-msgid "lang.uk"
-msgstr "Ukrainian"
-
-msgid "lang.eo"
-msgstr "Esperanto"
-
+# A language choice in the Translation dialog.
 msgid "lang.es"
 msgstr "Spanish"
 
-msgid "lang.es.mx"
-msgstr "Spanish (Mexico)"
-
-msgid "lang.cs"
-msgstr "Czech"
-
-msgid "lang.sk"
-msgstr "Slovak"
-
-msgid "lang.sr"
-msgstr "Serbian"
-
-msgid "lang.isv"
-msgstr "Interslavic"
-
-msgid "lang.tok"
-msgstr "Toki Pona"
-
 msgid "heading.newident"
 msgstr "NEW IDENTITY"
 
diff --git a/src/ui/util.c b/src/ui/util.c
index 88348ff8..2624bf2b 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2199,27 +2199,27 @@ iWidget *makeDialog_Widget(const char *id,
 
 iWidget *makePreferences_Widget(void) {
     /* Common items. */
-    const iMenuItem langItems[] = { { "${lang.cs} - cs", 0, 0, "uilang id:cs" },
-                                    { "${lang.de} - de", 0, 0, "uilang id:de" },
-                                    { "${lang.en} - en", 0, 0, "uilang id:en" },
-                                    { "${lang.es} - es", 0, 0, "uilang id:es" },
-                                    { "${lang.es.mx} - es", 0, 0, "uilang id:es_MX" },
-                                    { "${lang.eo} - eo", 0, 0, "uilang id:eo" },
-                                    { "${lang.fi} - fi", 0, 0, "uilang id:fi" },
-                                    { "${lang.fr} - fr", 0, 0, "uilang id:fr" },
-                                    { "${lang.gl} - gl", 0, 0, "uilang id:gl" },
-                                    { "${lang.hu} - hu", 0, 0, "uilang id:hu" },
-                                    { "${lang.ia} - ia", 0, 0, "uilang id:ia" },
-                                    { "${lang.ie} - ie", 0, 0, "uilang id:ie" },
-                                    { "${lang.isv} - isv", 0, 0, "uilang id:isv" },
-                                    { "${lang.pl} - pl", 0, 0, "uilang id:pl" },
-                                    { "${lang.ru} - ru", 0, 0, "uilang id:ru" },
-                                    { "${lang.sk} - sk", 0, 0, "uilang id:sk" },
-                                    { "${lang.sr} - sr", 0, 0, "uilang id:sr" },
-                                    { "${lang.tok} - tok", 0, 0, "uilang id:tok" },
-                                    { "${lang.uk} - uk", 0, 0, "uilang id:uk" },
-                                    { "${lang.zh.hans} - zh", 0, 0, "uilang id:zh_Hans" },
-                                    { "${lang.zh.hant} - zh", 0, 0, "uilang id:zh_Hant" },
+    const iMenuItem langItems[] = { { u8"Čeština - cs", 0, 0, "uilang id:cs" },
+                                    { u8"Deutsch - de", 0, 0, "uilang id:de" },
+                                    { u8"English - en", 0, 0, "uilang id:en" },
+                                    { u8"Español - es", 0, 0, "uilang id:es" },
+                                    { u8"Español (México) - es", 0, 0, "uilang id:es_MX" },
+                                    { u8"Esperanto - eo", 0, 0, "uilang id:eo" },
+                                    { u8"Suomi - fi", 0, 0, "uilang id:fi" },
+                                    { u8"Français - fr", 0, 0, "uilang id:fr" },
+                                    { u8"Galego - gl", 0, 0, "uilang id:gl" },
+                                    { u8"Magyar - hu", 0, 0, "uilang id:hu" },
+                                    { u8"Interlingua - ia", 0, 0, "uilang id:ia" },
+                                    { u8"Interlingue - ie", 0, 0, "uilang id:ie" },
+                                    { u8"Interslavic - isv", 0, 0, "uilang id:isv" },
+                                    { u8"Polski - pl", 0, 0, "uilang id:pl" },
+                                    { u8"Русский - ru", 0, 0, "uilang id:ru" },
+                                    { u8"Slovak - sk", 0, 0, "uilang id:sk" },
+                                    { u8"Српски - sr", 0, 0, "uilang id:sr" },
+                                    { u8"Toki pona - tok", 0, 0, "uilang id:tok" },
+                                    { u8"Українська - uk", 0, 0, "uilang id:uk" },
+                                    { u8"简体中文 - zh", 0, 0, "uilang id:zh_Hans" },
+                                    { u8"繁體/正體中文 - zh", 0, 0, "uilang id:zh_Hant" },
                                     { NULL } };
     const iMenuItem returnKeyBehaviors[] = {
         { "${prefs.returnkey.linebreak} " uiTextAction_ColorEscape shift_Icon return_Icon