From 93881642e533133ef9f455612611002531e4475e Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Sat, 9 Nov 2019 15:33:24 +0800 Subject: migrate from intltool to gettext --- Makefile.am | 17 +- configure.ac | 6 +- data/Makefile.am | 6 +- data/pluma.appdata.xml.in | 6 +- data/pluma.desktop.in.in | 10 +- its/pluma-taglist.its | 7 + its/pluma-taglist.loc | 7 + plugins/changecase/Makefile.am | 6 +- plugins/changecase/changecase.plugin.desktop.in | 4 +- plugins/docinfo/Makefile.am | 7 +- plugins/docinfo/docinfo.plugin.desktop.in | 4 +- plugins/externaltools/Makefile.am | 5 +- plugins/externaltools/data/Makefile.am | 3 +- plugins/externaltools/data/build.desktop.in | 4 +- .../data/open-terminal-here.desktop.in | 4 +- .../data/remove-trailing-spaces.desktop.in | 4 +- plugins/externaltools/data/run-command.desktop.in | 4 +- .../externaltools/data/search-recursive.desktop.in | 2 +- plugins/externaltools/data/switch-c.desktop.in | 2 +- .../externaltools/externaltools.plugin.desktop.in | 4 +- plugins/filebrowser/Makefile.am | 7 +- plugins/filebrowser/filebrowser.plugin.desktop.in | 4 +- plugins/modelines/Makefile.am | 6 +- plugins/modelines/modelines.plugin.desktop.in | 4 +- plugins/pythonconsole/Makefile.am | 5 +- .../pythonconsole/pythonconsole.plugin.desktop.in | 4 +- plugins/quickopen/Makefile.am | 5 +- plugins/quickopen/quickopen.plugin.desktop.in | 4 +- plugins/snippets/Makefile.am | 5 +- plugins/snippets/snippets.plugin.desktop.in | 4 +- plugins/sort/Makefile.am | 6 +- plugins/sort/sort.plugin.desktop.in | 4 +- plugins/spell/Makefile.am | 7 +- plugins/spell/spell.plugin.desktop.in | 4 +- plugins/taglist/HTML.tags.xml.in | 964 ++++++++++----------- plugins/taglist/Latex.tags.xml.in | 148 ++-- plugins/taglist/Makefile.am | 11 +- plugins/taglist/XSLT.tags.xml.in | 32 +- plugins/taglist/XUL.tags.xml.in | 2 +- plugins/taglist/taglist.plugin.desktop.in | 4 +- plugins/time/Makefile.am | 7 +- plugins/time/time.plugin.desktop.in | 4 +- plugins/trailsave/Makefile.am | 6 +- plugins/trailsave/trailsave.plugin.desktop.in | 4 +- po/Makevars | 79 ++ po/POTFILES.in | 37 +- tools/plugin_template/Makefile.am | 6 +- 47 files changed, 787 insertions(+), 698 deletions(-) create mode 100644 its/pluma-taglist.its create mode 100644 its/pluma-taglist.loc create mode 100644 po/Makevars diff --git a/Makefile.am b/Makefile.am index 4c5d0263..c4d648fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = pluma pixmaps po data plugins docs help +SUBDIRS = po pluma pixmaps data plugins docs help if ENABLE_TESTS SUBDIRS += tests @@ -11,19 +11,14 @@ distuninstallcheck_listfiles = find . -type f -print EXTRA_DIST = \ autogen.sh \ + its \ ChangeLog \ NEWS \ README \ xmldocs.make \ - omf.make \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in + omf.make -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update +DISTCLEANFILES = MAINTAINERCLEANFILES = \ aclocal.m4 \ @@ -31,9 +26,6 @@ MAINTAINERCLEANFILES = \ config.h.in \ config.sub \ depcomp \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ configure \ INSTALL \ gtk-doc.make \ @@ -45,7 +37,6 @@ MAINTAINERCLEANFILES = \ py-compile \ xmldocs.make \ m4/gtk-doc.m4 \ - m4/intltool.m4 \ m4/libtool.m4 \ m4/ltoptions.m4 \ m4/ltsugar.m4 \ diff --git a/configure.ac b/configure.ac index d8fce206..373825ab 100644 --- a/configure.ac +++ b/configure.ac @@ -73,11 +73,13 @@ AC_SUBST(FULL_LIBEXECDIR) dnl ================================================================ dnl Gettext stuff. dnl ================================================================ +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) + -IT_PROG_INTLTOOL([0.50.1]) GETTEXT_PACKAGE=pluma AC_SUBST([GETTEXT_PACKAGE]) -AM_GLIB_GNU_GETTEXT AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name]) dnl ================================================================ diff --git a/data/Makefile.am b/data/Makefile.am index 12d8a058..21c26baa 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,12 +1,14 @@ desktopdir = $(datadir)/applications desktop_in_files = pluma.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ +$(desktop_DATA): $(desktop_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ -@INTLTOOL_XML_RULE@ appdatadir = $(datadir)/metainfo appdata_in_files = pluma.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) +$(appdata_DATA): $(appdata_in_files) + $(AM_V_GEN) GETTEXTDATADIRS=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ gsettings_SCHEMAS = org.mate.pluma.gschema.xml @GSETTINGS_RULES@ diff --git a/data/pluma.appdata.xml.in b/data/pluma.appdata.xml.in index 9799fc0b..5ef27402 100644 --- a/data/pluma.appdata.xml.in +++ b/data/pluma.appdata.xml.in @@ -5,8 +5,8 @@ CC0-1.0 GPL-2.0+ Pluma - <_summary>A Text Editor for the MATE desktop environment - <_description> + A Text Editor for the MATE desktop environment +

Pluma is a small, but powerful text editor designed specifically for the MATE desktop. It has most standard text editor functions and fully @@ -19,7 +19,7 @@ support for spell checking, comparing files, viewing CVS ChangeLogs, and adjusting indentation levels.

- + diff --git a/data/pluma.desktop.in.in b/data/pluma.desktop.in.in index 6e83ae9c..24124400 100644 --- a/data/pluma.desktop.in.in +++ b/data/pluma.desktop.in.in @@ -1,17 +1,19 @@ [Desktop Entry] -_Name=Pluma -_GenericName=Text Editor -_Comment=Edit text files +Name=Pluma +GenericName=Text Editor +Comment=Edit text files Exec=pluma %U Terminal=false Type=Application StartupNotify=true MimeType=text/plain; +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=accessories-text-editor Categories=GTK;Utility;TextEditor; +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=text;editor;MATE;tabs;highlighting;code;multiple;files;pluggable; X-MATE-DocPath=pluma/pluma.xml -_X-MATE-FullName=Pluma Text Editor +X-MATE-FullName=Pluma Text Editor X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=Pluma X-MATE-Bugzilla-Component=general diff --git a/its/pluma-taglist.its b/its/pluma-taglist.its new file mode 100644 index 00000000..d7f5f59e --- /dev/null +++ b/its/pluma-taglist.its @@ -0,0 +1,7 @@ + + + + + diff --git a/its/pluma-taglist.loc b/its/pluma-taglist.loc new file mode 100644 index 00000000..2290ce81 --- /dev/null +++ b/its/pluma-taglist.loc @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/changecase/Makefile.am b/plugins/changecase/Makefile.am index e1404b1c..e30cfa37 100644 --- a/plugins/changecase/Makefile.am +++ b/plugins/changecase/Makefile.am @@ -19,11 +19,11 @@ uidir = $(PLUMA_PLUGINS_DATA_DIR)/changecase ui_DATA = plugin_in_files = changecase.plugin.desktop.in - -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + EXTRA_DIST = $(ui_DATA) $(plugin_in_files) CLEANFILES = $(plugin_DATA) diff --git a/plugins/changecase/changecase.plugin.desktop.in b/plugins/changecase/changecase.plugin.desktop.in index de4cb375..bff2f4f6 100644 --- a/plugins/changecase/changecase.plugin.desktop.in +++ b/plugins/changecase/changecase.plugin.desktop.in @@ -1,8 +1,8 @@ [Plugin] Module=changecase IAge=2 -_Name=Change Case -_Description=Changes the case of selected text. +Name=Change Case +Description=Changes the case of selected text. Authors=Paolo Borelli Copyright=Copyright © 2004-2005 Paolo Borelli Website=https://mate-desktop.org diff --git a/plugins/docinfo/Makefile.am b/plugins/docinfo/Makefile.am index 611dc17e..076bae60 100644 --- a/plugins/docinfo/Makefile.am +++ b/plugins/docinfo/Makefile.am @@ -21,15 +21,14 @@ include $(top_srcdir)/gla11y.mk ui_DATA = $(ui_files) plugin_in_files = docinfo.plugin.desktop.in - -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + EXTRA_DIST = $(ui_DATA) $(plugin_in_files) ui-a11y.suppr CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) - -include $(top_srcdir)/git.mk diff --git a/plugins/docinfo/docinfo.plugin.desktop.in b/plugins/docinfo/docinfo.plugin.desktop.in index b4da32b0..3f6b32e3 100644 --- a/plugins/docinfo/docinfo.plugin.desktop.in +++ b/plugins/docinfo/docinfo.plugin.desktop.in @@ -1,7 +1,7 @@ [Plugin] Module=docinfo IAge=2 -_Name=Document Statistics -_Description=Analyzes the current document and reports the number of words, lines, characters and non-space characters in it. +Name=Document Statistics +Description=Analyzes the current document and reports the number of words, lines, characters and non-space characters in it. Authors=Paolo Maggi ;Jorge Alberto Torres Copyright=Copyright © 2002-2005 Paolo Maggi diff --git a/plugins/externaltools/Makefile.am b/plugins/externaltools/Makefile.am index cd6f9720..9cff7fa7 100644 --- a/plugins/externaltools/Makefile.am +++ b/plugins/externaltools/Makefile.am @@ -3,10 +3,11 @@ SUBDIRS = tools data scripts plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugin_in_files = externaltools.plugin.desktop.in -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + EXTRA_DIST = $(plugin_in_files) CLEANFILES = $(plugin_DATA) diff --git a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am index c9abcce0..4a303ce1 100644 --- a/plugins/externaltools/data/Makefile.am +++ b/plugins/externaltools/data/Makefile.am @@ -23,7 +23,8 @@ all_desktop_in_files = $(all_tools_in_files:.tool.in=.desktop.in) all_desktop_files = $(all_tools_in_files:.tool.in=.desktop) all_tools_files = $(all_tools_in_files:.tool.in=) -@INTLTOOL_DESKTOP_RULE@ +%.desktop: %.desktop.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ # Tools are generated by merging a script file (.tool.in) with a data file # (.desktop), which happens to be translated using intltool. diff --git a/plugins/externaltools/data/build.desktop.in b/plugins/externaltools/data/build.desktop.in index c2a49871..7666abe1 100644 --- a/plugins/externaltools/data/build.desktop.in +++ b/plugins/externaltools/data/build.desktop.in @@ -1,6 +1,6 @@ [Pluma Tool] -_Name=Build -_Comment=Run "make" in the document directory +Name=Build +Comment=Run "make" in the document directory Input=nothing Output=output-panel Shortcut=F8 diff --git a/plugins/externaltools/data/open-terminal-here.desktop.in b/plugins/externaltools/data/open-terminal-here.desktop.in index 45587ef6..fcd281e5 100644 --- a/plugins/externaltools/data/open-terminal-here.desktop.in +++ b/plugins/externaltools/data/open-terminal-here.desktop.in @@ -1,6 +1,6 @@ [Pluma Tool] -_Name=Open terminal here -_Comment=Open a terminal in the document location +Name=Open terminal here +Comment=Open a terminal in the document location Input=nothing Output=output-panel Applicability=local diff --git a/plugins/externaltools/data/remove-trailing-spaces.desktop.in b/plugins/externaltools/data/remove-trailing-spaces.desktop.in index 70bd8fd1..3beb99ab 100644 --- a/plugins/externaltools/data/remove-trailing-spaces.desktop.in +++ b/plugins/externaltools/data/remove-trailing-spaces.desktop.in @@ -1,6 +1,6 @@ [Pluma Tool] -_Name=Remove trailing spaces -_Comment=Remove useless trailing spaces in your file +Name=Remove trailing spaces +Comment=Remove useless trailing spaces in your file Input=document Output=replace-document Shortcut=F12 diff --git a/plugins/externaltools/data/run-command.desktop.in b/plugins/externaltools/data/run-command.desktop.in index 4e15e678..7b1a821a 100644 --- a/plugins/externaltools/data/run-command.desktop.in +++ b/plugins/externaltools/data/run-command.desktop.in @@ -1,6 +1,6 @@ [Pluma Tool] -_Name=Run command -_Comment=Execute a custom command and put its output in a new document +Name=Run command +Comment=Execute a custom command and put its output in a new document Input=nothing Output=new-document Applicability=all diff --git a/plugins/externaltools/data/search-recursive.desktop.in b/plugins/externaltools/data/search-recursive.desktop.in index 41baf649..3574f456 100644 --- a/plugins/externaltools/data/search-recursive.desktop.in +++ b/plugins/externaltools/data/search-recursive.desktop.in @@ -1,5 +1,5 @@ [Pluma Tool] -_Name=Search +Name=Search Shortcut=f Languages= Applicability=local diff --git a/plugins/externaltools/data/switch-c.desktop.in b/plugins/externaltools/data/switch-c.desktop.in index 43d4f70b..fa5cb9bf 100644 --- a/plugins/externaltools/data/switch-c.desktop.in +++ b/plugins/externaltools/data/switch-c.desktop.in @@ -1,5 +1,5 @@ [Pluma Tool] -_Name=Switch onto a file .c and .h +Name=Switch onto a file .c and .h Shortcut=s Applicability=all Output=nothing diff --git a/plugins/externaltools/externaltools.plugin.desktop.in b/plugins/externaltools/externaltools.plugin.desktop.in index 409547f8..8fe1bd53 100644 --- a/plugins/externaltools/externaltools.plugin.desktop.in +++ b/plugins/externaltools/externaltools.plugin.desktop.in @@ -2,8 +2,8 @@ Loader=python3 Module=externaltools IAge=2 -_Name=External Tools -_Description=Execute external commands and shell scripts. +Name=External Tools +Description=Execute external commands and shell scripts. Authors=Steve Frécinaux Copyright=Copyright © 2005 Steve Frécinaux Website=https://mate-desktop.org diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am index 903e5bc7..095cdc1d 100644 --- a/plugins/filebrowser/Makefile.am +++ b/plugins/filebrowser/Makefile.am @@ -44,8 +44,10 @@ uidir = $(PLUMA_PLUGINS_DATA_DIR)/filebrowser ui_DATA = pluma-file-browser-widget-ui.xml plugin_in_files = filebrowser.plugin.desktop.in +plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ pluma-file-browser-enum-types.h: pluma-file-browser-enum-types.h.template $(NOINST_H_FILES) $(GLIB_MKENUMS) (cd $(srcdir) && $(GLIB_MKENUMS) --template pluma-file-browser-enum-types.h.template $(NOINST_H_FILES)) > $@ @@ -62,9 +64,6 @@ pluma-file-browser-marshal.c: pluma-file-browser-marshal.list $(GLIB_GENMARSHAL) $(AM_V_GEN) echo "#include \"pluma-file-browser-marshal.h\"" > $@ && \ $(GLIB_GENMARSHAL) $< --body --prefix=pluma_file_browser_marshal >> $@ -plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) - -@INTLTOOL_XML_NOMERGE_RULE@ filebrowser_gschema_in = org.mate.pluma.plugins.filebrowser.gschema.xml.in gsettings_SCHEMAS = $(filebrowser_gschema_in:.xml.in=.xml) @GSETTINGS_RULES@ diff --git a/plugins/filebrowser/filebrowser.plugin.desktop.in b/plugins/filebrowser/filebrowser.plugin.desktop.in index d9ea9ad3..b76497d5 100644 --- a/plugins/filebrowser/filebrowser.plugin.desktop.in +++ b/plugins/filebrowser/filebrowser.plugin.desktop.in @@ -2,8 +2,8 @@ Loader=C Module=filebrowser IAge=2 -_Name=File Browser Pane -_Description=Easy file access from the side pane +Name=File Browser Pane +Description=Easy file access from the side pane Icon=system-file-manager Authors=Jesse van den Kieboom Copyright=Copyright © 2006 Jesse van den Kieboom diff --git a/plugins/modelines/Makefile.am b/plugins/modelines/Makefile.am index 5284cf93..abcb58db 100644 --- a/plugins/modelines/Makefile.am +++ b/plugins/modelines/Makefile.am @@ -22,10 +22,11 @@ libmodelines_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) libmodelines_la_LIBADD = $(PLUMA_LIBS) plugin_in_files = modelines.plugin.desktop.in -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + EXTRA_DIST = \ $(plugin_in_files) \ $(modelines_DATA) @@ -33,5 +34,4 @@ EXTRA_DIST = \ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) - -include $(top_srcdir)/git.mk diff --git a/plugins/modelines/modelines.plugin.desktop.in b/plugins/modelines/modelines.plugin.desktop.in index bba8b48d..2d30c34e 100644 --- a/plugins/modelines/modelines.plugin.desktop.in +++ b/plugins/modelines/modelines.plugin.desktop.in @@ -1,8 +1,8 @@ [Plugin] Module=modelines IAge=2 -_Name=Modelines -_Description=Emacs, Kate and Vim-style modelines support for pluma. +Name=Modelines +Description=Emacs, Kate and Vim-style modelines support for pluma. Authors=Steve Frécinaux Copyright=Copyright © 2005 Steve Frécinaux Website=https://mate-desktop.org diff --git a/plugins/pythonconsole/Makefile.am b/plugins/pythonconsole/Makefile.am index 51a2e4a4..7c6a02e4 100644 --- a/plugins/pythonconsole/Makefile.am +++ b/plugins/pythonconsole/Makefile.am @@ -3,10 +3,11 @@ SUBDIRS = pythonconsole plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugin_in_files = pythonconsole.plugin.desktop.in -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + pythonconsole_gschema_in = org.mate.pluma.plugins.pythonconsole.gschema.xml.in gsettings_SCHEMAS = $(pythonconsole_gschema_in:.xml.in=.xml) @GSETTINGS_RULES@ diff --git a/plugins/pythonconsole/pythonconsole.plugin.desktop.in b/plugins/pythonconsole/pythonconsole.plugin.desktop.in index e8f9c083..4281403d 100644 --- a/plugins/pythonconsole/pythonconsole.plugin.desktop.in +++ b/plugins/pythonconsole/pythonconsole.plugin.desktop.in @@ -2,8 +2,8 @@ Loader=python3 Module=pythonconsole IAge=2 -_Name=Python Console -_Description=Interactive Python console standing in the bottom panel +Name=Python Console +Description=Interactive Python console standing in the bottom panel Icon=text-x-python Authors=Steve Frécinaux Copyright=Copyright © 2006 Steve Frécinaux diff --git a/plugins/quickopen/Makefile.am b/plugins/quickopen/Makefile.am index 4e5f8d85..e03a7147 100644 --- a/plugins/quickopen/Makefile.am +++ b/plugins/quickopen/Makefile.am @@ -3,10 +3,11 @@ SUBDIRS = quickopen plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugin_in_files = quickopen.plugin.desktop.in -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + EXTRA_DIST = $(plugin_in_files) CLEANFILES = $(plugin_DATA) diff --git a/plugins/quickopen/quickopen.plugin.desktop.in b/plugins/quickopen/quickopen.plugin.desktop.in index 5ad16d7e..471e0ec9 100644 --- a/plugins/quickopen/quickopen.plugin.desktop.in +++ b/plugins/quickopen/quickopen.plugin.desktop.in @@ -2,8 +2,8 @@ Loader=python3 Module=quickopen IAge=2 -_Name=Quick Open -_Description=Quickly open files +Name=Quick Open +Description=Quickly open files Icon=document-open Authors=Jesse van den Kieboom Copyright=Copyright © 2009 Jesse van den Kieboom diff --git a/plugins/snippets/Makefile.am b/plugins/snippets/Makefile.am index 40aeeb90..24f5a5b4 100644 --- a/plugins/snippets/Makefile.am +++ b/plugins/snippets/Makefile.am @@ -3,10 +3,11 @@ SUBDIRS = snippets data plugindir = $(PLUMA_PLUGINS_LIBS_DIR) plugin_in_files = snippets.plugin.desktop.in -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + EXTRA_DIST = $(plugin_in_files) CLEANFILES = $(plugin_DATA) diff --git a/plugins/snippets/snippets.plugin.desktop.in b/plugins/snippets/snippets.plugin.desktop.in index 826fd134..84de9c76 100644 --- a/plugins/snippets/snippets.plugin.desktop.in +++ b/plugins/snippets/snippets.plugin.desktop.in @@ -2,8 +2,8 @@ Loader=python3 Module=snippets IAge=2 -_Name=Snippets -_Description=Insert often-used pieces of text in a fast way +Name=Snippets +Description=Insert often-used pieces of text in a fast way Authors=Jesse van den Kieboom Copyright=Copyright © 2005 Jesse van den Kieboom Website=https://mate-desktop.org diff --git a/plugins/sort/Makefile.am b/plugins/sort/Makefile.am index a442c645..2f211352 100644 --- a/plugins/sort/Makefile.am +++ b/plugins/sort/Makefile.am @@ -21,11 +21,11 @@ include $(top_srcdir)/gla11y.mk ui_DATA = $(ui_files) plugin_in_files = sort.plugin.desktop.in - -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + EXTRA_DIST = $(ui_DATA) $(plugin_in_files) ui-a11y.suppr CLEANFILES = $(plugin_DATA) diff --git a/plugins/sort/sort.plugin.desktop.in b/plugins/sort/sort.plugin.desktop.in index 4a9332bc..7e02b3a5 100644 --- a/plugins/sort/sort.plugin.desktop.in +++ b/plugins/sort/sort.plugin.desktop.in @@ -1,8 +1,8 @@ [Plugin] Module=sort IAge=2 -_Name=Sort -_Description=Sorts a document or selected text. +Name=Sort +Description=Sorts a document or selected text. Icon=view-sort-ascending Authors=Carlo Borreo ;Lee Mallabone ;Paolo Maggi ;Jorge Alberto Torres H. Copyright=Copyright © 2001 Carlo Borreo\nCopyright © 2002-2003 Lee Mallabone, Paolo Maggi\nCopyright © 2004-2005 Paolo Maggi diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am index 1ea7462e..79f67c1b 100644 --- a/plugins/spell/Makefile.am +++ b/plugins/spell/Makefile.am @@ -46,12 +46,11 @@ pluma-spell-marshal.c: pluma-spell-marshal.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) $< --body --prefix=pluma_marshal >> $@ plugin_in_files = spell.plugin.desktop.in - -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) -@INTLTOOL_XML_NOMERGE_RULE@ +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + spell_gschema_in = org.mate.pluma.plugins.spell.gschema.xml.in gsettings_SCHEMAS = $(spell_gschema_in:.xml.in=.xml) @GSETTINGS_RULES@ diff --git a/plugins/spell/spell.plugin.desktop.in b/plugins/spell/spell.plugin.desktop.in index 0ed87ae5..8174141f 100644 --- a/plugins/spell/spell.plugin.desktop.in +++ b/plugins/spell/spell.plugin.desktop.in @@ -1,8 +1,8 @@ [Plugin] Module=spell IAge=2 -_Name=Spell Checker -_Description=Checks the spelling of the current document. +Name=Spell Checker +Description=Checks the spelling of the current document. Icon=tools-check-spelling Authors=Paolo Maggi Copyright=Copyright © 2002-2005 Paolo Maggi diff --git a/plugins/taglist/HTML.tags.xml.in b/plugins/taglist/HTML.tags.xml.in index 5eedb254..5d130014 100644 --- a/plugins/taglist/HTML.tags.xml.in +++ b/plugins/taglist/HTML.tags.xml.in @@ -1,2270 +1,2270 @@ - + - + <abbr title=" "></abbr> - + abbr=" " - + accesskey=" " - + <acronym title=" "></acronym> - + align=" " - + char=" " - + alt=" " - + <a href=" "></a> - + <a id=" "></a> - + code=" " - + content=" " - + <address> </address> - + axis=" " - + bgcolor=" " - + background=" " - + <basefont> - + codebase=" " - + <b> </b> - + border=" " - + rowspan=" " - + <center> </center> - + charset=" " - + checked="checked" - + <cite> </cite> - + cite=" " - + classid=" " - + class=" " - + clear=" " - + codetype=" " - + alink=" " - + colspan=" " - + cols=" " - + <!-- --> - + <code> </code> - + type=" " - + coords=" " - + datetime="YYYYMMDD" - + declare="declare" - + defer="defer" - + <dd> </dd> - + <dl> </dl> - + <dt> </dt> - + <del> </del> - + dir=" " - + <dir> </dir> - + disabled="disabled" - + <div> </div> - + <div style=> </div> - + <base href=" " /> - + <body> </body> - + <head> </head> - + id=" " - + <title> </title> - + <!DOCTYPE> - + <em> </em> - + enctype=" " - + face=" " - + for=" " - + <br /> - + action=" " - + <fieldset> </fieldset> - + <label> </label> - + <input type=" " /> - + <input /> - + <form method=" "></form> - + method=" " - + <form> </form> - + rel=" " - + frame=" " - + <frame src=" "></frame> - + target=" " - + <frame> </frame> - + frameborder=" " - + <frameset cols=" "></frameset> - + <frameset rows=" "></frameset> - + <frameset> </frameset> - + framespacing=" " - + <object> </object> - + <meta content=" "></meta> - + <span> </span> - + headers=" " - + <h1> </h1> - + <h2> </h2> - + <h3> </h3> - + <h4> </h4> - + <h5> </h5> - + <h6> </h6> - + height=" - + <hr /> - + hspace=" " - + href=" " - + <html> </html> - + http-equiv=" " - + <bdo> </bdo> - + <area alt=" "></area> - + <map name=" "></map> - + <map id=" "></map> - + <img id=" " src="" alt="" /> - + <iframe> </iframe> - + <ins> </ins> - + <dfn> </dfn> - + <i> </i> - + <applet height=" " width=""></applet> - + label=" " - + hreflang=" " - + lang=" " - + <big> </big> - + link=" " - + <li> </li> - + accept=" " - + accept-charset=" " - + <font> </font> - + longdesc=" " - + <blockquote> </blockquote> - + marginheight=" " - + marginwidth=" " - + maxlength=" " - + media=" " - + <link rel=" " type="" href="" /> - + <menu> </menu> - + <textarea cols=" " rows=""></textarea> - + multiple="multiple" - + name=" " - + <param name=" "></param> - + <noframes> </noframes> - + noresize="noresize" - + <noscript> </noscript> - + noshade="noshade" - + nohref=" " - + nowrap="nowrap" - + object=" " - + data=" " - + charoff=" " - + onblur=" " - + onchange=" " - + onclick=" " - + ondbclick=" " - + onfocus=" " - + onkeydown=" " - + onkeypress=" " - + onkeyup=" " - + onload=" " - + onmousedown=" " - + onmousemove=" " - + onmouseout=" " - + onmouseover=" " - + onmouseup=" " - + onreset=" " - + onselect=" " - + onsubmit=" " - + onunload=" " - + <optgroup label=" "></optgroup> - + <select> </select> - + <ol> </ol> - + <p class=" "></p> - + <p style=" "></p> - + <p> </p> - + <pre> </pre> - + profile=" " - + <button> </button> - + readonly="readonly" - + compact="compact_rendering" - + rev=" " - + rows=" " - + rules=" " - + <samp> </samp> - + scope=" " - + language=" " - + <script type=" "></script> - + scrolling=" " - + <option> </option> - + selected="selected" - + ismap=" " - + shape=" " - + <q> </q> - + size=" " - + <small> </small> - + src=" " - + archive=" " - + cellspacing=" " - + cellpadding=" " - + span=" " - + standby=" " - + start=" " - + <s> </s> - + <strike> </strike> - + <strong> </strong> - + <style type="text/css"> </style> - + style=" " - + <sub> </sub> - + <sup> </sup> - + <tbody> </tbody> - + <caption> </caption> - + <colgroup> </colgroup> - + <col> </col> - + <td> </td> - + <tfoot> </tfoot> - + <th> </th> - + <thead> </thead> - + <tr> </tr> - + summary=" " - + <table> </table> - + <a target="_blank"> </a> - + <a target="_parent"> </a> - + <a target="_self"> </a> - + <a target="_top"> </a> - + <tt> </tt> - + color=" " - + text=" " - + <kbd> </kbd> - + title=" " - + <u> </u> - + <ul> </ul> - + usemap=" " - + valuetype=" " - + value=" " - + <var> </var> - + valign=" " - + vspace=" " - + vlink=" " - + width=" " - + - + <abbr> </abbr> - + abbr= - + <above> - + accesskey= - + <acronym> </acronym> - + align= - + char= - + alt= - + <a href=> </a> - + <a> </a> - + code= - + <array> - + content= - + <address> </address> - + axis= - + bgcolor= - + background= - + <basefont> - + codebase= - + <b> </b> - + bordercolor= - + border= - + rowspan= - + <center> </center> - + charset= - + checked - + <cite> </cite> - + cite= - + classid= - + class= - + clear= - + codetype= - + alink= - + colspan= - + cols= - + <!-- --> - + <comment> </comment> - + <code> </code> - + scheme= - + type= - + coords= - + datetime= - + declare - + defer - + <dd> </dd> - + <dl> </dl> - + <dt> </dt> - + <del> </del> - + direction= - + dir= - + <dir> </dir> - + disabled - + <div> </div> - + <div style=> </div> - + <base> - + <body> </body> - + <head> </head> - + id= - + <title> </title> - + <!DOCTYPE> - + version= - + <embed> </embed> - + <em> </em> - + enctype= - + <fig> </fig> - + face= - + for= - + <br /> - + action= - + <fieldset> </fieldset> - + <label> </label> - + <input type=> - + <input> - + <form method=> - + method= - + <form> </form> - + rel= - + frame= - + <frame src=> - + target= - + <frame> - + frameborder= - + <frameset cols=> </frameset> - + <frameset rows=> </frameset> - + <frameset> </frameset> - + framespacing= - + <object> - + <meta> - + <span> </span> - + headers= - + <h1> </h1> - + <h2> </h2> - + <h3> </h3> - + <h4> </h4> - + <h5> </h5> - + <h6> </h6> - + <h> </h> - + height= - + <hr /> - + hspace= - + href= - + <html> </html> - + http-equiv= - + <BDO> </BDO> - + <area> - + <map name=> </map> - + <map> </map> - + <img src=> - + <img> - + <iframe> </iframe> - + <ilayer> </ilayer> - + <ins> </ins> - + <dfn> </dfn> - + <i> </i> - + <applet> </applet> - + label= - + hreflang= - + lang= - + <big> </big> - + <layer> - + link= - + <li> </li> - + accept= - + accept-charset= - + <listing> </listing> - + <font> </font> - + longdesc= - + <blockquote> </blockquote> - + mailto= - + marginheight= - + marginwidth= - + <marquee> </marquee> - + maxlength= - + media= - + <link rel="> - + <menu> </menu> - + <multicol> </multicol> - + <textarea> </textarea> - + multiple - + name= - + <param> - + <nextid> - + <noembed> - + <noframes> </noframes> - + <nolayer> </nolayer> - + <nobr> </nobr> - + noresize - + <noscript> </noscript> - + noshade - + nohref - + nowrap - + <note> </note> - + object= - + data= - + charoff= - + onblur= - + onchange= - + onclick= - + ondbclick= - + onfocus= - + onkeydown= - + onkeypress= - + onkeyup= - + onload= - + onmousedown= - + onmousemove= - + onmouseout= - + onmouseover= - + onmouseup= - + onreset= - + onselect= - + onsubmit= - + onunload= - + <optgroup> </optgroup> - + <select> </select> - + <ol> </ol> - + <p class=> </p> - + <p style=> </p> - + <p> </p> - + <xmp> </xmp> - + <pre> </pre> - + profile= - + prompt= - + <button> </button> - + <quote> - + <range> - + readonly - + compact - + rev= - + <root> - + rows= - + rules= - + <samp> </samp> - + scope= - + language= - + <script> </script> - + scrolling= - + <option> - + selected - + ismap - + shape= - + <q> </q> - + <isindex> - + size= - + <small> </small> - + <wbr> - + <sound> - + src= - + archive= - + <spacer> - + cellspacing= - + cellpadding= - + span= - + <sqrt> - + standby= - + start - + <s> </s> - + <strike> </strike> - + <strong> </strong> - + <style> </style> - + style= - + <sub> </sub> - + <sup> </sup> - + tabindex= - + <tbody> </tbody> - + <caption> </caption> - + <colgroup> </colgroup> - + <col> </col> - + <td> </td> - + <tfoot> </tfoot> - + <th> </th> - + <thead> </thead> - + <tr> </tr> - + summary= - + <table> </table> - + <a target="_blank"> </a> - + <a target="_parent"> </a> - + <a target="_self"> </a> - + <a target="_top"> </a> - + <tt> </tt> - + color= - + text= - + <kbd> </kbd> - + <text> - + title= - + topmargin - + <u> </u> - + <ul> </ul> - + url= - + usemap= - + valuetype= - + value= - + <var> </var> - + valign= - + vspace= - + vlink= - + width= - + - + &nbsp; diff --git a/plugins/taglist/Latex.tags.xml.in b/plugins/taglist/Latex.tags.xml.in index 78242fe3..ec4a1485 100644 --- a/plugins/taglist/Latex.tags.xml.in +++ b/plugins/taglist/Latex.tags.xml.in @@ -1,341 +1,341 @@ - - + + \cite{ } - + \bibitem{ }{} - + \shortcite{ } - + \begin{thebibliography}{99} \end{thebibliography} - + \left( \right) - + \left[ \right] - + \left\{ \right\} - + \left\langle \right\rangle - + \input{ } - + \cos{ } - + e^{ } - + \exp{ } - + \log{ } - + \log_{10}{ } - + \sin{ } - + \alpha - + \beta - + \varepsilon - + \gamma - + \lambda - + \rho - + \tau - + \chapter{ } - + \chapter*{ } - + \section{ } - + \section*{ } - + \subsection{ } - + \subsection*{ } - + \subsubsection{ } - + \subsubsection*{ } - + \paragraph{ } - + \appendix - + \begin{description} \end{description} - + \begin{enumerate} \end{enumerate} - + \begin{itemize} \end{itemize} - + \item[ ] - + \item - + $$ $$ - + $ $ - + \frac{ }{} - + \int\limits_{ }^{} - + \int_{ }^{} - + \sum\limits_{ }^{} - + \sum_{ }^{} - + \label{ } - + {\protect\ref{ }} - + \ll - + \le - + \ge - + \gg - + \mathrm{and} - + \mathrm{const} - + \frac{\partial{ }^2}{\partial t^2} - + \dagger - + \frac{{\mathrm{d}} }{{\mathrm{d}}t} - + \frac{\partial }{\partial t} - + \equiv - + -- - + --- - + \infty - + \quad\mathrm{,} - + \quad\mathrm{.} - + \quad - + \qquad - + \simeq - + \star - + \textbf{ } - + \texttt{ } - + \textit{ } - + \textsl{ } - + \emph{ } - + \mbox{ } - + \footnote{ } diff --git a/plugins/taglist/Makefile.am b/plugins/taglist/Makefile.am index 3088ba58..d2573f3d 100644 --- a/plugins/taglist/Makefile.am +++ b/plugins/taglist/Makefile.am @@ -30,18 +30,17 @@ libtaglist_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) libtaglist_la_LIBADD = $(PLUMA_LIBS) plugin_in_files = taglist.plugin.desktop.in +plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) - $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ GZIP_ENV = -9 -%.tags.gz: %.tags.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) - LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@:.gz=) -x -u -c $(top_builddir)/po/.intltool-merge-cache +%.tags.gz: %.tags.xml.in + $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $(@:.gz=) GZIP=$(GZIP_ENV) gzip -n -f $(@:.gz=) -plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) - EXTRA_DIST = \ $(taglist_in_files) $(taglist_DATA) \ $(plugin_in_files) $(plugin_DATA) diff --git a/plugins/taglist/XSLT.tags.xml.in b/plugins/taglist/XSLT.tags.xml.in index e625f6ca..ac75bd20 100644 --- a/plugins/taglist/XSLT.tags.xml.in +++ b/plugins/taglist/XSLT.tags.xml.in @@ -4,7 +4,7 @@ Jens Askengren --> - + <xsl:apply-imports> </xsl:apply-imports> @@ -138,7 +138,7 @@ - + boolean( ) @@ -293,44 +293,44 @@ - - + + ancestor:: - + ancestor-or-self:: - + @ - + child:: - + descendant:: - + // - + following:: - + following-sibling:: - + namespace:: - + .. - + preceding:: - + preceding-sibling:: - + . diff --git a/plugins/taglist/XUL.tags.xml.in b/plugins/taglist/XUL.tags.xml.in index 3d5d3c8c..f4359c7a 100644 --- a/plugins/taglist/XUL.tags.xml.in +++ b/plugins/taglist/XUL.tags.xml.in @@ -1,6 +1,6 @@ - + <action> diff --git a/plugins/taglist/taglist.plugin.desktop.in b/plugins/taglist/taglist.plugin.desktop.in index f33004d5..550dba2e 100644 --- a/plugins/taglist/taglist.plugin.desktop.in +++ b/plugins/taglist/taglist.plugin.desktop.in @@ -1,8 +1,8 @@ [Plugin] Module=taglist IAge=2 -_Name=Tag list -_Description=Provides a method to easily insert commonly used tags/strings into a document without having to type them. +Name=Tag list +Description=Provides a method to easily insert commonly used tags/strings into a document without having to type them. Authors=Paolo Maggi Copyright=Copyright © 2002-2005 Paolo Maggi Website=https://mate-desktop.org diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am index 591a04d6..185d1a86 100644 --- a/plugins/time/Makefile.am +++ b/plugins/time/Makefile.am @@ -23,12 +23,11 @@ include $(top_srcdir)/gla11y.mk ui_DATA = $(ui_files) plugin_in_files = time.plugin.desktop.in - -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) -@INTLTOOL_XML_NOMERGE_RULE@ +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + time_gschema_in = org.mate.pluma.plugins.time.gschema.xml.in gsettings_SCHEMAS = $(time_gschema_in:.xml.in=.xml) @GSETTINGS_RULES@ diff --git a/plugins/time/time.plugin.desktop.in b/plugins/time/time.plugin.desktop.in index c3c599f1..5c060665 100644 --- a/plugins/time/time.plugin.desktop.in +++ b/plugins/time/time.plugin.desktop.in @@ -1,8 +1,8 @@ [Plugin] Module=time IAge=2 -_Name=Insert Date/Time -_Description=Inserts current date and time at the cursor position. +Name=Insert Date/Time +Description=Inserts current date and time at the cursor position. Authors=Paolo Maggi ;Lee Mallabone Copyright=Copyright © 2002-2005 Paolo Maggi Website=https://mate-desktop.org diff --git a/plugins/trailsave/Makefile.am b/plugins/trailsave/Makefile.am index d9ef3225..45e80ab3 100644 --- a/plugins/trailsave/Makefile.am +++ b/plugins/trailsave/Makefile.am @@ -16,11 +16,11 @@ libtrailsave_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) libtrailsave_la_LIBADD = $(PLUMA_LIBS) plugin_in_files = trailsave.plugin.desktop.in - -%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + EXTRA_DIST = $(plugin_in_files) CLEANFILES = $(plugin_DATA) diff --git a/plugins/trailsave/trailsave.plugin.desktop.in b/plugins/trailsave/trailsave.plugin.desktop.in index f623ebcb..011de4d4 100644 --- a/plugins/trailsave/trailsave.plugin.desktop.in +++ b/plugins/trailsave/trailsave.plugin.desktop.in @@ -1,8 +1,8 @@ [Plugin] Module=trailsave IAge=2 -_Name=Save Without Trailing Spaces -_Description=Removes trailing spaces from lines before saving. +Name=Save Without Trailing Spaces +Description=Removes trailing spaces from lines before saving. Icon=edit-cut Authors=Marty Mills Copyright=Copyright © 2015 Marty Mills diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 00000000..c03ef084 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,79 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --keyword=Description --add-comments=Translators: + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = MATE Desktop Environment team + +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes +$(DOMAIN).pot-update: export GETTEXTDATADIRS = $(top_srcdir) diff --git a/po/POTFILES.in b/po/POTFILES.in index 479928b7..28459064 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,16 +1,15 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -[encoding: UTF-8] -[type: gettext/gsettings]data/org.mate.pluma.gschema.xml.in +data/org.mate.pluma.gschema.xml.in data/pluma.appdata.xml.in data/pluma.desktop.in.in pluma/dialogs/pluma-close-confirmation-dialog.c pluma/dialogs/pluma-encodings-dialog.c -[type: gettext/glade]pluma/dialogs/pluma-encodings-dialog.ui +pluma/dialogs/pluma-encodings-dialog.ui pluma/dialogs/pluma-preferences-dialog.c -[type: gettext/glade]pluma/dialogs/pluma-preferences-dialog.ui +pluma/dialogs/pluma-preferences-dialog.ui pluma/dialogs/pluma-search-dialog.c -[type: gettext/glade]pluma/dialogs/pluma-search-dialog.ui +pluma/dialogs/pluma-search-dialog.ui pluma/pluma.c pluma/pluma-app.c pluma/pluma-commands-file.c @@ -32,7 +31,7 @@ pluma/pluma-panel.c pluma/pluma-plugins-engine.c pluma/pluma-prefs-manager.c pluma/pluma-print-job.c -[type: gettext/glade]pluma/pluma-print-preferences.ui +pluma/pluma-print-preferences.ui pluma/pluma-print-preview.c pluma/pluma-progress-message-area.c pluma/pluma-smart-charset-converter.c @@ -48,7 +47,7 @@ pluma/pluma-window.c plugins/changecase/changecase.plugin.desktop.in plugins/changecase/pluma-changecase-plugin.c plugins/docinfo/docinfo.plugin.desktop.in -[type: gettext/glade]plugins/docinfo/docinfo.ui +plugins/docinfo/docinfo.ui plugins/docinfo/pluma-docinfo-plugin.c plugins/externaltools/externaltools.plugin.desktop.in plugins/externaltools/tools/__init__.py @@ -56,7 +55,7 @@ plugins/externaltools/tools/capture.py plugins/externaltools/tools/functions.py plugins/externaltools/tools/manager.py plugins/externaltools/tools/outputpanel.py -[type: gettext/glade]plugins/externaltools/tools/tools.ui +plugins/externaltools/tools/tools.ui plugins/externaltools/data/build.desktop.in plugins/externaltools/data/open-terminal-here.desktop.in plugins/externaltools/data/remove-trailing-spaces.desktop.in @@ -64,7 +63,7 @@ plugins/externaltools/data/run-command.desktop.in plugins/externaltools/data/search-recursive.desktop.in plugins/externaltools/data/switch-c.desktop.in plugins/filebrowser/filebrowser.plugin.desktop.in -[type: gettext/gsettings]plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in +plugins/filebrowser/org.mate.pluma.plugins.filebrowser.gschema.xml.in plugins/filebrowser/pluma-file-bookmarks-store.c plugins/filebrowser/pluma-file-browser-plugin.c plugins/filebrowser/pluma-file-browser-store.c @@ -74,12 +73,12 @@ plugins/filebrowser/pluma-file-browser-widget.c plugins/modelines/modelines.plugin.desktop.in plugins/pythonconsole/pythonconsole.plugin.desktop.in plugins/pythonconsole/pythonconsole/__init__.py -[type: gettext/glade]plugins/pythonconsole/pythonconsole/config.ui +plugins/pythonconsole/pythonconsole/config.ui plugins/quickopen/quickopen/popup.py plugins/quickopen/quickopen/windowhelper.py plugins/quickopen/quickopen.plugin.desktop.in plugins/snippets/snippets.plugin.desktop.in -[type: gettext/glade]plugins/snippets/snippets/snippets.ui +plugins/snippets/snippets/snippets.ui plugins/snippets/snippets/Document.py plugins/snippets/snippets/WindowHelper.py plugins/snippets/snippets/Manager.py @@ -88,17 +87,17 @@ plugins/snippets/snippets/Importer.py plugins/snippets/snippets/Placeholder.py plugins/sort/pluma-sort-plugin.c plugins/sort/sort.plugin.desktop.in -[type: gettext/glade]plugins/sort/sort.ui -[type: gettext/gsettings]plugins/spell/org.mate.pluma.plugins.spell.gschema.xml.in +plugins/sort/sort.ui +plugins/spell/org.mate.pluma.plugins.spell.gschema.xml.in plugins/spell/pluma-automatic-spell-checker.c plugins/spell/pluma-spell-checker.c plugins/spell/pluma-spell-checker-dialog.c plugins/spell/pluma-spell-checker-language.c plugins/spell/pluma-spell-language-dialog.c plugins/spell/pluma-spell-plugin.c -[type: gettext/glade]plugins/spell/languages-dialog.ui -[type: gettext/glade]plugins/spell/spell-checker.ui -[type: gettext/glade]plugins/spell/pluma-spell-setup-dialog.ui +plugins/spell/languages-dialog.ui +plugins/spell/spell-checker.ui +plugins/spell/pluma-spell-setup-dialog.ui plugins/spell/spell.plugin.desktop.in plugins/taglist/pluma-taglist-plugin.c plugins/taglist/pluma-taglist-plugin-panel.c @@ -108,9 +107,9 @@ plugins/taglist/Latex.tags.xml.in plugins/taglist/taglist.plugin.desktop.in plugins/taglist/XSLT.tags.xml.in plugins/taglist/XUL.tags.xml.in -[type: gettext/gsettings]plugins/time/org.mate.pluma.plugins.time.gschema.xml.in +plugins/time/org.mate.pluma.plugins.time.gschema.xml.in plugins/time/pluma-time-plugin.c plugins/time/time.plugin.desktop.in plugins/trailsave/trailsave.plugin.desktop.in -[type: gettext/glade]plugins/time/pluma-time-dialog.ui -[type: gettext/glade]plugins/time/pluma-time-setup-dialog.ui +plugins/time/pluma-time-dialog.ui +plugins/time/pluma-time-setup-dialog.ui diff --git a/tools/plugin_template/Makefile.am b/tools/plugin_template/Makefile.am index cf14f903..32569edd 100644 --- a/tools/plugin_template/Makefile.am +++ b/tools/plugin_template/Makefile.am @@ -22,11 +22,11 @@ uidir = $(PLUMA_PLUGINS_DATA_DIR)/##(PLUGIN_MODULE) ui_DATA = plugin_in_files = ##(PLUGIN_MODULE).pluma-plugin.desktop.in - -%.pluma-plugin: %.pluma-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - plugin_DATA = $(plugin_in_files:.pluma-plugin.desktop.in=.pluma-plugin) +$(plugin_DATA): $(plugin_in_files) + $(AM_V_GEN) $(MSGFMT) --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@ + EXTRA_DIST = $(plugin_in_files) CLEANFILES = $(plugin_DATA) $(ui_DATA) -- cgit v1.2.1