migrate from intltools to gettext

21 files changed, 41 insertions, 40 deletions

diff --git a/desktop-directories/Makefile.am b/desktop-directories/Makefile.am
index 4bcc63c..042899d 100644
--- a/desktop-directories/Makefile.am
+++ b/desktop-directories/Makefile.am
@@ -28,7 +28,8 @@ directory_in_files = \
 
 directory_DATA = $(directory_in_files:.directory.in=.directory)
 
-@INTLTOOL_DIRECTORY_RULE@
+%.directory: %.directory.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 EXTRA_DIST= $(directory_in_files)
 
diff --git a/desktop-directories/mate-audio-video.directory.in b/desktop-directories/mate-audio-video.directory.in
index 966fda1..5e5c766 100644
--- a/desktop-directories/mate-audio-video.directory.in
+++ b/desktop-directories/mate-audio-video.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Sound & Video
-_Comment=Multimedia menu
+Name=Sound & Video
+Comment=Multimedia menu
 Icon=applications-multimedia
 Type=Directory
diff --git a/desktop-directories/mate-development.directory.in b/desktop-directories/mate-development.directory.in
index d7e9de9..225fe44 100644
--- a/desktop-directories/mate-development.directory.in
+++ b/desktop-directories/mate-development.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Programming
-_Comment=Tools for software development
+Name=Programming
+Comment=Tools for software development
 Icon=applications-development
 Type=Directory
diff --git a/desktop-directories/mate-education.directory.in b/desktop-directories/mate-education.directory.in
index 689168a..402d371 100644
--- a/desktop-directories/mate-education.directory.in
+++ b/desktop-directories/mate-education.directory.in
@@ -1,4 +1,4 @@
 [Desktop Entry]
-_Name=Education
+Name=Education
 Icon=applications-science
 Type=Directory
diff --git a/desktop-directories/mate-game.directory.in b/desktop-directories/mate-game.directory.in
index 610bbd8..3f19147 100644
--- a/desktop-directories/mate-game.directory.in
+++ b/desktop-directories/mate-game.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Games
-_Comment=Games and amusements
+Name=Games
+Comment=Games and amusements
 Icon=applications-games
 Type=Directory
diff --git a/desktop-directories/mate-graphics.directory.in b/desktop-directories/mate-graphics.directory.in
index d2b4bb6..6514673 100644
--- a/desktop-directories/mate-graphics.directory.in
+++ b/desktop-directories/mate-graphics.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Graphics
-_Comment=Graphics applications
+Name=Graphics
+Comment=Graphics applications
 Icon=applications-graphics
 Type=Directory
diff --git a/desktop-directories/mate-hardware.directory.in b/desktop-directories/mate-hardware.directory.in
index e80430e..fbff4c9 100644
--- a/desktop-directories/mate-hardware.directory.in
+++ b/desktop-directories/mate-hardware.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Hardware
-_Comment=Settings for several hardware devices
+Name=Hardware
+Comment=Settings for several hardware devices
 Icon=preferences-desktop-peripherals
 Type=Directory
diff --git a/desktop-directories/mate-internet-and-network.directory.in b/desktop-directories/mate-internet-and-network.directory.in
index a37586f..a1a9645 100644
--- a/desktop-directories/mate-internet-and-network.directory.in
+++ b/desktop-directories/mate-internet-and-network.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Internet and Network
-_Comment=Network-related settings
+Name=Internet and Network
+Comment=Network-related settings
 Icon=preferences-system-network
 Type=Directory
diff --git a/desktop-directories/mate-look-and-feel.directory.in b/desktop-directories/mate-look-and-feel.directory.in
index ad8b187..fcebf90 100644
--- a/desktop-directories/mate-look-and-feel.directory.in
+++ b/desktop-directories/mate-look-and-feel.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Look and Feel
-_Comment=Settings controlling the desktop appearance and behavior
+Name=Look and Feel
+Comment=Settings controlling the desktop appearance and behavior
 Icon=preferences-desktop
 Type=Directory
diff --git a/desktop-directories/mate-menu-applications.directory.in b/desktop-directories/mate-menu-applications.directory.in
index d4106cb..e56b3da 100644
--- a/desktop-directories/mate-menu-applications.directory.in
+++ b/desktop-directories/mate-menu-applications.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Applications
-_Comment=Applications
+Name=Applications
+Comment=Applications
 Icon=applications-other
 Type=Directory
diff --git a/desktop-directories/mate-menu-system.directory.in b/desktop-directories/mate-menu-system.directory.in
index 643f042..26ea2de 100644
--- a/desktop-directories/mate-menu-system.directory.in
+++ b/desktop-directories/mate-menu-system.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=System
-_Comment=Personal preferences and administration settings
+Name=System
+Comment=Personal preferences and administration settings
 Icon=preferences-other
 Type=Directory
diff --git a/desktop-directories/mate-network.directory.in b/desktop-directories/mate-network.directory.in
index bc88bee..f27a5a2 100644
--- a/desktop-directories/mate-network.directory.in
+++ b/desktop-directories/mate-network.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Internet
-_Comment=Programs for Internet access such as web and email
+Name=Internet
+Comment=Programs for Internet access such as web and email
 Icon=applications-internet
 Type=Directory
diff --git a/desktop-directories/mate-office.directory.in b/desktop-directories/mate-office.directory.in
index d6c8d9e..23c9e8f 100644
--- a/desktop-directories/mate-office.directory.in
+++ b/desktop-directories/mate-office.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Office
-_Comment=Office Applications
+Name=Office
+Comment=Office Applications
 Icon=applications-office
 Type=Directory
diff --git a/desktop-directories/mate-other.directory.in b/desktop-directories/mate-other.directory.in
index 898d406..ab799b7 100644
--- a/desktop-directories/mate-other.directory.in
+++ b/desktop-directories/mate-other.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Other
-_Comment=Applications that did not fit in other categories
+Name=Other
+Comment=Applications that did not fit in other categories
 Icon=applications-other
 Type=Directory
diff --git a/desktop-directories/mate-personal.directory.in b/desktop-directories/mate-personal.directory.in
index 9f11595..3bb43bb 100644
--- a/desktop-directories/mate-personal.directory.in
+++ b/desktop-directories/mate-personal.directory.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 # Translators: this is Personal as in "Personal settings"
-_Name=Personal
-_Comment=Personal settings
+Name=Personal
+Comment=Personal settings
 Icon=preferences-desktop-personal
 Type=Directory
diff --git a/desktop-directories/mate-settings-system.directory.in b/desktop-directories/mate-settings-system.directory.in
index 5dbb708..b5506e5 100644
--- a/desktop-directories/mate-settings-system.directory.in
+++ b/desktop-directories/mate-settings-system.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Directory
-_Name=Administration
-_Comment=Change system-wide settings (affects all users)
+Name=Administration
+Comment=Change system-wide settings (affects all users)
 Icon=preferences-system
diff --git a/desktop-directories/mate-settings.directory.in b/desktop-directories/mate-settings.directory.in
index 7c663a6..ed1a087 100644
--- a/desktop-directories/mate-settings.directory.in
+++ b/desktop-directories/mate-settings.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Preferences
-_Comment=Personal preferences
+Name=Preferences
+Comment=Personal preferences
 Icon=preferences-desktop
 Type=Directory
diff --git a/desktop-directories/mate-system-tools.directory.in b/desktop-directories/mate-system-tools.directory.in
index d1d85be..bf8643e 100644
--- a/desktop-directories/mate-system-tools.directory.in
+++ b/desktop-directories/mate-system-tools.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=System Tools
-_Comment=System configuration and monitoring
+Name=System Tools
+Comment=System configuration and monitoring
 Icon=applications-system
 Type=Directory
diff --git a/desktop-directories/mate-system.directory.in b/desktop-directories/mate-system.directory.in
index 9de63bf..71536de 100644
--- a/desktop-directories/mate-system.directory.in
+++ b/desktop-directories/mate-system.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=System
-_Comment=System settings
+Name=System
+Comment=System settings
 Icon=preferences-system
 Type=Directory
diff --git a/desktop-directories/mate-utility-accessibility.directory.in b/desktop-directories/mate-utility-accessibility.directory.in
index 358b3a9..042f92e 100644
--- a/desktop-directories/mate-utility-accessibility.directory.in
+++ b/desktop-directories/mate-utility-accessibility.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Universal Access
-_Comment=Universal Access Settings
+Name=Universal Access
+Comment=Universal Access Settings
 Type=Directory
 Icon=preferences-desktop-accessibility
diff --git a/desktop-directories/mate-utility.directory.in b/desktop-directories/mate-utility.directory.in
index 0edeeef..491dbb2 100644
--- a/desktop-directories/mate-utility.directory.in
+++ b/desktop-directories/mate-utility.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Accessories
-_Comment=Desktop accessories
+Name=Accessories
+Comment=Desktop accessories
 Icon=applications-accessories
 Type=Directory