diff options
author | Ernestas Kulik <ernestask@src.gnome.org> | 2016-08-02 12:24:24 +0300 |
---|---|---|
committer | Ernestas Kulik <ernestask@src.gnome.org> | 2016-08-03 10:42:40 +0300 |
commit | fc2139c117d43e42ce4802370560ac279ea2cebd (patch) | |
tree | 0e33ae43f451a3f26e88060dde1aec6f15446ddc /data | |
parent | c76cace9e60f40648c7bb25879399451dbed2894 (diff) | |
download | nautilus-fc2139c117d43e42ce4802370560ac279ea2cebd.tar.gz |
Port from intltool
gettext has been continuously improving, up to a point where intltool
can be deprecated in favor of it. This commit ports the project files to
use upstream gettext.
https://bugzilla.gnome.org/show_bug.cgi?id=769362
Diffstat (limited to 'data')
-rw-r--r-- | data/Makefile.am | 19 | ||||
-rw-r--r-- | data/nautilus-autorun-software.desktop.in (renamed from data/nautilus-autorun-software.desktop.in.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.Nautilus.appdata.xml.in | 12 | ||||
-rw-r--r-- | data/org.gnome.Nautilus.desktop.in (renamed from data/org.gnome.Nautilus.desktop.in.in) | 8 |
4 files changed, 22 insertions, 19 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 05214a960..6d16e53b7 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,24 +5,29 @@ desktop_in_files = \ org.gnome.Nautilus.desktop.in \ nautilus-autorun-software.desktop.in -desktop_DATA = \ - $(desktop_in_files:.desktop.in=.desktop) - autostart_in_files = nautilus-autostart.desktop.in if ENABLE_DESKTOP -desktop_DATA += nautilus-classic.desktop +desktop_in_files += nautilus-classic.desktop.in autostartdir = $(sysconfdir)/xdg/autostart autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + +$(autostart_DATA): $(autostart_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ endif +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + +$(desktop_DATA): %.desktop: %.desktop.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + appdatadir = $(datadir)/appdata appdata_in_files = org.gnome.Nautilus.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) -@INTLTOOL_XML_RULE@ -@INTLTOOL_DESKTOP_RULE@ +$(appdata_DATA): $(appdata_in_files) + $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ servicedir = $(datadir)/dbus-1/services service_DATA = $(service_in_files:.service.in=.service) @@ -44,8 +49,6 @@ gsettings_SCHEMAS = org.gnome.nautilus.gschema.xml @GSETTINGS_RULES@ EXTRA_DIST = \ - org.gnome.Nautilus.desktop \ - org.gnome.Nautilus.desktop.in \ dbus-interfaces.xml \ freedesktop-dbus-interfaces.xml \ shell-search-provider-dbus-interfaces.xml \ diff --git a/data/nautilus-autorun-software.desktop.in.in b/data/nautilus-autorun-software.desktop.in index df386ef4a..9f0f32e3f 100644 --- a/data/nautilus-autorun-software.desktop.in.in +++ b/data/nautilus-autorun-software.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Run Software +Name=Run Software TryExec=nautilus-autorun-software Exec=nautilus-autorun-software %u Icon=application-x-executable diff --git a/data/org.gnome.Nautilus.appdata.xml.in b/data/org.gnome.Nautilus.appdata.xml.in index 7f9ec12cf..9ec61d52a 100644 --- a/data/org.gnome.Nautilus.appdata.xml.in +++ b/data/org.gnome.Nautilus.appdata.xml.in @@ -3,20 +3,20 @@ <id>org.gnome.Nautilus.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0+</project_license> - <_name>Nautilus</_name> - <_summary>Access and organize files</_summary> + <name>Nautilus</name> + <summary>Access and organize files</summary> <description> - <_p> + <p> Nautilus, also known as Files, is the default file manager of the GNOME desktop. It provides a simple and integrated way of managing your files and browsing your file system. - </_p> - <_p> + </p> + <p> Nautilus supports all the basic functions of a file manager and more. It can search and manage your files and folders, both locally and on a network, read and write data to and from removable media, run scripts, and launch applications. It has three views: Icon Grid, Icon List, and Tree List. Its functions can be extended with plugins and scripts. - </_p> + </p> </description> <kudos> <kudo>AppMenu</kudo> diff --git a/data/org.gnome.Nautilus.desktop.in.in b/data/org.gnome.Nautilus.desktop.in index 770b2ed83..442296ab6 100644 --- a/data/org.gnome.Nautilus.desktop.in.in +++ b/data/org.gnome.Nautilus.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] -_Name=Files -_Comment=Access and organize files -_Keywords=folder;manager;explore;disk;filesystem; +Name=Files +Comment=Access and organize files +Keywords=folder;manager;explore;disk;filesystem; Exec=nautilus --new-window %U Icon=system-file-manager Terminal=false @@ -18,5 +18,5 @@ X-GNOME-UsesNotifications=true Actions=new-window; [Desktop Action new-window] -_Name=New Window +Name=New Window Exec=nautilus --new-window |