[gucharmap] unicode: Move translatable strings to their own file

[Christian Persch <chpe src gnome org>]

commit 1f22228338ce2e3a514b99b04a79e56138730167
Author: Christian Persch <chpe gnome org>
Date:   Thu Mar 3 19:01:00 2016 +0100

    unicode: Move translatable strings to their own file
    
    Move strings marked for extraction by gettext to their own file,
    so that all translatable dummy strings only exist in that one place.

 gucharmap/gen-guch-unicode-tables.pl |   95 ++++++---
 gucharmap/unicode-blocks.h           |  266 ----------------------
 gucharmap/unicode-i18n.h             |  399 ++++++++++++++++++++++++++++++++++
 gucharmap/unicode-scripts.h          |  135 ------------
 po/POTFILES.in                       |    3 +-
 5 files changed, 466 insertions(+), 432 deletions(-)
---
diff --git a/gucharmap/gen-guch-unicode-tables.pl b/gucharmap/gen-guch-unicode-tables.pl
index bb67cd8..98c8f90 100755
--- a/gucharmap/gen-guch-unicode-tables.pl
+++ b/gucharmap/gen-guch-unicode-tables.pl
@@ -32,12 +32,12 @@ sub process_versions_txt ($);
 
 $| = 1;  # flush stdout buffer
 
-if (@ARGV != 2) 
+if (@ARGV != 2 && @ARGV != 3)
 {
     $0 =~ s  */@@;
     die <<EOF
 
-Usage: $0 UNICODE-VERSION DIRECTORY
+Usage: $0 UNICODE-VERSION DIRECTORY [--i18n]
 
 DIRECTORY should contain the following Unicode data files:
 UnicodeData.txt Unihan.zip NamesList.txt Blocks.txt Scripts.txt
@@ -51,6 +51,13 @@ my ($unicodedata_txt, $unihan_zip, $nameslist_txt, $blocks_txt, $scripts_txt, $v
 
 my $v = $ARGV[0];
 my $d = $ARGV[1];
+
+my $gen_translatable_strings = 0;
+if (@ARGV == 3)
+{
+    $gen_translatable_strings = 1 if ($ARGV[2] eq "--i18n") or die "Unknown option \"$ARGV[2]\"\n";
+}
+
 opendir (my $dir, $d) or die "Cannot open Unicode data dir $d: $!\n";
 for my $f (readdir ($dir))
 {
@@ -69,12 +76,19 @@ defined $blocks_txt or die "Did not find $d/Blocks.txt";
 defined $scripts_txt or die "Did not find $d/Scripts.txt";
 defined $versions_txt or die "Did not find $d/DerivedAge.txt";
 
-process_unicode_data_txt ($unicodedata_txt);
-process_nameslist_txt ($nameslist_txt);
-process_blocks_txt ($blocks_txt);
-process_scripts_txt ($scripts_txt);
-process_versions_txt ($versions_txt);
-process_unihan_zip ($unihan_zip);
+if ($gen_translatable_strings)
+{
+    process_translatable_strings ($blocks_txt, $scripts_txt);
+}
+else
+{
+    process_unicode_data_txt ($unicodedata_txt);
+    process_nameslist_txt ($nameslist_txt);
+    process_blocks_txt ($blocks_txt);
+    process_scripts_txt ($scripts_txt);
+    process_versions_txt ($versions_txt);
+    process_unihan_zip ($unihan_zip);
+}
 
 exit;
 
@@ -745,15 +759,6 @@ sub process_blocks_txt ($)
     my @blocks;
     read_blocks_txt ($blocks_txt, \ blocks);
 
-    print $out "/* for extraction by intltool */\n";
-    print $out "#if 0\n";
-    foreach my $block (@blocks)
-    {
-        my ($start, $end, $name, $offset) = @{$block};
-        print $out qq/  N_("$name"),\n/;
-    }
-    print $out "#endif /* 0 */\n\n";
-
     print $out "static const char unicode_blocks_strings[] =\n";
     foreach my $block (@blocks)
     {
@@ -865,24 +870,15 @@ sub process_scripts_txt ($)
 
     print $out "typedef struct _UnicodeScript UnicodeScript;\n\n";
 
-    print $out "/* for extraction by intltool */\n";
-    print $out "#if 0\n";
-    my $i = 0;
-    for my $script (sort keys %scripts)
-    {
-        $scripts{$script} = $i;
-        $i++;
-
-        print $out qq/  N_("$script"),\n/;
-    }
-    print $out "#endif /* 0 */\n\n";
-
     print $out "static const gchar unicode_script_list_strings[] =\n";
     my $offset = 0;
+    my $i = 0;
     my %script_offsets;
     for my $script (sort keys %scripts)
     {
         printf $out (qq/  "\%s\\0"\n/, $script);
+        $scripts{$script} = $i;
+        $i++;
        $script_offsets{$script} = $offset;
        $offset += length($script) + 1;
     }
@@ -920,6 +916,47 @@ sub process_scripts_txt ($)
 
 #------------------------#
 
+sub  process_translatable_strings
+{
+    my ($blocks_txt, $scripts_txt) = @_;
+
+    print "processing $blocks_txt and $scripts_txt...";
+
+    my @blocks;
+    read_blocks_txt ($blocks_txt, \ blocks);
+
+    my %script_hash;
+    my %scripts;
+
+    read_scripts_txt ($scripts_txt, \%script_hash, \%scripts);
+
+    open (my $out, "> unicode-i18n.h") or die;
+
+    print $out "unicode-i18n.h for extraction by gettext\n";
+    print $out "THIS IS A GENERATED FILE. CHANGES WILL BE OVERWRITTEN.\n";
+    print $out "Generated by $0\n";
+    print $out "Generated from UCD version $v\n\n";
+
+    foreach my $block (@blocks)
+    {
+        my ($start, $end, $name, $offset) = @{$block};
+        print $out qq/N_("$name")\n/;
+    }
+
+    print $out "\n";
+
+    my $i = 0;
+    for my $script (sort keys %scripts)
+    {
+        print $out qq/N_("$script")\n/;
+    }
+
+    close ($out);
+    print " done.\n";
+}
+
+#------------------------#
+
 sub process_versions_txt ($)
 {
     my ($versions_txt) = @_;
diff --git a/gucharmap/unicode-blocks.h b/gucharmap/unicode-blocks.h
index 74bb24e..1c4d378 100644
--- a/gucharmap/unicode-blocks.h
+++ b/gucharmap/unicode-blocks.h
@@ -9,272 +9,6 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-/* for extraction by intltool */
-#if 0
-  N_("Basic Latin"),
-  N_("Latin-1 Supplement"),
-  N_("Latin Extended-A"),
-  N_("Latin Extended-B"),
-  N_("IPA Extensions"),
-  N_("Spacing Modifier Letters"),
-  N_("Combining Diacritical Marks"),
-  N_("Greek and Coptic"),
-  N_("Cyrillic"),
-  N_("Cyrillic Supplement"),
-  N_("Armenian"),
-  N_("Hebrew"),
-  N_("Arabic"),
-  N_("Syriac"),
-  N_("Arabic Supplement"),
-  N_("Thaana"),
-  N_("N'Ko"),
-  N_("Samaritan"),
-  N_("Mandaic"),
-  N_("Arabic Extended-A"),
-  N_("Devanagari"),
-  N_("Bengali"),
-  N_("Gurmukhi"),
-  N_("Gujarati"),
-  N_("Oriya"),
-  N_("Tamil"),
-  N_("Telugu"),
-  N_("Kannada"),
-  N_("Malayalam"),
-  N_("Sinhala"),
-  N_("Thai"),
-  N_("Lao"),
-  N_("Tibetan"),
-  N_("Myanmar"),
-  N_("Georgian"),
-  N_("Hangul Jamo"),
-  N_("Ethiopic"),
-  N_("Ethiopic Supplement"),
-  N_("Cherokee"),
-  N_("Unified Canadian Aboriginal Syllabics"),
-  N_("Ogham"),
-  N_("Runic"),
-  N_("Tagalog"),
-  N_("Hanunoo"),
-  N_("Buhid"),
-  N_("Tagbanwa"),
-  N_("Khmer"),
-  N_("Mongolian"),
-  N_("Unified Canadian Aboriginal Syllabics Extended"),
-  N_("Limbu"),
-  N_("Tai Le"),
-  N_("New Tai Lue"),
-  N_("Khmer Symbols"),
-  N_("Buginese"),
-  N_("Tai Tham"),
-  N_("Combining Diacritical Marks Extended"),
-  N_("Balinese"),
-  N_("Sundanese"),
-  N_("Batak"),
-  N_("Lepcha"),
-  N_("Ol Chiki"),
-  N_("Sundanese Supplement"),
-  N_("Vedic Extensions"),
-  N_("Phonetic Extensions"),
-  N_("Phonetic Extensions Supplement"),
-  N_("Combining Diacritical Marks Supplement"),
-  N_("Latin Extended Additional"),
-  N_("Greek Extended"),
-  N_("General Punctuation"),
-  N_("Superscripts and Subscripts"),
-  N_("Currency Symbols"),
-  N_("Combining Diacritical Marks for Symbols"),
-  N_("Letterlike Symbols"),
-  N_("Number Forms"),
-  N_("Arrows"),
-  N_("Mathematical Operators"),
-  N_("Miscellaneous Technical"),
-  N_("Control Pictures"),
-  N_("Optical Character Recognition"),
-  N_("Enclosed Alphanumerics"),
-  N_("Box Drawing"),
-  N_("Block Elements"),
-  N_("Geometric Shapes"),
-  N_("Miscellaneous Symbols"),
-  N_("Dingbats"),
-  N_("Miscellaneous Mathematical Symbols-A"),
-  N_("Supplemental Arrows-A"),
-  N_("Braille Patterns"),
-  N_("Supplemental Arrows-B"),
-  N_("Miscellaneous Mathematical Symbols-B"),
-  N_("Supplemental Mathematical Operators"),
-  N_("Miscellaneous Symbols and Arrows"),
-  N_("Glagolitic"),
-  N_("Latin Extended-C"),
-  N_("Coptic"),
-  N_("Georgian Supplement"),
-  N_("Tifinagh"),
-  N_("Ethiopic Extended"),
-  N_("Cyrillic Extended-A"),
-  N_("Supplemental Punctuation"),
-  N_("CJK Radicals Supplement"),
-  N_("Kangxi Radicals"),
-  N_("Ideographic Description Characters"),
-  N_("CJK Symbols and Punctuation"),
-  N_("Hiragana"),
-  N_("Katakana"),
-  N_("Bopomofo"),
-  N_("Hangul Compatibility Jamo"),
-  N_("Kanbun"),
-  N_("Bopomofo Extended"),
-  N_("CJK Strokes"),
-  N_("Katakana Phonetic Extensions"),
-  N_("Enclosed CJK Letters and Months"),
-  N_("CJK Compatibility"),
-  N_("CJK Unified Ideographs Extension A"),
-  N_("Yijing Hexagram Symbols"),
-  N_("CJK Unified Ideographs"),
-  N_("Yi Syllables"),
-  N_("Yi Radicals"),
-  N_("Lisu"),
-  N_("Vai"),
-  N_("Cyrillic Extended-B"),
-  N_("Bamum"),
-  N_("Modifier Tone Letters"),
-  N_("Latin Extended-D"),
-  N_("Syloti Nagri"),
-  N_("Common Indic Number Forms"),
-  N_("Phags-pa"),
-  N_("Saurashtra"),
-  N_("Devanagari Extended"),
-  N_("Kayah Li"),
-  N_("Rejang"),
-  N_("Hangul Jamo Extended-A"),
-  N_("Javanese"),
-  N_("Myanmar Extended-B"),
-  N_("Cham"),
-  N_("Myanmar Extended-A"),
-  N_("Tai Viet"),
-  N_("Meetei Mayek Extensions"),
-  N_("Ethiopic Extended-A"),
-  N_("Latin Extended-E"),
-  N_("Cherokee Supplement"),
-  N_("Meetei Mayek"),
-  N_("Hangul Syllables"),
-  N_("Hangul Jamo Extended-B"),
-  N_("High Surrogates"),
-  N_("High Private Use Surrogates"),
-  N_("Low Surrogates"),
-  N_("Private Use Area"),
-  N_("CJK Compatibility Ideographs"),
-  N_("Alphabetic Presentation Forms"),
-  N_("Arabic Presentation Forms-A"),
-  N_("Variation Selectors"),
-  N_("Vertical Forms"),
-  N_("Combining Half Marks"),
-  N_("CJK Compatibility Forms"),
-  N_("Small Form Variants"),
-  N_("Arabic Presentation Forms-B"),
-  N_("Halfwidth and Fullwidth Forms"),
-  N_("Specials"),
-  N_("Linear B Syllabary"),
-  N_("Linear B Ideograms"),
-  N_("Aegean Numbers"),
-  N_("Ancient Greek Numbers"),
-  N_("Ancient Symbols"),
-  N_("Phaistos Disc"),
-  N_("Lycian"),
-  N_("Carian"),
-  N_("Coptic Epact Numbers"),
-  N_("Old Italic"),
-  N_("Gothic"),
-  N_("Old Permic"),
-  N_("Ugaritic"),
-  N_("Old Persian"),
-  N_("Deseret"),
-  N_("Shavian"),
-  N_("Osmanya"),
-  N_("Elbasan"),
-  N_("Caucasian Albanian"),
-  N_("Linear A"),
-  N_("Cypriot Syllabary"),
-  N_("Imperial Aramaic"),
-  N_("Palmyrene"),
-  N_("Nabataean"),
-  N_("Hatran"),
-  N_("Phoenician"),
-  N_("Lydian"),
-  N_("Meroitic Hieroglyphs"),
-  N_("Meroitic Cursive"),
-  N_("Kharoshthi"),
-  N_("Old South Arabian"),
-  N_("Old North Arabian"),
-  N_("Manichaean"),
-  N_("Avestan"),
-  N_("Inscriptional Parthian"),
-  N_("Inscriptional Pahlavi"),
-  N_("Psalter Pahlavi"),
-  N_("Old Turkic"),
-  N_("Old Hungarian"),
-  N_("Rumi Numeral Symbols"),
-  N_("Brahmi"),
-  N_("Kaithi"),
-  N_("Sora Sompeng"),
-  N_("Chakma"),
-  N_("Mahajani"),
-  N_("Sharada"),
-  N_("Sinhala Archaic Numbers"),
-  N_("Khojki"),
-  N_("Multani"),
-  N_("Khudawadi"),
-  N_("Grantha"),
-  N_("Tirhuta"),
-  N_("Siddham"),
-  N_("Modi"),
-  N_("Takri"),
-  N_("Ahom"),
-  N_("Warang Citi"),
-  N_("Pau Cin Hau"),
-  N_("Cuneiform"),
-  N_("Cuneiform Numbers and Punctuation"),
-  N_("Early Dynastic Cuneiform"),
-  N_("Egyptian Hieroglyphs"),
-  N_("Anatolian Hieroglyphs"),
-  N_("Bamum Supplement"),
-  N_("Mro"),
-  N_("Bassa Vah"),
-  N_("Pahawh Hmong"),
-  N_("Miao"),
-  N_("Kana Supplement"),
-  N_("Duployan"),
-  N_("Shorthand Format Controls"),
-  N_("Byzantine Musical Symbols"),
-  N_("Musical Symbols"),
-  N_("Ancient Greek Musical Notation"),
-  N_("Tai Xuan Jing Symbols"),
-  N_("Counting Rod Numerals"),
-  N_("Mathematical Alphanumeric Symbols"),
-  N_("Sutton SignWriting"),
-  N_("Mende Kikakui"),
-  N_("Arabic Mathematical Alphabetic Symbols"),
-  N_("Mahjong Tiles"),
-  N_("Domino Tiles"),
-  N_("Playing Cards"),
-  N_("Enclosed Alphanumeric Supplement"),
-  N_("Enclosed Ideographic Supplement"),
-  N_("Miscellaneous Symbols and Pictographs"),
-  N_("Emoticons"),
-  N_("Ornamental Dingbats"),
-  N_("Transport and Map Symbols"),
-  N_("Alchemical Symbols"),
-  N_("Geometric Shapes Extended"),
-  N_("Supplemental Arrows-C"),
-  N_("Supplemental Symbols and Pictographs"),
-  N_("CJK Unified Ideographs Extension B"),
-  N_("CJK Unified Ideographs Extension C"),
-  N_("CJK Unified Ideographs Extension D"),
-  N_("CJK Unified Ideographs Extension E"),
-  N_("CJK Compatibility Ideographs Supplement"),
-  N_("Tags"),
-  N_("Variation Selectors Supplement"),
-  N_("Supplementary Private Use Area-A"),
-  N_("Supplementary Private Use Area-B"),
-#endif /* 0 */
-
 static const char unicode_blocks_strings[] =
   "Basic Latin\0"
   "Latin-1 Supplement\0"
diff --git a/gucharmap/unicode-i18n.h b/gucharmap/unicode-i18n.h
new file mode 100644
index 0000000..291c658
--- /dev/null
+++ b/gucharmap/unicode-i18n.h
@@ -0,0 +1,399 @@
+unicode-i18n.h for extraction by gettext
+THIS IS A GENERATED FILE. CHANGES WILL BE OVERWRITTEN.
+Generated by ./gen-guch-unicode-tables.pl
+Generated from UCD version 8.0.0
+
+N_("Basic Latin")
+N_("Latin-1 Supplement")
+N_("Latin Extended-A")
+N_("Latin Extended-B")
+N_("IPA Extensions")
+N_("Spacing Modifier Letters")
+N_("Combining Diacritical Marks")
+N_("Greek and Coptic")
+N_("Cyrillic")
+N_("Cyrillic Supplement")
+N_("Armenian")
+N_("Hebrew")
+N_("Arabic")
+N_("Syriac")
+N_("Arabic Supplement")
+N_("Thaana")
+N_("N'Ko")
+N_("Samaritan")
+N_("Mandaic")
+N_("Arabic Extended-A")
+N_("Devanagari")
+N_("Bengali")
+N_("Gurmukhi")
+N_("Gujarati")
+N_("Oriya")
+N_("Tamil")
+N_("Telugu")
+N_("Kannada")
+N_("Malayalam")
+N_("Sinhala")
+N_("Thai")
+N_("Lao")
+N_("Tibetan")
+N_("Myanmar")
+N_("Georgian")
+N_("Hangul Jamo")
+N_("Ethiopic")
+N_("Ethiopic Supplement")
+N_("Cherokee")
+N_("Unified Canadian Aboriginal Syllabics")
+N_("Ogham")
+N_("Runic")
+N_("Tagalog")
+N_("Hanunoo")
+N_("Buhid")
+N_("Tagbanwa")
+N_("Khmer")
+N_("Mongolian")
+N_("Unified Canadian Aboriginal Syllabics Extended")
+N_("Limbu")
+N_("Tai Le")
+N_("New Tai Lue")
+N_("Khmer Symbols")
+N_("Buginese")
+N_("Tai Tham")
+N_("Combining Diacritical Marks Extended")
+N_("Balinese")
+N_("Sundanese")
+N_("Batak")
+N_("Lepcha")
+N_("Ol Chiki")
+N_("Sundanese Supplement")
+N_("Vedic Extensions")
+N_("Phonetic Extensions")
+N_("Phonetic Extensions Supplement")
+N_("Combining Diacritical Marks Supplement")
+N_("Latin Extended Additional")
+N_("Greek Extended")
+N_("General Punctuation")
+N_("Superscripts and Subscripts")
+N_("Currency Symbols")
+N_("Combining Diacritical Marks for Symbols")
+N_("Letterlike Symbols")
+N_("Number Forms")
+N_("Arrows")
+N_("Mathematical Operators")
+N_("Miscellaneous Technical")
+N_("Control Pictures")
+N_("Optical Character Recognition")
+N_("Enclosed Alphanumerics")
+N_("Box Drawing")
+N_("Block Elements")
+N_("Geometric Shapes")
+N_("Miscellaneous Symbols")
+N_("Dingbats")
+N_("Miscellaneous Mathematical Symbols-A")
+N_("Supplemental Arrows-A")
+N_("Braille Patterns")
+N_("Supplemental Arrows-B")
+N_("Miscellaneous Mathematical Symbols-B")
+N_("Supplemental Mathematical Operators")
+N_("Miscellaneous Symbols and Arrows")
+N_("Glagolitic")
+N_("Latin Extended-C")
+N_("Coptic")
+N_("Georgian Supplement")
+N_("Tifinagh")
+N_("Ethiopic Extended")
+N_("Cyrillic Extended-A")
+N_("Supplemental Punctuation")
+N_("CJK Radicals Supplement")
+N_("Kangxi Radicals")
+N_("Ideographic Description Characters")
+N_("CJK Symbols and Punctuation")
+N_("Hiragana")
+N_("Katakana")
+N_("Bopomofo")
+N_("Hangul Compatibility Jamo")
+N_("Kanbun")
+N_("Bopomofo Extended")
+N_("CJK Strokes")
+N_("Katakana Phonetic Extensions")
+N_("Enclosed CJK Letters and Months")
+N_("CJK Compatibility")
+N_("CJK Unified Ideographs Extension A")
+N_("Yijing Hexagram Symbols")
+N_("CJK Unified Ideographs")
+N_("Yi Syllables")
+N_("Yi Radicals")
+N_("Lisu")
+N_("Vai")
+N_("Cyrillic Extended-B")
+N_("Bamum")
+N_("Modifier Tone Letters")
+N_("Latin Extended-D")
+N_("Syloti Nagri")
+N_("Common Indic Number Forms")
+N_("Phags-pa")
+N_("Saurashtra")
+N_("Devanagari Extended")
+N_("Kayah Li")
+N_("Rejang")
+N_("Hangul Jamo Extended-A")
+N_("Javanese")
+N_("Myanmar Extended-B")
+N_("Cham")
+N_("Myanmar Extended-A")
+N_("Tai Viet")
+N_("Meetei Mayek Extensions")
+N_("Ethiopic Extended-A")
+N_("Latin Extended-E")
+N_("Cherokee Supplement")
+N_("Meetei Mayek")
+N_("Hangul Syllables")
+N_("Hangul Jamo Extended-B")
+N_("High Surrogates")
+N_("High Private Use Surrogates")
+N_("Low Surrogates")
+N_("Private Use Area")
+N_("CJK Compatibility Ideographs")
+N_("Alphabetic Presentation Forms")
+N_("Arabic Presentation Forms-A")
+N_("Variation Selectors")
+N_("Vertical Forms")
+N_("Combining Half Marks")
+N_("CJK Compatibility Forms")
+N_("Small Form Variants")
+N_("Arabic Presentation Forms-B")
+N_("Halfwidth and Fullwidth Forms")
+N_("Specials")
+N_("Linear B Syllabary")
+N_("Linear B Ideograms")
+N_("Aegean Numbers")
+N_("Ancient Greek Numbers")
+N_("Ancient Symbols")
+N_("Phaistos Disc")
+N_("Lycian")
+N_("Carian")
+N_("Coptic Epact Numbers")
+N_("Old Italic")
+N_("Gothic")
+N_("Old Permic")
+N_("Ugaritic")
+N_("Old Persian")
+N_("Deseret")
+N_("Shavian")
+N_("Osmanya")
+N_("Elbasan")
+N_("Caucasian Albanian")
+N_("Linear A")
+N_("Cypriot Syllabary")
+N_("Imperial Aramaic")
+N_("Palmyrene")
+N_("Nabataean")
+N_("Hatran")
+N_("Phoenician")
+N_("Lydian")
+N_("Meroitic Hieroglyphs")
+N_("Meroitic Cursive")
+N_("Kharoshthi")
+N_("Old South Arabian")
+N_("Old North Arabian")
+N_("Manichaean")
+N_("Avestan")
+N_("Inscriptional Parthian")
+N_("Inscriptional Pahlavi")
+N_("Psalter Pahlavi")
+N_("Old Turkic")
+N_("Old Hungarian")
+N_("Rumi Numeral Symbols")
+N_("Brahmi")
+N_("Kaithi")
+N_("Sora Sompeng")
+N_("Chakma")
+N_("Mahajani")
+N_("Sharada")
+N_("Sinhala Archaic Numbers")
+N_("Khojki")
+N_("Multani")
+N_("Khudawadi")
+N_("Grantha")
+N_("Tirhuta")
+N_("Siddham")
+N_("Modi")
+N_("Takri")
+N_("Ahom")
+N_("Warang Citi")
+N_("Pau Cin Hau")
+N_("Cuneiform")
+N_("Cuneiform Numbers and Punctuation")
+N_("Early Dynastic Cuneiform")
+N_("Egyptian Hieroglyphs")
+N_("Anatolian Hieroglyphs")
+N_("Bamum Supplement")
+N_("Mro")
+N_("Bassa Vah")
+N_("Pahawh Hmong")
+N_("Miao")
+N_("Kana Supplement")
+N_("Duployan")
+N_("Shorthand Format Controls")
+N_("Byzantine Musical Symbols")
+N_("Musical Symbols")
+N_("Ancient Greek Musical Notation")
+N_("Tai Xuan Jing Symbols")
+N_("Counting Rod Numerals")
+N_("Mathematical Alphanumeric Symbols")
+N_("Sutton SignWriting")
+N_("Mende Kikakui")
+N_("Arabic Mathematical Alphabetic Symbols")
+N_("Mahjong Tiles")
+N_("Domino Tiles")
+N_("Playing Cards")
+N_("Enclosed Alphanumeric Supplement")
+N_("Enclosed Ideographic Supplement")
+N_("Miscellaneous Symbols and Pictographs")
+N_("Emoticons")
+N_("Ornamental Dingbats")
+N_("Transport and Map Symbols")
+N_("Alchemical Symbols")
+N_("Geometric Shapes Extended")
+N_("Supplemental Arrows-C")
+N_("Supplemental Symbols and Pictographs")
+N_("CJK Unified Ideographs Extension B")
+N_("CJK Unified Ideographs Extension C")
+N_("CJK Unified Ideographs Extension D")
+N_("CJK Unified Ideographs Extension E")
+N_("CJK Compatibility Ideographs Supplement")
+N_("Tags")
+N_("Variation Selectors Supplement")
+N_("Supplementary Private Use Area-A")
+N_("Supplementary Private Use Area-B")
+
+N_("Ahom")
+N_("Anatolian Hieroglyphs")
+N_("Arabic")
+N_("Armenian")
+N_("Avestan")
+N_("Balinese")
+N_("Bamum")
+N_("Bassa Vah")
+N_("Batak")
+N_("Bengali")
+N_("Bopomofo")
+N_("Brahmi")
+N_("Braille")
+N_("Buginese")
+N_("Buhid")
+N_("Canadian Aboriginal")
+N_("Carian")
+N_("Caucasian Albanian")
+N_("Chakma")
+N_("Cham")
+N_("Cherokee")
+N_("Common")
+N_("Coptic")
+N_("Cuneiform")
+N_("Cypriot")
+N_("Cyrillic")
+N_("Deseret")
+N_("Devanagari")
+N_("Duployan")
+N_("Egyptian Hieroglyphs")
+N_("Elbasan")
+N_("Ethiopic")
+N_("Georgian")
+N_("Glagolitic")
+N_("Gothic")
+N_("Grantha")
+N_("Greek")
+N_("Gujarati")
+N_("Gurmukhi")
+N_("Han")
+N_("Hangul")
+N_("Hanunoo")
+N_("Hatran")
+N_("Hebrew")
+N_("Hiragana")
+N_("Imperial Aramaic")
+N_("Inherited")
+N_("Inscriptional Pahlavi")
+N_("Inscriptional Parthian")
+N_("Javanese")
+N_("Kaithi")
+N_("Kannada")
+N_("Katakana")
+N_("Kayah Li")
+N_("Kharoshthi")
+N_("Khmer")
+N_("Khojki")
+N_("Khudawadi")
+N_("Lao")
+N_("Latin")
+N_("Lepcha")
+N_("Limbu")
+N_("Linear A")
+N_("Linear B")
+N_("Lisu")
+N_("Lycian")
+N_("Lydian")
+N_("Mahajani")
+N_("Malayalam")
+N_("Mandaic")
+N_("Manichaean")
+N_("Meetei Mayek")
+N_("Mende Kikakui")
+N_("Meroitic Cursive")
+N_("Meroitic Hieroglyphs")
+N_("Miao")
+N_("Modi")
+N_("Mongolian")
+N_("Mro")
+N_("Multani")
+N_("Myanmar")
+N_("N'Ko")
+N_("Nabataean")
+N_("New Tai Lue")
+N_("Ogham")
+N_("Ol Chiki")
+N_("Old Hungarian")
+N_("Old Italic")
+N_("Old North Arabian")
+N_("Old Permic")
+N_("Old Persian")
+N_("Old South Arabian")
+N_("Old Turkic")
+N_("Oriya")
+N_("Osmanya")
+N_("Pahawh Hmong")
+N_("Palmyrene")
+N_("Pau Cin Hau")
+N_("Phags Pa")
+N_("Phoenician")
+N_("Psalter Pahlavi")
+N_("Rejang")
+N_("Runic")
+N_("Samaritan")
+N_("Saurashtra")
+N_("Sharada")
+N_("Shavian")
+N_("Siddham")
+N_("Signwriting")
+N_("Sinhala")
+N_("Sora Sompeng")
+N_("Sundanese")
+N_("Syloti Nagri")
+N_("Syriac")
+N_("Tagalog")
+N_("Tagbanwa")
+N_("Tai Le")
+N_("Tai Tham")
+N_("Tai Viet")
+N_("Takri")
+N_("Tamil")
+N_("Telugu")
+N_("Thaana")
+N_("Thai")
+N_("Tibetan")
+N_("Tifinagh")
+N_("Tirhuta")
+N_("Ugaritic")
+N_("Vai")
+N_("Warang Citi")
+N_("Yi")
diff --git a/gucharmap/unicode-scripts.h b/gucharmap/unicode-scripts.h
index 84480a0..0562d48 100644
--- a/gucharmap/unicode-scripts.h
+++ b/gucharmap/unicode-scripts.h
@@ -11,141 +11,6 @@
 
 typedef struct _UnicodeScript UnicodeScript;
 
-/* for extraction by intltool */
-#if 0
-  N_("Ahom"),
-  N_("Anatolian Hieroglyphs"),
-  N_("Arabic"),
-  N_("Armenian"),
-  N_("Avestan"),
-  N_("Balinese"),
-  N_("Bamum"),
-  N_("Bassa Vah"),
-  N_("Batak"),
-  N_("Bengali"),
-  N_("Bopomofo"),
-  N_("Brahmi"),
-  N_("Braille"),
-  N_("Buginese"),
-  N_("Buhid"),
-  N_("Canadian Aboriginal"),
-  N_("Carian"),
-  N_("Caucasian Albanian"),
-  N_("Chakma"),
-  N_("Cham"),
-  N_("Cherokee"),
-  N_("Common"),
-  N_("Coptic"),
-  N_("Cuneiform"),
-  N_("Cypriot"),
-  N_("Cyrillic"),
-  N_("Deseret"),
-  N_("Devanagari"),
-  N_("Duployan"),
-  N_("Egyptian Hieroglyphs"),
-  N_("Elbasan"),
-  N_("Ethiopic"),
-  N_("Georgian"),
-  N_("Glagolitic"),
-  N_("Gothic"),
-  N_("Grantha"),
-  N_("Greek"),
-  N_("Gujarati"),
-  N_("Gurmukhi"),
-  N_("Han"),
-  N_("Hangul"),
-  N_("Hanunoo"),
-  N_("Hatran"),
-  N_("Hebrew"),
-  N_("Hiragana"),
-  N_("Imperial Aramaic"),
-  N_("Inherited"),
-  N_("Inscriptional Pahlavi"),
-  N_("Inscriptional Parthian"),
-  N_("Javanese"),
-  N_("Kaithi"),
-  N_("Kannada"),
-  N_("Katakana"),
-  N_("Kayah Li"),
-  N_("Kharoshthi"),
-  N_("Khmer"),
-  N_("Khojki"),
-  N_("Khudawadi"),
-  N_("Lao"),
-  N_("Latin"),
-  N_("Lepcha"),
-  N_("Limbu"),
-  N_("Linear A"),
-  N_("Linear B"),
-  N_("Lisu"),
-  N_("Lycian"),
-  N_("Lydian"),
-  N_("Mahajani"),
-  N_("Malayalam"),
-  N_("Mandaic"),
-  N_("Manichaean"),
-  N_("Meetei Mayek"),
-  N_("Mende Kikakui"),
-  N_("Meroitic Cursive"),
-  N_("Meroitic Hieroglyphs"),
-  N_("Miao"),
-  N_("Modi"),
-  N_("Mongolian"),
-  N_("Mro"),
-  N_("Multani"),
-  N_("Myanmar"),
-  N_("N'Ko"),
-  N_("Nabataean"),
-  N_("New Tai Lue"),
-  N_("Ogham"),
-  N_("Ol Chiki"),
-  N_("Old Hungarian"),
-  N_("Old Italic"),
-  N_("Old North Arabian"),
-  N_("Old Permic"),
-  N_("Old Persian"),
-  N_("Old South Arabian"),
-  N_("Old Turkic"),
-  N_("Oriya"),
-  N_("Osmanya"),
-  N_("Pahawh Hmong"),
-  N_("Palmyrene"),
-  N_("Pau Cin Hau"),
-  N_("Phags Pa"),
-  N_("Phoenician"),
-  N_("Psalter Pahlavi"),
-  N_("Rejang"),
-  N_("Runic"),
-  N_("Samaritan"),
-  N_("Saurashtra"),
-  N_("Sharada"),
-  N_("Shavian"),
-  N_("Siddham"),
-  N_("Signwriting"),
-  N_("Sinhala"),
-  N_("Sora Sompeng"),
-  N_("Sundanese"),
-  N_("Syloti Nagri"),
-  N_("Syriac"),
-  N_("Tagalog"),
-  N_("Tagbanwa"),
-  N_("Tai Le"),
-  N_("Tai Tham"),
-  N_("Tai Viet"),
-  N_("Takri"),
-  N_("Tamil"),
-  N_("Telugu"),
-  N_("Thaana"),
-  N_("Thai"),
-  N_("Tibetan"),
-  N_("Tifinagh"),
-  N_("Tirhuta"),
-  N_("Ugaritic"),
-  N_("Vai"),
-  N_("Warang Citi"),
-  N_("Yi"),
-#endif /* 0 */
-
 static const gchar unicode_script_list_strings[] =
   "Ahom\0"
   "Anatolian Hieroglyphs\0"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4dbe100..257fb1d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,5 +15,4 @@ gucharmap/gucharmap-unicode-info.c
 gucharmap/gucharmap-window.c
 gucharmap/main.c
 gucharmap/org.gnome.Charmap.gschema.xml
-gucharmap/unicode-blocks.h
-gucharmap/unicode-scripts.h
+gucharmap/unicode-i18n.h