summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--capplets/about-me/Makefile.am4
-rw-r--r--capplets/about-me/mate-about-me.desktop.in6
-rw-r--r--capplets/accessibility/at-properties/Makefile.am5
-rw-r--r--capplets/accessibility/at-properties/mate-at-properties.desktop.in6
-rw-r--r--capplets/appearance/data/Makefile.am9
-rw-r--r--capplets/appearance/data/mate-appearance-properties.desktop.in6
-rw-r--r--capplets/appearance/data/mate-theme-installer.desktop.in6
-rw-r--r--capplets/default-applications/Makefile.am4
-rw-r--r--capplets/default-applications/mate-default-applications-properties.desktop.in6
-rw-r--r--capplets/display/Makefile.am10
-rw-r--r--capplets/display/mate-display-properties.desktop.in6
-rw-r--r--capplets/display/org.mate.randr.policy.in4
-rw-r--r--capplets/keybindings/Makefile.am7
-rw-r--r--capplets/keybindings/mate-keybinding.desktop.in6
-rw-r--r--capplets/keyboard/Makefile.am5
-rw-r--r--capplets/keyboard/mate-keyboard.desktop.in6
-rw-r--r--capplets/mouse/Makefile.am5
-rw-r--r--capplets/mouse/mate-settings-mouse.desktop.in6
-rw-r--r--capplets/network/Makefile.am5
-rw-r--r--capplets/network/mate-network-properties.desktop.in6
-rw-r--r--capplets/time-admin/data/Makefile.am5
-rw-r--r--capplets/time-admin/data/mate-time-admin.desktop.in6
-rw-r--r--capplets/windows/Makefile.am5
-rw-r--r--capplets/windows/mate-window-properties.desktop.in6
-rw-r--r--configure.ac6
-rw-r--r--font-viewer/Makefile.am6
-rw-r--r--font-viewer/mate-font-viewer.desktop.in6
-rw-r--r--its/marco-keybindings.its14
-rw-r--r--its/marco-keybindings.loc6
-rw-r--r--its/mimeinfo.its7
-rw-r--r--its/mimeinfo.loc6
-rw-r--r--po/Makevars79
-rw-r--r--po/POTFILES.in39
-rw-r--r--shell/Makefile.am12
-rw-r--r--shell/matecc.desktop.in8
-rw-r--r--shell/matecc.directory.desktop.in6
-rw-r--r--shell/matecc.directory.in5
38 files changed, 244 insertions, 98 deletions
diff --git a/Makefile.am b/Makefile.am
index c99db1e6..4aaa856e 100644
--- 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
index 8a872e7a..0ce7d84f 100644
--- 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
index 71d3f704..d211f369 100644
--- 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
index 370d459e..d845ba31 100644
--- 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
index e07d332a..3a85634c 100644
--- 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
index 4941da96..fc78ee53 100644
--- a/capplets/appearance/data/Makefile.am
+++ b/capplets/appearance/data/Makefile.am
@@ -17,15 +17,13 @@ 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
@@ -33,6 +31,9 @@ xml_in_files = \
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
index b984155a..5dd10d5d 100644
--- 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
index 0c9fc718..557b2fde 100644
--- 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
index a8d21f8b..d00cd389 100644
--- 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
index 072dd304..677e5eba 100644
--- 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
index 058e206d..c5e92882 100644
--- 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
index 59de1d13..8e99251b 100644
--- 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
index 0024d822..880449bb 100644
--- 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
index 022e006f..efa8c919 100644
--- 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
index d154d342..b67aad9b 100644
--- 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
index 7a9858ad..0581eee6 100644
--- 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
index e7458a41..97987aa8 100644
--- 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
index 8ba2fd12..8494f986 100644
--- 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
index d309131e..0cfa1e6e 100644
--- 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
index 7ac02281..90abdf1a 100644
--- 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
index 5c2d2963..4d042578 100644
--- 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
index c6d7f65b..f9a03573 100644
--- 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
index 5f8de5a6..bc08e122 100644
--- 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;
diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am
index 63f75fbb..92175d2c 100644
--- a/capplets/windows/Makefile.am
+++ b/capplets/windows/Makefile.am
@@ -10,12 +10,13 @@ mate_window_properties_SOURCES = \
mate-metacity-support.c \
mate-window-properties.c
-@INTLTOOL_DESKTOP_RULE@
-
desktopdir = $(datadir)/applications
Desktop_in_files = mate-window-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 = $(MATECC_CAPPLETS_CFLAGS) \
-DUIDIR=\""$(uidir)"\" \
-DPIXMAPDIR=\""$(pixmapdir)"\"
diff --git a/capplets/windows/mate-window-properties.desktop.in b/capplets/windows/mate-window-properties.desktop.in
index 49d2bc76..bf1f0557 100644
--- a/capplets/windows/mate-window-properties.desktop.in
+++ b/capplets/windows/mate-window-properties.desktop.in
@@ -1,11 +1,13 @@
[Desktop Entry]
-_Name=Windows
-_Comment=Set your window properties
+Name=Windows
+Comment=Set your window properties
Exec=mate-window-properties
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=preferences-system-windows
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;window;manager;properties;marco;preferences;
OnlyShowIn=MATE;
diff --git a/configure.ac b/configure.ac
index bfdc261e..56addc03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,15 +27,13 @@ fi
changequote([,])dnl
# Internationalization support
-
-IT_PROG_INTLTOOL([0.50.1])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE=mate-control-center
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
-AM_GLIB_GNU_GETTEXT
-
# GLIB_COMPILE_RESOURCES
AC_ARG_VAR([GLIB_COMPILE_RESOURCES],[glib-compile-resources bin])
diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am
index b71ed500..dad9d5ac 100644
--- a/font-viewer/Makefile.am
+++ b/font-viewer/Makefile.am
@@ -34,6 +34,8 @@ thumbnailer_DATA = mate-font-viewer.thumbnailer
desktopdir = $(datadir)/applications
desktop_in_files = mate-font-viewer.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 $@
install-data-local: install-desktop-database
@@ -43,10 +45,6 @@ install-desktop-database: install-desktopDATA
uninstall-local:
rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache
-@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_DIRECTORY_RULE@
-@INTLTOOL_SCHEMAS_RULE@
-
CLEANFILES = $(desktop_DATA) \
$(schemas_DATA) $(directory_DATA)
diff --git a/font-viewer/mate-font-viewer.desktop.in b/font-viewer/mate-font-viewer.desktop.in
index de4993a4..537f83c0 100644
--- a/font-viewer/mate-font-viewer.desktop.in
+++ b/font-viewer/mate-font-viewer.desktop.in
@@ -1,6 +1,7 @@
[Desktop Entry]
-_Name=MATE Font Viewer
-_Comment=View fonts on your system
+Name=MATE Font Viewer
+Comment=View fonts on your system
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=preferences-desktop-font
Exec=mate-font-viewer %u
Terminal=false
@@ -8,4 +9,5 @@ Type=Application
StartupNotify=true
Categories=GTK;Utility;
MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf;
+# 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;font;viewer;preview;desktop;preferences;
diff --git a/its/marco-keybindings.its b/its/marco-keybindings.its
new file mode 100644
index 00000000..c769dbf4
--- /dev/null
+++ b/its/marco-keybindings.its
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+ xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0"
+ version="2.0">
+ <its:translateRule selector="/KeyListEntries" translate="no"/>
+ <its:translateRule selector="/KeyListEntries/@name" translate="yes"/>
+ <its:translateRule selector="//KeyListEntry/@description" translate="yes"/>
+
+ <gt:contextRule selector="//KeyListEntry[@msgctxt]" contextPointer="@msgctxt"/>
+
+ <!-- Extracted strings are consumed by the library and are never
+ merged back; we don't want to escape special characters. -->
+ <gt:escapeRule selector="/KeyListEntries" escape="no"/>
+</its:rules>
diff --git a/its/marco-keybindings.loc b/its/marco-keybindings.loc
new file mode 100644
index 00000000..13ad7d66
--- /dev/null
+++ b/its/marco-keybindings.loc
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<locatingRules>
+ <locatingRule name="MarcoKeybindings" pattern="*.xml">
+ <documentRule localName="KeyListEntries" target="marco-keybindings.its"/>
+ </locatingRule>
+</locatingRules>
diff --git a/its/mimeinfo.its b/its/mimeinfo.its
new file mode 100644
index 00000000..80a1b56d
--- /dev/null
+++ b/its/mimeinfo.its
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+ xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0"
+ version="2.0">
+ <its:translateRule selector="/mime-info" translate="no"/>
+ <its:translateRule selector="///@comment" translate="yes"/>
+</its:rules>
diff --git a/its/mimeinfo.loc b/its/mimeinfo.loc
new file mode 100644
index 00000000..ae6a7e47
--- /dev/null
+++ b/its/mimeinfo.loc
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<locatingRules>
+ <locatingRule name="MimeInfo" pattern="*.xml">
+ <documentRule localName="mime-info" target="mimeinfo.its"/>
+ </locatingRule>
+</locatingRules>
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..31f6faf1
--- /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 --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 5369264b..93215507 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,17 +1,16 @@
# Add files with translateable strings here.
# Please keep this file sorted alphabetically.
-[encoding: UTF-8]
-[type: gettext/gsettings]org.mate.control-center.gschema.xml.in
-[type: gettext/gsettings]org.mate.control-center.keybinding.gschema.xml.in
+org.mate.control-center.gschema.xml.in
+org.mate.control-center.keybinding.gschema.xml.in
capplets/about-me/e-image-chooser.c
capplets/about-me/mate-about-me.c
-[type: gettext/glade]capplets/about-me/mate-about-me-dialog.ui
+capplets/about-me/mate-about-me-dialog.ui
capplets/about-me/mate-about-me.desktop.in
capplets/about-me/mate-about-me-fingerprint.c
-[type: gettext/glade]capplets/about-me/mate-about-me-fingerprint.ui
+capplets/about-me/mate-about-me-fingerprint.ui
capplets/about-me/mate-about-me-password.c
-[type: gettext/glade]capplets/about-me/mate-about-me-password.ui
-[type: gettext/glade]capplets/accessibility/at-properties/at-enable-dialog.ui
+capplets/about-me/mate-about-me-password.ui
+capplets/accessibility/at-properties/at-enable-dialog.ui
capplets/accessibility/at-properties/mate-at-properties.desktop.in
capplets/accessibility/at-properties/main.c
capplets/appearance/appearance-desktop.c
@@ -19,7 +18,7 @@ capplets/appearance/appearance-font.c
capplets/appearance/appearance-main.c
capplets/appearance/appearance-style.c
capplets/appearance/appearance-themes.c
-[type: gettext/glade]capplets/appearance/data/appearance.ui
+capplets/appearance/data/appearance.ui
capplets/appearance/data/mate-appearance-properties.desktop.in
capplets/appearance/data/mate-theme-installer.desktop.in
capplets/appearance/data/mate-theme-package.xml.in
@@ -35,8 +34,8 @@ capplets/common/mate-theme-info.c
capplets/common/theme-thumbnail.c
capplets/default-applications/mate-default-applications-properties.desktop.in
capplets/default-applications/mate-da-capplet.c
-[type: gettext/glade]capplets/default-applications/mate-default-applications-properties.ui
-[type: gettext/glade]capplets/display/display-capplet.ui
+capplets/default-applications/mate-default-applications-properties.ui
+capplets/display/display-capplet.ui
capplets/display/mate-display-properties.desktop.in
capplets/display/mate-display-properties-install-systemwide.c
capplets/display/org.mate.randr.policy.in
@@ -45,14 +44,14 @@ capplets/keybindings/00-multimedia-key.xml.in
capplets/keybindings/01-desktop-key.xml.in
capplets/keybindings/eggcellrendererkeys.c
capplets/keybindings/mate-keybinding-properties.c
-[type: gettext/glade]capplets/keybindings/mate-keybinding-properties.ui
+capplets/keybindings/mate-keybinding-properties.ui
capplets/keybindings/mate-keybinding.desktop.in
capplets/keyboard/mate-keyboard-properties.c
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-dialog.ui
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-model-chooser.ui
-[type: gettext/glade]capplets/keyboard/mate-keyboard-properties-options-dialog.ui
+capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui
+capplets/keyboard/mate-keyboard-properties-dialog.ui
+capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
+capplets/keyboard/mate-keyboard-properties-model-chooser.ui
+capplets/keyboard/mate-keyboard-properties-options-dialog.ui
capplets/keyboard/mate-keyboard-properties-xkb.c
capplets/keyboard/mate-keyboard-properties-xkbltadd.c
capplets/keyboard/mate-keyboard-properties-xkblt.c
@@ -61,16 +60,16 @@ capplets/keyboard/mate-keyboard-properties-xkbot.c
capplets/keyboard/mate-keyboard-properties-xkbpv.c
capplets/keyboard/mate-keyboard.desktop.in
capplets/mouse/mate-mouse-properties.c
-[type: gettext/glade]capplets/mouse/mate-mouse-properties.ui
+capplets/mouse/mate-mouse-properties.ui
capplets/mouse/mate-settings-mouse.desktop.in
capplets/network/mate-network-properties.c
capplets/network/mate-network-properties.desktop.in
-[type: gettext/glade]capplets/network/mate-network-properties.ui
+capplets/network/mate-network-properties.ui
capplets/windows/mate-metacity-support.c
capplets/windows/mate-window-properties.c
capplets/windows/mate-window-properties.desktop.in
capplets/time-admin/src/main.c
-[type: gettext/glade]capplets/time-admin/src/time-admin.ui
+capplets/time-admin/src/time-admin.ui
capplets/time-admin/src/time-map.c
capplets/time-admin/src/time-tool.c
capplets/time-admin/src/time-share.c
@@ -81,7 +80,7 @@ libwindow-settings/mate-wm-manager.c
libwindow-settings/marco-window-manager.c
shell/control-center.c
shell/matecc.desktop.in
-shell/matecc.directory.in
+shell/matecc.directory.desktop.in
typing-break/drw-break-window.c
typing-break/drwright.c
typing-break/main.c
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 5d87e4aa..e2f81ba8 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -19,17 +19,19 @@ mate_control_center_LDADD = \
sysdir = $(datadir)/applications
sys_in_files = matecc.desktop.in
sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(sys_DATA): $(sys_in_files)
+ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
directorydir = $(datadir)/desktop-directories
-directory_in_files = matecc.directory.in
-directory_DATA = $(directory_in_files:.directory.in=.directory)
-@INTLTOOL_DIRECTORY_RULE@
+directory_in_files = matecc.directory.desktop.in
+directory_DATA = $(directory_in_files:.directory.desktop.in=.directory)
+$(directory_DATA): $(directory_in_files)
+ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
menudir = $(sysconfdir)/xdg/menus
menu_DATA = matecc.menu
-EXTRA_DIST = $(sys_in_files) matecc.directory.in matecc.menu
+EXTRA_DIST = $(sys_in_files) matecc.directory.desktop.in matecc.menu
DISTCLEANFILES = $(sys_DATA) matecc.directory
diff --git a/shell/matecc.desktop.in b/shell/matecc.desktop.in
index 9b1b4c22..c0d6d40a 100644
--- a/shell/matecc.desktop.in
+++ b/shell/matecc.desktop.in
@@ -1,12 +1,14 @@
[Desktop Entry]
-_Name=Control Center
-_GenericName=The MATE configuration tool
-_Comment=Configure MATE settings
+Name=Control Center
+GenericName=The MATE configuration tool
+Comment=Configure MATE settings
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=preferences-desktop
Exec=mate-control-center
Terminal=false
Type=Application
StartupNotify=false
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;configuration;tool;destop;preferences;
OnlyShowIn=MATE;
diff --git a/shell/matecc.directory.desktop.in b/shell/matecc.directory.desktop.in
new file mode 100644
index 00000000..003f4507
--- /dev/null
+++ b/shell/matecc.directory.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Control Center
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=mate-settings
+Type=Directory
+
diff --git a/shell/matecc.directory.in b/shell/matecc.directory.in
deleted file mode 100644
index d95757b7..00000000
--- a/shell/matecc.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-_Name=Control Center
-Icon=mate-settings
-Type=Directory
-