Merge branch 'master' of https://github.com/mate-desktop/mate-control-center

1 files changed, 559 insertions, 351 deletions

diff --git a/capplets/default-applications/mate-default-applications.xml.in b/capplets/default-applications/mate-default-applications.xml.in
index 4bd2f8b9..43438ae2 100644
--- a/capplets/default-applications/mate-default-applications.xml.in
+++ b/capplets/default-applications/mate-default-applications.xml.in
@@ -4,249 +4,289 @@
 
 <!-- Remember to never use the same string for <command>, <tab-command> and <win-command> entries -->
 
-  <web-browsers>
-    <web-browser>
-      <_name>Opera</_name>
-      <executable>opera</executable>
-      <command>opera %s</command>
-      <icon-name>opera</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>opera -newpage %s</tab-command>
-      <win-command>opera -newwindow %s</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Debian Sensible Browser</_name>
-      <executable>sensible-browser</executable>
-      <command>sensible-browser %s</command>
-      <icon-name></icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>false</netscape-remote>
-    </web-browser>
-    <web-browser>
-      <_name>Epiphany Web Browser</_name>
-      <executable>epiphany</executable>
-      <command>epiphany %s</command>
-      <icon-name>web-browser</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>epiphany --new-tab %s</tab-command>
-      <win-command>epiphany --new-window %s</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Galeon</_name>
-      <executable>galeon</executable>
-      <command>galeon %s</command>
-      <icon-name>galeon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>galeon -n %s</tab-command>
-      <win-command>galeon -w %s</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Encompass</_name>
-      <executable>encompass</executable>
-      <command>encompass %s</command>
-      <icon-name>encompass</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>false</netscape-remote>
-    </web-browser>
-    <web-browser>
-      <_name>Firebird</_name>
-      <executable>mozilla-firebird</executable>
-      <command>mozilla-firebird %s</command>
-      <icon-name></icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Firefox</_name>
-      <executable>firefox</executable>
-      <command>firefox %s</command>
-      <icon-name>firefox</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>firefox -new-tab "%s"</tab-command>
-      <win-command>firefox -new-window "%s"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Iceweasel</_name>
-      <executable>iceweasel</executable>
-      <command>iceweasel %s</command>
-      <icon-name>iceweasel</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>iceweasel -new-tab "%s"</tab-command>
-      <win-command>iceweasel -new-window "%s"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Mozilla 1.6</_name>
-      <executable>mozilla-1.6</executable>
-      <command>mozilla-1.6 %s</command>
-      <icon-name>mozilla-icon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Mozilla</_name>
-      <executable>mozilla</executable>
-      <command>mozilla %s</command>
-      <icon-name>mozilla-icon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>SeaMonkey</_name>
-      <executable>seamonkey</executable>
-      <command>seamonkey %s</command>
-      <icon-name>seamonkey</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>seamonkey -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Iceape</_name>
-      <executable>iceape</executable>
-      <command>iceape %s</command>
-      <icon-name>iceape</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>iceape -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>iceape -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Netscape Communicator</_name>
-      <executable>netscape</executable>
-      <command>netscape %s</command>
-      <icon-name>netscape</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>netscape -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Konqueror</_name>
-      <executable>konqueror</executable>
-      <command>konqueror %s</command>
-      <icon-name>konqueror</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>false</netscape-remote>
-    </web-browser>
-    <web-browser>
-      <_name>Midori</_name>
-      <executable>midori</executable>
-      <command>midori %s</command>
-      <icon-name>web-browser</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>false</netscape-remote>
-    </web-browser>
-  </web-browsers>
-
-  <mail-readers>
-    <mail-reader>
-      <_name>Evolution Mail Reader</_name>
-      <executable>evolution</executable>
-      <command>evolution %s</command>
-      <icon-name>evolution</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Balsa</_name>
-      <executable>balsa</executable>
-      <command>balsa -m %s</command>
-      <icon-name>mate-balsa2</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>KMail</_name>
-      <executable>kmail</executable>
-      <command>kmail %s</command>
-      <icon-name>kmail</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Icedove</_name>
-      <executable>icedove</executable>
-      <command>icedove %s</command>
-      <icon-name>icedove</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Thunderbird</_name>
-      <executable>thunderbird</executable>
-      <command>thunderbird %s</command>
-      <icon-name>thunderbird</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Mozilla Thunderbird</_name>
-      <executable>mozilla-thunderbird</executable>
-      <command>mozilla-thunderbird %s</command>
-      <icon-name>thunderbird</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Mozilla Mail</_name>
-      <executable>mozilla</executable>
-      <command>mozilla -mail %s</command>
-      <icon-name>mozilla-mail-icon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>SeaMonkey Mail</_name>
-      <executable>seamonkey</executable>
-      <command>seamonkey -mail %s</command>
-      <icon-name>seamonkey</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Iceape Mail</_name>
-      <executable>iceape</executable>
-      <command>iceape -mail %s</command>
-      <icon-name>iceape</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Mutt</_name>
-      <executable>mutt</executable>
-      <command>mutt %s</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <run-in-terminal>true</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Claws Mail</_name>
-      <executable>claws-mail</executable>
-      <command>claws-mail --compose %s</command>
-      <icon-name>claws-mail</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Sylpheed-Claws</_name>
-      <executable>sylpheed-claws</executable>
-      <command>sylpheed-claws --compose %s</command>
-      <icon-name>sylpheed</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Sylpheed</_name>
-      <executable>sylpheed</executable>
-      <command>sylpheed --compose %s</command>
-      <icon-name>sylpheed</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-  </mail-readers>
+	<web-browsers>
+
+		<web-browser>
+			<_name>Opera</_name>
+			<executable>opera</executable>
+			<command>opera %s</command>
+			<icon-name>opera</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>opera -newpage %s</tab-command>
+			<win-command>opera -newwindow %s</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Debian Sensible Browser</_name>
+			<executable>sensible-browser</executable>
+			<command>sensible-browser %s</command>
+			<icon-name></icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Epiphany Web Browser</_name>
+			<executable>epiphany</executable>
+			<command>epiphany %s</command>
+			<icon-name>web-browser</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>epiphany --new-tab %s</tab-command>
+			<win-command>epiphany --new-window %s</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Galeon</_name>
+			<executable>galeon</executable>
+			<command>galeon %s</command>
+			<icon-name>galeon</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>galeon -n %s</tab-command>
+			<win-command>galeon -w %s</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Encompass</_name>
+			<executable>encompass</executable>
+			<command>encompass %s</command>
+			<icon-name>encompass</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Firebird</_name>
+			<executable>mozilla-firebird</executable>
+			<command>mozilla-firebird %s</command>
+			<icon-name></icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Firefox</_name>
+			<executable>firefox</executable>
+			<command>firefox %s</command>
+			<icon-name>firefox</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>firefox -new-tab "%s"</tab-command>
+			<win-command>firefox -new-window "%s"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Iceweasel</_name>
+			<executable>iceweasel</executable>
+			<command>iceweasel %s</command>
+			<icon-name>iceweasel</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>iceweasel -new-tab "%s"</tab-command>
+			<win-command>iceweasel -new-window "%s"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Mozilla 1.6</_name>
+			<executable>mozilla-1.6</executable>
+			<command>mozilla-1.6 %s</command>
+			<icon-name>mozilla-icon</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Mozilla</_name>
+			<executable>mozilla</executable>
+			<command>mozilla %s</command>
+			<icon-name>mozilla-icon</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>SeaMonkey</_name>
+			<executable>seamonkey</executable>
+			<command>seamonkey %s</command>
+			<icon-name>seamonkey</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>seamonkey -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Iceape</_name>
+			<executable>iceape</executable>
+			<command>iceape %s</command>
+			<icon-name>iceape</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>iceape -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>iceape -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Netscape Communicator</_name>
+			<executable>netscape</executable>
+			<command>netscape %s</command>
+			<icon-name>netscape</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>true</netscape-remote>
+			<tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
+			<win-command>netscape -remote "openurl(%s,new-window)"</win-command>
+		</web-browser>
+
+		<web-browser>
+			<_name>Konqueror</_name>
+			<executable>konqueror</executable>
+			<command>konqueror %s</command>
+			<icon-name>konqueror</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Midori</_name>
+			<executable>midori</executable>
+			<command>midori %s</command>
+			<icon-name>midori</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Chromium</_name>
+			<executable>chromium</executable>
+			<command>chromium %s</command>
+			<icon-name>chromium</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+		<web-browser>
+			<_name>Google Chrome</_name>
+			<executable>google-chrome</executable>
+			<command>google-chrome %s</command>
+			<icon-name>google-chrome</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+			<netscape-remote>false</netscape-remote>
+		</web-browser>
+
+	</web-browsers>
+
+	<mail-readers>
+
+		<mail-reader>
+			<_name>Thunderbird</_name>
+			<executable>thunderbird</executable>
+			<command>thunderbird %s</command>
+			<icon-name>thunderbird</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Evolution Mail Reader</_name>
+			<executable>evolution</executable>
+			<command>evolution %s</command>
+			<icon-name>evolution</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Balsa</_name>
+			<executable>balsa</executable>
+			<command>balsa -m %s</command>
+			<icon-name>mate-balsa2</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>KMail</_name>
+			<executable>kmail</executable>
+			<command>kmail %s</command>
+			<icon-name>kmail</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Icedove</_name>
+			<executable>icedove</executable>
+			<command>icedove %s</command>
+			<icon-name>icedove</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Mozilla Thunderbird</_name>
+			<executable>mozilla-thunderbird</executable>
+			<command>mozilla-thunderbird %s</command>
+			<icon-name>thunderbird</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Mozilla Mail</_name>
+			<executable>mozilla</executable>
+			<command>mozilla -mail %s</command>
+			<icon-name>mozilla-mail-icon</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>SeaMonkey Mail</_name>
+			<executable>seamonkey</executable>
+			<command>seamonkey -mail %s</command>
+			<icon-name>seamonkey</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Iceape Mail</_name>
+			<executable>iceape</executable>
+			<command>iceape -mail %s</command>
+			<icon-name>iceape</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Mutt</_name>
+			<executable>mutt</executable>
+			<command>mutt %s</command>
+			<icon-name>application-x-executable</icon-name>
+			<run-in-terminal>true</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Claws Mail</_name>
+			<executable>claws-mail</executable>
+			<command>claws-mail --compose %s</command>
+			<icon-name>claws-mail</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+		<mail-reader>
+			<_name>Sylpheed</_name>
+			<executable>sylpheed</executable>
+			<command>sylpheed --compose %s</command>
+			<icon-name>sylpheed</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</mail-reader>
+
+	</mail-readers>
 
 	<!-- agregando para los ... -->
 	<file-managers>
 		<file-manager>
-			<_name>Mate File Manager</_name>
+			<_name>MATE file manager</_name>
 			<executable>caja</executable>
 			<run-in-terminal>false</run-in-terminal>
 			<command>caja %s</command>
@@ -263,85 +303,95 @@
 
 		<file-manager>
 			<_name>Thunar</_name>
-			<executable>thunar</executable>
+			<executable>Thunar</executable>
 			<run-in-terminal>false</run-in-terminal>
 			<command>thunar %s</command>
-			<icon-name>thunar</icon-name>
+			<icon-name>Thunar</icon-name>
 		</file-manager>
 
 	</file-managers>
 
-  <terminals>
-    <terminal>
-      <_name>Debian Terminal Emulator</_name>
-      <executable>x-terminal-emulator</executable>
-      <command>x-terminal-emulator</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>MATE Terminal</_name>
-      <executable>mate-terminal</executable>
-      <command>mate-terminal</command>
-      <icon-name>utilities-terminal</icon-name>
-      <exec-flag>-x</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>GNOME Terminal</_name>
-      <executable>gnome-terminal</executable>
-      <command>gnome-terminal</command>
-      <icon-name>gnome-terminal</icon-name>
-      <exec-flag>-x</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>Terminator</_name>
-      <executable>terminator</executable>
-      <command>terminator</command>
-      <icon-name>terminator</icon-name>
-      <exec-flag>-x</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>Standard XTerminal</_name>
-      <executable>xterm</executable>
-      <command>xterm</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>NXterm</_name>
-      <executable>nxterm</executable>
-      <command>nxterm</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>RXVT</_name>
-      <executable>rxvt</executable>
-      <command>rxvt</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>aterm</_name>
-      <executable>aterm</executable>
-      <command>aterm</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-      <_name>ETerm</_name>
-      <executable>ETerm</executable>
-      <command>ETerm</command>
-      <icon-name>mate-mime-application-x-executable</icon-name>
-      <exec-flag>-e</exec-flag>
-    </terminal>
-    <terminal>
-       <_name>Konsole</_name>
-       <executable>konsole</executable>
-       <command>konsole</command>
-       <icon-name>konsole</icon-name>
-       <exec-flag>-e</exec-flag>
-     </terminal>
+	<terminals>
+		<terminal>
+			<_name>Debian Terminal Emulator</_name>
+			<executable>x-terminal-emulator</executable>
+			<command>x-terminal-emulator</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>MATE Terminal</_name>
+			<executable>mate-terminal</executable>
+			<command>mate-terminal</command>
+			<icon-name>utilities-terminal</icon-name>
+			<exec-flag>-x</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>GNOME Terminal</_name>
+			<executable>gnome-terminal</executable>
+			<command>gnome-terminal</command>
+			<icon-name>gnome-terminal</icon-name>
+			<exec-flag>-x</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>Terminator</_name>
+			<executable>terminator</executable>
+			<command>terminator</command>
+			<icon-name>terminator</icon-name>
+			<exec-flag>-x</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>Standard XTerminal</_name>
+			<executable>xterm</executable>
+			<command>xterm</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>NXterm</_name>
+			<executable>nxterm</executable>
+			<command>nxterm</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>RXVT</_name>
+			<executable>rxvt</executable>
+			<command>rxvt</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>aterm</_name>
+			<executable>aterm</executable>
+			<command>aterm</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>ETerm</_name>
+			<executable>ETerm</executable>
+			<command>ETerm</command>
+			<icon-name>application-x-executable</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
+		<terminal>
+			<_name>Konsole</_name>
+			<executable>konsole</executable>
+			<command>konsole</command>
+			<icon-name>konsole</icon-name>
+			<exec-flag>-e</exec-flag>
+		</terminal>
+
 		<terminal>
 			<_name>Terminal</_name>
 			<executable>terminal</executable>
@@ -349,6 +399,7 @@
 			<icon-name>utilities-terminal</icon-name>
 			<exec-flag>-e</exec-flag>
 		</terminal>
+
 		<terminal>
 			<_name>Sakura</_name>
 			<executable>sakura</executable>
@@ -356,45 +407,202 @@
 			<icon-name>terminal-tango</icon-name>
 			<exec-flag>-e</exec-flag>
 		</terminal>
-  </terminals>
-
-  <media-players>
-    <media-player>
-      <_name>Banshee Music Player</_name>
-      <executable>banshee</executable>
-      <command>banshee</command>
-      <icon-name>music-player-banshee</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </media-player>
-    <media-player>
-      <_name>Muine Music Player</_name>
-      <executable>muine</executable>
-      <command>muine</command>
-      <icon-name>muine</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-	</media-player>
-    <media-player>
-      <_name>Rhythmbox Music Player</_name>
-      <executable>rhythmbox</executable>
-      <command>rhythmbox</command>
-      <icon-name>rhythmbox</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </media-player>
-    <media-player>
-      <_name>Totem Movie Player</_name>
-      <executable>totem</executable>
-      <command>totem</command>
-      <icon-name>totem</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </media-player>
-    <media-player>
-      <_name>Listen</_name>
-      <executable>listen</executable>
-      <command>listen</command>
-      <icon-name>listen</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </media-player>
-   </media-players>
+	</terminals>
+
+	<image-viewers>
+
+		<image-viewer>
+			<_name>MATE image viewer</_name>
+			<executable>eom</executable>
+			<command>eog %s</command>
+			<icon-name>eom</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>Eye of GNOME</_name>
+			<executable>eog</executable>
+			<command>eog %s</command>
+			<icon-name>eog</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>Shotwell</_name>
+			<executable>shotwell</executable>
+			<command>shotwell %s</command>
+			<icon-name>shotwell</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>MComix</_name>
+			<executable>mcomix</executable>
+			<command>mcomix %s</command>
+			<icon-name>mcomix</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>gThumb</_name>
+			<executable>gthumb</executable>
+			<command>gthumb %s</command>
+			<icon-name>gthumb</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>Gwenview</_name>
+			<executable>gwenview</executable>
+			<command>gwenview %s</command>
+			<icon-name>gwenview</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<image-viewer>
+			<_name>Ristretto</_name>
+			<executable>ristretto</executable>
+			<command>ristretto %s</command>
+			<icon-name>ristretto</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</image-viewer>
+
+		<!-- se necesita agregar los otros visores -->
+	</image-viewers>
+
+	<music-players>
+
+		<music-player>
+			<_name>DeaDBeeF</_name>
+			<executable>deadbeef</executable>
+			<command>deadbeef %s</command>
+			<icon-name>deadbeef</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>VLC</_name>
+			<executable>vlc</executable>
+			<command>vlc %s</command>
+			<icon-name>vlc</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>Rhythmbox Music Player</_name>
+			<executable>rhythmbox</executable>
+			<command>rhythmbox</command>
+			<icon-name>rhythmbox</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>Totem Movie Player</_name>
+			<executable>totem</executable>
+			<command>totem</command>
+			<icon-name>totem</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>Banshee Music Player</_name>
+			<executable>banshee</executable>
+			<command>banshee</command>
+			<icon-name>music-player-banshee</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<music-player>
+			<_name>Muine Music Player</_name>
+			<executable>muine</executable>
+			<command>muine</command>
+			<icon-name>muine</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+
+		<music-player>
+			<_name>Listen</_name>
+			<executable>listen</executable>
+			<command>listen</command>
+			<icon-name>listen</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</music-player>
+
+		<!-- se necesita agregar los otros reproductores de musica -->
+	</music-players>
+
+	<video-players>
+
+		<video-player>
+			<_name>VLC</_name>
+			<executable>vlc</executable>
+			<command>vlc %s</command>
+			<icon-name>vlc</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</video-player>
+
+		<video-player>
+			<_name>Totem Movie Player</_name>
+			<executable>totem</executable>
+			<command>totem</command>
+			<icon-name>totem</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</video-player>
+
+	</video-players>
+
+	<text-editors>
+
+		<text-editor>
+			<_name>Gedit</_name>
+			<executable>gedit</executable>
+			<command>gedit %s</command>
+			<icon-name>accessories-text-editor</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor>
+
+		<text-editor>
+			<_name>MATE text editor</_name>
+			<executable>pluma</executable>
+			<command>pluma %s</command>
+			<icon-name>accessories-text-editor</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor>
+
+		<!-- <text-editor>
+			<_name>Geany</_name>
+			<executable>geany</executable>
+			<command>geany %s</command>
+			<icon-name>geany</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor> -->
+
+		<text-editor>
+			<_name>leafpad</_name>
+			<executable>leafpad</executable>
+			<command>leafpad %s</command>
+			<icon-name>leafpad</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor>
+
+		<!-- <text-editor>
+			<_name>mousepad</_name>
+			<executable>mousepad</executable>
+			<command>mousepad %s</command>
+			<icon-name>mousepad</icon-name>
+			<run-in-terminal>false</run-in-terminal>
+		</text-editor> -->
+
+		<!-- <text-editor>
+			<_name>GNU nano</_name>
+			<executable>nano</executable>
+			<command>nano %s</command>
+			<icon-name>application-x-executable</icon-name>
+			<run-in-terminal>true</run-in-terminal>
+		</text-editor> -->
+
+	</text-editors>
 
   <a11y-visual>
     <visual>