migrate from intltool to gettext

mate-desktop · Nov 7, 2019 · 235e8ed · 235e8ed
1 parent 0470814
commit 235e8ed
Show file tree

Hide file tree

Showing 38 changed files with 244 additions and 98 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -13,7 +13,6 @@ if HAVE_TYPING_BREAK
 SUBDIRS += typing-break
 endif
 
-@INTLTOOL_XML_NOMERGE_RULE@
 gsettingsschema_in_files = \
 	org.mate.control-center.gschema.xml.in \
 	org.mate.control-center.keybinding.gschema.xml.in
@@ -48,6 +47,7 @@ MAINTAINERCLEANFILES = \
 
 EXTRA_DIST = \
 	autogen.sh \
+	its	\
 	$(gsettingsschema_in_files)
 
 DISTCHECK_CONFIGURE_FLAGS = \

diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
@@ -32,10 +32,10 @@ mate_about_me_LDADD += $(ACCOUNTSSERVICE_LIBS)
 endif
 mate_about_me_LDFLAGS = -export-dynamic
 
-@INTLTOOL_DESKTOP_RULE@
-
 desktopdir = $(datadir)/applications
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+$(desktop_DATA): $(Desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 include $(top_srcdir)/gla11y.mk
 

diff --git a/capplets/about-me/mate-about-me.desktop.in b/capplets/about-me/mate-about-me.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=About Me
-_Comment=Set your personal information
+Name=About Me
+Comment=Set your personal information
 Exec=mate-about-me
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=user-info
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;X-MATE-PersonalSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;personal;information;
 OnlyShowIn=MATE;
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
@@ -13,12 +13,13 @@ mate_at_properties_SOURCES = \
 	main.c
 mate_at_properties_LDFLAGS = -export-dynamic
 
-@INTLTOOL_DESKTOP_RULE@
-
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-at-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
+$(desktop_DATA): $(Desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 pixmapdir  = $(pkgdatadir)/pixmaps
 pixmap_DATA =					\
 	at-startup.png				\

diff --git a/capplets/accessibility/at-properties/mate-at-properties.desktop.in b/capplets/accessibility/at-properties/mate-at-properties.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Assistive Technologies
-_Comment=Choose which accessibility features to enable when you log in
+Name=Assistive Technologies
+Comment=Choose which accessibility features to enable when you log in
 Exec=mate-at-properties
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=preferences-desktop-accessibility
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;Accessibility;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;accessibility;features;
 OnlyShowIn=MATE;
diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am
@@ -17,22 +17,23 @@ dist_pixmap_DATA = \
         mouse-cursor-white.png \
         mouse-cursor-white-large.png
 
-@INTLTOOL_DESKTOP_RULE@
-
 desktopdir = $(datadir)/applications
 desktop_in_files = \
 	mate-appearance-properties.desktop.in \
 	mate-theme-installer.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_XML_RULE@
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 xml_in_files = \
 	mate-theme-package.xml.in
 
 mimedir = $(datadir)/mime/packages
 mime_DATA = $(xml_in_files:.xml.in=.xml)
 
+$(mime_DATA): $(xml_in_files)
+	$(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 install-data-hook:
 if ENABLE_UPDATE_MIMEDB
 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"

diff --git a/capplets/appearance/data/mate-appearance-properties.desktop.in b/capplets/appearance/data/mate-appearance-properties.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Appearance
-_Comment=Customize the look of the desktop
+Name=Appearance
+Comment=Customize the look of the desktop
 Exec=mate-appearance-properties %F
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Icon=preferences-desktop-theme
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;DesktopSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;appearance;properties;desktop;customize;look;
 OnlyShowIn=MATE;
diff --git a/capplets/appearance/data/mate-theme-installer.desktop.in b/capplets/appearance/data/mate-theme-installer.desktop.in
@@ -1,13 +1,15 @@
 [Desktop Entry]
-_Name=Theme Installer
-_Comment=Installs themes packages for various parts of the desktop
+Name=Theme Installer
+Comment=Installs themes packages for various parts of the desktop
 Exec=mate-appearance-properties -i %u
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=preferences-desktop-theme
 Terminal=false
 Type=Application
 MimeType=application/x-mate-theme-package;
 StartupNotify=true
 Categories=GTK;Settings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;install;desktop;themes;
 NoDisplay=true
 OnlyShowIn=MATE;
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
@@ -17,13 +17,13 @@ nodist_mate_default_applications_properties_SOURCES = \
 mate_default_applications_properties_SOURCES = \
 	mate-da-capplet.c mate-da-capplet.h
 
-@INTLTOOL_DESKTOP_RULE@
-
 include $(top_srcdir)/gla11y.mk
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-default-applications-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+$(desktop_DATA): $(Desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = mate-default-applications.pc

diff --git a/capplets/default-applications/mate-default-applications-properties.desktop.in b/capplets/default-applications/mate-default-applications-properties.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Preferred Applications
-_Comment=Select your default applications
+Name=Preferred Applications
+Comment=Select your default applications
 Exec=mate-default-applications-properties
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=preferences-desktop-default-applications
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;X-MATE-PersonalSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;default;preferred;applications;
 OnlyShowIn=MATE;
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
@@ -37,16 +37,16 @@ polkit_policydir = $(datadir)/polkit-1/actions
 dist_polkit_policy_DATA =					\
 	org.mate.randr.policy
 
-# You will need a recent intltool or the patch from this bug
-# http://bugzilla.gnome.org/show_bug.cgi?id=462312
-@INTLTOOL_POLICY_RULE@
-
-@INTLTOOL_DESKTOP_RULE@
+%.policy: %.policy.in
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-display-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
+$(desktop_DATA): $(Desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 AM_CPPFLAGS   = $(DISPLAY_CAPPLET_CFLAGS) \
              $(MATECC_CAPPLETS_CFLAGS) \
 	     -DSBINDIR="\"$(sbindir)\"" \

diff --git a/capplets/display/mate-display-properties.desktop.in b/capplets/display/mate-display-properties.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Displays
-_Comment=Change resolution and position of monitors and projectors
+Name=Displays
+Comment=Change resolution and position of monitors and projectors
 Exec=mate-display-properties
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=preferences-desktop-display
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;HardwareSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;resolution;position;monitors;display;properties;
 OnlyShowIn=MATE;
diff --git a/capplets/display/org.mate.randr.policy.in b/capplets/display/org.mate.randr.policy.in
@@ -14,8 +14,8 @@
   <icon_name>mate-display-properties</icon_name>
 
   <action id="org.mate.randr.install-system-wide">
-    <_description>Install multi-monitor settings for the whole system</_description>
-    <_message>Authentication is required to install multi-monitor settings for all users</_message>
+    <description>Install multi-monitor settings for the whole system</description>
+    <message>Authentication is required to install multi-monitor settings for all users</message>
     <icon_name>mate-display-properties</icon_name>
     <defaults>
       <allow_any>no</allow_any>

diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
@@ -16,20 +16,21 @@ mate_keybinding_properties_SOURCES = \
 	eggaccelerators.c \
 	eggaccelerators.h
 
-@INTLTOOL_DESKTOP_RULE@
-
 include $(top_srcdir)/gla11y.mk
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-keybinding.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-@INTLTOOL_XML_NOMERGE_RULE@
+$(desktop_DATA): $(Desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 xmldir = $(pkgdatadir)/keybindings
 xml_in_files = 00-multimedia-key.xml.in 01-desktop-key.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
+$(xml_DATA): $(xml_in_files)
+	$(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = mate-keybindings.pc
 

diff --git a/capplets/keybindings/mate-keybinding.desktop.in b/capplets/keybindings/mate-keybinding.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Keyboard Shortcuts
-_Comment=Assign shortcut keys to commands
+Name=Keyboard Shortcuts
+Comment=Assign shortcut keys to commands
 Exec=mate-keybinding-properties
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=preferences-desktop-keyboard-shortcuts
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;HardwareSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;assign;keyboard;shortcuts;keybindings;
 OnlyShowIn=MATE;
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
@@ -27,14 +27,15 @@ mate_keyboard_properties_SOURCES = \
 
 mate_keyboard_properties_LDADD = $(MATECC_CAPPLETS_LIBS) $(LIBMATEKBDUI_LIBS)
 
-@INTLTOOL_DESKTOP_RULE@
-
 include $(top_srcdir)/gla11y.mk
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-keyboard.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
+$(desktop_DATA): $(Desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 mate-keyboard-properties-resources.h mate-keyboard-properties-resources.c: org.mate.mcc.keyboard.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.keyboard.gresource.xml)
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name keyboard $<
 

diff --git a/capplets/keyboard/mate-keyboard.desktop.in b/capplets/keyboard/mate-keyboard.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Keyboard
-_Comment=Set your keyboard preferences
+Name=Keyboard
+Comment=Set your keyboard preferences
 Exec=mate-keyboard-properties
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=input-keyboard
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;HardwareSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;keyboard;preferences;
 OnlyShowIn=MATE;
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
@@ -14,14 +14,15 @@ mate_mouse_properties_SOURCES =	\
 	msd-input-helper.c	\
 	msd-input-helper.h
 
-@INTLTOOL_DESKTOP_RULE@
-
 include $(top_srcdir)/gla11y.mk
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = mate-settings-mouse.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
+$(desktop_DATA): $(Desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 mate-mouse-properties-resources.h mate-mouse-properties-resources.c: org.mate.mcc.mouse.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.mouse.gresource.xml)
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name mouse $<
 

diff --git a/capplets/mouse/mate-settings-mouse.desktop.in b/capplets/mouse/mate-settings-mouse.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Mouse
-_Comment=Set your mouse preferences
+Name=Mouse
+Comment=Set your mouse preferences
 Exec=mate-mouse-properties
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=input-mouse
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;HardwareSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;mouse;preferences;
 OnlyShowIn=MATE;
diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am
@@ -11,14 +11,15 @@ nodist_mate_network_properties_SOURCES = \
 mate_network_properties_SOURCES = mate-network-properties.c
 mate_network_properties_LDADD = $(MATECC_CAPPLETS_LIBS)
 
-@INTLTOOL_DESKTOP_RULE@
-
 include $(top_srcdir)/gla11y.mk
 
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-network-properties.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 mate-network-properties-resources.h mate-network-properties-resources.c: org.mate.mcc.network.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.network.gresource.xml)
 	$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name network $<
 

diff --git a/capplets/network/mate-network-properties.desktop.in b/capplets/network/mate-network-properties.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Network Proxy
-_Comment=Set your network proxy preferences
+Name=Network Proxy
+Comment=Set your network proxy preferences
 Exec=mate-network-properties
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=network-server
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Settings;X-MATE-NetworkSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;network;http;socks;proxy;
 OnlyShowIn=MATE;
diff --git a/capplets/time-admin/data/Makefile.am b/capplets/time-admin/data/Makefile.am
@@ -23,12 +23,13 @@ map/timezone_12.75_dim.png  map/timezone_-3.png        map/timezone_-6_dim.png
 map/timezone_12.75.png      map/timezone_3.png         map/timezone_6_dim.png     map/timezone_9.png \
 map/timezone_12_dim.png     map/timezone_-4.5_dim.png  map/timezone_-6.png
 
-@INTLTOOL_DESKTOP_RULE@
-
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-time-admin.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 CLEANFILES = $(desktop_DATA)
 EXTRA_DIST = \
     $(desktop_in_files)

diff --git a/capplets/time-admin/data/mate-time-admin.desktop.in b/capplets/time-admin/data/mate-time-admin.desktop.in
@@ -1,11 +1,13 @@
 [Desktop Entry]
-_Name=Time And Date Manager
-_Comment=Setting the time and date of the local system
+Name=Time And Date Manager
+Comment=Setting the time and date of the local system
 Terminal=false
 Type=Application
 Exec=mate-time-admin
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=preferences-system-time
 StartupNotify=true
 Categories=GTK;Settings;HardwareSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=mate-control-center;MATE;clock;date;time;preferences;
 OnlyShowIn=MATE;