diff --git a/po/make-template.sh b/po/make-template.sh
index f223841..8232e4d 100755
--- a/po/make-template.sh
+++ b/po/make-template.sh
@@ -1,47 +1,19 @@
-#!/bin/sh
+#!/bin/sh -e
 # This shell script generates the translation template.
 #
-# The reason for this not being inside CMakeLists.txt
-# is that the translator should not need to run the whole
-# configuration process just to get this single stupid file.
+# The reason for this not being inside CMakeLists.txt is that the translator
+# should not need to run the whole configuration process just to get this file.
+dir=$(dirname $0)
 
-# Get the directory this script resides in so that the user
-# doesn't have to run the script from there
-DIR=$(dirname $0)
-
-# Collect source files
-SOURCES=$(echo $DIR/../src/*.c)
-
-# Get the package name from CMakeLists.txt
-PACKAGE=$(sed -n '/^[ \t]*project[ \t]*([ \t]*\([^ \t)]\{1,\}\).*).*/{s//\1/p;q}' \
-	$DIR/../CMakeLists.txt)
-
-# Get the package version from CMakeLists.txt
-EXP_BEG='/^[ \t]*set[ \t]*([ \t]*project_VERSION_'
-EXP_END='[ \t]\{1,\}"\{0,1\}\([^)"]\{1,\}\)"\{0,1\}).*/{s//\1/p;q}'
-
-MAJOR=$(sed -n "${EXP_BEG}MAJOR${EXP_END}" $DIR/../CMakeLists.txt)
-MINOR=$(sed -n "${EXP_BEG}MINOR${EXP_END}" $DIR/../CMakeLists.txt)
-PATCH=$(sed -n "${EXP_BEG}PATCH${EXP_END}" $DIR/../CMakeLists.txt)
-
-if [ "$MAJOR" != "" ]; then
-	VERSION=$MAJOR
-	if [ "$MINOR" != "" ]; then
-		VERSION=$VERSION.$MINOR
-		if [ "$PATCH" != "" ]; then
-			VERSION=$VERSION.$PATCH
-		fi
-	fi
-fi
-
-if [ -z "$PACKAGE" -o -z "$VERSION" ]; then
+re='^[ \t]*project *( *\([^ \t)]\{1,\}\) \{1,\}VERSION \{1,\}\([^ \t)]\{1,\}\).*'
+package=$(sed -n "s/$re/\\1/p" "$dir/../CMakeLists.txt")
+version=$(sed -n "s/$re/\\2/p" "$dir/../CMakeLists.txt")
+if [ -z "$package" -o -z "$version" ]; then
 	echo "Failed to get information from CMakeLists.txt"
 	exit 1
 fi
 
-# Finally make the template
-xgettext -LC -k_ -kN_ $SOURCES -o "$DIR/$PACKAGE.pot" \
-	--package-name="$PACKAGE" --package-version="$VERSION" \
+xgettext -LC -k_ -kN_ $dir/../src/*.c -o "$dir/$package.pot" \
+	--package-name="$package" --package-version="$version" \
 	--copyright-holder="Přemysl Eric Janouch" \
-	--msgid-bugs-address="https://github.com/pjanouch/$PACKAGE/issues"
-
+	--msgid-bugs-address="https://git.janouch.name/p/$package/issues"
diff --git a/po/sdtui.pot b/po/sdtui.pot
index 22dbf32..dd347fa 100644
--- a/po/sdtui.pot
+++ b/po/sdtui.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sdtui 0.1.0\n"
-"Report-Msgid-Bugs-To: https://github.com/pjanouch/sdtui/issues\n"
-"POT-Creation-Date: 2016-09-28 16:12+0200\n"
+"Report-Msgid-Bugs-To: https://git.janouch.name/p/sdtui/issues\n"
+"POT-Creation-Date: 2021-10-11 21:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,115 +17,137 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/sdtui.c:283
+#: ../src/sdgtk.c:289 ../src/sdtui.c:2481
+msgid "Warning"
+msgstr ""
+
+#: ../src/sdgtk.c:289 ../src/sdtui.c:2481
+msgid "failed to set the locale"
+msgstr ""
+
+#: ../src/sdgtk.c:299
+msgid "FILE..."
+msgstr ""
+
+#: ../src/sdgtk.c:304
+msgid "- StarDict GTK+ UI"
+msgstr ""
+
+#: ../src/sdgtk.c:355
+msgid "Follow selection"
+msgstr ""
+
+#: ../src/sdtui.c:320
 msgid "error in entry"
 msgstr ""
 
-#: ../src/sdtui.c:302
+#: ../src/sdtui.c:415
 msgid "no usable field found"
 msgstr ""
 
-#: ../src/sdtui.c:548
+#: ../src/sdtui.c:700
 msgid "Search"
 msgstr ""
 
-#: ../src/sdtui.c:573
+#: ../src/sdtui.c:726
 msgid "Cannot load configuration"
 msgstr ""
 
-#: ../src/sdtui.c:606
+#: ../src/sdtui.c:745
 msgid "Error loading dictionary"
 msgstr ""
 
-#: ../src/sdtui.c:612
+#: ../src/sdtui.c:750
 msgid ""
 "No dictionaries found either in the configuration or on the command line"
 msgstr ""
 
-#: ../src/sdtui.c:966
+#: ../src/sdtui.c:1114
 msgid "Terminal UI for StarDict dictionaries"
 msgstr ""
 
-#: ../src/sdtui.c:969
+#: ../src/sdtui.c:1117
 msgid "Type to search"
 msgstr ""
 
-#: ../src/sdtui.c:1976
+#: ../src/sdtui.c:2095
+#, c-format
+msgid "X11 connection failed (error code %d)"
+msgstr ""
+
+#: ../src/sdtui.c:2241
+#, c-format
+msgid "X11 request error (%d, major %d, minor %d)"
+msgstr ""
+
+#: ../src/sdtui.c:2476
 msgid "Output version information and exit"
 msgstr ""
 
-#: ../src/sdtui.c:1981
-msgid "Warning"
-msgstr ""
-
-#: ../src/sdtui.c:1981
-msgid "failed to set the locale"
-msgstr ""
-
-#: ../src/sdtui.c:1989
+#: ../src/sdtui.c:2489
 msgid "[dictionary.ifo...] - StarDict terminal UI"
 msgstr ""
 
-#: ../src/sdtui.c:1997
+#: ../src/sdtui.c:2497
 msgid "Error"
 msgstr ""
 
-#: ../src/sdtui.c:1997
+#: ../src/sdtui.c:2497
 msgid "option parsing failed"
 msgstr ""
 
-#: ../src/stardict.c:91
+#: ../src/stardict.c:89
 msgid "invalid header format"
 msgstr ""
 
-#: ../src/stardict.c:227
+#: ../src/stardict.c:249
 msgid "version not specified"
 msgstr ""
 
-#: ../src/stardict.c:238
+#: ../src/stardict.c:260
 msgid "invalid version"
 msgstr ""
 
-#: ../src/stardict.c:252
+#: ../src/stardict.c:274
 msgid "unknown key, ignoring"
 msgstr ""
 
-#: ../src/stardict.c:259
+#: ../src/stardict.c:281
 msgid "invalid encoding, must be valid UTF-8"
 msgstr ""
 
-#: ../src/stardict.c:276
+#: ../src/stardict.c:298
 msgid "invalid integer"
 msgstr ""
 
-#: ../src/stardict.c:286
+#: ../src/stardict.c:308
 msgid "option format error"
 msgstr ""
 
-#: ../src/stardict.c:296
+#: ../src/stardict.c:318
 msgid "no book name specified"
 msgstr ""
 
-#: ../src/stardict.c:302
+#: ../src/stardict.c:324
 msgid "word count not specified"
 msgstr ""
 
-#: ../src/stardict.c:308
+#: ../src/stardict.c:330
 msgid "index file size not specified"
 msgstr ""
 
-#: ../src/stardict.c:317
+#: ../src/stardict.c:339
 msgid "invalid index offset bits"
 msgstr ""
 
-#: ../src/stardict.c:812
+#: ../src/stardict.c:827
 msgid "cannot find .idx file"
 msgstr ""
 
-#: ../src/stardict.c:835
+#: ../src/stardict.c:850
 msgid "cannot find .dict file"
 msgstr ""
 
-#: ../src/stardict.c:1130 ../src/stardict.c:1155
+#: ../src/stardict.c:1153 ../src/stardict.c:1178
 msgid "invalid data entry"
 msgstr ""