From 0c8d27f02c3faa2b0ea7cd3e1539f777e1938ded Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Thu, 14 Aug 2014 20:45:13 +0800
Subject: [PATCH] Revert "Merge pull request #16 from FelixZhang/bnc#877369-1"

This reverts commit 3798eb07a56734a1985e343ba645d87b524ef3f1, reversing
changes made to af6b52af2064b934ef70a5edca181b2139842ee7.

The revert is due to build errors with update_desktop_file
---
 etc/yast-gnome-apparmor.directory       |  3 +--
 etc/yast-gnome-ha.directory             |  4 ++--
 etc/yast-gnome-hardware.directory       |  7 +++----
 etc/yast-gnome-misc.directory           |  3 +--
 etc/yast-gnome-net-devices.directory    |  5 +++--
 etc/yast-gnome-net-services.directory   |  4 ++--
 etc/yast-gnome-security.directory       |  4 ++--
 etc/yast-gnome-software.directory       |  5 +++--
 etc/yast-gnome-support.directory        |  3 +--
 etc/yast-gnome-system.directory         |  4 ++--
 etc/yast-gnome-virtualization.directory | 17 +++++++++++------
 etc/yast-gnome.directory                |  1 -
 12 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/etc/yast-gnome-apparmor.directory b/etc/yast-gnome-apparmor.directory
index ad445a4..ef08dbd 100644
--- a/etc/yast-gnome-apparmor.directory
+++ b/etc/yast-gnome-apparmor.directory
@@ -1,8 +1,7 @@
 [Desktop Entry]
 Type=Directory
 Icon=apparmor_app_armor
-Name=Novell AppArmor
 
 X-SuSE-DocTeamID=ycc_apparmor
-X-SuSE-translate=true
 
+Name=Novell AppArmor
diff --git a/etc/yast-gnome-ha.directory b/etc/yast-gnome-ha.directory
index cebdeb2..e042b0b 100644
--- a/etc/yast-gnome-ha.directory
+++ b/etc/yast-gnome-ha.directory
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Directory
 Icon=yast-high_availability
-Name=High Availability
 
 X-SuSE-DocTeamID=ycc_high_availability
-X-SuSE-translate=true
+Name=High Availability
+
 
diff --git a/etc/yast-gnome-hardware.directory b/etc/yast-gnome-hardware.directory
index 472fdd5..45c609b 100644
--- a/etc/yast-gnome-hardware.directory
+++ b/etc/yast-gnome-hardware.directory
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Type=Directory
 Icon=yast-hardware
-Name=Hardware
-
-X-KDE-SubstituteUID=true
 
 X-SuSE-DocTeamID=ycc_hardware
-X-SuSE-translate=true
+
+Name=Hardware
+X-KDE-SubstituteUID=true
 
diff --git a/etc/yast-gnome-misc.directory b/etc/yast-gnome-misc.directory
index 3c134a5..79b60f2 100644
--- a/etc/yast-gnome-misc.directory
+++ b/etc/yast-gnome-misc.directory
@@ -1,8 +1,7 @@
 [Desktop Entry]
 Type=Directory
 Icon=yast-misc
-Name=Miscellaneous
 
 X-SuSE-DocTeamID=ycc_misc
-X-SuSE-translate=true
+Name=Miscellaneous
 
diff --git a/etc/yast-gnome-net-devices.directory b/etc/yast-gnome-net-devices.directory
index d960e36..1ac5418 100644
--- a/etc/yast-gnome-net-devices.directory
+++ b/etc/yast-gnome-net-devices.directory
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Directory
 Icon=yast-network_devices
-Name=Network Devices
 
 X-SuSE-DocTeamID=ycc_network_devices
-X-SuSE-translate=true
+
+Name=Network Devices
+
 
diff --git a/etc/yast-gnome-net-services.directory b/etc/yast-gnome-net-services.directory
index c0e2f41..20a4662 100644
--- a/etc/yast-gnome-net-services.directory
+++ b/etc/yast-gnome-net-services.directory
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Directory
 Icon=yast-network_services
-Name=Network Services
 
 X-SuSE-DocTeamID=ycc_network_services
-X-SuSE-translate=true
+
+Name=Network Services
 
diff --git a/etc/yast-gnome-security.directory b/etc/yast-gnome-security.directory
index 1cbd2d6..6fb10f0 100644
--- a/etc/yast-gnome-security.directory
+++ b/etc/yast-gnome-security.directory
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Directory
 Icon=yast-security
-Name=Security and Users
 
 X-SuSE-DocTeamID=ycc_security
-X-SuSE-translate=true
+
+Name=Security and Users
 
diff --git a/etc/yast-gnome-software.directory b/etc/yast-gnome-software.directory
index ec7f5f3..13fa545 100644
--- a/etc/yast-gnome-software.directory
+++ b/etc/yast-gnome-software.directory
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Type=Directory
 Icon=yast-software
-Name=Software
 
 X-SuSE-DocTeamID=ycc_software
-X-SuSE-translate=true
+
+Name=Software
+
 
diff --git a/etc/yast-gnome-support.directory b/etc/yast-gnome-support.directory
index bdfbcac..30b063c 100644
--- a/etc/yast-gnome-support.directory
+++ b/etc/yast-gnome-support.directory
@@ -1,8 +1,7 @@
 [Desktop Entry]
 Type=Directory
 Icon=yast-support
-Name=Support
 
 X-SuSE-DocTeamID=ycc_support
-X-SuSE-translate=true
+Name=Support
 
diff --git a/etc/yast-gnome-system.directory b/etc/yast-gnome-system.directory
index fad56ce..3841ab8 100644
--- a/etc/yast-gnome-system.directory
+++ b/etc/yast-gnome-system.directory
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Directory
 Icon=yast-system
-Name=System
 
 X-SuSE-DocTeamID=ycc_system
-X-SuSE-translate=true
+
+Name=System
 
diff --git a/etc/yast-gnome-virtualization.directory b/etc/yast-gnome-virtualization.directory
index c27e611..48b6ad6 100644
--- a/etc/yast-gnome-virtualization.directory
+++ b/etc/yast-gnome-virtualization.directory
@@ -1,15 +1,20 @@
 [Desktop Entry]
+X-SuSE-DocTeamID=ycc_virtualization
+X-SuSE-DocTeamID=ycc_virtualization
+# X-SuSE-DocTeamID=ycc_Virtualization
 Type=Directory
-Icon=yast-host
-Name=Virtualization
 
-X-KDE-HasReadOnlyMode=true
-X-KDE-Library=yast2
 X-KDE-ModuleType=Library
 X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=true
+X-KDE-Library=yast2
 
-X-SuSE-DocTeamID=ycc_virtualization
 X-SuSE-YaST-Group=Virtualization
 X-SuSE-YaST-SortKey=60
-X-SuSE-translate=true
+
+Icon=yast-host
+
+Name=Virtualization
+
+
 
diff --git a/etc/yast-gnome.directory b/etc/yast-gnome.directory
index 6c462f6..4a53c82 100644
--- a/etc/yast-gnome.directory
+++ b/etc/yast-gnome.directory
@@ -3,4 +3,3 @@ Name=YaST2 Modules
 Comment=YaST2 Modules
 Type=Directory
 Icon=package_settings
-X-SuSE-translate=true