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 --- plugins/externaltools/Makefile.am | 5 +++-- plugins/externaltools/data/Makefile.am | 3 ++- plugins/externaltools/data/build.desktop.in | 4 ++-- plugins/externaltools/data/open-terminal-here.desktop.in | 4 ++-- plugins/externaltools/data/remove-trailing-spaces.desktop.in | 4 ++-- plugins/externaltools/data/run-command.desktop.in | 4 ++-- plugins/externaltools/data/search-recursive.desktop.in | 2 +- plugins/externaltools/data/switch-c.desktop.in | 2 +- plugins/externaltools/externaltools.plugin.desktop.in | 4 ++-- 9 files changed, 17 insertions(+), 15 deletions(-) (limited to 'plugins/externaltools') 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 -- cgit v1.2.1