Added back intltool stuff

cmake/modules/FindMooI18n.cmake

@@ -24,6 +24,49 @@ MACRO(MOO_ADD_MSG_CATALOG catalogname dir)
       INSTALL(FILES ${_moo_gmo_file} DESTINATION ${LOCALEDIR}/${_moo_lang_code}/LC_MESSAGES/ RENAME ${catalogname}.mo)
     ENDFOREACH(_moo_po_file)
     SET_SOURCE_FILES_PROPERTIES(${_moo_gmo_files} PROPERTIES GENERATED 1 EXTERNAL_OBJECT 1)
-    ADD_CUSTOM_TARGET(translations-${catalogname} ALL SOURCES ${_moo_gmo_files})
+    ADD_CUSTOM_TARGET(intl-${catalogname} ALL SOURCES ${_moo_gmo_files})
   ENDIF(ENABLE_NLS)
 ENDMACRO(MOO_ADD_MSG_CATALOG)
+
+IF(ENABLE_NLS)
+  IF(WIN32)
+    MACRO(_MOO_FIND_INTLTOOL_VAR var script)
+      SET(${var} $ENV{${var}})
+      IF(NOT "${var}")
+        FIND_FILE(${var} ${script})
+      ENDIF(NOT "${var}")
+    ENDMACRO(_MOO_FIND_INTLTOOL_VAR)
+    _MOO_FIND_INTLTOOL_VAR(INTLTOOL_UPDATE intltool-update)
+    _MOO_FIND_INTLTOOL_VAR(INTLTOOL_EXTRACT intltool-extract)
+    _MOO_FIND_INTLTOOL_VAR(INTLTOOL_MERGE intltool-merge)
+    CONFIGURE_FILE(${MOO_SOURCE_DIR}/plat/win32/intltool-wrapper.bat.in ${MOO_BINARY_DIR}/intltool-wrapper.bat)
+    SET(INTLTOOL_UPDATE_COMMAND ${MOO_BINARY_DIR}/intltool-wrapper.bat)
+  ELSE(WIN32)
+    FIND_PROGRAM(INTLTOOL_UPDATE_COMMAND intltool-update)
+  ENDIF(WIN32)
+
+  SET(MOO_PO_DIR ${MOO_SOURCE_DIR}/po)
+
+  ADD_CUSTOM_TARGET(
+    intl-check
+    ${INTLTOOL_UPDATE_COMMAND} --gettext-package=moo -m
+    WORKING_DIRECTORY ${MOO_PO_DIR}
+  )
+
+  ADD_CUSTOM_TARGET(
+    intl-pot
+    COMMAND ${INTLTOOL_UPDATE_COMMAND} --gettext-package=moo -p
+    WORKING_DIRECTORY ${MOO_PO_DIR}
+  )
+
+  FILE(STRINGS ${MOO_PO_DIR}/LINGUAS MOO_PO_LINGUAS)
+  ADD_CUSTOM_TARGET(intl-update-po)
+  FOREACH(_moo_lang ${MOO_PO_LINGUAS})
+    ADD_CUSTOM_TARGET(
+      intl-update-${_moo_lang}-po
+      ${INTLTOOL_UPDATE_COMMAND} --gettext-package=moo -d ${_moo_lang}
+      WORKING_DIRECTORY ${MOO_PO_DIR}
+    )
+    ADD_DEPENDENCIES(intl-update-po intl-update-${_moo_lang}-po)
+  ENDFOREACH(_moo_lang)
+ENDIF(ENABLE_NLS)

plat/win32/intltool-wrapper.bat.in

@@ -0,0 +1,4 @@
+set INTLTOOL_UPDATE=${INTLTOOL_UPDATE}
+set INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT}
+set INTLTOOL_MERGE=${INTLTOOL_MERGE}
+${PERL_EXECUTABLE} ${INTLTOOL_UPDATE} %* || exit /b %errorlevel%

po/LINGUAS

@@ -1 +1,7 @@
-de es fr nl ru zh_CN cs
+de
+es
+fr
+nl
+ru
+zh_CN
+cs

po/POTFILES.in

@@ -3,70 +3,66 @@ medit/medit.desktop.in
 moo/mooapp/glade/mooappabout-credits.glade
 moo/mooapp/glade/mooappabout-dialog.glade
 moo/mooapp/glade/mooappabout-license.glade
-moo/mooapp/mooappabout.c
 moo/mooapp/mooapp.c
+moo/mooapp/mooappabout.c
 moo/mooapp/moohtml.c
-moo/mooedit/filters.xml
-moo/mooedit/glade/mooeditprefs.glade
-moo/mooedit/glade/mooeditprogress.glade
+moo/mooapp/smclient/eggdesktopfile.c
+moo/mooapp/smclient/eggsmclient.c
+moo/mooedit/glade/mooeditprefs-file.glade
+moo/mooedit/glade/mooeditprefs-filters.glade
+moo/mooedit/glade/mooeditprefs-general.glade
+moo/mooedit/glade/mooeditprefs-langs.glade
+moo/mooedit/glade/mooeditprefs-view.glade
 moo/mooedit/glade/mooeditsavemult.glade
-moo/mooedit/glade/mooedittools-exe.glade
 moo/mooedit/glade/moopluginprefs.glade
 moo/mooedit/glade/mooprint.glade
 moo/mooedit/glade/mooprintpreview.glade
 moo/mooedit/glade/mooquicksearch.glade
-moo/mooedit/glade/mootextfind.glade
 moo/mooedit/glade/mootextfind-prompt.glade
+moo/mooedit/glade/mootextfind.glade
 moo/mooedit/glade/mootextgotoline.glade
-moo/mooedit/glade/moousertools.glade
 moo/mooedit/medit.xml
-moo/mooedit/moocommand-exe.c
-moo/mooedit/moocommand-lua.c
+moo/mooedit/mooedit-fileops.c
 moo/mooedit/mooeditaction-factory.c
 moo/mooedit/mooeditdialogs.c
-moo/mooedit/mooedit-fileops.c
 moo/mooedit/mooeditor.c
 moo/mooedit/mooeditprefspage.c
 moo/mooedit/mooeditwindow.c
 moo/mooedit/mooplugin.c
 moo/mooedit/mootextfind.c
-moo/mooedit/mootextstylescheme.c
-moo/mooedit/moousertools.c
-moo/mooedit/moousertools-prefs.c
-moo/mooedit/plugins/moofilelist.c
-moo/mooedit/plugins/moofileselector.c
-moo/mooedit/plugins/moofileselector.glade
-moo/mooedit/plugins/moofileselector-prefs.c
-moo/mooedit/plugins/moofileselector-prefs.glade
-moo/mooedit/plugins/moofind.c
-moo/mooedit/plugins/moofind.glade
-moo/mooedit/plugins/moogrep.glade
 moo/moofileview/glade/moobookmark-editor.glade
 moo/moofileview/glade/moocreatefolder.glade
 moo/moofileview/glade/moofileprops.glade
 moo/moofileview/glade/moofileview-drop.glade
-moo/moofileview/moofileview.c
 moo/moofileview/moofileview-tools.c
+moo/moofileview/moofileview.c
 moo/moofileview/moofileview.xml
-moo/moopython/plugins/medit/runpython.py
-moo/moopython/plugins/pycmd.py
-moo/moopython/plugins/python.py
-moo/moopython/plugins/terminal.py
 moo/mooutils/glade/mooaccelprefs.glade
-moo/mooutils/glade/moologwindow.glade
 moo/mooutils/mooaccelprefs.c
-moo/mooutils/mooutils-file.c
+moo/mooutils/moocompat.c
 moo/mooutils/moodialogs.c
-moo/mooutils/mooencodings.c
 moo/mooutils/mooencodings-data.h
+moo/mooutils/mooencodings.c
 moo/mooutils/moofiledialog.c
 moo/mooutils/moofiltermgr.c
-moo/mooutils/moofontsel.c
 moo/mooutils/moohelp.c
 moo/mooutils/moopane.c
 moo/mooutils/moostock.c
+moo/mooutils/mooutils-file.c
 moo/mooutils/mooutils-fs.c
 moo/mooutils/moowindow.c
-[type: gettext/ini]moo/moopython/plugins/pycmd.ini.in.in
-[type: gettext/ini]moo/moopython/plugins/python.ini.in.in
-[type: gettext/ini]moo/moopython/plugins/terminal.ini.in.in
+plugins/glade/moofileselector-prefs.glade
+plugins/glade/moofileselector.glade
+plugins/glade/moofind.glade
+plugins/glade/moogrep.glade
+plugins/moofilelist.c
+plugins/moofileselector-prefs.c
+plugins/moofileselector.c
+plugins/moofind.c
+plugins/usertools/filters.xml
+plugins/usertools/glade/mooedittools-exe.glade
+plugins/usertools/glade/moousertools.glade
+plugins/usertools/moocommand-lua.c
+plugins/usertools/moocommand-sh.c
+plugins/usertools/moousertools-prefs.c
+plugins/usertools/moousertools.c

po/POTFILES.skip

@@ -1,25 +1,7 @@
 build/
-
-moo/mooapp/smclient/
-moo/mooedit/gtksourceview/
+junk/
 moo/mooedit/langs/
-moo/mooedit/plugins/completion/
-moo/moopython/plugins/pyproject/
-moo/mooutils/newgtk/
+moo/mooedit/gtksourceview/upstream/
 
-moo/mooutils/moocompat.c
-
-moo/mooedit/gtksourceview/gtksourcecontextengine-mangled.c
-moo/mooedit/gtksourceview/gtksourcelanguage-mangled.c
-moo/mooedit/gtksourceview/gtksourcelanguage-parser-2-mangled.c
-moo/mooedit/gtksourceview/gtksourcelanguagemanager-mangled.c
-moo/mooedit/gtksourceview/gtksourcestyle-mangled.c
-moo/mooedit/gtksourceview/gtksourcestylescheme-mangled.c
-moo/mooedit/gtksourceview/gtksourcestyleschememanager-mangled.c
-moo/mooedit/gtksourceview/gtksourcecontextengine-mangled.c
-moo/mooedit/gtksourceview/gtksourcelanguage-mangled.c
-moo/mooedit/gtksourceview/gtksourcelanguage-parser-2-mangled.c
-moo/mooedit/gtksourceview/gtksourcelanguagemanager-mangled.c
-moo/mooedit/gtksourceview/gtksourcestyle-mangled.c
-moo/mooedit/gtksourceview/gtksourcestylescheme-mangled.c
-moo/mooedit/gtksourceview/gtksourcestyleschememanager-mangled.c
+doc/txt2tags/txt2tags.py
+moo/mooutils/moofontsel.c