]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
Reorder list of programming languages.
authorBruno Haible <bruno@clisp.org>
Sun, 10 May 2020 18:44:55 +0000 (20:44 +0200)
committerBruno Haible <bruno@clisp.org>
Sun, 10 May 2020 19:18:18 +0000 (21:18 +0200)
* gettext-tools/src/format.h: Reorder declarations.
* gettext-tools/src/format.c (formatstring_parsers): Reorder entries.
* gettext-tools/src/message.h (enum format_type): Reorder items.
* gettext-tools/src/message.c (format_language, format_language_pretty): Reorder
entries.
* gettext-tools/src/xgettext.c: Reorder includes.
(flag_table_*): Reorder declarations.
(main): Reorder init_flag_table_* invocations.
(xgettext_record_flag): Reorder switch statement.
(language_to_extractor, extension_to_language): Reorder table entries.
* gettext-tools/src/format-smalltalk.c: Renamed from
gettext-tools/src/format-ycp.c.
* gettext-tools/src/FILES: Update.
* gettext-tools/src/Makefile.am (noinst_HEADERS, FORMAT_SOURCE,
xgettext_SOURCES): Update.
* gettext-tools/po/POTFILES.in: Update.
* gettext-tools/libgettextpo/Makefile.am (libgettextpo_la_AUXSOURCES): Update.
* gettext-tools/tests/Makefile.am (TESTS): Reorder.

gettext-tools/libgettextpo/Makefile.am
gettext-tools/po/POTFILES.in
gettext-tools/src/FILES
gettext-tools/src/Makefile.am
gettext-tools/src/format-smalltalk.c [moved from gettext-tools/src/format-ycp.c with 96% similarity]
gettext-tools/src/format.c
gettext-tools/src/format.h
gettext-tools/src/message.c
gettext-tools/src/message.h
gettext-tools/src/xgettext.c
gettext-tools/tests/Makefile.am

index c2c2f3b48197176c85b3f605c311ad5eb444d506..7d55f43f62d66cc785a2f33ca274915892342bea 100644 (file)
@@ -65,33 +65,33 @@ libgettextpo_la_AUXSOURCES = \
   ../src/read-catalog.c \
   ../src/plural-table.c \
   ../src/format-c.c \
-  ../src/format-sh.c \
   ../src/format-python.c \
   ../src/format-python-brace.c \
-  ../src/format-lisp.c \
-  ../src/format-elisp.c \
-  ../src/format-librep.c \
-  ../src/format-scheme.c \
   ../src/format-java.c \
   ../src/format-java-printf.c \
-  ../src/format-javascript.c \
   ../src/format-csharp.c \
+  ../src/format-javascript.c \
+  ../src/format-scheme.c \
+  ../src/format-lisp.c \
+  ../src/format-elisp.c \
+  ../src/format-librep.c \
+  ../src/format-ruby.c \
+  ../src/format-sh.c \
   ../src/format-awk.c \
+  ../src/format-lua.c \
   ../src/format-pascal.c \
-  ../src/format-ycp.c \
+  ../src/format-smalltalk.c \
+  ../src/format-qt.c \
+  ../src/format-qt-plural.c \
+  ../src/format-kde.c \
+  ../src/format-kde-kuit.c \
+  ../src/format-boost.c \
   ../src/format-tcl.c \
   ../src/format-perl.c \
   ../src/format-perl-brace.c \
   ../src/format-php.c \
-  ../src/format-ruby.c \
   ../src/format-gcc-internal.c \
   ../src/format-gfc-internal.c \
-  ../src/format-qt.c \
-  ../src/format-qt-plural.c \
-  ../src/format-kde.c \
-  ../src/format-kde-kuit.c \
-  ../src/format-boost.c \
-  ../src/format-lua.c \
   ../src/format.c \
   ../src/plural-exp.c \
   ../src/plural-eval.c \
index 433e07266c6bb1bfcad9652c50c216107c074602..931cf67b243827902814803d855a483db1f1333a 100644 (file)
@@ -63,8 +63,8 @@ src/format-qt-plural.c
 src/format-ruby.c
 src/format-scheme.c
 src/format-sh.c
+src/format-smalltalk.c
 src/format-tcl.c
-src/format-ycp.c
 src/hostname.c
 src/its.c
 src/locating-rule.c
index 5f7d21d9a7defec3352edc05bdc18c9e2dc43a9a..8d3e7d1f31d34b7461f9f5d731310331c6fb4fe6 100644 (file)
@@ -215,32 +215,33 @@ format.h        Declarations of the language dependent format string handlers.
 format-invalid.h  Declarations of some error messages for invalid strings.
 format-c.c             Format string handling for C.
 format-c-parse.h         Format string handling for C, parsing routine.
-format-sh.c            Format string handling for Shell.
 format-python.c        Format string handling for Python.
 format-python-brace.c  Format string handling for Python, braced syntax.
-format-lisp.c          Format string handling for Common Lisp.
-format-elisp.c         Format string handling for Emacs Lisp.
-format-librep.c        Format string handling for librep.
-format-scheme.c        Format string handling for Scheme.
 format-java.c          Format string handling for Java.
 format-java-printf.c   Format string handling for Java, printf syntax.
 format-csharp.c        Format string handling for C#.
+format-javascript.c    Format string handling for JavaScript.
+format-scheme.c        Format string handling for Scheme.
+format-lisp.c          Format string handling for Common Lisp.
+format-elisp.c         Format string handling for Emacs Lisp.
+format-librep.c        Format string handling for librep.
+format-ruby.c          Format string handling for Ruby.
+format-sh.c            Format string handling for Shell.
 format-awk.c           Format string handling for awk.
+format-lua.c           Format string handling for Lua.
 format-pascal.c        Format string handling for Object Pascal.
-format-ycp.c           Format string handling for YCP.
+format-smalltalk.c     Format string handling for Smalltalk and YCP.
+format-qt.c            Format string handling for Qt.
+format-qt-plural.c     Format string handling for Qt plural forms.
+format-kde.c           Format string handling for KDE.
+format-kde-kuit.c      Format string handling for KDE User Interface Text.
+format-boost.c         Format string handling for Boost.
 format-tcl.c           Format string handling for Tcl.
 format-perl.c          Format string handling for Perl.
 format-perl-brace.c    Format string handling for Perl, braced syntax.
 format-php.c           Format string handling for PHP.
-format-ruby.c          Format string handling for Ruby.
 format-gcc-internal.c  Format string handling GCC internal.
 format-gfc-internal.c  Format string handling GFC internal.
-format-qt.c            Format string handling for Qt.
-format-qt-plural.c     Format string handling for Qt plural forms.
-format-kde.c           Format string handling for KDE.
-format-boost.c         Format string handling for Boost.
-format-lua.c           Format string handling for Lua.
-format-javascript.c    Format string handling for JavaScript.
 format.c        Table of the language dependent format string handlers.
 
 plural-exp.c
@@ -311,21 +312,30 @@ msgl-check.c
 | xg-message.h
 | xg-message.c
 |               Extracting a message.  Accumulating the message list.
-| x-c.h
-| x-c.c
-|               String extractor for C.
 | x-po.h
 | x-properties.h
 | x-stringtable.h
 | x-po.c
 |               String extractor from PO files and Java .properties and
 |               NeXTstep/GNUstep .strings files.
-| x-sh.h
-| x-sh.c
-|               String extractor for Shell.
+| x-c.h
+| x-c.c
+|               String extractor for C.
 | x-python.h
 | x-python.c
 |               String extractor for Python.
+| x-java.h
+| x-java.c
+|               String extractor for Java.
+| x-csharp.h
+| x-csharp.c
+|               String extractor for C#.
+| x-javascript.h
+| x-javascript.c
+|               String extractor for JavaScript.
+| x-scheme.h
+| x-scheme.c
+|               String extractor for Scheme.
 | x-lisp.h
 | x-lisp.c
 |               String extractor for Common Lisp.
@@ -335,24 +345,24 @@ msgl-check.c
 | x-librep.h
 | x-librep.c
 |               String extractor for librep.
-| x-scheme.h
-| x-scheme.c
-|               String extractor for Scheme.
-| x-smalltalk.h
-| x-smalltalk.c
-|               String extractor for Smalltalk.
-| x-java.h
-| x-java.c
-|               String extractor for Java.
-| x-csharp.h
-| x-csharp.c
-|               String extractor for C#.
+| x-ruby.h
+| x-ruby.c
+|               String extractor for Ruby.
+| x-sh.h
+| x-sh.c
+|               String extractor for Shell.
 | x-awk.h
 | x-awk.c
 |               String extractor for awk.
-| x-ycp.h
-| x-ycp.c
-|               String extractor for YCP.
+| x-lua.h
+| x-lua.c
+|               String extractor for Lua.
+| x-smalltalk.h
+| x-smalltalk.c
+|               String extractor for Smalltalk.
+| x-vala.h
+| x-vala.c
+|               String extractor for Vala.
 | x-tcl.h
 | x-tcl.c
 |               String extractor for Tcl.
@@ -362,30 +372,21 @@ msgl-check.c
 | x-php.h
 | x-php.c
 |               String extractor for PHP.
-| x-ruby.h
-| x-ruby.c
-|               String extractor for Ruby.
+| x-ycp.h
+| x-ycp.c
+|               String extractor for YCP.
 | x-rst.h
 | x-rst.c
 |               String extractor from .rst files, for Object Pascal.
+| x-desktop.h
+| x-desktop.c
+|               String extractor from Desktop Entry file.
 | x-glade.h
 | x-glade.c
 |               String extractor from .glade files, GNOME GUI descriptions.
-| x-lua.h
-| x-lua.c
-|               String extractor for Lua.
-| x-javascript.h
-| x-javascript.c
-|               String extractor for JavaScript.
-| x-vala.h
-| x-vala.c
-|               String extractor for Vala.
 | x-gsettings.h
 | x-gsettings.c
 |               String extractor for GSettings schema file.
-| x-desktop.h
-| x-desktop.c
-|               String extractor from Desktop Entry file.
 | x-appdata.h
 | x-appdata.c
 |               String extractor for AppData files.
index fb7f2161a1c975ac40a9b9f7babc61b228f84743..85854beb704ef1faff97e164249e5f157166bbfd 100644 (file)
@@ -35,32 +35,52 @@ noinst_PROGRAMS = hostname urlget cldr-plurals
 
 lib_LTLIBRARIES = libgettextsrc.la
 
-noinst_HEADERS = pos.h message.h po-error.h po-xerror.h po-gram.h po-charset.h \
-po-lex.h open-catalog.h read-catalog-abstract.h read-catalog.h \
-read-po.h read-properties.h read-stringtable.h \
-str-list.h \
-write-catalog.h write-po.h write-properties.h write-stringtable.h \
-dir-list.h file-list.h po-gram-gen.h po-gram-gen2.h cldr-plural.h \
-cldr-plural-exp.h locating-rule.h its.h search-path.h \
-msgl-charset.h msgl-equal.h msgl-iconv.h msgl-ascii.h msgl-cat.h msgl-header.h \
-msgl-english.h msgl-check.h msgl-fsearch.h msgfmt.h msgunfmt.h \
-plural-count.h plural-eval.h plural-distrib.h \
-read-mo.h write-mo.h \
-read-java.h write-java.h \
-read-csharp.h write-csharp.h \
-read-resources.h write-resources.h \
-read-tcl.h write-tcl.h \
-write-qt.h \
-read-desktop.h write-desktop.h \
-write-xml.h \
-po-time.h plural-table.h lang-table.h format.h filters.h \
-xgettext.h \
-rc-str-list.h xg-pos.h xg-encoding.h xg-mixed-string.h xg-arglist-context.h \
-xg-arglist-callshape.h xg-arglist-parser.h xg-message.h \
-x-c.h x-po.h x-sh.h x-python.h x-lisp.h x-elisp.h x-librep.h \
-x-scheme.h x-smalltalk.h x-java.h x-properties.h x-csharp.h x-awk.h x-ycp.h \
-x-tcl.h x-perl.h x-php.h x-ruby.h x-stringtable.h x-rst.h x-glade.h x-lua.h \
-x-javascript.h x-vala.h x-gsettings.h x-desktop.h x-appdata.h
+noinst_HEADERS = \
+  pos.h message.h po-error.h po-xerror.h po-gram.h po-charset.h \
+  po-lex.h open-catalog.h read-catalog-abstract.h read-catalog.h \
+  read-po.h read-properties.h read-stringtable.h \
+  str-list.h \
+  write-catalog.h write-po.h write-properties.h write-stringtable.h \
+  dir-list.h file-list.h po-gram-gen.h po-gram-gen2.h cldr-plural.h \
+  cldr-plural-exp.h locating-rule.h its.h search-path.h \
+  msgl-charset.h msgl-equal.h msgl-iconv.h msgl-ascii.h msgl-cat.h msgl-header.h \
+  msgl-english.h msgl-check.h msgl-fsearch.h msgfmt.h msgunfmt.h \
+  plural-count.h plural-eval.h plural-distrib.h \
+  read-mo.h write-mo.h \
+  read-java.h write-java.h \
+  read-csharp.h write-csharp.h \
+  read-resources.h write-resources.h \
+  read-tcl.h write-tcl.h \
+  write-qt.h \
+  read-desktop.h write-desktop.h \
+  write-xml.h \
+  po-time.h plural-table.h lang-table.h format.h filters.h \
+  xgettext.h \
+  rc-str-list.h xg-pos.h xg-encoding.h xg-mixed-string.h xg-arglist-context.h \
+  xg-arglist-callshape.h xg-arglist-parser.h xg-message.h \
+  x-po.h x-properties.h x-stringtable.h \
+  x-c.h \
+  x-python.h \
+  x-java.h \
+  x-csharp.h \
+  x-javascript.h \
+  x-scheme.h \
+  x-lisp.h \
+  x-elisp.h \
+  x-librep.h \
+  x-ruby.h \
+  x-sh.h \
+  x-awk.h \
+  x-lua.h \
+  x-smalltalk.h \
+  x-vala.h \
+  x-tcl.h \
+  x-perl.h \
+  x-php.h \
+  x-ycp.h \
+  x-rst.h \
+  x-desktop.h \
+  x-glade.h x-gsettings.h x-appdata.h
 
 EXTRA_DIST += FILES project-id
 
@@ -122,33 +142,33 @@ endif
 FORMAT_SOURCE += \
   format-invalid.h \
   format-c.c format-c-parse.h \
-  format-sh.c \
   format-python.c \
   format-python-brace.c \
-  format-lisp.c \
-  format-elisp.c \
-  format-librep.c \
-  format-scheme.c \
   format-java.c \
   format-java-printf.c \
   format-csharp.c \
+  format-javascript.c \
+  format-scheme.c \
+  format-lisp.c \
+  format-elisp.c \
+  format-librep.c \
+  format-ruby.c \
+  format-sh.c \
   format-awk.c \
+  format-lua.c \
   format-pascal.c \
-  format-ycp.c \
-  format-tcl.c \
-  format-perl.c \
-  format-perl-brace.c \
-  format-php.c \
-  format-ruby.c \
-  format-gcc-internal.c \
-  format-gfc-internal.c \
+  format-smalltalk.c \
   format-qt.c \
   format-qt-plural.c \
   format-kde.c \
   format-kde-kuit.c \
   format-boost.c \
-  format-lua.c \
-  format-javascript.c
+  format-tcl.c \
+  format-perl.c \
+  format-perl-brace.c \
+  format-php.c \
+  format-gcc-internal.c \
+  format-gfc-internal.c
 
 # libgettextsrc contains all code that is needed by at least two programs.
 libgettextsrc_la_SOURCES = \
@@ -191,27 +211,27 @@ xgettext_SOURCES += \
   xg-mixed-string.c \
   xg-arglist-context.c xg-arglist-callshape.c xg-arglist-parser.c \
   xg-message.c \
-  x-c.c \
   x-po.c \
-  x-sh.c ../../gettext-runtime/src/escapes.h \
+  x-c.c \
   x-python.c \
+  x-java.c \
+  x-csharp.c \
+  x-javascript.c \
+  x-scheme.c \
   x-lisp.c \
   x-elisp.c \
   x-librep.c \
-  x-scheme.c \
-  x-smalltalk.c \
-  x-java.c \
-  x-csharp.c \
+  x-ruby.c \
+  x-sh.c ../../gettext-runtime/src/escapes.h \
   x-awk.c \
-  x-ycp.c \
+  x-lua.c \
+  x-smalltalk.c \
+  x-vala.c \
   x-tcl.c \
   x-perl.c \
   x-php.c \
-  x-ruby.c \
+  x-ycp.c \
   x-rst.c \
-  x-lua.c \
-  x-javascript.c \
-  x-vala.c \
   x-desktop.c
 if !WOE32DLL
 msgattrib_SOURCES = msgattrib.c
similarity index 96%
rename from gettext-tools/src/format-ycp.c
rename to gettext-tools/src/format-smalltalk.c
index 7068ef4c15e14e70b3f1c6444d5962ec6dcb1b88..711aa6dc2f287c7bf229a7d2fbb580653409a320 100644 (file)
@@ -1,5 +1,5 @@
-/* YCP and Smalltalk format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2019 Free Software Foundation, Inc.
+/* Smalltalk and YCP format strings.
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2019-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -156,7 +156,7 @@ format_check (void *msgid_descr, void *msgstr_descr, bool equality,
 }
 
 
-struct formatstring_parser formatstring_ycp =
+struct formatstring_parser formatstring_smalltalk =
 {
   format_parse,
   format_free,
@@ -166,7 +166,7 @@ struct formatstring_parser formatstring_ycp =
 };
 
 
-struct formatstring_parser formatstring_smalltalk =
+struct formatstring_parser formatstring_ycp =
 {
   format_parse,
   format_free,
@@ -243,7 +243,7 @@ main ()
 /*
  * For Emacs M-x compile
  * Local Variables:
- * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-ycp.c ../gnulib-lib/libgettextlib.la"
+ * compile-command: "/bin/sh ../libtool --tag=CC --mode=link gcc -o a.out -static -O -g -Wall -I.. -I../gnulib-lib -I../../gettext-runtime/intl -DHAVE_CONFIG_H -DTEST format-smalltalk.c ../gnulib-lib/libgettextlib.la"
  * End:
  */
 
index d215434981e11c075d8991d70ec7b03869a57b76..07550707eb4daa5f98e5d3413c07784d464ee792 100644 (file)
@@ -36,34 +36,34 @@ struct formatstring_parser *formatstring_parsers[NFORMATS] =
 {
   /* format_c */                &formatstring_c,
   /* format_objc */             &formatstring_objc,
-  /* format_sh */               &formatstring_sh,
   /* format_python */           &formatstring_python,
   /* format_python_brace */     &formatstring_python_brace,
-  /* format_lisp */             &formatstring_lisp,
-  /* format_elisp */            &formatstring_elisp,
-  /* format_librep */           &formatstring_librep,
-  /* format_scheme */           &formatstring_scheme,
-  /* format_smalltalk */        &formatstring_smalltalk,
   /* format_java */             &formatstring_java,
   /* format_java_printf */      &formatstring_java_printf,
   /* format_csharp */           &formatstring_csharp,
+  /* format_javascript */       &formatstring_javascript,
+  /* format_scheme */           &formatstring_scheme,
+  /* format_lisp */             &formatstring_lisp,
+  /* format_elisp */            &formatstring_elisp,
+  /* format_librep */           &formatstring_librep,
+  /* format_ruby */             &formatstring_ruby,
+  /* format_sh */               &formatstring_sh,
   /* format_awk */              &formatstring_awk,
+  /* format_lua */              &formatstring_lua,
   /* format_pascal */           &formatstring_pascal,
-  /* format_ycp */              &formatstring_ycp,
+  /* format_smalltalk */        &formatstring_smalltalk,
+  /* format_qt */               &formatstring_qt,
+  /* format_qt_plural */        &formatstring_qt_plural,
+  /* format_kde */              &formatstring_kde,
+  /* format_kde_kuit */         &formatstring_kde_kuit,
+  /* format_boost */            &formatstring_boost,
   /* format_tcl */              &formatstring_tcl,
   /* format_perl */             &formatstring_perl,
   /* format_perl_brace */       &formatstring_perl_brace,
   /* format_php */              &formatstring_php,
-  /* format_ruby */             &formatstring_ruby,
   /* format_gcc_internal */     &formatstring_gcc_internal,
   /* format_gfc_internal */     &formatstring_gfc_internal,
-  /* format_qt */               &formatstring_qt,
-  /* format_qt_plural */        &formatstring_qt_plural,
-  /* format_kde */              &formatstring_kde,
-  /* format_kde_kuit */         &formatstring_kde_kuit,
-  /* format_boost */            &formatstring_boost,
-  /* format_lua */              &formatstring_lua,
-  /* format_javascript */       &formatstring_javascript
+  /* format_ycp */              &formatstring_ycp
 };
 
 /* Check whether both formats strings contain compatible format
index d25e15b3bc14dcd42a906bfa5e1225c44397a6d0..af670ac15379d6cbd3bbc4fc88bda74aae7c5a13 100644 (file)
@@ -97,34 +97,34 @@ struct formatstring_parser
 /* Format string parsers, each defined in its own file.  */
 extern DLL_VARIABLE struct formatstring_parser formatstring_c;
 extern DLL_VARIABLE struct formatstring_parser formatstring_objc;
-extern DLL_VARIABLE struct formatstring_parser formatstring_sh;
 extern DLL_VARIABLE struct formatstring_parser formatstring_python;
 extern DLL_VARIABLE struct formatstring_parser formatstring_python_brace;
-extern DLL_VARIABLE struct formatstring_parser formatstring_lisp;
-extern DLL_VARIABLE struct formatstring_parser formatstring_elisp;
-extern DLL_VARIABLE struct formatstring_parser formatstring_librep;
-extern DLL_VARIABLE struct formatstring_parser formatstring_scheme;
-extern DLL_VARIABLE struct formatstring_parser formatstring_smalltalk;
 extern DLL_VARIABLE struct formatstring_parser formatstring_java;
 extern DLL_VARIABLE struct formatstring_parser formatstring_java_printf;
 extern DLL_VARIABLE struct formatstring_parser formatstring_csharp;
+extern DLL_VARIABLE struct formatstring_parser formatstring_javascript;
+extern DLL_VARIABLE struct formatstring_parser formatstring_scheme;
+extern DLL_VARIABLE struct formatstring_parser formatstring_lisp;
+extern DLL_VARIABLE struct formatstring_parser formatstring_elisp;
+extern DLL_VARIABLE struct formatstring_parser formatstring_librep;
+extern DLL_VARIABLE struct formatstring_parser formatstring_ruby;
+extern DLL_VARIABLE struct formatstring_parser formatstring_sh;
 extern DLL_VARIABLE struct formatstring_parser formatstring_awk;
+extern DLL_VARIABLE struct formatstring_parser formatstring_lua;
 extern DLL_VARIABLE struct formatstring_parser formatstring_pascal;
-extern DLL_VARIABLE struct formatstring_parser formatstring_ycp;
+extern DLL_VARIABLE struct formatstring_parser formatstring_smalltalk;
+extern DLL_VARIABLE struct formatstring_parser formatstring_qt;
+extern DLL_VARIABLE struct formatstring_parser formatstring_qt_plural;
+extern DLL_VARIABLE struct formatstring_parser formatstring_kde;
+extern DLL_VARIABLE struct formatstring_parser formatstring_kde_kuit;
+extern DLL_VARIABLE struct formatstring_parser formatstring_boost;
 extern DLL_VARIABLE struct formatstring_parser formatstring_tcl;
 extern DLL_VARIABLE struct formatstring_parser formatstring_perl;
 extern DLL_VARIABLE struct formatstring_parser formatstring_perl_brace;
 extern DLL_VARIABLE struct formatstring_parser formatstring_php;
-extern DLL_VARIABLE struct formatstring_parser formatstring_ruby;
 extern DLL_VARIABLE struct formatstring_parser formatstring_gcc_internal;
 extern DLL_VARIABLE struct formatstring_parser formatstring_gfc_internal;
-extern DLL_VARIABLE struct formatstring_parser formatstring_qt;
-extern DLL_VARIABLE struct formatstring_parser formatstring_qt_plural;
-extern DLL_VARIABLE struct formatstring_parser formatstring_kde;
-extern DLL_VARIABLE struct formatstring_parser formatstring_kde_kuit;
-extern DLL_VARIABLE struct formatstring_parser formatstring_boost;
-extern DLL_VARIABLE struct formatstring_parser formatstring_lua;
-extern DLL_VARIABLE struct formatstring_parser formatstring_javascript;
+extern DLL_VARIABLE struct formatstring_parser formatstring_ycp;
 
 /* Table of all format string parsers.  */
 extern DLL_VARIABLE struct formatstring_parser *formatstring_parsers[NFORMATS];
index ead21c30529883a2e01019c807a000294884d498..5f08ee2b6c0eee1fd080a224693c32cea2ad1f49 100644 (file)
@@ -36,68 +36,68 @@ const char *const format_language[NFORMATS] =
 {
   /* format_c */                "c",
   /* format_objc */             "objc",
-  /* format_sh */               "sh",
   /* format_python */           "python",
   /* format_python_brace */     "python-brace",
-  /* format_lisp */             "lisp",
-  /* format_elisp */            "elisp",
-  /* format_librep */           "librep",
-  /* format_scheme */           "scheme",
-  /* format_smalltalk */        "smalltalk",
   /* format_java */             "java",
   /* format_java_printf */      "java-printf",
   /* format_csharp */           "csharp",
+  /* format_javascript */       "javascript",
+  /* format_scheme */           "scheme",
+  /* format_lisp */             "lisp",
+  /* format_elisp */            "elisp",
+  /* format_librep */           "librep",
+  /* format_ruby */             "ruby",
+  /* format_sh */               "sh",
   /* format_awk */              "awk",
+  /* format_lua */              "lua",
   /* format_pascal */           "object-pascal",
-  /* format_ycp */              "ycp",
+  /* format_smalltalk */        "smalltalk",
+  /* format_qt */               "qt",
+  /* format_qt_plursl */        "qt-plural",
+  /* format_kde */              "kde",
+  /* format_kde_kuit */         "kde-kuit",
+  /* format_boost */            "boost",
   /* format_tcl */              "tcl",
   /* format_perl */             "perl",
   /* format_perl_brace */       "perl-brace",
   /* format_php */              "php",
-  /* format_ruby */             "ruby",
   /* format_gcc_internal */     "gcc-internal",
   /* format_gfc_internal */     "gfc-internal",
-  /* format_qt */               "qt",
-  /* format_qt_plursl */        "qt-plural",
-  /* format_kde */              "kde",
-  /* format_kde_kuit */         "kde-kuit",
-  /* format_boost */            "boost",
-  /* format_lua */              "lua",
-  /* format_javascript */       "javascript"
+  /* format_ycp */              "ycp"
 };
 
 const char *const format_language_pretty[NFORMATS] =
 {
   /* format_c */                "C",
   /* format_objc */             "Objective C",
-  /* format_sh */               "Shell",
   /* format_python */           "Python",
   /* format_python_brace */     "Python brace",
-  /* format_lisp */             "Lisp",
-  /* format_elisp */            "Emacs Lisp",
-  /* format_librep */           "librep",
-  /* format_scheme */           "Scheme",
-  /* format_smalltalk */        "Smalltalk",
   /* format_java */             "Java MessageFormat",
   /* format_java_printf */      "Java printf",
   /* format_csharp */           "C#",
+  /* format_javascript */       "JavaScript",
+  /* format_scheme */           "Scheme",
+  /* format_lisp */             "Lisp",
+  /* format_elisp */            "Emacs Lisp",
+  /* format_librep */           "librep",
+  /* format_ruby */             "Ruby",
+  /* format_sh */               "Shell",
   /* format_awk */              "awk",
+  /* format_lua */              "Lua",
   /* format_pascal */           "Object Pascal",
-  /* format_ycp */              "YCP",
+  /* format_smalltalk */        "Smalltalk",
+  /* format_qt */               "Qt",
+  /* format_qt_plural */        "Qt plural",
+  /* format_kde */              "KDE",
+  /* format_kde_kuit */         "KDE KUIT",
+  /* format_boost */            "Boost",
   /* format_tcl */              "Tcl",
   /* format_perl */             "Perl",
   /* format_perl_brace */       "Perl brace",
   /* format_php */              "PHP",
-  /* format_ruby */             "Ruby",
   /* format_gcc_internal */     "GCC internal",
   /* format_gfc_internal */     "GFC internal",
-  /* format_qt */               "Qt",
-  /* format_qt_plural */        "Qt plural",
-  /* format_kde */              "KDE",
-  /* format_kde_kuit */         "KDE KUIT",
-  /* format_boost */            "Boost",
-  /* format_lua */              "Lua",
-  /* format_javascript */       "JavaScript"
+  /* format_ycp */              "YCP"
 };
 
 
index 70ffa26b594a608b8aab8cf296044e1fd902d279..24760990149ced4bd0992d60f4354df9c7b06a88 100644 (file)
@@ -45,34 +45,34 @@ enum format_type
 {
   format_c,
   format_objc,
-  format_sh,
   format_python,
   format_python_brace,
-  format_lisp,
-  format_elisp,
-  format_librep,
-  format_scheme,
-  format_smalltalk,
   format_java,
   format_java_printf,
   format_csharp,
+  format_javascript,
+  format_scheme,
+  format_lisp,
+  format_elisp,
+  format_librep,
+  format_ruby,
+  format_sh,
   format_awk,
+  format_lua,
   format_pascal,
-  format_ycp,
+  format_smalltalk,
+  format_qt,
+  format_qt_plural,
+  format_kde,
+  format_kde_kuit,
+  format_boost,
   format_tcl,
   format_perl,
   format_perl_brace,
   format_php,
-  format_ruby,
   format_gcc_internal,
   format_gfc_internal,
-  format_qt,
-  format_qt_plural,
-  format_kde,
-  format_kde_kuit,
-  format_boost,
-  format_lua,
-  format_javascript
+  format_ycp
 };
 #define NFORMATS 30     /* Number of format_type enum values.  */
 extern DLL_VARIABLE const char *const format_language[NFORMATS];
index 8c6c3fbc6e5daa90e268f29b302e2c3a8edbbcae..c4b2527e1397230b4cda4a347a4a834f03fa36e4 100644 (file)
 #define _(str) gettext (str)
 
 
-#include "x-c.h"
 #include "x-po.h"
-#include "x-sh.h"
+#include "x-properties.h"
+#include "x-stringtable.h"
+#include "x-c.h"
 #include "x-python.h"
+#include "x-java.h"
+#include "x-csharp.h"
+#include "x-javascript.h"
+#include "x-scheme.h"
 #include "x-lisp.h"
 #include "x-elisp.h"
 #include "x-librep.h"
-#include "x-scheme.h"
-#include "x-smalltalk.h"
-#include "x-java.h"
-#include "x-properties.h"
-#include "x-csharp.h"
-#include "x-appdata.h"
+#include "x-ruby.h"
+#include "x-sh.h"
 #include "x-awk.h"
-#include "x-ycp.h"
+#include "x-lua.h"
+#include "x-smalltalk.h"
+#include "x-vala.h"
 #include "x-tcl.h"
 #include "x-perl.h"
 #include "x-php.h"
-#include "x-ruby.h"
-#include "x-stringtable.h"
+#include "x-ycp.h"
 #include "x-rst.h"
+#include "x-desktop.h"
 #include "x-glade.h"
-#include "x-lua.h"
-#include "x-javascript.h"
-#include "x-vala.h"
 #include "x-gsettings.h"
-#include "x-desktop.h"
+#include "x-appdata.h"
 
 
 #define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
@@ -178,23 +178,23 @@ static flag_context_list_table_ty flag_table_cxx_kde;
 static flag_context_list_table_ty flag_table_cxx_boost;
 static flag_context_list_table_ty flag_table_objc;
 static flag_context_list_table_ty flag_table_gcc_internal;
-static flag_context_list_table_ty flag_table_sh;
 static flag_context_list_table_ty flag_table_python;
+static flag_context_list_table_ty flag_table_java;
+static flag_context_list_table_ty flag_table_csharp;
+static flag_context_list_table_ty flag_table_javascript;
+static flag_context_list_table_ty flag_table_scheme;
 static flag_context_list_table_ty flag_table_lisp;
 static flag_context_list_table_ty flag_table_elisp;
 static flag_context_list_table_ty flag_table_librep;
-static flag_context_list_table_ty flag_table_scheme;
-static flag_context_list_table_ty flag_table_java;
-static flag_context_list_table_ty flag_table_csharp;
+static flag_context_list_table_ty flag_table_ruby;
+static flag_context_list_table_ty flag_table_sh;
 static flag_context_list_table_ty flag_table_awk;
-static flag_context_list_table_ty flag_table_ycp;
+static flag_context_list_table_ty flag_table_lua;
+static flag_context_list_table_ty flag_table_vala;
 static flag_context_list_table_ty flag_table_tcl;
 static flag_context_list_table_ty flag_table_perl;
 static flag_context_list_table_ty flag_table_php;
-static flag_context_list_table_ty flag_table_ruby;
-static flag_context_list_table_ty flag_table_lua;
-static flag_context_list_table_ty flag_table_javascript;
-static flag_context_list_table_ty flag_table_vala;
+static flag_context_list_table_ty flag_table_ycp;
 
 /* If true, recognize Qt format strings.  */
 static bool recognize_format_qt;
@@ -361,25 +361,25 @@ main (int argc, char *argv[])
   xgettext_global_source_encoding = NULL;
   init_flag_table_c ();
   init_flag_table_objc ();
-  init_flag_table_gcc_internal ();
   init_flag_table_kde ();
-  init_flag_table_sh ();
   init_flag_table_python ();
+  init_flag_table_java ();
+  init_flag_table_csharp ();
+  init_flag_table_javascript ();
+  init_flag_table_scheme ();
   init_flag_table_lisp ();
   init_flag_table_elisp ();
   init_flag_table_librep ();
-  init_flag_table_scheme ();
-  init_flag_table_java ();
-  init_flag_table_csharp ();
+  init_flag_table_ruby ();
+  init_flag_table_sh ();
   init_flag_table_awk ();
-  init_flag_table_ycp ();
+  init_flag_table_lua ();
+  init_flag_table_vala ();
   init_flag_table_tcl ();
   init_flag_table_perl ();
   init_flag_table_php ();
-  init_flag_table_ruby ();
-  init_flag_table_lua ();
-  init_flag_table_javascript ();
-  init_flag_table_vala ();
+  init_flag_table_gcc_internal ();
+  init_flag_table_ycp ();
 
   while ((optchar = getopt_long (argc, argv,
                                  "ac::Cd:D:eEf:Fhijk::l:L:m::M::no:p:sTvVw:W:x:",
@@ -1490,11 +1490,6 @@ xgettext_record_flag (const char *optionstring)
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_sh:
-                    flag_context_list_table_insert (&flag_table_sh, 0,
-                                                    name_start, name_end,
-                                                    argnum, value, pass);
-                    break;
                   case format_python:
                     flag_context_list_table_insert (&flag_table_python, 0,
                                                     name_start, name_end,
@@ -1505,28 +1500,6 @@ xgettext_record_flag (const char *optionstring)
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_lisp:
-                    flag_context_list_table_insert (&flag_table_lisp, 0,
-                                                    name_start, name_end,
-                                                    argnum, value, pass);
-                    break;
-                  case format_elisp:
-                    flag_context_list_table_insert (&flag_table_elisp, 0,
-                                                    name_start, name_end,
-                                                    argnum, value, pass);
-                    break;
-                  case format_librep:
-                    flag_context_list_table_insert (&flag_table_librep, 0,
-                                                    name_start, name_end,
-                                                    argnum, value, pass);
-                    break;
-                  case format_scheme:
-                    flag_context_list_table_insert (&flag_table_scheme, 0,
-                                                    name_start, name_end,
-                                                    argnum, value, pass);
-                    break;
-                  case format_smalltalk:
-                    break;
                   case format_java:
                     flag_context_list_table_insert (&flag_table_java, 0,
                                                     name_start, name_end,
@@ -1542,53 +1515,55 @@ xgettext_record_flag (const char *optionstring)
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_awk:
-                    flag_context_list_table_insert (&flag_table_awk, 0,
+                  case format_javascript:
+                    flag_context_list_table_insert (&flag_table_javascript, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_pascal:
-                    break;
-                  case format_ycp:
-                    flag_context_list_table_insert (&flag_table_ycp, 0,
+                  case format_scheme:
+                    flag_context_list_table_insert (&flag_table_scheme, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_tcl:
-                    flag_context_list_table_insert (&flag_table_tcl, 0,
+                  case format_lisp:
+                    flag_context_list_table_insert (&flag_table_lisp, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_perl:
-                    flag_context_list_table_insert (&flag_table_perl, 0,
+                  case format_elisp:
+                    flag_context_list_table_insert (&flag_table_elisp, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_perl_brace:
-                    flag_context_list_table_insert (&flag_table_perl, 1,
+                  case format_librep:
+                    flag_context_list_table_insert (&flag_table_librep, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_php:
-                    flag_context_list_table_insert (&flag_table_php, 0,
+                  case format_ruby:
+                    flag_context_list_table_insert (&flag_table_ruby, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_ruby:
-                    flag_context_list_table_insert (&flag_table_ruby, 0,
+                  case format_sh:
+                    flag_context_list_table_insert (&flag_table_sh, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_gcc_internal:
-                    flag_context_list_table_insert (&flag_table_gcc_internal, 0,
+                  case format_awk:
+                    flag_context_list_table_insert (&flag_table_awk, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_gfc_internal:
-                    flag_context_list_table_insert (&flag_table_gcc_internal, 1,
+                  case format_lua:
+                    flag_context_list_table_insert (&flag_table_lua, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
+                  case format_pascal:
+                    break;
+                  case format_smalltalk:
+                    break;
                   case format_qt:
                     flag_context_list_table_insert (&flag_table_cxx_qt, 1,
                                                     name_start, name_end,
@@ -1614,13 +1589,38 @@ xgettext_record_flag (const char *optionstring)
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_lua:
-                    flag_context_list_table_insert (&flag_table_lua, 0,
+                  case format_tcl:
+                    flag_context_list_table_insert (&flag_table_tcl, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
-                  case format_javascript:
-                    flag_context_list_table_insert (&flag_table_javascript, 0,
+                  case format_perl:
+                    flag_context_list_table_insert (&flag_table_perl, 0,
+                                                    name_start, name_end,
+                                                    argnum, value, pass);
+                    break;
+                  case format_perl_brace:
+                    flag_context_list_table_insert (&flag_table_perl, 1,
+                                                    name_start, name_end,
+                                                    argnum, value, pass);
+                    break;
+                  case format_php:
+                    flag_context_list_table_insert (&flag_table_php, 0,
+                                                    name_start, name_end,
+                                                    argnum, value, pass);
+                    break;
+                  case format_gcc_internal:
+                    flag_context_list_table_insert (&flag_table_gcc_internal, 0,
+                                                    name_start, name_end,
+                                                    argnum, value, pass);
+                    break;
+                  case format_gfc_internal:
+                    flag_context_list_table_insert (&flag_table_gcc_internal, 1,
+                                                    name_start, name_end,
+                                                    argnum, value, pass);
+                    break;
+                  case format_ycp:
+                    flag_context_list_table_insert (&flag_table_ycp, 0,
                                                     name_start, name_end,
                                                     argnum, value, pass);
                     break;
@@ -2133,32 +2133,32 @@ language_to_extractor (const char *name)
 
   static table_ty table[] =
   {
-    SCANNERS_C
     SCANNERS_PO
-    SCANNERS_SH
+    SCANNERS_PROPERTIES
+    SCANNERS_STRINGTABLE
+    SCANNERS_C
     SCANNERS_PYTHON
+    SCANNERS_JAVA
+    SCANNERS_CSHARP
+    SCANNERS_JAVASCRIPT
+    SCANNERS_SCHEME
     SCANNERS_LISP
     SCANNERS_ELISP
     SCANNERS_LIBREP
-    SCANNERS_SCHEME
-    SCANNERS_SMALLTALK
-    SCANNERS_JAVA
-    SCANNERS_PROPERTIES
-    SCANNERS_CSHARP
+    SCANNERS_RUBY
+    SCANNERS_SH
     SCANNERS_AWK
-    SCANNERS_YCP
+    SCANNERS_LUA
+    SCANNERS_SMALLTALK
+    SCANNERS_VALA
     SCANNERS_TCL
     SCANNERS_PERL
     SCANNERS_PHP
-    SCANNERS_RUBY
-    SCANNERS_STRINGTABLE
+    SCANNERS_YCP
     SCANNERS_RST
+    SCANNERS_DESKTOP
     SCANNERS_GLADE
-    SCANNERS_LUA
-    SCANNERS_JAVASCRIPT
-    SCANNERS_VALA
     SCANNERS_GSETTINGS
-    SCANNERS_DESKTOP
     SCANNERS_APPDATA
     /* Here may follow more languages and their scanners: pike, etc...
        Make sure new scanners honor the --exclude-file option.  */
@@ -2225,32 +2225,32 @@ extension_to_language (const char *extension)
 
   static table_ty table[] =
   {
-    EXTENSIONS_C
     EXTENSIONS_PO
-    EXTENSIONS_SH
+    EXTENSIONS_PROPERTIES
+    EXTENSIONS_STRINGTABLE
+    EXTENSIONS_C
     EXTENSIONS_PYTHON
+    EXTENSIONS_JAVA
+    EXTENSIONS_CSHARP
+    EXTENSIONS_JAVASCRIPT
+    EXTENSIONS_SCHEME
     EXTENSIONS_LISP
     EXTENSIONS_ELISP
     EXTENSIONS_LIBREP
-    EXTENSIONS_SCHEME
-    EXTENSIONS_SMALLTALK
-    EXTENSIONS_JAVA
-    EXTENSIONS_PROPERTIES
-    EXTENSIONS_CSHARP
+    EXTENSIONS_RUBY
+    EXTENSIONS_SH
     EXTENSIONS_AWK
-    EXTENSIONS_YCP
+    EXTENSIONS_LUA
+    EXTENSIONS_SMALLTALK
+    EXTENSIONS_VALA
     EXTENSIONS_TCL
     EXTENSIONS_PERL
     EXTENSIONS_PHP
-    EXTENSIONS_RUBY
-    EXTENSIONS_STRINGTABLE
+    EXTENSIONS_YCP
     EXTENSIONS_RST
+    EXTENSIONS_DESKTOP
     EXTENSIONS_GLADE
-    EXTENSIONS_LUA
-    EXTENSIONS_JAVASCRIPT
-    EXTENSIONS_VALA
     EXTENSIONS_GSETTINGS
-    EXTENSIONS_DESKTOP
     EXTENSIONS_APPDATA
     /* Here may follow more file extensions... */
   };
index 14272f4b801d09c3439b0b8e528273834500a69e..0768ce1d33d87e1d5fb0bcd17db300434779205d 100644 (file)
@@ -91,13 +91,20 @@ TESTS = gettext-1 gettext-2 \
        xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \
        xgettext-csharp-4 xgettext-csharp-5 xgettext-csharp-6 \
        xgettext-csharp-7 xgettext-csharp-8 \
+       xgettext-desktop-1 xgettext-desktop-2 \
        xgettext-elisp-1 xgettext-elisp-2 \
        xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 xgettext-glade-4 \
        xgettext-glade-5 xgettext-glade-6 xgettext-glade-7 \
+       xgettext-gsettings-1 \
+       xgettext-its-1 xgettext-its-2 \
        xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \
        xgettext-java-5 xgettext-java-6 xgettext-java-7 \
+       xgettext-javascript-1 xgettext-javascript-2 xgettext-javascript-3 \
+       xgettext-javascript-4 xgettext-javascript-5 xgettext-javascript-6 \
+       xgettext-javascript-7 \
        xgettext-librep-1 xgettext-librep-2 \
        xgettext-lisp-1 xgettext-lisp-2 \
+       xgettext-lua-1 xgettext-lua-2 \
        xgettext-objc-1 xgettext-objc-2 \
        xgettext-perl-1 xgettext-perl-2 xgettext-perl-3 xgettext-perl-4 \
        xgettext-perl-5 xgettext-perl-6 xgettext-perl-7 xgettext-perl-8 \
@@ -116,15 +123,8 @@ TESTS = gettext-1 gettext-2 \
        xgettext-smalltalk-1 xgettext-smalltalk-2 \
        xgettext-stringtable-1 \
        xgettext-tcl-1 xgettext-tcl-2 xgettext-tcl-3 xgettext-tcl-4 \
-       xgettext-ycp-1 xgettext-ycp-2 xgettext-ycp-3 xgettext-ycp-4 \
-       xgettext-lua-1 xgettext-lua-2 \
-       xgettext-javascript-1 xgettext-javascript-2 xgettext-javascript-3 \
-       xgettext-javascript-4 xgettext-javascript-5 xgettext-javascript-6 \
-       xgettext-javascript-7 \
        xgettext-vala-1 xgettext-vala-2 \
-       xgettext-gsettings-1 \
-       xgettext-desktop-1 xgettext-desktop-2 \
-       xgettext-its-1 xgettext-its-2 \
+       xgettext-ycp-1 xgettext-ycp-2 xgettext-ycp-3 xgettext-ycp-4 \
        format-awk-1 format-awk-2 \
        format-boost-1 format-boost-2 \
        format-c-1 format-c-2 format-c-3 format-c-4 format-c-5 \
@@ -134,10 +134,12 @@ TESTS = gettext-1 gettext-2 \
        format-gfc-internal-1 format-gfc-internal-2 \
        format-java-1 format-java-2 \
        format-java-printf-1 format-java-printf-2 \
+       format-javascript-1 format-javascript-2 \
        format-kde-1 format-kde-2 \
        format-kde-kuit-1 format-kde-kuit-2 \
        format-librep-1 format-librep-2 \
        format-lisp-1 format-lisp-2 \
+       format-lua-1 format-lua-2 \
        format-php-1 format-php-2 \
        format-python-1 format-python-2 \
        format-python-brace-1 format-python-brace-2 \
@@ -152,15 +154,26 @@ TESTS = gettext-1 gettext-2 \
        format-sh-1 format-sh-2 \
        format-tcl-1 format-tcl-2 \
        format-ycp-1 format-ycp-2 \
-       format-lua-1 format-lua-2 \
-       format-javascript-1 format-javascript-2 \
        plural-1 plural-2 \
        gettextpo-1 sentence-1 \
-       lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
-       lang-python-2 lang-clisp lang-elisp lang-librep lang-guile \
-       lang-smalltalk lang-java lang-csharp lang-gawk lang-pascal \
-       lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php lang-po lang-rst \
-       lang-lua lang-javascript lang-vala \
+       lang-po \
+       lang-c lang-c++ lang-objc \
+       lang-python-1 lang-python-2 \
+       lang-java \
+       lang-csharp \
+       lang-javascript \
+       lang-guile lang-clisp lang-elisp lang-librep \
+       lang-sh lang-bash \
+       lang-gawk \
+       lang-lua \
+       lang-pascal \
+       lang-smalltalk \
+       lang-vala \
+       lang-tcl \
+       lang-perl-1 lang-perl-2 \
+       lang-php \
+       lang-ycp \
+       lang-rst \
        autopoint-1 autopoint-2 autopoint-3 cldr-plurals-1
 
 EXTRA_DIST += init.sh init.cfg $(TESTS) \