diff --git a/po/ar.po b/po/ar.po
index 1d2e4e78e..5ac8936f9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7053,11 +7053,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "اقفل عند اﻹقلاع"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/bg.po b/po/bg.po
index 754817b80..475ef5dec 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7417,11 +7417,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Ключалка на Startup"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/ca.po b/po/ca.po
index 1af709f80..30be89f2d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7008,11 +7008,11 @@ msgid "Response"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Restaura configuració a l'arrancar"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Connexió en calent de monitor"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/cs.po b/po/cs.po
index a56907fca..48ca48fca 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7051,11 +7051,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Uzamknout při spuštění"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/da.po b/po/da.po
index f94bad231..baf18c39d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6935,11 +6935,11 @@ msgid "Response"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Gendan opsætning ved start"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Hotplug af skærm"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/de.po b/po/de.po
index 0f2e54804..d752ee456 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7026,11 +7026,11 @@ msgid "Response"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Wiederherstellen nach start"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Neue Monitore"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/el.po b/po/el.po
index 5a64403df..0f2d5c329 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7071,11 +7071,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Αποκατάσταση κατά την εκκίνηση"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/eo.po b/po/eo.po
index 66a9aed7e..8b7caa4e4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7003,11 +7003,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Restaŭrigi dum starto"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/es.po b/po/es.po
index 9ac8832cd..4d4947341 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7185,20 +7185,20 @@ msgstr ""
 # Hay que encontrar algo más corto.
 # Preguntar a Massimo sobre cadenas largas en italiano.
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Restaurar configuración al iniciar"
 
 # Controlar en vez de "pantalla", eso de hotplug de una pantalla externa:
 #    o = elm_check_add(win);
 #    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
 #    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-#    elm_object_text_set(o, _("Monitor hotplug"));
+#    elm_object_text_set(o, _("Hotplug"));
 #    elm_check_state_set(o, cfdata->hotplug);
 #    elm_box_pack_end(bx2, o);
 #    evas_object_show(o);
 #    evas_object_smart_callback_add(o, "changed", _cb_hotplug_changed, cfdata);
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Controlar hotplug"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/et.po b/po/et.po
index 043a86c23..4a02223f5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7603,11 +7603,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Lukk Startup"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/fi.po b/po/fi.po
index 8f44eef5c..f39b5d48c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6954,11 +6954,11 @@ msgid "Response"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Palauta asetukset käynnistyksessä"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/fo.po b/po/fo.po
index 1d96712d4..9ea2f9c91 100644
--- a/po/fo.po
+++ b/po/fo.po
@@ -6849,11 +6849,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Hvílustøða"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/fr.po b/po/fr.po
index 381895aac..c1589612f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6989,11 +6989,11 @@ msgid "Response"
 msgstr "Réponse"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Restaurer la configuration au démarrage"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Branchement à chaud"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/fr_CH.po b/po/fr_CH.po
index a8d0ca7df..8e02721d1 100644
--- a/po/fr_CH.po
+++ b/po/fr_CH.po
@@ -7481,11 +7481,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Restauration de la Résolution au Démarrage"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/gl.po b/po/gl.po
index fa81d6367..757c2b8a6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7026,11 +7026,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Restaurar no arranque"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/he.po b/po/he.po
index fb9622604..c94d3c479 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7400,11 +7400,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "נעל על אתחול"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/hr.po b/po/hr.po
index dc0dd00c5..338a1fe27 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7335,11 +7335,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Zaključavanje na pokretanje"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/hu.po b/po/hu.po
index 93a4d0dca..940d8ed29 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7015,11 +7015,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Indításkor helyreállít"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/it.po b/po/it.po
index 5b39d5a18..88340f92f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7006,11 +7006,11 @@ msgid "Response"
 msgstr "Responso"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Ripristina impostazioni all'avvio"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Gestisci connessione monitor"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/ja.po b/po/ja.po
index bc96ca59b..d40187b66 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7343,11 +7343,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "起動時にガバナー復帰"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/ka.po b/po/ka.po
index bf93e564c..67a2a62e2 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -6687,11 +6687,11 @@ msgid "Response"
 msgstr "პასუხი"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "ეკრანის ჩართულზე მიერთება"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/km.po b/po/km.po
index ad0a43d02..13a878b96 100644
--- a/po/km.po
+++ b/po/km.po
@@ -6788,11 +6788,11 @@ msgid "Response"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/ko.po b/po/ko.po
index 8359ba360..6dba4e6c8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7003,11 +7003,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "시작시 잠금"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/lt.po b/po/lt.po
index 924688d30..f5dc97897 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6878,11 +6878,11 @@ msgid "Response"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/ms.po b/po/ms.po
index c6d9901ae..bcdbecd78 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7603,11 +7603,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Mengunci Permulaan"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/nb.po b/po/nb.po
index 0650df7b6..a7044f934 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7427,11 +7427,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Gjenopprett oppløsningen ved oppstart"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/nl.po b/po/nl.po
index 51964283e..47fa56c0e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6919,11 +6919,11 @@ msgid "Response"
 msgstr "Reactie"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Instellingen terugzetten bij starten"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Inprikken van beeldscherm"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/pl.po b/po/pl.po
index b901e50e5..d7cc273dc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7364,11 +7364,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Przywróć Zarządcę przy Starcie"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/pt.po b/po/pt.po
index a8f5f0d06..90275b349 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6938,12 +6938,12 @@ msgid "Response"
 msgstr "Resposta"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Restaurar configuração ao iniciar"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
-msgstr "Monitor hotplug"
+msgid "Hotplug"
+msgstr "Hotplug"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
 msgid "Lid Events"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a6f0a6dd7..a9ce32191 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7050,11 +7050,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Bloquear ao iniciar"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/ro.po b/po/ro.po
index c0f2a97a6..e9df97002 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7488,11 +7488,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Blocare la pornire"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/ru.po b/po/ru.po
index bb8f08a46..2b60ddbb0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7026,11 +7026,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Восстанавливать при запуске"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/sk.po b/po/sk.po
index 146a97ae2..dc2551347 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7387,11 +7387,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Obnoviť Regulátor pri Štarte"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/sl.po b/po/sl.po
index 117efd694..0d1c39395 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7015,11 +7015,11 @@ msgid "Response"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Obnovi nastavitev ob zagonu"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Monitorjev priključek"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/sr.po b/po/sr.po
index 9bf701c24..77d4b2031 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6933,11 +6933,11 @@ msgid "Response"
 msgstr "Одзив"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Поврати поставке на почетку"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Надгледај прикључења"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/sv.po b/po/sv.po
index 9c8495c3a..273054e57 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7432,11 +7432,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Återställ Governor vid start"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/tr.po b/po/tr.po
index 15ec24ae1..5e0793559 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7004,11 +7004,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Başlangıçta yenile"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/uk.po b/po/uk.po
index 2539a04df..b367d8128 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7331,11 +7331,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Блокування при запуску"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/vi.po b/po/vi.po
index abe832900..cedfa4361 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6978,11 +6978,11 @@ msgid "Response"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "Khôi phục thiết lập lúc khởi động"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr "Màn hình hotplug"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 333c7ff98..773dfcca3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6946,11 +6946,11 @@ msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
 #, fuzzy
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr "启动时锁定"
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e5663ff37..7389f506b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6837,11 +6837,11 @@ msgid "Response"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1182
-msgid "Restore setup on start"
+msgid "Restore on start"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1191
-msgid "Monitor hotplug"
+msgid "Hotplug"
 msgstr ""
 
 #: src/modules/conf_randr/e_int_config_randr2.c:1200
diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c
index 4917c7906..d4cd72753 100644
--- a/src/bin/e_comp_x_randr.c
+++ b/src/bin/e_comp_x_randr.c
@@ -875,13 +875,17 @@ _e_comp_xrandr_ecore_x(void)
 E_API void
 e_comp_x_randr_config_apply(void)
 {
-   if (use_xrandr == -1)
-     {
-        if (ecore_file_app_installed("xrandr")) use_xrandr = 1;
-        else use_xrandr = 0;
-     }
-   if (use_xrandr == 1) _e_comp_xrandr_cmd();
-   else _e_comp_xrandr_ecore_x();
+  if (e_randr2_cfg->use_cmd)
+    {
+      if (use_xrandr == -1)
+        {
+          if (ecore_file_app_installed("xrandr")) use_xrandr = 1;
+          else use_xrandr = 0;
+        }
+    }
+  else use_xrandr = 0;
+  if (use_xrandr == 1) _e_comp_xrandr_cmd();
+  else _e_comp_xrandr_ecore_x();
 }
 
 E_API Eina_Bool
diff --git a/src/bin/e_randr2.c b/src/bin/e_randr2.c
index 6efb767e0..24bc464e6 100644
--- a/src/bin/e_randr2.c
+++ b/src/bin/e_randr2.c
@@ -90,6 +90,7 @@ e_randr2_init(void)
    E_CONFIG_LIST(D, T, screens, _e_randr2_cfg_screen_edd);
    E_CONFIG_VAL(D, T, hotplug_response, DOUBLE);
    E_CONFIG_VAL(D, T, restore, UCHAR);
+   E_CONFIG_VAL(D, T, use_cmd, UCHAR);
    E_CONFIG_VAL(D, T, ignore_hotplug_events, UCHAR);
    E_CONFIG_VAL(D, T, ignore_acpi_events, UCHAR);
    E_CONFIG_VAL(D, T, default_policy, UINT);
@@ -393,6 +394,7 @@ _config_load(void)
    cfg->version = E_RANDR_CONFIG_VERSION;
    cfg->screens = NULL;
    cfg->restore = 1;
+   cfg->use_cmd = 0;
    cfg->ignore_hotplug_events = 0;
    cfg->ignore_acpi_events = 0;
    cfg->default_policy = E_RANDR2_POLICY_EXTEND;
diff --git a/src/bin/e_randr2.h b/src/bin/e_randr2.h
index 70d27c092..9d36af328 100644
--- a/src/bin/e_randr2.h
+++ b/src/bin/e_randr2.h
@@ -102,6 +102,7 @@ struct _E_Config_Randr2
    unsigned char  restore;
    unsigned char  ignore_hotplug_events;
    unsigned char  ignore_acpi_events;
+   unsigned char  use_cmd;
    E_Randr2_Policy default_policy;
    double         hotplug_response;
 };
diff --git a/src/modules/conf_randr/e_int_config_randr2.c b/src/modules/conf_randr/e_int_config_randr2.c
index 9f2163b41..3a2cf6323 100644
--- a/src/modules/conf_randr/e_int_config_randr2.c
+++ b/src/modules/conf_randr/e_int_config_randr2.c
@@ -30,6 +30,7 @@ struct _E_Config_Dialog_Data
    Evas_Object *scale_value_obj;
    Evas_Object *policy_obj;
    int restore;
+   int use_cmd;
    int hotplug;
    int acpi;
    int screen;
@@ -103,6 +104,7 @@ _create_data(E_Config_Dialog *cfd EINA_UNUSED)
    if (!(cfdata = E_NEW(E_Config_Dialog_Data, 1))) return NULL;
    if (cfd->data) cfdata->params = strdup(cfd->data);
    cfdata->restore = e_randr2_cfg->restore;
+   cfdata->use_cmd = e_randr2_cfg->use_cmd;
    cfdata->hotplug = !e_randr2_cfg->ignore_hotplug_events;
    cfdata->acpi = !e_randr2_cfg->ignore_acpi_events;
    cfdata->policy = e_randr2_cfg->default_policy;
@@ -147,6 +149,14 @@ _cb_restore_changed(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_U
    e_config_dialog_changed_set(cfdata->cfd, EINA_TRUE);
 }
 
+static void
+_cb_use_cmd_changed(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   cfdata->use_cmd = elm_check_state_get(obj);
+   e_config_dialog_changed_set(cfdata->cfd, EINA_TRUE);
+}
+
 static void
 _cb_hotplug_changed(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED)
 {
@@ -1179,7 +1189,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas EINA_UNUSED, E_Config_Dialog_Data
    o = elm_check_add(win);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_object_text_set(o, _("Restore setup on start"));
+   elm_object_text_set(o, _("Restore on start"));
    elm_check_state_set(o, cfdata->restore);
    elm_box_pack_end(bx2, o);
    evas_object_show(o);
@@ -1188,7 +1198,16 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas EINA_UNUSED, E_Config_Dialog_Data
    o = elm_check_add(win);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_object_text_set(o, _("Monitor hotplug"));
+   elm_object_text_set(o, _("Use command"));
+   elm_check_state_set(o, cfdata->use_cmd);
+   elm_box_pack_end(bx2, o);
+   evas_object_show(o);
+   evas_object_smart_callback_add(o, "changed", _cb_use_cmd_changed, cfdata);
+
+   o = elm_check_add(win);
+   evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_object_text_set(o, _("Hotplug"));
    elm_check_state_set(o, cfdata->hotplug);
    elm_box_pack_end(bx2, o);
    evas_object_show(o);
@@ -1229,6 +1248,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
    E_Config_Randr2_Screen *cs, *cs2;
 
    e_randr2_cfg->restore = cfdata->restore;
+   e_randr2_cfg->use_cmd = cfdata->use_cmd;
    e_randr2_cfg->ignore_hotplug_events = !cfdata->hotplug;
    e_randr2_cfg->ignore_acpi_events = !cfdata->acpi;
    e_randr2_cfg->default_policy = cfdata->policy;