forgot to update pofiles for e_eap->e_desktop move yesterday

SVN revision: 83616

40 files changed, 976 insertions, 976 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 04b47f6da9..1da717e57b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,7 +21,7 @@ src/bin/e_desklock.c
 src/bin/e_dialog.c
 src/bin/e_dnd.c
 src/bin/e_dpms.c
-src/bin/e_eap_editor.c
+src/bin/e_desktop_editor.c
 src/bin/e_entry.c
 src/bin/e_entry_dialog.c
 src/bin/e_error.c
diff --git a/po/ar.po b/po/ar.po
index ad05c03dbf..3b92ef449c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -670,7 +670,7 @@ msgstr "تشغيل"
 msgid "Command"
 msgstr "اﻷمر"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -798,8 +798,8 @@ msgstr "منتقي اﻵلوان"
 msgid "Select"
 msgstr "حدد"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -860,8 +860,8 @@ msgstr ""
 "%s<br><br>بقية الكتابة أُلغيت ﻷجل سلامة الملفات<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -984,7 +984,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "متقدم"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "أساسي"
 
@@ -1085,11 +1085,11 @@ msgstr "لا ، ولكن زد مدة المهلة"
 msgid "No, and stop asking"
 msgstr "لا, وتوقف عن السؤال"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "خصائص النافذة غير كاملة"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1101,11 +1101,11 @@ msgstr ""
 "منها<br>إستخدام عنوان النافذة كبديل. و سيعمل هذا فقط <br> في حالة كون أن "
 "عنوان النافذة هو نفسه <br> وقت بدة تشغيل النافذة , و لم<br>يتغير."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "محرر دخول سطح المكتب"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1113,42 +1113,42 @@ msgstr "محرر دخول سطح المكتب"
 msgid "Name"
 msgstr "اﻹسم"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "التعليق"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "الرابط"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "اﻷيقونة"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "اسم عام"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "فئة النافذة"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "المجموعات"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "أنواع الملفات"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "ملف سطح المكتب"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1161,30 +1161,30 @@ msgstr "ملف سطح المكتب"
 msgid "General"
 msgstr "عام"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "ابدأ التنبيه"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "شغل في الطرفية"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "اظهر في قوائم"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "خيارات"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "اختر أيقونة لـ '%s'"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "اختر ملف تنفيذي"
 
diff --git a/po/bg.po b/po/bg.po
index 01a4fd1493..e320179320 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -719,7 +719,7 @@ msgstr "Стартиране"
 msgid "Command"
 msgstr "Команда"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -864,8 +864,8 @@ msgstr "Изберете цвят"
 msgid "Select"
 msgstr "Настройки"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -914,8 +914,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1056,7 +1056,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Сложни"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Прости"
 
@@ -1160,11 +1160,11 @@ msgstr "Не, но увеличаване на изчакване"
 msgid "No, and stop asking"
 msgstr "Не, и да спре да иска"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Непълни характеристики на прозореца"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1179,11 +1179,11 @@ msgstr ""
 "заглавието на прозореца е една и съща в<br>време на прозореца се стартира , "
 "и не<br>промяна."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Редактор на Desktop файлове"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1191,44 +1191,44 @@ msgstr "Редактор на Desktop файлове"
 msgid "Name"
 msgstr "Име"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Икона"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Общо име"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Клас на прозорец"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Категории"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 #, fuzzy
 msgid "Mime Types"
 msgstr "Mime Видове"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Desktop файл"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1241,31 +1241,31 @@ msgstr "Desktop файл"
 msgid "General"
 msgstr "Общи"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Известие при стартиране"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Стартиране в терминал"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Показване в менюта"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 #, fuzzy
 msgid "Options"
 msgstr "Опции"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Избиране на икона"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Избиране на изпълним файл"
 
diff --git a/po/ca.po b/po/ca.po
index 87237f4565..e5ca524cf2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -662,7 +662,7 @@ msgstr "Executa"
 msgid "Command"
 msgstr "Comanda"
 
-#: src/bin/e_actions.c:3350 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3350 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -790,8 +790,8 @@ msgstr "Selector de Color"
 msgid "Select"
 msgstr "Selecciona"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:195
 #: src/bin/e_import_config_dialog.c:540
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -856,8 +856,8 @@ msgstr ""
 "abortada per seguretat.<br>"
 
 #: src/bin/e_config.c:1529 src/bin/e_config.c:2163
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
 #: src/bin/e_fm.c:9967 src/bin/e_fm.c:10698 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:539 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:588
@@ -984,7 +984,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Bàsic"
 
@@ -1089,11 +1089,11 @@ msgstr "No, però augmenta temps d'espera"
 msgid "No, and stop asking"
 msgstr "No , i deixar de preguntar"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Propietats de Finestra Incompletes"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1106,11 +1106,11 @@ msgstr ""
 "titol de la finestra<br> és el mateix que quan la finestra s'ha arrancat i "
 "no <br>canvia."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Editor de l'Entrada de Taula de Treball"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499
 #: src/modules/conf_display/e_int_config_desk.c:186
 #: src/modules/conf_intl/e_int_config_imc.c:896
@@ -1119,42 +1119,42 @@ msgstr "Editor de l'Entrada de Taula de Treball"
 msgid "Name"
 msgstr "Nom"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Comentari"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icona"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Nom Genèric"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:120
 msgid "Window Class"
 msgstr "Classe de Finestra"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Categories"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Tipus Mime"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Fitxer de Taula de Treball"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:70
 #: src/modules/conf_comp/e_mod_config.c:561
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1167,30 +1167,30 @@ msgstr "Fitxer de Taula de Treball"
 msgid "General"
 msgstr "General"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Notificació d'Inici"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
 msgid "Run in Terminal"
 msgstr "Executa en una Terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Mostra en els Menús"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
 #: src/bin/e_int_border_remember.c:762
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opcions"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Seleccioneu una Icona per '%s'"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Seleccioneu un Executable "
 
diff --git a/po/cs.po b/po/cs.po
index 9df7c7c3e4..a7e9f92c83 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -669,7 +669,7 @@ msgstr "Spustit"
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -797,8 +797,8 @@ msgstr "Výběr barvy"
 msgid "Select"
 msgstr "Vybrat"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -861,8 +861,8 @@ msgstr ""
 "%s<br><br>do:<br>%s<br><br>Zbytek byl přerušen kvůli bezpečnosti.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -986,7 +986,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Základní"
 
@@ -1092,11 +1092,11 @@ msgstr "Ne, ale prodloužit limit"
 msgid "No, and stop asking"
 msgstr "Ne, a přestat se ptát"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Neúplné vlastnosti okna"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1108,11 +1108,11 @@ msgstr ""
 "Budete muset<br>použít titulek okna. To bude fungovat<br>pouze jestli se "
 "titulek okna nemění."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Editor spouštěčů"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1120,42 +1120,42 @@ msgstr "Editor spouštěčů"
 msgid "Name"
 msgstr "Název"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Komentář"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Obecný název"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Třída okna"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorie"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "MIME typy"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Desktop soubor"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1168,30 +1168,30 @@ msgstr "Desktop soubor"
 msgid "General"
 msgstr "Obecné"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Upozornění při spuštění"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Spustit v terminálu"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Zobrazit v nabídkách"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Možnosti"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Vyberte ikonu pro '%s'"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Vyberte spustitelný soubor"
 
diff --git a/po/da.po b/po/da.po
index d46e210419..f6c4483ec0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -739,7 +739,7 @@ msgstr "Kør"
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -880,8 +880,8 @@ msgstr "Farvevælger"
 msgid "Select"
 msgstr "Vælg et vindue"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -930,8 +930,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1072,7 +1072,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Grundlæggende"
 
@@ -1180,12 +1180,12 @@ msgstr "Nej, men øge timeout"
 msgid "No, and stop asking"
 msgstr "Nej, og op med at spørge"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 #, fuzzy
 msgid "Incomplete Window Properties"
 msgstr "Ufuldstændige Window Egenskaber"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1200,12 +1200,12 @@ msgstr ""
 "den samme på<br>det tidspunkt, hvor vinduet starter op , og "
 "ikke<br>forandring."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 #, fuzzy
 msgid "Desktop Entry Editor"
 msgstr "Desktop Entry Editor"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1213,45 +1213,45 @@ msgstr "Desktop Entry Editor"
 msgid "Name"
 msgstr "Navn"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Generisk navn"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 #, fuzzy
 msgid "Window Class"
 msgstr "Window klasse"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorier"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 #, fuzzy
 msgid "Mime Types"
 msgstr "mimetyper"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Desktop-fil"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1264,32 +1264,32 @@ msgstr "Desktop-fil"
 msgid "General"
 msgstr "Generelt"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 #, fuzzy
 msgid "Startup Notify"
 msgstr "Startup Notify"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Kør i terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 #, fuzzy
 msgid "Show in Menus"
 msgstr "Vis i menuer"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Indstilinger"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Vælg en ikon"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Vælg en kørbar fil"
 
diff --git a/po/de.po b/po/de.po
index 12537bfff9..18ba06530a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -689,7 +689,7 @@ msgstr "Ausführen"
 msgid "Command"
 msgstr "Befehl"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -817,8 +817,8 @@ msgstr "Farbwähler"
 msgid "Select"
 msgstr "Auswählen"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -883,8 +883,8 @@ msgstr ""
 "%s<br>verschieben.<br>Sicherheitshalber wurde der Schreibvorgang abgebrochen."
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1012,7 +1012,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Einfach"
 
@@ -1118,11 +1118,11 @@ msgstr "Nein, stattdessen Verzögerung erhöhen"
 msgid "No, and stop asking"
 msgstr "Nein, nicht mehr nachfragen"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Unvollständige Fenstereigenscahften"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1135,11 +1135,11 @@ msgstr ""
 "der<br>Fenstertitel bei jedem Öffnen des Fensters<br>identisch ist und sich "
 "nicht ändert."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Editor für Programmeinträge"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1147,42 +1147,42 @@ msgstr "Editor für Programmeinträge"
 msgid "Name"
 msgstr "Name"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Symbol"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Generischer Name"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Fensterklasse"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorien"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Dateitypen"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr ".desktop-Datei"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1195,30 +1195,30 @@ msgstr ".desktop-Datei"
 msgid "General"
 msgstr "Allgemein"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Startmitteilung"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "In der Konsole ausführen"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "In den Menüs zeigen"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Optionen"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Wählen Sie ein Symbol für '%s'"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Wählen Sie eine ausführbare Datei aus"
 
diff --git a/po/el.po b/po/el.po
index 1ef1f4d651..00914648bd 100644
--- a/po/el.po
+++ b/po/el.po
@@ -675,7 +675,7 @@ msgstr "Εκτέλεση"
 msgid "Command"

 msgstr "Εντολή"

 

-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698

+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698

 #: src/bin/e_int_border_menu.c:118

 #, c-format

 msgid "Application"

@@ -803,8 +803,8 @@ msgstr "Επιλογή Χρώματος"
 msgid "Select"

 msgstr "Επιλογή"

 

-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862

-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959

+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862

+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959

 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194

 #: src/bin/e_import_config_dialog.c:537

 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637

@@ -871,8 +871,8 @@ msgstr ""
 "<br>"

 

 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366

-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860

-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613

+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860

+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613

 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624

 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318

 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431

@@ -999,7 +999,7 @@ msgstr ""
 msgid "Advanced"

 msgstr "Για προχωρημένους"

 

-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719

+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719

 msgid "Basic"

 msgstr "Βασικά"

 

@@ -1105,11 +1105,11 @@ msgstr "Όχι, αλλά αύξησε το χρόνο λήξης"
 msgid "No, and stop asking"

 msgstr "Όχι, και σταμάτα να ρωτάς"

 

-#: src/bin/e_eap_editor.c:181

+#: src/bin/e_desktop_editor.c:181

 msgid "Incomplete Window Properties"

 msgstr "Ελλιπείς Ιδιότητες Παραθύρου"

 

-#: src/bin/e_eap_editor.c:182

+#: src/bin/e_desktop_editor.c:182

 msgid ""

 "The window you are creating an icon for<br>does not contain window name and "

 "class<br>properties. Without these, you will have to<br>use the window title "

@@ -1122,11 +1122,11 @@ msgstr ""
 "παραθύρου είναι ίδιος<br>κατά τη διάρκεια εκκίνησης του παραθύρου, και "

 "δεν<br>αλλάξει."

 

-#: src/bin/e_eap_editor.c:235

+#: src/bin/e_desktop_editor.c:235

 msgid "Desktop Entry Editor"

 msgstr "Επεξεργαστής καταχωρήσεων επιφάνειας εργασίας"

 

-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445

+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445

 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713

 #: src/modules/conf_intl/e_int_config_imc.c:896

 #: src/modules/conf_menus/e_int_config_menus.c:265

@@ -1134,42 +1134,42 @@ msgstr "Επεξεργαστής καταχωρήσεων επιφάνειας �
 msgid "Name"

 msgstr "Όνομα"

 

-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134

+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134

 msgid "Comment"

 msgstr "Σχόλιο"

 

-#: src/bin/e_eap_editor.c:710

+#: src/bin/e_desktop_editor.c:710

 msgid "URL"

 msgstr "URL"

 

-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741

+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741

 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95

 #: src/modules/fileman/e_int_config_mime_edit.c:145

 msgid "Icon"

 msgstr "Εικονίδιο"

 

-#: src/bin/e_eap_editor.c:745

+#: src/bin/e_desktop_editor.c:745

 msgid "Generic Name"

 msgstr "Γενικό όνομα"

 

-#: src/bin/e_eap_editor.c:751

+#: src/bin/e_desktop_editor.c:751

 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103

 msgid "Window Class"

 msgstr "Κλάση Παραθύρου"

 

-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170

+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170

 msgid "Categories"

 msgstr "Κατηγορίες"

 

-#: src/bin/e_eap_editor.c:764

+#: src/bin/e_desktop_editor.c:764

 msgid "Mime Types"

 msgstr "Τύποι Mime"

 

-#: src/bin/e_eap_editor.c:771

+#: src/bin/e_desktop_editor.c:771

 msgid "Desktop file"

 msgstr "Αρχείο Επιφάνειας Εργασίας"

 

-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450

+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450

 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68

 #: src/modules/comp/e_mod_config.c:1531

 #: src/modules/conf_applications/e_int_config_defapps.c:358

@@ -1182,30 +1182,30 @@ msgstr "Αρχείο Επιφάνειας Εργασίας"
 msgid "General"

 msgstr "Γενικά"

 

-#: src/bin/e_eap_editor.c:784

+#: src/bin/e_desktop_editor.c:784

 msgid "Startup Notify"

 msgstr "Ειδοποίηση Έναρξης"

 

-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182

+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182

 msgid "Run in Terminal"

 msgstr "Εκτέλεση σε Τερματικό"

 

-#: src/bin/e_eap_editor.c:788

+#: src/bin/e_desktop_editor.c:788

 msgid "Show in Menus"

 msgstr "Εμφάνιση στα Mενού"

 

-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924

+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924

 #: src/bin/e_int_border_remember.c:763

 #: src/modules/xkbswitch/e_mod_config.c:334

 msgid "Options"

 msgstr "Επιλογές"

 

-#: src/bin/e_eap_editor.c:822

+#: src/bin/e_desktop_editor.c:822

 #, c-format

 msgid "Select an Icon for '%s'"

 msgstr "Επιλογή ενός Εικονιδίου για '%s'"

 

-#: src/bin/e_eap_editor.c:888

+#: src/bin/e_desktop_editor.c:888

 msgid "Select an Executable"

 msgstr "Επιλογή ενός Εκτελέσιμου"

 

diff --git a/po/eo.po b/po/eo.po
index b8107e924d..bbfed1a252 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -673,7 +673,7 @@ msgstr "Lanĉi"
 msgid "Command"
 msgstr "Komando"
 
-#: src/bin/e_actions.c:3350 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3350 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -801,8 +801,8 @@ msgstr "Elektilo de koloro"
 msgid "Select"
 msgstr "Elekti"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:193
 #: src/bin/e_import_config_dialog.c:536
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -866,8 +866,8 @@ msgstr ""
 "sekure ĉesigita.<br>"
 
 #: src/bin/e_config.c:1529 src/bin/e_config.c:2163
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
 #: src/bin/e_fm.c:9967 src/bin/e_fm.c:10698 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:535 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:568
@@ -992,7 +992,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Progresita"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Baza"
 
@@ -1097,11 +1097,11 @@ msgstr "Ne sed pligrandigi la tempolimon"
 msgid "No, and stop asking"
 msgstr "Ne kaj ĉesi denove peti"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Ecoj de nekompleta fenestro"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1113,11 +1113,11 @@ msgstr ""
 "fenestro<br>anstataŭe. Tio nur funkcias se la titolo<br>de la fenestro estas "
 "la sama ol la tempo, kiam<br>la fenestro startiĝas kaj ĝi<br>ne ŝanĝas."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Redaktilo de labortableroj"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499
 #: src/modules/conf_display/e_int_config_desk.c:186
 #: src/modules/conf_intl/e_int_config_imc.c:896
@@ -1126,42 +1126,42 @@ msgstr "Redaktilo de labortableroj"
 msgid "Name"
 msgstr "Nomo"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Komento"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "Retadreso"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Piktogramo"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Ĝenerala nomo"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:120
 msgid "Window Class"
 msgstr "Klaso de fenestro"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorioj"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "MIME-specoj"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Labortabla dosiero"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:70
 #: src/modules/conf_comp/e_mod_config.c:561
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1174,30 +1174,30 @@ msgstr "Labortabla dosiero"
 msgid "General"
 msgstr "Ĝenerala"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Atentigo de lanĉo"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
 msgid "Run in Terminal"
 msgstr "Lanĉi en terminalo"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Montri en menuoj"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
 #: src/bin/e_int_border_remember.c:762
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opcioj"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Elektu piktogramon por \"%s\""
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Elektu plenumeblon"
 
diff --git a/po/es.po b/po/es.po
index 5c39ef2d45..65cc3cec8a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -674,7 +674,7 @@ msgstr "Lanzar"
 msgid "Command"
 msgstr "Ejecutar"
 
-#: src/bin/e_actions.c:3350 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3350 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -802,8 +802,8 @@ msgstr "Selector de color"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:193
 #: src/bin/e_import_config_dialog.c:536
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -867,8 +867,8 @@ msgstr ""
 "%s<br>Se ha cancelado la operación por seguridad.<br>"
 
 #: src/bin/e_config.c:1529 src/bin/e_config.c:2163
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
 #: src/bin/e_fm.c:9967 src/bin/e_fm.c:10698 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:535 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:568
@@ -995,7 +995,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Básico"
 
@@ -1099,11 +1099,11 @@ msgstr "No, pero incrementar el tiempo de espera"
 msgid "No, and stop asking"
 msgstr "No, y parar de preguntar"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Propiedades de ventana incompleta"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1116,11 +1116,11 @@ msgstr ""
 "de la ventana en su lugar. Esto sólo <br>funcionará, si el título de la "
 "ventana es el mismo en el momento en que se inicia y no cambia."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Edicrear untor de entrada de escritorio"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499
 #: src/modules/conf_display/e_int_config_desk.c:186
 #: src/modules/conf_intl/e_int_config_imc.c:896
@@ -1129,42 +1129,42 @@ msgstr "Edicrear untor de entrada de escritorio"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icono"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Nombre genérico"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:120
 msgid "Window Class"
 msgstr "Clase de la ventana"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Categorías"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Tipos MIME"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Archivo de escritorio"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:70
 #: src/modules/conf_comp/e_mod_config.c:561
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1177,30 +1177,30 @@ msgstr "Archivo de escritorio"
 msgid "General"
 msgstr "General"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Notificar al arrancar"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
 msgid "Run in Terminal"
 msgstr "Ejecutar en una terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Mostrar en los menús"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
 #: src/bin/e_int_border_remember.c:762
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opciones"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Seleccione un icono para '%s'"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Seleccione un ejecutable"
 
diff --git a/po/et.po b/po/et.po
index 5a7b22af14..86f8e3a5dc 100644
--- a/po/et.po
+++ b/po/et.po
@@ -786,7 +786,7 @@ msgstr "algatama"
 msgid "Command"
 msgstr "käsk"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, fuzzy, c-format
 msgid "Application"
@@ -935,8 +935,8 @@ msgstr "Color Selector"
 msgid "Select"
 msgstr "valimine"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -986,8 +986,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1128,7 +1128,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "edasijõudnud"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 #, fuzzy
 msgid "Basic"
 msgstr "põhi-"
@@ -1239,12 +1239,12 @@ msgstr "Ei, aga suurendada timeout"
 msgid "No, and stop asking"
 msgstr "No, ja lõpetage paludes"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 #, fuzzy
 msgid "Incomplete Window Properties"
 msgstr "Puudulik Window omadused"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1257,12 +1257,12 @@ msgstr ""
 "Sa pead<br>kasutada akna tiitli asemel. See ainult<br>tööd, kui akna "
 "pealkiri on sama at<br>aegaken käivitub, ja ei<br>muutusi."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 #, fuzzy
 msgid "Desktop Entry Editor"
 msgstr "Desktop Entry Editor"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1271,50 +1271,50 @@ msgstr "Desktop Entry Editor"
 msgid "Name"
 msgstr "nimi"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 #, fuzzy
 msgid "Comment"
 msgstr "kommentaar"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 #, fuzzy
 msgid "Icon"
 msgstr "ikoon"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 #, fuzzy
 msgid "Generic Name"
 msgstr "üldnimetus"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 #, fuzzy
 msgid "Window Class"
 msgstr "Window klass"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 #, fuzzy
 msgid "Categories"
 msgstr "Kategooriad"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 #, fuzzy
 msgid "Mime Types"
 msgstr "Mime tüübid"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 #, fuzzy
 msgid "Desktop file"
 msgstr "desktop-fail"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1328,34 +1328,34 @@ msgstr "desktop-fail"
 msgid "General"
 msgstr "üldine"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 #, fuzzy
 msgid "Startup Notify"
 msgstr "Startup Notify"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 #, fuzzy
 msgid "Run in Terminal"
 msgstr "Käivita Terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 #, fuzzy
 msgid "Show in Menus"
 msgstr "Kuva menüüd"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 #, fuzzy
 msgid "Options"
 msgstr "Valikud"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "ValiIcon"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 #, fuzzy
 msgid "Select an Executable"
 msgstr "ValiTeostatavad"
diff --git a/po/fi.po b/po/fi.po
index 01570d6e15..325b2386d3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -696,7 +696,7 @@ msgstr "Käynnistä"
 msgid "Command"
 msgstr "Komento"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -832,8 +832,8 @@ msgstr "Värivalitsin"
 msgid "Select"
 msgstr "Valitse jokin"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -898,8 +898,8 @@ msgstr ""
 "välttämiseksi.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1042,7 +1042,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Perusasetukset"
 
@@ -1155,11 +1155,11 @@ msgstr "Ei, mutta lisää aikaviivettä"
 msgid "No, and stop asking"
 msgstr "Ei, äläkä kysele enää"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Epätäydelliset ikkunan ominaisuudet"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1173,11 +1173,11 @@ msgstr ""
 "<br>täytyy käyttää ikkunan otsikkoa. Tämä toimii vain,<br>jos ikkunan "
 "otsikko on sama kuin<br>ikkunan avautuessa eikä muutu."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Työpöydän alkioeditori"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1185,43 +1185,43 @@ msgstr "Työpöydän alkioeditori"
 msgid "Name"
 msgstr "Nimi"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Kommentti"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Yleinen nimi"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Ikkunan luokka"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Luokat"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Mime-tyypit"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Työpöytätiedosto"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1234,30 +1234,30 @@ msgstr "Työpöytätiedosto"
 msgid "General"
 msgstr "Yleiset"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Käynnistyksen huomautus"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Aja päätteessä"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Näytä valikoissa"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Valinnat"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Valitse kuvake"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Valitse suoritettava ohjelma"
 
diff --git a/po/fo.po b/po/fo.po
index ba80221c3f..781d01acc7 100644
--- a/po/fo.po
+++ b/po/fo.po
@@ -678,7 +678,7 @@ msgstr "Koyr"
 msgid "Command"
 msgstr "Boð"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -810,8 +810,8 @@ msgstr "Lita veljari"
 msgid "Select"
 msgstr "Vel ein/eitt"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -860,8 +860,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -980,7 +980,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Framkomið"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Grundleggjandi"
 
@@ -1075,11 +1075,11 @@ msgstr ""
 msgid "No, and stop asking"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1087,11 +1087,11 @@ msgid ""
 "time the window starts up, and does not<br>change."
 msgstr ""
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1099,42 +1099,42 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1147,30 +1147,30 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 28b80b1cbd..b9b856b77e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -681,7 +681,7 @@ msgstr "Lancer"
 msgid "Command"
 msgstr "Commande"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -809,8 +809,8 @@ msgstr "Sélecteur de couleur"
 msgid "Select"
 msgstr "Sélectionner"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -876,8 +876,8 @@ msgstr ""
 "abandonnée par sécurité.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1005,7 +1005,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Basique"
 
@@ -1112,11 +1112,11 @@ msgstr "Non, mais augmenter le délai"
 msgid "No, and stop asking"
 msgstr "Non, et ne plus demander"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Propriétés de la fenêtre incomplètes"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1130,11 +1130,11 @@ msgstr ""
 "place. Cela fonctionnera<br>seulement si le nom de la fenêtre est "
 "identique<br>à celui du démarrage, et ne change pas ensuite."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Éditeur de fichier desktop"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1142,42 +1142,42 @@ msgstr "Éditeur de fichier desktop"
 msgid "Name"
 msgstr "Nom"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icône"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Nom générique"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Classe de fenêtre"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Catégories"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Types MIME"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Fichier desktop"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1190,30 +1190,30 @@ msgstr "Fichier desktop"
 msgid "General"
 msgstr "Général"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Notification de démarrage"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Exécuter dans un terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Afficher dans les menus"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Options"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Choisir une icône pour '%s'"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Sélectionner un exécutable"
 
diff --git a/po/fr_CH.po b/po/fr_CH.po
index a1fe1c9203..534cd6a4fc 100644
--- a/po/fr_CH.po
+++ b/po/fr_CH.po
@@ -731,7 +731,7 @@ msgstr "Exécuter"
 msgid "Command"
 msgstr "Commande"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -876,8 +876,8 @@ msgstr "Sélectionneur de thème"
 msgid "Select"
 msgstr "Sélectionner une icône"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -947,8 +947,8 @@ msgstr ""
 "%s<br><br>Ce fichier a été effacé pour éviter des erreurs de corruption.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1074,7 +1074,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Benêt"
 
@@ -1180,11 +1180,11 @@ msgstr ""
 msgid "No, and stop asking"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Propriétés de fenêtre incomplètes"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1198,11 +1198,11 @@ msgstr ""
 "la fenêtre<br>à la place. Cela fonctionnera<br>uniquement si le nom de la "
 "fenêtre est identique<br> à celui du démarrage, et ne change pas."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Editer un élément du bureau"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1210,43 +1210,43 @@ msgstr "Editer un élément du bureau"
 msgid "Name"
 msgstr "Nom"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icône"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Nom générique"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Classe de fenêtre"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Catégories"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 #, fuzzy
 msgid "Mime Types"
 msgstr "Types Mime"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Fichier du bureau"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1259,31 +1259,31 @@ msgstr "Fichier du bureau"
 msgid "General"
 msgstr "Général"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Notification de démarrage"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Exécuter dans un terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Montrer dans les Menus"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 #, fuzzy
 msgid "Options"
 msgstr "Options de remplissage"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Sélectionner une icône"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 #, fuzzy
 msgid "Select an Executable"
 msgstr "Sélectionner un programme"
diff --git a/po/gl.po b/po/gl.po
index 062d5201d7..457a6c3fed 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -669,7 +669,7 @@ msgstr "Lanzar"
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -797,8 +797,8 @@ msgstr "Selector de Cor"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -864,8 +864,8 @@ msgstr ""
 "<br>%s<br><br>a:<br>%s<br><br>A tarefa cancelouse por seguridade.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -991,7 +991,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Básico"
 
@@ -1096,11 +1096,11 @@ msgstr "Non, pero aumentar o tempo límite"
 msgid "No, and stop asking"
 msgstr "Non, e parar de preguntar"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Propiedades da xanela incompletas"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1112,11 +1112,11 @@ msgstr ""
 "no seu lugar. Isto só<br>funcionará se o título da xanela é o mesmo "
 "no<br>momento en que se inicia e non<br>cambia."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Entrada do editor de escritorio"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1124,42 +1124,42 @@ msgstr "Entrada do editor de escritorio"
 msgid "Name"
 msgstr "Nome"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icona"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Nome xenérico"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Clase de xanela"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Categorías"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Tipos de Mime"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Ficheiro do Escritorio"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1172,30 +1172,30 @@ msgstr "Ficheiro do Escritorio"
 msgid "General"
 msgstr "Xeral"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Notificación ó arranque"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Executar na terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Amosar nos menús"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opcións"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Seleccione unha icona para '%s'"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Seleccione un executable"
 
diff --git a/po/he.po b/po/he.po
index f1dd77d954..563e24b94b 100644
--- a/po/he.po
+++ b/po/he.po
@@ -698,7 +698,7 @@ msgstr "הפעל"
 msgid "Command"
 msgstr "פקודה"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -834,8 +834,8 @@ msgstr "בוחר צבע"
 msgid "Select"
 msgstr "הגדרות"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -887,8 +887,8 @@ msgstr ""
 "נמחק מחשש לנתונים פגומים.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1027,7 +1027,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "בסיסי"
 
@@ -1132,11 +1132,11 @@ msgstr "לא, אבל להגדיל את פסק הזמן"
 msgid "No, and stop asking"
 msgstr "לא, להפסיק לשאול"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "מאפייני החלון אינם מלאים"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1149,11 +1149,11 @@ msgstr ""
 "יהיה עליך<br>להשתמשכותרת החלון במקום. זה עובד רק אם<br>כותרת החלון היא אותה "
 "ב<br>הזמן החלון מתחיל לעלות , והאם השינוי לא<br>."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "עורך רשומות שולחן העבודה"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1161,43 +1161,43 @@ msgstr "עורך רשומות שולחן העבודה"
 msgid "Name"
 msgstr "שם"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "הערה"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "כתובת האתר"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "סמל"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "שם כללי"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "מחלקת החלון"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "קטגוריות"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "טיפוסי MIME"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "קובץ שולחן העבודה"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1210,30 +1210,30 @@ msgstr "קובץ שולחן העבודה"
 msgid "General"
 msgstr "כללי"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "התרעות בהפעלה"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "הפעלה במסוף"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "הצגה בתפריטים"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "אפשרויות"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "בחר סמל"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "בחר קובץהפעלה"
 
diff --git a/po/hr.po b/po/hr.po
index 9c5aac7b7e..ee8fff1c27 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -697,7 +697,7 @@ msgstr "Pokreni"
 msgid "Command"
 msgstr "Naredba"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -833,8 +833,8 @@ msgstr "Odabirač Boja"
 msgid "Select"
 msgstr "Odaberi Jedan"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -900,8 +900,8 @@ msgstr ""
 "<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1045,7 +1045,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -1153,11 +1153,11 @@ msgstr "Ne, ali povećaj vrijeme neaktivnosti"
 msgid "No, and stop asking"
 msgstr "Ne, i prestani pitati"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Nekompletna Svojstva Prozora"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1171,11 +1171,11 @@ msgstr ""
 "prozora. Ovo je u redu<br>jedino onda kad je naslov prozora isti u "
 "momentu<br>podizanja, i ako se ne mijenja."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Urednik Unosa u Radnu Površinu"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1183,43 +1183,43 @@ msgstr "Urednik Unosa u Radnu Površinu"
 msgid "Name"
 msgstr "Ime"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Komentar"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Općenito Ime"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Klasa Prozora"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorije"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Mime tipovi"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Datoteka Radne Površine"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1232,30 +1232,30 @@ msgstr "Datoteka Radne Površine"
 msgid "General"
 msgstr "Općenito"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Početna Obavijest"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Izvodi u Terminalu"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Prikaži u Izbornicima"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opcije"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Odaberi Ikonu"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Odaberi Izvršni"
 
diff --git a/po/hu.po b/po/hu.po
index 15086985db..464138a0f0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -699,7 +699,7 @@ msgstr "Indítás"
 msgid "Command"
 msgstr "Parancs"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -835,8 +835,8 @@ msgstr "Szín választó"
 msgid "Select"
 msgstr "Válassz egy"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -899,8 +899,8 @@ msgstr ""
 "%s<br><br> A fájl törölve lett.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1043,7 +1043,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Speciális"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Alap"
 
@@ -1150,11 +1150,11 @@ msgstr "Ne, de növelje a késleltetési időt"
 msgid "No, and stop asking"
 msgstr "Ne, és ne kérdezősködj"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Teljesítetlen ablak beállítások"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1167,11 +1167,11 @@ msgstr ""
 "lesz megkérdezve.<br> Az ablak címét kell használniod, mert a beállítások, "
 "csak akkor működnek, ha megegyezik az blak és z ikon neve."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Munkaasztal bejegyzés szerkesztő"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1179,43 +1179,43 @@ msgstr "Munkaasztal bejegyzés szerkesztő"
 msgid "Name"
 msgstr "Név"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Általános név"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Ablak osztály"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategóriák"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Mime Típus"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Desktop fájl"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1228,30 +1228,30 @@ msgstr "Desktop fájl"
 msgid "General"
 msgstr "Általános"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Indulás"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Futtatás terminálban"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Megjelenítés a menükben"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Beállítások"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Válassz egy ikont"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Egy futtatható kiválasztása"
 
diff --git a/po/it.po b/po/it.po
index e583fcdb12..9ffe84a524 100644
--- a/po/it.po
+++ b/po/it.po
@@ -662,7 +662,7 @@ msgstr "Lancia"
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:3350 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3350 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -790,8 +790,8 @@ msgstr "Selettore colore"
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:195
 #: src/bin/e_import_config_dialog.c:540
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -858,8 +858,8 @@ msgstr ""
 "stato abortito per sicurezza.<br>"
 
 #: src/bin/e_config.c:1529 src/bin/e_config.c:2163
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
 #: src/bin/e_fm.c:9967 src/bin/e_fm.c:10698 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:539 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:588
@@ -986,7 +986,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Basilari"
 
@@ -1092,11 +1092,11 @@ msgstr "No, ma aumenta la temporizzazione"
 msgid "No, and stop asking"
 msgstr "No, e non chiedere più"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Proprietà della finestra incomplete"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1108,11 +1108,11 @@ msgstr ""
 "\"titolo finestra\". Questo funzionerà solo se<br>il titolo sarà identico "
 "all'avvio della finestra<br>e non cambierà in seguito."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Editor file desktop"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499
 #: src/modules/conf_display/e_int_config_desk.c:186
 #: src/modules/conf_intl/e_int_config_imc.c:896
@@ -1121,42 +1121,42 @@ msgstr "Editor file desktop"
 msgid "Name"
 msgstr "Nome"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Commento"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icona"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Descrizione"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:120
 msgid "Window Class"
 msgstr "Classe"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Categorie"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Tipi Mime"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "File desktop"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:70
 #: src/modules/conf_comp/e_mod_config.c:561
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1169,30 +1169,30 @@ msgstr "File desktop"
 msgid "General"
 msgstr "Impostazioni generali"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Notifica avvio"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
 msgid "Run in Terminal"
 msgstr "Esegui in terminale"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Mostra in menù"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
 #: src/bin/e_int_border_remember.c:762
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Selezionare un'icona per '%s'"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Seleziona un'eseguibile"
 
diff --git a/po/ja.po b/po/ja.po
index 06c9b999b9..96d4e42b5f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -703,7 +703,7 @@ msgstr "コマンドの実行"
 msgid "Command"
 msgstr "コマンド"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -840,8 +840,8 @@ msgstr "色選択"
 msgid "Select"
 msgstr "選択"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -903,8 +903,8 @@ msgstr ""
 "はここで強制終了しました."
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1031,7 +1031,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "基本設定"
 
@@ -1137,11 +1137,11 @@ msgstr "いいえ. しかしタイムアウトは増やす"
 msgid "No, and stop asking"
 msgstr "いいえ. 以降は尋ねない"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "ウィンドウプロパティが不完全です"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1155,11 +1155,11 @@ msgstr ""
 "これがうまくいくのは, ウィンドウのタイトルが起動時と同じで,<br>変わっていない"
 "場合だけです."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "デスクトップエントリエディタ"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1167,45 +1167,45 @@ msgstr "デスクトップエントリエディタ"
 msgid "Name"
 msgstr "名前"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "注釈"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
 #
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "アイコン"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "一般名称"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "ウィンドウクラス"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "カテゴリ"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "MIME タイプ"
 
 #
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "desktop ファイル"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1218,30 +1218,30 @@ msgstr "desktop ファイル"
 msgid "General"
 msgstr "一般"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "起動通知"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "端末内で実行"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "メニューに表示する"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "オプション"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "アイコンを選択する"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "プログラムの選択"
 
diff --git a/po/km.po b/po/km.po
index a37229fade..ab25d95cb1 100644
--- a/po/km.po
+++ b/po/km.po
@@ -678,7 +678,7 @@ msgstr "ដំណើរការ"
 msgid "Command"
 msgstr "ពាក្យ​បញ្ជា"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -808,8 +808,8 @@ msgstr ""
 msgid "Select"
 msgstr "ជ្រើស​ទាំងអស់"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -858,8 +858,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -977,7 +977,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "កម្រិត​ខ្ពស់"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "មូល​ដ្ឋាន"
 
@@ -1072,11 +1072,11 @@ msgstr ""
 msgid "No, and stop asking"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1084,11 +1084,11 @@ msgid ""
 "time the window starts up, and does not<br>change."
 msgstr ""
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1096,42 +1096,42 @@ msgstr ""
 msgid "Name"
 msgstr "ឈ្មោះ"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "រូបតំណាង"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "ថ្នាក់​បង្អួច"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "ប្រភេទ"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "ប្រភេទ Mime"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1144,30 +1144,30 @@ msgstr ""
 msgid "General"
 msgstr "ទូទៅ"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "ជម្រើស"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index 701db9b340..1978f854c5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -669,7 +669,7 @@ msgstr "실행"
 msgid "Command"
 msgstr "명령"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -797,8 +797,8 @@ msgstr "색상 선택"
 msgid "Select"
 msgstr "선택"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9966
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9966
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -861,8 +861,8 @@ msgstr ""
 "니다.<br>"
 
 #: src/bin/e_config.c:1520 src/bin/e_config.c:2154
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9965 src/bin/e_fm.c:10691 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -985,7 +985,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "고급 설정"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "기본"
 
@@ -1090,11 +1090,11 @@ msgstr "아니요, 제한 시간을 늘립니다"
 msgid "No, and stop asking"
 msgstr "아니오, 묻지 마십시오"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "불 완전한 창 속성"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1105,11 +1105,11 @@ msgstr ""
 "<br>창 제목을 대신 사용해야 합니다.<br>동일한 창 제목을 가진 창에 대해서만"
 "<br>동작하며 제목을 바꿀 수 없습니다."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "데스크톱 항목 편집기"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:709
 #: src/modules/conf_display/e_int_config_desk.c:186
 #: src/modules/conf_intl/e_int_config_imc.c:896
@@ -1118,42 +1118,42 @@ msgstr "데스크톱 항목 편집기"
 msgid "Name"
 msgstr "이름"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "메모"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "아이콘"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "일반 이름"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:120
 msgid "Window Class"
 msgstr "창 분류"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "분류"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "MIME 형식"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "데스크톱 파일"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:70
 #: src/modules/comp/e_mod_config.c:1527
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1166,30 +1166,30 @@ msgstr "데스크톱 파일"
 msgid "General"
 msgstr "일반"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "시작 알림"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
 msgid "Run in Terminal"
 msgstr "터미널에서 실행"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "메뉴에 표시"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8771 src/bin/e_fm.c:8931
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8771 src/bin/e_fm.c:8931
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "옵션"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "'%s'에 대한 아이콘 선택"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "실행 파일 선택"
 
diff --git a/po/ku.po b/po/ku.po
index 578ff107e8..414aa07ee7 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -662,7 +662,7 @@ msgstr ""
 msgid "Command"
 msgstr ""
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -790,8 +790,8 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -840,8 +840,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -958,7 +958,7 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr ""
 
@@ -1053,11 +1053,11 @@ msgstr ""
 msgid "No, and stop asking"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1065,11 +1065,11 @@ msgid ""
 "time the window starts up, and does not<br>change."
 msgstr ""
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1077,42 +1077,42 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1125,30 +1125,30 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 77b96c9015..e0e497dc85 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -663,7 +663,7 @@ msgstr "Vykdyti"
 msgid "Command"
 msgstr "Komanda"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -791,8 +791,8 @@ msgstr "Spalvos parinkimas"
 msgid "Select"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9966
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9966
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -854,8 +854,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1524 src/bin/e_config.c:2158
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9965 src/bin/e_fm.c:10691 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -972,7 +972,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Sudėtingesnės"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Pagrindinės"
 
@@ -1074,11 +1074,11 @@ msgstr "Ne, bet padidinkite laukimo laiką"
 msgid "No, and stop asking"
 msgstr "Ne, ir daugiau neklauskite"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Nepilnos lango savybės"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1086,11 +1086,11 @@ msgid ""
 "time the window starts up, and does not<br>change."
 msgstr ""
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Darbalaukio elemento redaktorius"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:709
 #: src/modules/conf_display/e_int_config_desk.c:186
 #: src/modules/conf_intl/e_int_config_imc.c:896
@@ -1099,42 +1099,42 @@ msgstr "Darbalaukio elemento redaktorius"
 msgid "Name"
 msgstr "Vardas"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Komentaras"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Piktograma"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Bendrinis vardas"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:120
 msgid "Window Class"
 msgstr "Lango klasė"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorijos"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Mime tipai"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Darbalaukio failas"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:70
 #: src/modules/comp/e_mod_config.c:1527
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1147,30 +1147,30 @@ msgstr "Darbalaukio failas"
 msgid "General"
 msgstr "Bendri"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Informavimas paleidžiant"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
 msgid "Run in Terminal"
 msgstr "Vykdyti terminale"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Rodyti meniu"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8771 src/bin/e_fm.c:8931
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8771 src/bin/e_fm.c:8931
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Parinktys"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Parinkti vykdomąjį failą"
 
diff --git a/po/ms.po b/po/ms.po
index f5014d5828..b3664c2f0e 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -778,7 +778,7 @@ msgstr "Pelancaran"
 msgid "Command"
 msgstr "perintah"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, fuzzy, c-format
 msgid "Application"
@@ -927,8 +927,8 @@ msgstr "warna Pemilih"
 msgid "Select"
 msgstr "memilih"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -978,8 +978,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1122,7 +1122,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "maju"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 #, fuzzy
 msgid "Basic"
 msgstr "asas"
@@ -1234,12 +1234,12 @@ msgstr "Tidak, tetapi meningkatkan timeout"
 msgid "No, and stop asking"
 msgstr "Tidak, dan berhenti mempersoalkan"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 #, fuzzy
 msgid "Incomplete Window Properties"
 msgstr "Tetingkap Hartanah tidak lengkap"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1254,12 +1254,12 @@ msgstr ""
 "kerja<br>jika tajuk tetingkap yang sama di<br>masa tingkap bermula , dan "
 "melakukan perubahan yang tidak<br>."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 #, fuzzy
 msgid "Desktop Entry Editor"
 msgstr "Desktop Entry Editor"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1268,50 +1268,50 @@ msgstr "Desktop Entry Editor"
 msgid "Name"
 msgstr "nama"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 #, fuzzy
 msgid "Comment"
 msgstr "Komen"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 #, fuzzy
 msgid "Icon"
 msgstr "icon"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 #, fuzzy
 msgid "Generic Name"
 msgstr "Nama generik"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 #, fuzzy
 msgid "Window Class"
 msgstr "Kelas tetingkap"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 #, fuzzy
 msgid "Categories"
 msgstr "kategori"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 #, fuzzy
 msgid "Mime Types"
 msgstr "Jenis MIME"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 #, fuzzy
 msgid "Desktop file"
 msgstr "fail desktop"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1325,34 +1325,34 @@ msgstr "fail desktop"
 msgid "General"
 msgstr "Ketua"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 #, fuzzy
 msgid "Startup Notify"
 msgstr "startup Maklumkan"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 #, fuzzy
 msgid "Run in Terminal"
 msgstr "Diuruskan di Terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 #, fuzzy
 msgid "Show in Menus"
 msgstr "Tunjuk di Menu"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 #, fuzzy
 msgid "Options"
 msgstr "pilihan"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Pilih Icon"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 #, fuzzy
 msgid "Select an Executable"
 msgstr "Pilih laksana"
diff --git a/po/nb.po b/po/nb.po
index 8e5503e0d9..82c5cbda85 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -701,7 +701,7 @@ msgstr "Start"
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -837,8 +837,8 @@ msgstr "Fargevelger"
 msgid "Select"
 msgstr "Velg en"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -887,8 +887,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1029,7 +1029,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avansert"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Grunnleggende"
 
@@ -1135,12 +1135,12 @@ msgstr "Nei , men øke timeout"
 msgid "No, and stop asking"
 msgstr "Nei, og slutt å spør"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 #, fuzzy
 msgid "Incomplete Window Properties"
 msgstr "Ufullstendige Window Egenskaper"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1154,12 +1154,12 @@ msgstr ""
 "vinduet tittelen i stedet. Dette vil bare<br>arbeid hvis vinduet tittelen er "
 "den samme ved<br>den tiden vinduet starter opp , og ikke<br>endring."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 #, fuzzy
 msgid "Desktop Entry Editor"
 msgstr "Desktop Entry Editor"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1167,43 +1167,43 @@ msgstr "Desktop Entry Editor"
 msgid "Name"
 msgstr "Navn"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Generelt Navn"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Vindusklasse"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorier"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "MIME-typer"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Skrivebordsfil"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1216,30 +1216,30 @@ msgstr "Skrivebordsfil"
 msgid "General"
 msgstr "Generelt"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Oppstartsvarsling"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Kjør i terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Vis i Menyer"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Innstillinger"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Velg et ikon"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Velg et Program"
 
diff --git a/po/nl.po b/po/nl.po
index c8f7e93098..eb62341fb2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -684,7 +684,7 @@ msgstr "Voer uit"
 msgid "Command"
 msgstr "Commando"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -819,8 +819,8 @@ msgstr "Kleurenkiezer"
 msgid "Select"
 msgstr "Selecterend"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -886,8 +886,8 @@ msgstr ""
 "het schrijven is afgebroken voor uw veiligheid. <br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1016,7 +1016,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Eenvoudig"
 
@@ -1124,11 +1124,11 @@ msgstr "Neen, maar vergroot time-out"
 msgid "No, and stop asking"
 msgstr "Neen en stop met vragen"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Niet-complete venstereigenschappen"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1143,11 +1143,11 @@ msgstr ""
 "gebruiken. Dit zal alleen<br>werken wanneer de venstertitel niet hetzelfde "
 "is op het<br> moment dat het venster opstart en niet<br>verandert."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Bureaublad-invulling-bewerker"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1155,42 +1155,42 @@ msgstr "Bureaublad-invulling-bewerker"
 msgid "Name"
 msgstr "Naam"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Commentaar"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Icoon"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Generieke Naam"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Venster Klasse"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Categorieën"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Mimetypen"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Desktopbestand"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1203,30 +1203,30 @@ msgstr "Desktopbestand"
 msgid "General"
 msgstr "Algemeen"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Opstart Melding"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Uitvoeren in terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Weergeven in Menus"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opties"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Selecteer een Icoon"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Selecteer een Uitvoerbaar bestand"
 
diff --git a/po/pl.po b/po/pl.po
index 0587e1ad01..c0f68d69a6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -708,7 +708,7 @@ msgstr "Uruchom"
 msgid "Command"
 msgstr "Polecenie"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -845,8 +845,8 @@ msgstr "Wybór koloru"
 msgid "Select"
 msgstr "Ustawienia"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -907,8 +907,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1049,7 +1049,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Ustawienia zaawansowane"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Proste"
 
@@ -1161,11 +1161,11 @@ msgstr "Nie, ale zwiększ czas oczekiwania"
 msgid "No, and stop asking"
 msgstr "Nie i nie pytaj więcej"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Niekompletne właściwości okna"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1179,12 +1179,12 @@ msgstr ""
 "tego<br>tytułu okna. To zadziała tylko wtedy, gdy tytył jest taki<br>sam jak "
 "przy uruchomieniu programu<br>i nie zmienia się w trakcie jego działania"
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 #, fuzzy
 msgid "Desktop Entry Editor"
 msgstr "Redaktor Desktop Entry"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1192,42 +1192,42 @@ msgstr "Redaktor Desktop Entry"
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Komentarz"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Standardowa nazwa"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Klasa Okna"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorie"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Typy MIME"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Plik desktop"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1240,30 +1240,30 @@ msgstr "Plik desktop"
 msgid "General"
 msgstr "Ogólne"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Powiadomienie o uruchomieniu"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Uruchom w konsoli"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Pokaż w menu"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opcje"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Wybierz ikonę"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Wybierz plik wykonywalny"
 
diff --git a/po/pt.po b/po/pt.po
index e835693759..4c14400944 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -662,7 +662,7 @@ msgstr "Iniciar"
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:3350 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3350 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -790,8 +790,8 @@ msgstr "Seletor de cores"
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:193
 #: src/bin/e_import_config_dialog.c:536
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -855,8 +855,8 @@ msgstr ""
 "<br>"
 
 #: src/bin/e_config.c:1529 src/bin/e_config.c:2163
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
 #: src/bin/e_fm.c:9967 src/bin/e_fm.c:10698 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:535 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:568
@@ -981,7 +981,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Básico"
 
@@ -1086,11 +1086,11 @@ msgstr "Não mas aumentar o tempo limite."
 msgid "No, and stop asking"
 msgstr "Não e parar de perguntar."
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Propriedades incompletas da janela"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1102,11 +1102,11 @@ msgstr ""
 "o título da janela.<br>Isto só vai funcionar se o título da janela<br>for o "
 "mesmo no momento em que a janela<br>é iniciada e não for alterado."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Editor de itens da área de trabalho"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499
 #: src/modules/conf_display/e_int_config_desk.c:186
 #: src/modules/conf_intl/e_int_config_imc.c:896
@@ -1115,42 +1115,42 @@ msgstr "Editor de itens da área de trabalho"
 msgid "Name"
 msgstr "Nome"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ícone"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Nome genérico"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:120
 msgid "Window Class"
 msgstr "Classe da janela"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Categorias"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Tipo mime"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Ficheiro .desktop"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:70
 #: src/modules/conf_comp/e_mod_config.c:561
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1163,30 +1163,30 @@ msgstr "Ficheiro .desktop"
 msgid "General"
 msgstr "Geral"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Notificação de arranque"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
 msgid "Run in Terminal"
 msgstr "Executar no terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Mostrar no menu"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
 #: src/bin/e_int_border_remember.c:762
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opções"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Escolha o ícone para %s"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Escolha o executável"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8ec3c7e108..452f46a28e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -669,7 +669,7 @@ msgstr "Iniciar"
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -797,8 +797,8 @@ msgstr "Seletor de cores"
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -862,8 +862,8 @@ msgstr ""
 "<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -989,7 +989,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Básico"
 
@@ -1094,11 +1094,11 @@ msgstr "Não, mas aumentar o tempo limite"
 msgid "No, and stop asking"
 msgstr "Não e parar de perguntar"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Propriedades incompletas da janela"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1110,11 +1110,11 @@ msgstr ""
 "Isto só vai funcionar se o título da janela for o mesmo no momento em que a "
 "janela é iniciada e não for alterado."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Editor de itens da área de trabalho"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1122,42 +1122,42 @@ msgstr "Editor de itens da área de trabalho"
 msgid "Name"
 msgstr "Nome"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ícone"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Nome genérico"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Classe da janela"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Categorias"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Tipos mime"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Arquivo .desktop"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1170,30 +1170,30 @@ msgstr "Arquivo .desktop"
 msgid "General"
 msgstr "Geral"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Notificação de inicialização"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Executar no terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Mostrar no menu"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opções"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Escolha o ícone para %s"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Escolha o executável"
 
diff --git a/po/ro.po b/po/ro.po
index 3a3c2d1721..6761c9ea06 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -720,7 +720,7 @@ msgstr "Lansează"
 msgid "Command"
 msgstr "Comandă"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -862,8 +862,8 @@ msgstr "Selector culoare"
 msgid "Select"
 msgstr "Selectați o imagine"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -912,8 +912,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1054,7 +1054,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Standard"
 
@@ -1161,12 +1161,12 @@ msgstr "Nu , dar creşte timeout"
 msgid "No, and stop asking"
 msgstr "Nu , şi nu mai solicită"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 #, fuzzy
 msgid "Incomplete Window Properties"
 msgstr "Proprietăţi incomplete ferestre"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1181,12 +1181,12 @@ msgstr ""
 "loc. Acest lucru va doar munca<br>în cazul în care titlul de fereastra "
 "esteacelaşi<br>momentulfereastra porneşte în sus , şi nu schimbarea nu<br>."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 #, fuzzy
 msgid "Desktop Entry Editor"
 msgstr "Desktop Entry Editor"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1194,45 +1194,45 @@ msgstr "Desktop Entry Editor"
 msgid "Name"
 msgstr "Nume"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Comentariu"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL-ul"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Iconiță"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Nume generic"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 #, fuzzy
 msgid "Window Class"
 msgstr "Clasa window"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Categorii"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Tipuri MIME"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 #, fuzzy
 msgid "Desktop file"
 msgstr "Desktop fişier"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1245,31 +1245,31 @@ msgstr "Desktop fişier"
 msgid "General"
 msgstr "General"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 #, fuzzy
 msgid "Startup Notify"
 msgstr "Startup Notify"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Execută în terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Arată în meniuri"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Opțiuni"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Selectaţi o pictogramă"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 #, fuzzy
 msgid "Select an Executable"
 msgstr "Selectaţi un executabil"
diff --git a/po/ru.po b/po/ru.po
index 6576844092..8ef6ac5e64 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -666,7 +666,7 @@ msgstr "Запуск"
 msgid "Command"
 msgstr "Команда"
 
-#: src/bin/e_actions.c:3350 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3350 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -794,8 +794,8 @@ msgstr "Выбор цвета"
 msgid "Select"
 msgstr "Выбрать"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:195
 #: src/bin/e_import_config_dialog.c:540
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -857,8 +857,8 @@ msgstr ""
 "%s<br><br>в:<br>%s<br><br>Запись была прервана в целях безопасности.<br>"
 
 #: src/bin/e_config.c:1529 src/bin/e_config.c:2163
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:615
 #: src/bin/e_fm.c:9967 src/bin/e_fm.c:10698 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:539 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:568
@@ -982,7 +982,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Базово"
 
@@ -1087,11 +1087,11 @@ msgstr "Нет, но увеличить задержку"
 msgid "No, and stop asking"
 msgstr "Нет, и не спрашивать больше"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Неполные свойства окна"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1103,11 +1103,11 @@ msgstr ""
 "будет работать<br>только если заголовок окна будет тем же<br>самым в момент "
 "запуска окна, и не будет<br>меняться в дальнейшем."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Редактор записей .desktop"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499
 #: src/modules/conf_display/e_int_config_desk.c:186
 #: src/modules/conf_intl/e_int_config_imc.c:896
@@ -1116,42 +1116,42 @@ msgstr "Редактор записей .desktop"
 msgid "Name"
 msgstr "Имя"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Комментарий"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Значок"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Стандартное имя"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:120
 msgid "Window Class"
 msgstr "Класс окна"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Категории"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Mime-типы"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Файл .desktop"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:70
 #: src/modules/conf_comp/e_mod_config.c:561
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1164,30 +1164,30 @@ msgstr "Файл .desktop"
 msgid "General"
 msgstr "Общее"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Уведомление о запуске"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1183
 msgid "Run in Terminal"
 msgstr "Запускать в терминале"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Показывать в меню"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936
 #: src/bin/e_int_border_remember.c:762
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Опции"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Выбрать значок для '%s'"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Выбрать исполняемый файл"
 
diff --git a/po/sk.po b/po/sk.po
index cf03a40283..e08466ea28 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -696,7 +696,7 @@ msgstr "Spustiť"
 msgid "Command"
 msgstr "Príkaz"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -833,8 +833,8 @@ msgstr "Výber farieb"
 msgid "Select"
 msgstr "Vyberte jednu"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -899,8 +899,8 @@ msgstr ""
 "%s<br><br>Tento súbor bol zmazaný, aby sa<br>zabránilo poškodeniu údajov.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1042,7 +1042,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Základné"
 
@@ -1150,11 +1150,11 @@ msgstr "Nie, ale zvýšenie zostávajuceho času"
 msgid "No, and stop asking"
 msgstr "Nie, a žiadosť o zastavenie"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Nastavenia nedokončeného okna"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1168,11 +1168,11 @@ msgstr ""
 "fungovať iba pokiaľ nadpis okna bude rovnaký pri štarte a nezmení <br>sa "
 "počas behu."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Editor záznamov plochy"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1180,43 +1180,43 @@ msgstr "Editor záznamov plochy"
 msgid "Name"
 msgstr "Meno"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Komentár"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Vešobecný názov"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Trieda Okna"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategórie"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Typy MIME"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Súbor plochy"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1229,30 +1229,30 @@ msgstr "Súbor plochy"
 msgid "General"
 msgstr "Hlavné"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Upozorniť pri štarte"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Spustiť v termináli"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Zobraziť v ponukách"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Voľby"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Vybrať ikonu"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Vybrať spustiteľný súbor"
 
diff --git a/po/sl.po b/po/sl.po
index 03cf5d8cf6..035686ce45 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -694,7 +694,7 @@ msgstr "Zaženi"
 msgid "Command"
 msgstr "Ukaz"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -831,8 +831,8 @@ msgstr "Izbirnik barve"
 msgid "Select"
 msgstr "Izbiranje"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -896,8 +896,8 @@ msgstr ""
 "opuščeno.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1027,7 +1027,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -1135,11 +1135,11 @@ msgstr "Ne, ampak zvišaj časovno zakasnitev"
 msgid "No, and stop asking"
 msgstr "Ne in ne sprašuj več"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Lastnosti nepopolnih oken"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1153,11 +1153,11 @@ msgstr ""
 "okna. To bo delovalo<br>le če je naslov okna enak ob<br>zagonu okna, in se "
 "ne<br>spremeni."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Urejevalnik namiznih vnosov"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1165,42 +1165,42 @@ msgstr "Urejevalnik namiznih vnosov"
 msgid "Name"
 msgstr "Ime"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Opomba"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Splošno ime"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Razred okna"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorije"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Vrste MIME"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Datoteka namizja"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1213,30 +1213,30 @@ msgstr "Datoteka namizja"
 msgid "General"
 msgstr "Splošno"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Zagonsko Obveščanje"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Zaženi v terminalu"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Prikaži v menijih"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Možnosti"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Izberi ikono"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Izberi izvršilno datoteko"
 
diff --git a/po/sv.po b/po/sv.po
index e41a441c81..c90b3a8d6a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -706,7 +706,7 @@ msgstr "Kör"
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -848,8 +848,8 @@ msgstr "Färgväljare"
 msgid "Select"
 msgstr "Välj en"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -898,8 +898,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1038,7 +1038,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Enkelt"
 
@@ -1147,11 +1147,11 @@ msgstr "Nej, men öka timeout"
 msgid "No, and stop asking"
 msgstr "Nej, och sluta fråga"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Ofullständiga fönsteregenskaper"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1166,12 +1166,12 @@ msgstr ""
 "fönstret titeln är densamma vid<br>när fönstret startar , och "
 "inte<br>förändring."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 #, fuzzy
 msgid "Desktop Entry Editor"
 msgstr "Desktop Entry Editor"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1179,44 +1179,44 @@ msgstr "Desktop Entry Editor"
 msgid "Name"
 msgstr "Namn"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 #, fuzzy
 msgid "Generic Name"
 msgstr "generiskt namn"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Fönsterklass"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategorier"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Mimetyper"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Skrivbordsfil"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1229,30 +1229,30 @@ msgstr "Skrivbordsfil"
 msgid "General"
 msgstr "Allmänt"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Uppstartsindikering"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Kör i terminal"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Visa i menyer"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Inställningar"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Välj en ikon"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Välj en körbar fil"
 
diff --git a/po/tr.po b/po/tr.po
index 4967a8f6b1..29a45344e3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -699,7 +699,7 @@ msgstr "Başlat"
 msgid "Command"
 msgstr "Komut"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -835,8 +835,8 @@ msgstr "Renk Seçici"
 msgid "Select"
 msgstr "Birini seç"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -885,8 +885,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1024,7 +1024,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Basit"
 
@@ -1136,11 +1136,11 @@ msgstr "Hayır, fakat zaman aşımını arttır"
 msgid "No, and stop asking"
 msgstr "Hayır, tekrar sorma"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Tamamlanmamış Pencere Özellikleri"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1155,11 +1155,11 @@ msgstr ""
 "başlık<br>iş<br>penceresi açılıyorzamanaynıdır ve<br>değil değişiklik yok "
 "eğer."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Masaüstü Girdisi Düzenleyici"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1167,43 +1167,43 @@ msgstr "Masaüstü Girdisi Düzenleyici"
 msgid "Name"
 msgstr "İsim"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Yorum"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Simge"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Genel Adı"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Pencere Sınıfı"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Kategoriler"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Mime Türleri"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Masaüstü dosyası"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1216,30 +1216,30 @@ msgstr "Masaüstü dosyası"
 msgid "General"
 msgstr "Genel"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Açılışta Bildir"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Terminalde Çalıştır"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Menüde Göster"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Seçenekler"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Simge Seç"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Çalıştırılabilir Dosya Seç"
 
diff --git a/po/uk.po b/po/uk.po
index a896fc48ad..190653d306 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -696,7 +696,7 @@ msgstr "Запустити"
 msgid "Command"
 msgstr "Команду"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -832,8 +832,8 @@ msgstr "Вибір кольору"
 msgid "Select"
 msgstr "Вибрати один"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -897,8 +897,8 @@ msgstr ""
 "файл був вилучений, щоб уникнути недостовірних даних.<br>"
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9958 src/bin/e_fm.c:10684 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -1040,7 +1040,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "Додатково"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "Базове"
 
@@ -1147,11 +1147,11 @@ msgstr "Ні, але збільшити затримку"
 msgid "No, and stop asking"
 msgstr "Ні, і більше не запитувати"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "Неповні властивості вікна"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1165,11 +1165,11 @@ msgstr ""
 "замість цього.<br>Це спрацює якщо тільки заголовок буде таким самим "
 "під<br>час запуску вікна, та не змінюватиметься надалі."
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Редактор програм"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1177,43 +1177,43 @@ msgstr "Редактор програм"
 msgid "Name"
 msgstr "Назва"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 #, fuzzy
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "Піктограма"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "Загальна назва"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "Клас вікна"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "Категорії"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Типи MIME"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "Файл стільниці"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1226,30 +1226,30 @@ msgstr "Файл стільниці"
 msgid "General"
 msgstr "Загальні"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "Сповіщення про запуск"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "Запустити в Терміналі"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "Показувати в меню"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8764 src/bin/e_fm.c:8924
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "Опції"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, fuzzy, c-format
 msgid "Select an Icon for '%s'"
 msgstr "Вибрати піктограму"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "Виберіть виконуваний файл"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 75a226a735..ada6920e7c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -706,7 +706,7 @@ msgid "Command"
 msgstr "命令"
 
 #. desktop type: application
-#: ../src/bin/e_actions.c:3353 ../src/bin/e_eap_editor.c:698
+#: ../src/bin/e_actions.c:3353 ../src/bin/e_desktop_editor.c:698
 #: ../src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -840,8 +840,8 @@ msgstr "颜色选择器"
 msgid "Select"
 msgstr "选择"
 
-#: ../src/bin/e_color_dialog.c:47 ../src/bin/e_eap_editor.c:862
-#: ../src/bin/e_eap_editor.c:925 ../src/bin/e_entry_dialog.c:64
+#: ../src/bin/e_color_dialog.c:47 ../src/bin/e_desktop_editor.c:862
+#: ../src/bin/e_desktop_editor.c:925 ../src/bin/e_entry_dialog.c:64
 #: ../src/bin/e_fm.c:9959 ../src/bin/e_fm_prop.c:625
 #: ../src/bin/e_import_dialog.c:194 ../src/bin/e_import_config_dialog.c:537
 #: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -901,8 +901,8 @@ msgstr ""
 #. buttons at the bottom
 #. Some buttons
 #: ../src/bin/e_config.c:1732 ../src/bin/e_config.c:2366
-#: ../src/bin/e_config_dialog.c:278 ../src/bin/e_eap_editor.c:860
-#: ../src/bin/e_eap_editor.c:923 ../src/bin/e_entry_dialog.c:63
+#: ../src/bin/e_config_dialog.c:278 ../src/bin/e_desktop_editor.c:860
+#: ../src/bin/e_desktop_editor.c:923 ../src/bin/e_entry_dialog.c:63
 #: ../src/bin/e_exec.c:613 ../src/bin/e_fm.c:9958 ../src/bin/e_fm.c:10684
 #: ../src/bin/e_fm_prop.c:624 ../src/bin/e_import_config_dialog.c:536
 #: ../src/bin/e_int_border_remember.c:318
@@ -1022,7 +1022,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "高级"
 
-#: ../src/bin/e_config_dialog.c:255 ../src/bin/e_eap_editor.c:719
+#: ../src/bin/e_config_dialog.c:255 ../src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "基本"
 
@@ -1124,11 +1124,11 @@ msgstr "否，继续延时"
 msgid "No, and stop asking"
 msgstr "否，以后不再询问"
 
-#: ../src/bin/e_eap_editor.c:181
+#: ../src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "窗口属性不全"
 
-#: ../src/bin/e_eap_editor.c:182
+#: ../src/bin/e_desktop_editor.c:182
 #, fuzzy
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
@@ -1140,11 +1140,11 @@ msgstr ""
 "瞎猜的。您可以使用窗口标题名代替，但这必须是窗口启动后，其标题名和设置一致，"
 "并且一直不能改变。"
 
-#: ../src/bin/e_eap_editor.c:235
+#: ../src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "桌面条目编辑器"
 
-#: ../src/bin/e_eap_editor.c:677 ../src/bin/e_int_border_prop.c:445
+#: ../src/bin/e_desktop_editor.c:677 ../src/bin/e_int_border_prop.c:445
 #: ../src/bin/e_int_border_prop.c:499 ../src/modules/comp/e_mod_config.c:713
 #: ../src/modules/conf_intl/e_int_config_imc.c:896
 #: ../src/modules/conf_menus/e_int_config_menus.c:265
@@ -1152,46 +1152,46 @@ msgstr "桌面条目编辑器"
 msgid "Name"
 msgstr "名称"
 
-#: ../src/bin/e_eap_editor.c:688 ../src/modules/ibar/e_mod_config.c:134
+#: ../src/bin/e_desktop_editor.c:688 ../src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "评论"
 
 #. desktop type: url
-#: ../src/bin/e_eap_editor.c:710
+#: ../src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: ../src/bin/e_eap_editor.c:732 ../src/bin/e_eap_editor.c:741
+#: ../src/bin/e_desktop_editor.c:732 ../src/bin/e_desktop_editor.c:741
 #: ../src/bin/e_fm_prop.c:495
 #: ../src/modules/conf_theme/e_int_config_fonts.c:95
 #: ../src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "图标"
 
-#: ../src/bin/e_eap_editor.c:745
+#: ../src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "常规名称"
 
-#: ../src/bin/e_eap_editor.c:751
+#: ../src/bin/e_desktop_editor.c:751
 #: ../src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "窗口类"
 
-#: ../src/bin/e_eap_editor.c:757
+#: ../src/bin/e_desktop_editor.c:757
 #: ../src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "分类"
 
-#: ../src/bin/e_eap_editor.c:764
+#: ../src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "MIME 类型"
 
-#: ../src/bin/e_eap_editor.c:771
+#: ../src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "desktop 文件"
 
 #. General settings
-#: ../src/bin/e_eap_editor.c:781 ../src/bin/e_int_border_prop.c:450
+#: ../src/bin/e_desktop_editor.c:781 ../src/bin/e_int_border_prop.c:450
 #: ../src/bin/e_int_border_prop.c:502 ../src/modules/access/e_mod_config.c:68
 #: ../src/modules/comp/e_mod_config.c:1531
 #: ../src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1205,31 +1205,31 @@ msgstr "desktop 文件"
 msgid "General"
 msgstr "常规"
 
-#: ../src/bin/e_eap_editor.c:784
+#: ../src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "启动时通知"
 
-#: ../src/bin/e_eap_editor.c:786
+#: ../src/bin/e_desktop_editor.c:786
 #: ../src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "在终端中运行"
 
-#: ../src/bin/e_eap_editor.c:788
+#: ../src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "显示在菜单中"
 
-#: ../src/bin/e_eap_editor.c:791 ../src/bin/e_fm.c:8764 ../src/bin/e_fm.c:8924
+#: ../src/bin/e_desktop_editor.c:791 ../src/bin/e_fm.c:8764 ../src/bin/e_fm.c:8924
 #: ../src/bin/e_int_border_remember.c:763
 #: ../src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "选项"
 
-#: ../src/bin/e_eap_editor.c:822
+#: ../src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "为 %s 选择一个图标"
 
-#: ../src/bin/e_eap_editor.c:888
+#: ../src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "选择一个可执行文件"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ac37e15166..5eeeaf484c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -665,7 +665,7 @@ msgstr "啟動"
 msgid "Command"
 msgstr "命令"
 
-#: src/bin/e_actions.c:3353 src/bin/e_eap_editor.c:698
+#: src/bin/e_actions.c:3353 src/bin/e_desktop_editor.c:698
 #: src/bin/e_int_border_menu.c:118
 #, c-format
 msgid "Application"
@@ -793,8 +793,8 @@ msgstr "顏色選擇"
 msgid "Select"
 msgstr "選取"
 
-#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862
-#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9958
+#: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:862
+#: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9958
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
@@ -848,8 +848,8 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_config.c:1732 src/bin/e_config.c:2366
-#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860
-#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
+#: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:860
+#: src/bin/e_desktop_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613
 #: src/bin/e_fm.c:9957 src/bin/e_fm.c:10683 src/bin/e_fm_prop.c:624
 #: src/bin/e_import_config_dialog.c:536 src/bin/e_int_border_remember.c:318
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
@@ -966,7 +966,7 @@ msgstr ""
 msgid "Advanced"
 msgstr "進階設定"
 
-#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719
+#: src/bin/e_config_dialog.c:255 src/bin/e_desktop_editor.c:719
 msgid "Basic"
 msgstr "基本設定"
 
@@ -1064,11 +1064,11 @@ msgstr ""
 msgid "No, and stop asking"
 msgstr "不要，並且往後不要再詢問"
 
-#: src/bin/e_eap_editor.c:181
+#: src/bin/e_desktop_editor.c:181
 msgid "Incomplete Window Properties"
 msgstr "不完整的視窗屬性"
 
-#: src/bin/e_eap_editor.c:182
+#: src/bin/e_desktop_editor.c:182
 msgid ""
 "The window you are creating an icon for<br>does not contain window name and "
 "class<br>properties. Without these, you will have to<br>use the window title "
@@ -1076,11 +1076,11 @@ msgid ""
 "time the window starts up, and does not<br>change."
 msgstr ""
 
-#: src/bin/e_eap_editor.c:235
+#: src/bin/e_desktop_editor.c:235
 msgid "Desktop Entry Editor"
 msgstr "Desktop 內容編輯器"
 
-#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445
+#: src/bin/e_desktop_editor.c:677 src/bin/e_int_border_prop.c:445
 #: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:713
 #: src/modules/conf_intl/e_int_config_imc.c:896
 #: src/modules/conf_menus/e_int_config_menus.c:265
@@ -1088,42 +1088,42 @@ msgstr "Desktop 內容編輯器"
 msgid "Name"
 msgstr "名稱"
 
-#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134
+#: src/bin/e_desktop_editor.c:688 src/modules/ibar/e_mod_config.c:134
 msgid "Comment"
 msgstr "註解"
 
-#: src/bin/e_eap_editor.c:710
+#: src/bin/e_desktop_editor.c:710
 msgid "URL"
 msgstr "URL"
 
-#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741
+#: src/bin/e_desktop_editor.c:732 src/bin/e_desktop_editor.c:741
 #: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95
 #: src/modules/fileman/e_int_config_mime_edit.c:145
 msgid "Icon"
 msgstr "圖示"
 
-#: src/bin/e_eap_editor.c:745
+#: src/bin/e_desktop_editor.c:745
 msgid "Generic Name"
 msgstr "通用名稱"
 
-#: src/bin/e_eap_editor.c:751
+#: src/bin/e_desktop_editor.c:751
 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103
 msgid "Window Class"
 msgstr "視窗類別"
 
-#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
+#: src/bin/e_desktop_editor.c:757 src/modules/fileman/e_int_config_mime.c:170
 msgid "Categories"
 msgstr "類別"
 
-#: src/bin/e_eap_editor.c:764
+#: src/bin/e_desktop_editor.c:764
 msgid "Mime Types"
 msgstr "Mime類型"
 
-#: src/bin/e_eap_editor.c:771
+#: src/bin/e_desktop_editor.c:771
 msgid "Desktop file"
 msgstr "桌面檔"
 
-#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450
+#: src/bin/e_desktop_editor.c:781 src/bin/e_int_border_prop.c:450
 #: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68
 #: src/modules/comp/e_mod_config.c:1531
 #: src/modules/conf_applications/e_int_config_defapps.c:358
@@ -1136,30 +1136,30 @@ msgstr "桌面檔"
 msgid "General"
 msgstr "一般資訊"
 
-#: src/bin/e_eap_editor.c:784
+#: src/bin/e_desktop_editor.c:784
 msgid "Startup Notify"
 msgstr "啟動通知"
 
-#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
+#: src/bin/e_desktop_editor.c:786 src/modules/everything/evry_plug_apps.c:1182
 msgid "Run in Terminal"
 msgstr "在終端機執行"
 
-#: src/bin/e_eap_editor.c:788
+#: src/bin/e_desktop_editor.c:788
 msgid "Show in Menus"
 msgstr "在選單中顯示"
 
-#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8763 src/bin/e_fm.c:8923
+#: src/bin/e_desktop_editor.c:791 src/bin/e_fm.c:8763 src/bin/e_fm.c:8923
 #: src/bin/e_int_border_remember.c:763
 #: src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
 msgstr "選項"
 
-#: src/bin/e_eap_editor.c:822
+#: src/bin/e_desktop_editor.c:822
 #, c-format
 msgid "Select an Icon for '%s'"
 msgstr "請替 '%s' 選取一個圖示"
 
-#: src/bin/e_eap_editor.c:888
+#: src/bin/e_desktop_editor.c:888
 msgid "Select an Executable"
 msgstr "選擇一個執行檔"