From fe31c9defdc7f69d1e33bcef19cc5ade65da9a4a Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Wed, 15 May 2019 19:04:00 +0800 Subject: migrate intltool to gettext --- data/Makefile.am | 8 ++++++-- data/caja-autorun-software.desktop.in | 2 +- data/caja-browser.desktop.in | 6 +++--- data/caja-computer.desktop.in | 4 ++-- data/caja-file-management-properties.desktop.in | 4 ++-- data/caja-folder-handler.desktop.in | 4 ++-- data/caja-home.desktop.in | 4 ++-- data/caja.appdata.xml.in | 6 +++--- data/caja.desktop.in | 4 ++-- data/caja.xml.in | 2 +- 10 files changed, 24 insertions(+), 20 deletions(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 42a9dea2..92d6e824 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,8 @@ NULL = xml_in_files = caja.xml.in xml_files = $(xml_in_files:.xml.in=.xml) -@INTLTOOL_XML_RULE@ +$(xml_files): $(xml_in_files) + $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -14,7 +15,8 @@ desktop_in_files = \ caja-file-management-properties.desktop.in \ caja-browser.desktop.in \ caja-autorun-software.desktop.in -@INTLTOOL_DESKTOP_RULE@ +%.desktop: %.desktop.in + $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ mimedir = $(datadir)/mime/packages mime_DATA = $(xml_files) @@ -41,6 +43,8 @@ cajadata_DATA = \ appdatadir = $(datadir)/metainfo appdata_in_files = caja.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) +$(appdata_DATA): $(appdata_in_files) + $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(cajadata_DATA) \ caja.desktop \ diff --git a/data/caja-autorun-software.desktop.in b/data/caja-autorun-software.desktop.in index 054ef010..0db85788 100644 --- a/data/caja-autorun-software.desktop.in +++ b/data/caja-autorun-software.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Autorun Prompt +Name=Autorun Prompt TryExec=caja-autorun-software Exec=caja-autorun-software %u Icon=application-x-executable diff --git a/data/caja-browser.desktop.in b/data/caja-browser.desktop.in index 9c0a8f06..a9a40eb0 100644 --- a/data/caja-browser.desktop.in +++ b/data/caja-browser.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] -_Name=Caja -_GenericName=File Browser -_Comment=Browse the file system with the file manager +Name=Caja +GenericName=File Browser +Comment=Browse the file system with the file manager TryExec=caja Exec=caja --no-desktop --browser %U Icon=system-file-manager diff --git a/data/caja-computer.desktop.in b/data/caja-computer.desktop.in index b085e6e0..25c1ba24 100644 --- a/data/caja-computer.desktop.in +++ b/data/caja-computer.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Computer -_Comment=Browse all local and remote disks and folders accessible from this computer +Name=Computer +Comment=Browse all local and remote disks and folders accessible from this computer TryExec=caja Exec=caja --no-desktop computer: Icon=computer diff --git a/data/caja-file-management-properties.desktop.in b/data/caja-file-management-properties.desktop.in index 288a0d06..14ee8f24 100644 --- a/data/caja-file-management-properties.desktop.in +++ b/data/caja-file-management-properties.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=File Management -_Comment=Change the behaviour and appearance of file manager windows +Name=File Management +Comment=Change the behaviour and appearance of file manager windows Exec=caja-file-management-properties Icon=system-file-manager Terminal=false diff --git a/data/caja-folder-handler.desktop.in b/data/caja-folder-handler.desktop.in index e7f40676..b536bf89 100644 --- a/data/caja-folder-handler.desktop.in +++ b/data/caja-folder-handler.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Caja -_GenericName=Open Folder +Name=Caja +GenericName=Open Folder TryExec=caja Exec=caja --no-desktop %U NoDisplay=true diff --git a/data/caja-home.desktop.in b/data/caja-home.desktop.in index aa0a6f04..3aad993f 100644 --- a/data/caja-home.desktop.in +++ b/data/caja-home.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Home Folder -_Comment=Open your personal folder +Name=Home Folder +Comment=Open your personal folder TryExec=caja Exec=caja --no-desktop Icon=user-home diff --git a/data/caja.appdata.xml.in b/data/caja.appdata.xml.in index 3830c719..5f07f4b8 100644 --- a/data/caja.appdata.xml.in +++ b/data/caja.appdata.xml.in @@ -5,8 +5,8 @@ CC0-1.0 GPL-2.0+ Caja - <_summary>File manager for the MATE desktop environment - <_description> + File manager for the MATE desktop environment +

Caja is the official file manager for the MATE desktop. It allows for browsing directories, as well as previewing files and launching applications @@ -17,7 +17,7 @@ Caja is extensible through a plugin system, similar to that of GNOME Nautilus, of which Caja is a fork.

- + diff --git a/data/caja.desktop.in b/data/caja.desktop.in index 66df07bf..ce4f8340 100644 --- a/data/caja.desktop.in +++ b/data/caja.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Caja -_GenericName=File Manager +Name=Caja +GenericName=File Manager Exec=caja Icon=system-file-manager Terminal=false diff --git a/data/caja.xml.in b/data/caja.xml.in index 5d69859d..c9a908a4 100644 --- a/data/caja.xml.in +++ b/data/caja.xml.in @@ -2,7 +2,7 @@ - <_comment>Saved search + Saved search -- cgit v1.2.1