diff --git a/po/ca.po b/po/ca.po
index 84144fb3db..beb25bceb0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,12 +4,12 @@
 # Marc Furtià i Puig <marc.furtia@gmail.com>, 2013.
 # Joan Coll <jcoll2@gmail.com>, 2013.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2015-02-10 09:34+0000\n"
 "Last-Translator: JoanColl <Unknown>\n"
 "Language-Team: Catalan\n"
@@ -208,69 +208,69 @@ msgstr "ERROR: valor geomètric incorrecte '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERROR: tamany incorrecte '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Escriptori"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Descàrregues"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Plantilles"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Públic"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Documents"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Música"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Imatges"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Amunt"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Carpeta personal"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr "Cerca"
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "Accepta"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Estat: desactivat"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr "etiqueta d'entrada múltiple"
 msgid "multi button entry item"
 msgstr "element entrada múltiple"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "entrada múltiple"
 
@@ -291,19 +291,19 @@ msgid "Title"
 msgstr "Títol"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Enrere"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Següent"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Títol finestra emergent"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Text de la finestra emergent"
 
@@ -359,21 +359,21 @@ msgstr "mes del calendari"
 msgid "calendar year"
 msgstr "any del calendari"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Estat: activat"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Estat: desactivat"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Estat"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Comprova"
 
@@ -417,11 +417,11 @@ msgstr "A:"
 msgid "color selector palette item"
 msgstr "paleta de selecció de color"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "Per defecte: LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "selector de dia"
 
@@ -429,27 +429,27 @@ msgstr "selector de dia"
 msgid "diskselector item"
 msgstr "selector de disc"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Retalla"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Copia"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Enganxa"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Selecciona"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Entrada"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Quadrícula genèrica"
 
@@ -461,7 +461,7 @@ msgstr "Índex"
 msgid "Index Item"
 msgstr "Element d'índex"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -494,7 +494,7 @@ msgid "Radio"
 msgstr "Opció"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Estat: Seleccionat"
 
@@ -534,22 +534,22 @@ msgstr "botó de decrement del spinner"
 msgid "spinner text"
 msgstr "text  rotatiu"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Seleccionat"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Separador"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Té menú"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "No seleccionat"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Element de barra d'eines"
diff --git a/po/cs.po b/po/cs.po
index 0b47a8e8d2..67a92c0791 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,12 +5,12 @@
 # quaker66@gmail.com
 # Vít Pelčák <vit@pelcak.org>, 2011.
 # Tomáš Čech <sleep_walker@suse.cz>, 2012.
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2014-05-22 22:44+0200\n"
 "Last-Translator: Tomáš Čech <sleep_walker@suse.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -211,69 +211,69 @@ msgstr "CHYBA: neplatná hodnota geometrie '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "CHYBA: neplatná hodnota velikosti '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Plocha"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Stažené"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Veřejné"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Hudba"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Obrázky"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Videa"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Nahoru"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Domů"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Stav: Zakázáno"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr "popisek vícetlačítkového vstupu"
 msgid "multi button entry item"
 msgstr "položka vícetlačítkového vstupu"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "vícetlačítkový vstup"
 
@@ -294,19 +294,19 @@ msgid "Title"
 msgstr "Název"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Zpět"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Další"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Titulek vyskakujícího okna"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Text vyskakovacího okna"
 
@@ -362,21 +362,21 @@ msgstr "kalendářní měsíc"
 msgid "calendar year"
 msgstr "kalendářní rok"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Stav: Zapnuto"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Stav: Vypnuto"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Stav"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Ověřit"
 
@@ -420,11 +420,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "položka výběru barvy z palety"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "výchozí:LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "položka výběru dne"
 
@@ -432,27 +432,27 @@ msgstr "položka výběru dne"
 msgid "diskselector item"
 msgstr "položka výběru disků"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Vybrat"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Vstup"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Položka mřížky"
 
@@ -464,7 +464,7 @@ msgstr "Index"
 msgid "Index Item"
 msgstr "Položka indexu"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Popisek"
 
@@ -497,7 +497,7 @@ msgid "Radio"
 msgstr "Přepínač"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Stav: Vybráno"
 
@@ -538,22 +538,22 @@ msgstr "odečítací tlačítko spinneru"
 msgid "spinner text"
 msgstr "spinner"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Vybrané"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Oddělovač"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Má nabídku"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Nevybrané"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Položka panelu nástrojů"
diff --git a/po/de.po b/po/de.po
index bf721ce1db..2bd298a543 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,12 +4,12 @@
 # Chris Leick <c.leick@vollbio.de>, 2009.
 # Fabian Nowak <timystery@arcor.de>, 2010.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary 0.7.0.57309\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2011-02-25 20:22+0100\n"
 "Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
 "Language-Team: German\n"
@@ -209,69 +209,69 @@ msgstr "FEHLER: Falscher Geometriewert \"%s\"\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "FEHLER: Falscher Größenwert \"%s\"\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Arbeitsfläche"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Aufwärts"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Persönlicher Ordner"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr ""
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -283,7 +283,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -292,19 +292,19 @@ msgid "Title"
 msgstr ""
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr ""
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr ""
 
@@ -360,21 +360,21 @@ msgstr ""
 msgid "calendar year"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr ""
 
@@ -418,11 +418,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr ""
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "Standard: LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr ""
 
@@ -430,27 +430,27 @@ msgstr ""
 msgid "diskselector item"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Auswählen"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr ""
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr ""
 
@@ -462,7 +462,7 @@ msgstr ""
 msgid "Index Item"
 msgstr ""
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr ""
 
@@ -495,7 +495,7 @@ msgid "Radio"
 msgstr ""
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr ""
 
@@ -536,24 +536,24 @@ msgstr ""
 msgid "spinner text"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 #, fuzzy
 msgid "Selected"
 msgstr "Auswählen"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 #, fuzzy
 msgid "Unselected"
 msgstr "Auswählen"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index a071b691aa..2fe377369c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,12 +6,12 @@
 # Alex-P. Natsios <drakevr@linuxteam.teilar.gr> 2012
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2012-12-19 15:58+0200\n"
 "Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
 "Language-Team: Ελληνικά, Σύγχρονα <opensuse-translation-el@opensuse.org>\n"
@@ -212,69 +212,69 @@ msgstr "ΣΦΑΛΜΑ: μη έγκυρη γεωμετρική τιμή '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ΣΦΑΛΜΑ: μη έγκυρη τιμή μεγέθους '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Επιφάνεια εργασίας"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Λήψεις"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Πρότυπα"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Δημόσια"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Λήψεις"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Μουσική"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Εικόνες"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Βίντεο"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Πάνω"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Αρχική"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "Εντάξει"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Κατάσταση: Απενεργοποιημένο"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -286,7 +286,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -295,19 +295,19 @@ msgid "Title"
 msgstr ""
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr ""
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr ""
 
@@ -369,21 +369,21 @@ msgstr "Μηνας Ημερολογίου"
 msgid "calendar year"
 msgstr "αντικείμενο ημερολογίου"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Κατάσταση: Ενεργό"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Κατάσταση: Ανενεργό"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Κατάσταση"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Επιλογή"
 
@@ -429,11 +429,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "παλέτα επιλογής χρώματος"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 #, fuzzy
 msgid "day selector item"
 msgstr "επιλογή δίσκου"
@@ -442,27 +442,27 @@ msgstr "επιλογή δίσκου"
 msgid "diskselector item"
 msgstr "επιλογή δίσκου"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Επιλογή"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Καταχώριση"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Αντικείμενο Gengrid"
 
@@ -474,7 +474,7 @@ msgstr "Κατάλογος"
 msgid "Index Item"
 msgstr "Αντικείμενο Καταλόγου"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Ετικέτα"
 
@@ -507,7 +507,7 @@ msgid "Radio"
 msgstr "Επιλογή"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Κατάσταση: Επιλεγμένο"
 
@@ -552,23 +552,23 @@ msgstr "κουμπί spinner προηγούμενο"
 msgid "spinner text"
 msgstr "spinner"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Επιλεγμένο"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Διαχωριστικό"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Έχει μενού"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Μη Επιλεγμένο"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Αντικείμενο μπάρας εργαλείων"
 
diff --git a/po/eo.po b/po/eo.po
index f41915a18e..d4116fcbe2 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the enlightenment package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2013-11-05 18:59+0000\n"
 "Last-Translator: Eliovir <Unknown>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -207,69 +207,69 @@ msgstr "ERARO: nekorekta geometria valoro '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERARO: nekorekta valoro de grando '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Labortablo"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Elŝutujo"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Ŝablonujo"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Publikujo"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Dokumentujo"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Muzikujo"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Bildujo"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Videujo"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Supren"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Hejmo"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "Bone"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Stato: malŝaltita"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -281,7 +281,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -290,19 +290,19 @@ msgid "Title"
 msgstr "Titolo"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Reen"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Antaŭen"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Titolo de spruĉfenestro"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Enhava teksto de spruĉfenestro"
 
@@ -358,21 +358,21 @@ msgstr "monato de kalendaro"
 msgid "calendar year"
 msgstr "jara kalendaro"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Stato: enŝaltita"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Stato: malŝaltita"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Stato"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Kontroli"
 
@@ -416,11 +416,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "ero de elektilo de kolorpaletro"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr ""
 
@@ -428,27 +428,27 @@ msgstr ""
 msgid "diskselector item"
 msgstr "ero de diskelektilo"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Eltondi"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Kopii"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Alglui"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Elekti"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Ero"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Ero de komuna krado"
 
@@ -460,7 +460,7 @@ msgstr "Indekso"
 msgid "Index Item"
 msgstr "Indeksero"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Etikedo"
 
@@ -493,7 +493,7 @@ msgid "Radio"
 msgstr "Radiobutono"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Stato: elektita"
 
@@ -534,22 +534,22 @@ msgstr "dekrementa sago-butono"
 msgid "spinner text"
 msgstr "sago-butono"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Elektita"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Disigilo"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Ĝi havas menuo"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Malelektita"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Ilobretero"
diff --git a/po/es.po b/po/es.po
index 0382751650..64c8c25ae8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,12 +4,12 @@
 # Aníbal Garrido <khany@member.trisquel.info>, 2012.
 # Adrián Arévalo <adri58@gmail.com>, 2015.
 # Roy W. Reese <waterbearer54@gmx.com> 2015.
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2015-05-03 18:19+0100\n"
 "Last-Translator: Adrián Arévalo <adri58@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -207,69 +207,69 @@ msgstr "ERROR: valor geométrico incorrecto '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERROR: tamaño incorrecto '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Descargas"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Público"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Documentos"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Música"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Imágenes"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Arriba"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Carpeta personal"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr "Buscar"
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Estado: Desactivado"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -281,7 +281,7 @@ msgstr "etiqueta de entrada multi-botón"
 msgid "multi button entry item"
 msgstr "elemento de entrada multi-botón"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "entrada multi-botón"
 
@@ -290,20 +290,20 @@ msgid "Title"
 msgstr "Título"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Atrás"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 #, fuzzy
 msgid "Popup Title"
 msgstr "Nombre emergente"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 #, fuzzy
 msgid "Popup Body Text"
 msgstr "Texto emergente"
@@ -362,21 +362,21 @@ msgid "calendar year"
 msgstr "año del calendario"
 
 # RR: Traducción italiana usa ativado/desactivado. No sé a que refiere la cadena.
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Estado: Conectado"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Estado: Desconectado"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Estado"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Comprobar"
 
@@ -421,11 +421,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "Selector de color de paleta"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "Predeterminado: LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "Selector de día"
 
@@ -433,27 +433,27 @@ msgstr "Selector de día"
 msgid "diskselector item"
 msgstr "Selector de disco"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Entrada"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Cuadrícula genérica"
 
@@ -465,7 +465,7 @@ msgstr "Índice"
 msgid "Index Item"
 msgstr "Elemento del índice"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -498,7 +498,7 @@ msgid "Radio"
 msgstr "Radio"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Estado: Seleccionado"
 
@@ -539,23 +539,23 @@ msgstr "botón de decremento del spinner"
 msgid "spinner text"
 msgstr "spinner"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Separador"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Tiene menú"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Sin seleccionar"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Elemento de la barra de herramientas"
 
diff --git a/po/fi.po b/po/fi.po
index 57484ec24f..8bda4b1fd0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the enlightenment package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2014-08-31 15:13+0000\n"
 "Last-Translator: Kai Huuhko <kai.huuhko@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -207,69 +207,69 @@ msgstr "VIRHE: virheellinen geometrinen arvo '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "VIRHE: virheellinen koon arvo '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Lataukset"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Mallipohjat"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Julkinen"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Asiakirjat"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Musiikki"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Videot"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Ylös"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Koti"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Tila: Pois käytöstä"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -281,7 +281,7 @@ msgstr "moninappisyöttökentän nimiö"
 msgid "multi button entry item"
 msgstr "moninappisyöttökentän kohta"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "moninappisyöttökenttä"
 
@@ -290,19 +290,19 @@ msgid "Title"
 msgstr "Otsikko"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Takaisin"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Ponnahdusikkunan otsikko"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Ponnahdusikkunan leipäteksti"
 
@@ -358,21 +358,21 @@ msgstr "kalenterikuukausi"
 msgid "calendar year"
 msgstr "kalenterivuosi"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Tila: päällä"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Tila: pois päältä"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Tila"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Valinta"
 
@@ -416,11 +416,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "värivalitsimen palettikohta"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr ""
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "päivyrin kohta"
 
@@ -428,27 +428,27 @@ msgstr "päivyrin kohta"
 msgid "diskselector item"
 msgstr "kiekkovalitsimen kohta"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Kopioi"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Liitä"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Valitse"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Syöttökenttä"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Gengridin kohta"
 
@@ -460,7 +460,7 @@ msgstr "Indeksi"
 msgid "Index Item"
 msgstr "Indeksin kohta"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Nimiö"
 
@@ -493,7 +493,7 @@ msgid "Radio"
 msgstr "Vaihtoehto"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Tila: valittu"
 
@@ -534,22 +534,22 @@ msgstr "Pyörövalitsimen vähennä-nappi"
 msgid "spinner text"
 msgstr "pyörövalitsin"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Valittu"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Erotin"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Valikollinen"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Valitsematon"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Työkalupalkin kohta"
diff --git a/po/fr.po b/po/fr.po
index 66416e6221..87b91e9856 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,12 +6,12 @@
 # Jerome Pinot <ngc891@gmail.com>, 2012.
 # Chidambar Zinnoury <illogict@online.fr>, 2013.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2014-05-25 20:18+0000\n"
 "Last-Translator: Eliovir <Unknown>\n"
 "Language-Team: French <sansgourou@gmail.com>\n"
@@ -213,69 +213,69 @@ msgstr "ERREUR : valeur géométrique incorrecte « %s »\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERREUR : valeur de taille incorrecte « %s »\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Bureau"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Public"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Documents"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Musique"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Images"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Vidéos"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Monter"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Home"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "État : désactivé"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -287,7 +287,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -296,19 +296,19 @@ msgid "Title"
 msgstr "Titre"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Retour"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Suivant"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Titre du Popup"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Corps du texte du Popup"
 
@@ -364,21 +364,21 @@ msgstr "Mois du calendrier"
 msgid "calendar year"
 msgstr "Année du calendrier"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "État : activé"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "État : désactivé"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "État"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "À cocher"
 
@@ -422,11 +422,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "élément de palette de choix de couleur"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "LTR par défaut"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "élement de choix de date"
 
@@ -434,27 +434,27 @@ msgstr "élement de choix de date"
 msgid "diskselector item"
 msgstr "élément de choix de disque"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Couper"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Copier"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Coller"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Sélectionner"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Entrée"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr ""
 
@@ -466,7 +466,7 @@ msgstr "Index"
 msgid "Index Item"
 msgstr ""
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Étiquette"
 
@@ -499,7 +499,7 @@ msgid "Radio"
 msgstr "Radio"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "État : sélectionné"
 
@@ -540,22 +540,22 @@ msgstr "bouton fléché de décrémentation"
 msgid "spinner text"
 msgstr "bouton fléché"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Sélectionné"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Séparateur"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Possède un menu"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Désélectionné"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Élément de barre d'outils"
diff --git a/po/gl.po b/po/gl.po
index 6b22cb2d8e..89448685e5 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,12 +2,12 @@
 # This file is put in the public domain.
 # Aníbal Garrido <khany@member.trisquel.info>, 2012.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2014-05-24 08:39+0000\n"
 "Last-Translator: Kaptan <khanyux@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -206,69 +206,69 @@ msgstr "ERRO: valor xeométrico incorrecto '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERRO: valor do tamaño incorrecto '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Descargas"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Público"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Documentos"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Música"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Imaxes"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Arriba"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Cartafol persoal"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Estado: Desactivado"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -280,7 +280,7 @@ msgstr "etiqueta de entrada de botón múltiplo"
 msgid "multi button entry item"
 msgstr "elemento de entrada de botón múltiplo"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "entrada de botón múltiplo"
 
@@ -289,19 +289,19 @@ msgid "Title"
 msgstr "Título"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Atrás"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Título da emerxente"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Corpo de texto emerxente"
 
@@ -357,21 +357,21 @@ msgstr "mes do calendario"
 msgid "calendar year"
 msgstr "ano do calendario"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Estado: Conectado"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Estado: Desconectado"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Estado"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Comprobar"
 
@@ -415,11 +415,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "Paleta de selección de cor"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "Predeterminado: LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "selector de día"
 
@@ -427,27 +427,27 @@ msgstr "selector de día"
 msgid "diskselector item"
 msgstr "Selector de disco"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Entrada"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Grella xenérica"
 
@@ -459,7 +459,7 @@ msgstr "Índice"
 msgid "Index Item"
 msgstr "Elemento do índice"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -492,7 +492,7 @@ msgid "Radio"
 msgstr "Radio"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Estado: Seleccionado"
 
@@ -533,23 +533,23 @@ msgstr "botón de disminución"
 msgid "spinner text"
 msgstr "botón de spinner"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Separador"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Ten menú"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Non seleccionado"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Elemento da barra de ferramentas"
 
diff --git a/po/hu.po b/po/hu.po
index c5872d58f3..5b515881dd 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary 1.8.2\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2014-01-29 15:27+0100\n"
 "Last-Translator: rezso <rezso@rezso.net>\n"
 "Language-Team: General\n"
@@ -208,69 +208,69 @@ msgstr "HIBA: helytelen geometria érték: '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "HIBA: helytelen méret érték: '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Asztal"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Letöltések"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Sablonok"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Publikus"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Dokumentumok"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Zene"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Képek"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Videók"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Fel"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Kezdőlap"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Állapot: letiltva"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -291,19 +291,19 @@ msgid "Title"
 msgstr "Cím"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Vissza"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Következő"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Popup címsora"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Popup szövege"
 
@@ -359,21 +359,21 @@ msgstr "naptár hónapja"
 msgid "calendar year"
 msgstr "naptár éve"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Állapot: be"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Állapot: ki"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Állapot"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Ellenőrzés"
 
@@ -417,11 +417,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr ""
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr ""
 
@@ -429,27 +429,27 @@ msgstr ""
 msgid "diskselector item"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Kiválaszt"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Bejegyzés"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr ""
 
@@ -461,7 +461,7 @@ msgstr ""
 msgid "Index Item"
 msgstr ""
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Címke"
 
@@ -494,7 +494,7 @@ msgid "Radio"
 msgstr "Rádió"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Állapot: kijelölve"
 
@@ -534,22 +534,22 @@ msgstr ""
 msgid "spinner text"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Kiválasztva"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Elválasztó"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Nincs kijelölve"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Eszköztár elem"
diff --git a/po/it.po b/po/it.po
index 8feb84c226..4a6c430fe5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,12 +3,12 @@
 # This file is put in the public domain.
 # Massimo Maiurana <maiurana@gmail.com>, 2013
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2017-01-01 16:29+0100\n"
 "Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
 "Language-Team: General\n"
@@ -206,69 +206,69 @@ msgstr "ERRORE: valore geometrico non corretto '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERRORE: valore dimensione non corretto '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Scrivania"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Scaricati"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Modelli"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Pubblici"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Documenti"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Musica"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Immagini"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Video"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Su"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Home"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr "Cerca"
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Stato: disabilitato"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr "Lista per bottone (hoversel)"
 
@@ -280,7 +280,7 @@ msgstr "etichetta voce multibottone"
 msgid "multi button entry item"
 msgstr "oggetto voce multibottone"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "voce multibottone"
 
@@ -289,19 +289,19 @@ msgid "Title"
 msgstr "Titolo"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Indietro"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Avanti"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Titolo popup"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Testo corpo popup"
 
@@ -357,21 +357,21 @@ msgstr "mese del calendario"
 msgid "calendar year"
 msgstr "anno del calendario"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Stato: attivo"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Stato: inattivo"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Stato"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Controllo"
 
@@ -415,11 +415,11 @@ msgstr "A:"
 msgid "color selector palette item"
 msgstr "oggetto palette selezione colore"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "predefintito: LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "oggetto selettore giorno"
 
@@ -427,27 +427,27 @@ msgstr "oggetto selettore giorno"
 msgid "diskselector item"
 msgstr "selettore disco"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Copia"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Incolla"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Voce"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "oggetto griglia generica"
 
@@ -459,7 +459,7 @@ msgstr "Indice"
 msgid "Index Item"
 msgstr "oggetto indice"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Etichetta"
 
@@ -492,7 +492,7 @@ msgid "Radio"
 msgstr "Opzione"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Stato: selezionato"
 
@@ -532,22 +532,22 @@ msgstr "bottone diminuzione spinner"
 msgid "spinner text"
 msgstr "testo spinner"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Selezionato"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Separatore"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Include menù"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Non selezionato"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Oggetto della barra strumenti"
diff --git a/po/ja.po b/po/ja.po
index 3595230938..651ee245b9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2012 Enlightenment development team
 # This file is put in the public domain.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Daichi Fukui<when.a.cat.sits.beside.you@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -206,69 +206,69 @@ msgstr "エラー: 不正なジオメトリ値 '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "エラー: 不正なsize値です '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Downloads"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Templates"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Public"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Documents"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Music"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Pictures"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Videos"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr ""
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr ""
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -280,7 +280,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -289,19 +289,19 @@ msgid "Title"
 msgstr ""
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr ""
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr ""
 
@@ -357,21 +357,21 @@ msgstr ""
 msgid "calendar year"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr ""
 
@@ -415,12 +415,12 @@ msgstr ""
 msgid "color selector palette item"
 msgstr ""
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 #, fuzzy
 msgid "default:LTR"
 msgstr "Default:"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr ""
 
@@ -428,27 +428,27 @@ msgstr ""
 msgid "diskselector item"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr ""
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr ""
 
@@ -460,7 +460,7 @@ msgstr ""
 msgid "Index Item"
 msgstr ""
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr ""
 
@@ -493,7 +493,7 @@ msgid "Radio"
 msgstr ""
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr ""
 
@@ -533,22 +533,22 @@ msgstr ""
 msgid "spinner text"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 210e60e5e9..ff3bb7feac 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,12 +5,12 @@
 # Daniel Juyung Seo <seojuyung2@gmail.com>, 2011-2013
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2012-2013
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2014-11-10 01:01+0900\n"
 "Last-Translator: Daniel Juyung Seo <seojuyung2@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -210,69 +210,69 @@ msgstr "오류: '%s' 값의 좌표가 올바르지 않습니다\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "오류: '%s' 값의 크기가 올바르지 않습니다\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "데스크톱"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "다운로드"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "서식"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "공개"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "문서"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "음악"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "사진"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "영상"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr ""
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr ""
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -284,7 +284,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -293,19 +293,19 @@ msgid "Title"
 msgstr ""
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr ""
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr ""
 
@@ -361,21 +361,21 @@ msgstr ""
 msgid "calendar year"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr ""
 
@@ -419,12 +419,12 @@ msgstr ""
 msgid "color selector palette item"
 msgstr ""
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 #, fuzzy
 msgid "default:LTR"
 msgstr "기본값: "
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr ""
 
@@ -432,27 +432,27 @@ msgstr ""
 msgid "diskselector item"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr ""
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr ""
 
@@ -464,7 +464,7 @@ msgstr ""
 msgid "Index Item"
 msgstr ""
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgid "Radio"
 msgstr ""
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr ""
 
@@ -537,22 +537,22 @@ msgstr ""
 msgid "spinner text"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 6f25f73574..663132776a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the enlightenment package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2014-02-21 22:38+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
@@ -207,69 +207,69 @@ msgstr ""
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Darbastalis"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Atsiuntimai"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Šablonai"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Vieša"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Dokumentai"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Muzika"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Paveikslėliai"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Video"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Atsisakyti"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "Gerai"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr ""
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -281,7 +281,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -290,19 +290,19 @@ msgid "Title"
 msgstr ""
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Atgal"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr ""
 
@@ -358,21 +358,21 @@ msgstr ""
 msgid "calendar year"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Būsena"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr ""
 
@@ -416,11 +416,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr ""
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr ""
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr ""
 
@@ -428,27 +428,27 @@ msgstr ""
 msgid "diskselector item"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Įdėti"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Pasirinkti"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr ""
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr ""
 
@@ -460,7 +460,7 @@ msgstr ""
 msgid "Index Item"
 msgstr ""
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Etiketė"
 
@@ -493,7 +493,7 @@ msgid "Radio"
 msgstr ""
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr ""
 
@@ -533,22 +533,22 @@ msgstr ""
 msgid "spinner text"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Skirtukas"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Turi meniu"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Nepasirinkta(s)"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index a124867047..ae10f14713 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,12 +3,12 @@
 # This file is put in the public domain.
 # Fabian Nowak <timystery@arcor.de>, 2011.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary 0.7.0.57309\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2011-06-19 16:41+0100\n"
 "Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n"
 "Language-Team: Dutch <vistausss@gmail.com>\n"
@@ -210,69 +210,69 @@ msgstr "Fout: foutieve wiskundige waarde '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "FOUT: foutieve grootte-waarden '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Bureaublad"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Persoonlijke map"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr ""
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -284,7 +284,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -293,19 +293,19 @@ msgid "Title"
 msgstr ""
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr ""
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr ""
 
@@ -361,21 +361,21 @@ msgstr ""
 msgid "calendar year"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr ""
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr ""
 
@@ -419,11 +419,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr ""
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "Standaard: LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr ""
 
@@ -431,27 +431,27 @@ msgstr ""
 msgid "diskselector item"
 msgstr ""
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Knippen"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Plakken"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Selecteren"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr ""
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr ""
 
@@ -463,7 +463,7 @@ msgstr ""
 msgid "Index Item"
 msgstr ""
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr ""
 
@@ -496,7 +496,7 @@ msgid "Radio"
 msgstr ""
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr ""
 
@@ -537,24 +537,24 @@ msgstr ""
 msgid "spinner text"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 #, fuzzy
 msgid "Selected"
 msgstr "Selecteren"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 #, fuzzy
 msgid "Unselected"
 msgstr "Selecteren"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index d47e6e9958..0eabfa5df8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,12 +3,12 @@
 # This file is put in the public domain.
 # Konrad Makowski <poczta@konradmakowski.pl>, 2013
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2013-11-23 14:48+0100\n"
 "Last-Translator: Konrad Makowski <poczta@konradmakowski.pl>\n"
 "Language-Team: General\n"
@@ -209,69 +209,69 @@ msgstr "BŁĄD: nieprawidłowa wartość geometryczna \"%s\"\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "BŁĄD: nieprawdiłowy rozmiar wartości \"%s\"\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Pulpit"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Pobrane"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Szablony"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Publiczne"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Muzyka"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Obrazy"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Wideo"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Do góry"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Początek"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Statuj: wyłączony"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -283,7 +283,7 @@ msgstr "etykietka przycisku wyboru"
 msgid "multi button entry item"
 msgstr "wartość pozycji przycisku wyboru"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "przycisk wyboru"
 
@@ -292,19 +292,19 @@ msgid "Title"
 msgstr "Tytuł"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Cofnij"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Następny"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Tytuł okienka"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Treść główna okienka"
 
@@ -360,21 +360,21 @@ msgstr "kalendarz z miesiącami"
 msgid "calendar year"
 msgstr "kalendarz roczny"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Stan: włączony"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Stan: wyłączony"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Stan"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Sprawdzony"
 
@@ -418,11 +418,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "paleta wyboru kolorów"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "wybór dni"
 
@@ -430,27 +430,27 @@ msgstr "wybór dni"
 msgid "diskselector item"
 msgstr "wybór dysków"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Wklej"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Wybór"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Pozycja"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr ""
 
@@ -462,7 +462,7 @@ msgstr "Indeks"
 msgid "Index Item"
 msgstr "Indeks"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Etykieta"
 
@@ -495,7 +495,7 @@ msgid "Radio"
 msgstr ""
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Stan: wybrany"
 
@@ -536,22 +536,22 @@ msgstr "przycisk zmniejszający typu spinner"
 msgid "spinner text"
 msgstr "spinner"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Wybrany"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Separator"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Posiada menu"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Nie wybrany"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Pasek narzędzi"
diff --git a/po/pt.po b/po/pt.po
index b80f3d6124..804dad0e8e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,12 +3,12 @@
 # This file is public domain.
 # Sérgio Marques <smarquespt@gmail.com>, 2010-2014
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2013-11-05 14:11-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: General\n"
@@ -207,69 +207,69 @@ msgstr "ERRO: valor geométrico incorreto \"%s\"\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ERRO: tamanho incorreto \"%s\"\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Área de trabalho"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Transferências"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Público"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Documentos"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Música"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Imagens"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Para cima"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Pasta pessoal"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "Aceitar"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Estado: inativo"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -281,7 +281,7 @@ msgstr "texto da entrada de botão múltiplo"
 msgid "multi button entry item"
 msgstr "item da entrada de botão múltiplo"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "entrada do botão múltiplo"
 
@@ -290,19 +290,19 @@ msgid "Title"
 msgstr "Título"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Recuar"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Avançar"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Título do alerta"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Texto do alerta"
 
@@ -358,21 +358,21 @@ msgstr "mês do calendário"
 msgid "calendar year"
 msgstr "ano do calendário"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Estado: ligado"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Estado: desligado"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Estado"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Seleção"
 
@@ -416,11 +416,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "item do seletor de cor"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "padrão: LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "item do seletor de dia"
 
@@ -428,27 +428,27 @@ msgstr "item do seletor de dia"
 msgid "diskselector item"
 msgstr "item do seletor de disco"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Colar"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Entrada"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Item da grelha genérica"
 
@@ -460,7 +460,7 @@ msgstr "Índice"
 msgid "Index Item"
 msgstr "Item do índice"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Texto"
 
@@ -493,7 +493,7 @@ msgid "Radio"
 msgstr "Opção"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Estado: selecionado"
 
@@ -534,23 +534,23 @@ msgstr "botão de diminuição do spinner"
 msgid "spinner text"
 msgstr "spinner"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Selecionado"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Separador"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Tem menu"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Não selecionado"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Item da barra de ferramentas"
 
diff --git a/po/ru.po b/po/ru.po
index f8dd25b573..a1948c4c93 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,12 +4,12 @@
 # Danny Moshnakov <dm@agent.co.il>, 2012.
 # Igor Murzov <garik@efl.so>, 2015.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary 1.11\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2015-02-07 15:16+0300\n"
 "Last-Translator: Игорь Мурзов <garik@efl.so>\n"
 "Language-Team: ru <enlightenment-intl@lists.sourceforge.net>\n"
@@ -208,69 +208,69 @@ msgstr ""
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr ""
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Рабочий стол"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Загрузки"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Общий каталог"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Документы"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Музыка"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Изображения"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Видео"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Вверх"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Дом"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr "Поиск"
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "ОК"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Состояние: Отключено"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr "метка многокопочного элемента"
 msgid "multi button entry item"
 msgstr "кнопка многокопочного элемента"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "многокнопочный элемент"
 
@@ -291,19 +291,19 @@ msgid "Title"
 msgstr "Заголовок"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Назад"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Вперёд"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Заголовок всплывающего окна"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Текст всплывающего окна"
 
@@ -359,21 +359,21 @@ msgstr "месяц календаря"
 msgid "calendar year"
 msgstr "год календаря"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Состояния: Включено"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Состояние: Выключено"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Состояние"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Флажок"
 
@@ -417,11 +417,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "элемент выбора цвета палитры"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "по умолчанию: ЛНП"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "элемент выбора дня"
 
@@ -429,27 +429,27 @@ msgstr "элемент выбора дня"
 msgid "diskselector item"
 msgstr "элемент диска выбора"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Вставить"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Выбрать"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Запись"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Элемент сетки"
 
@@ -461,7 +461,7 @@ msgstr "Алфавитный указатель"
 msgid "Index Item"
 msgstr "Элемент алфавитного указателя"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Метка"
 
@@ -494,7 +494,7 @@ msgid "Radio"
 msgstr "Радио флажок"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Состояние: Выбрано"
 
@@ -535,22 +535,22 @@ msgstr "кнопка уменьшения счётчика"
 msgid "spinner text"
 msgstr "счётчик"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Выбрано"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Разделитель"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "С меню"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Невыбрано"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Элемент панели инструментов"
diff --git a/po/sl.po b/po/sl.po
index 3e1368e287..2a99e5d145 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,12 +3,12 @@
 # This file is put in the public domain.
 # r1to <renato.rener@gmail.com>, 2011.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2016-09-21 17:00+0200\n"
 "Last-Translator: Renato Rener <renato.rener@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
@@ -206,69 +206,69 @@ msgstr "NAPAKA::·nepravilna geometrijska vrednost·'%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "NAPAKA::·nepravilna vrednost velikosti·'%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Namizje"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Prejemi"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Predloge"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Javno"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Glasba"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Slike"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Videi"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Gor"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Dom"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr "Poišči"
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "V redu"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Stanje: onemogočeno"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -280,7 +280,7 @@ msgstr "oznaka vnosa večkratnih gumbov"
 msgid "multi button entry item"
 msgstr "predmet vnosa večkratnih gumbov"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "vnos večkratnih gumbov"
 
@@ -289,19 +289,19 @@ msgid "Title"
 msgstr "Naslov"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Nazaj"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Naslednje"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Naslov pojavnika"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Besedilo telesa pojavnika"
 
@@ -357,21 +357,21 @@ msgstr "mesečni koledar"
 msgid "calendar year"
 msgstr "letni koledar"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Stanje: Vključeno"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Stanje: Izključeno"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Stanje"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Preveri"
 
@@ -415,11 +415,11 @@ msgstr "A:"
 msgid "color selector palette item"
 msgstr "izbirnik s paleto barve"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "privzeto:LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "izbirnik dneva"
 
@@ -427,27 +427,27 @@ msgstr "izbirnik dneva"
 msgid "diskselector item"
 msgstr "izbirnik diska"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Izreži"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Prilepi"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Izberi"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Vnos"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Generator mreže"
 
@@ -459,7 +459,7 @@ msgstr "Kazalo"
 msgid "Index Item"
 msgstr "Predmet kazala"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Oznaka"
 
@@ -492,7 +492,7 @@ msgid "Radio"
 msgstr "Radio"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Stanje: Izbrano"
 
@@ -532,22 +532,22 @@ msgstr "gumb za zniževanje vrtilnika"
 msgid "spinner text"
 msgstr "besedilo vrtilnika"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Izbrano"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Ločilnik"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Ima meni"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Neizbrano"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Predmet orodne vrstice"
diff --git a/po/sr.po b/po/sr.po
index 2ced9bae09..24ca910a08 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,12 +4,12 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 # Саша Петровић <salepetronije@gmail.com>, 2013, 2015.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: а\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2015-01-31 14:06+0100\n"
 "Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
 "Language-Team: српски <xfce4@xfce4.org>\n"
@@ -210,69 +210,69 @@ msgstr "ГРЕШКА: неисправна геометријска вредно
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "ГРЕШКА: неисправна вредност величине  „%s“\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Радна површ"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Преузимања"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Обрасци"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Јавно"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Документа"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Музика"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Слике"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Видео снимци"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Горе"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Лична фасцикла"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr "Тражи"
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "У реду"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Стање: онемогућено"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -284,7 +284,7 @@ msgstr "ознака улаза са више дугмади"
 msgid "multi button entry item"
 msgstr "ставка улаза са више дугмади"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "улаз са више дугмади"
 
@@ -293,19 +293,19 @@ msgid "Title"
 msgstr "Наслов"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Назад"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Следеће"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Искачући наслов"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Тело искачућег текста"
 
@@ -361,21 +361,21 @@ msgstr "месец календара"
 msgid "calendar year"
 msgstr "година календара"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Стање : укључен"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Стање: искључен"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Стање"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Провера"
 
@@ -419,11 +419,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "ставка избирача палете боја"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "задато:слева на десно"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "ставка одабирач дана"
 
@@ -431,27 +431,27 @@ msgstr "ставка одабирач дана"
 msgid "diskselector item"
 msgstr "ставка одабира диска"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Исеци"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Умножи"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Прилепи"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Изаберите"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Улаз"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Ставка родне мреже"
 
@@ -463,7 +463,7 @@ msgstr "Садржина"
 msgid "Index Item"
 msgstr "Ставка садржине"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Натпис"
 
@@ -496,7 +496,7 @@ msgid "Radio"
 msgstr "Искључујуће дугме"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Стање: означено"
 
@@ -537,22 +537,22 @@ msgstr "стрелица избирача смањења"
 msgid "spinner text"
 msgstr "избирач са стрелицама"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Изабрано"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Одвајач"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Има изборник"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Неозначено"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Ставка траке алата"
diff --git a/po/tr.po b/po/tr.po
index 041a944f5f..b4dadc29fa 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the enlightenment package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2014-04-18 13:35+0000\n"
 "Last-Translator: Ali E.İMREK <alierkanimrek@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -207,69 +207,69 @@ msgstr "HATA: yanlış geometri değeri '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "HATA: yanlış boyut değeri '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Masaüstü"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "İndirilenler"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Genel"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Belgeler"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Müzik"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Resimler"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Videolar"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Yukarı"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Ev"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "Tamam"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Durum: Kapalı"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -281,7 +281,7 @@ msgstr "çoklu düğme giriş etiketi"
 msgid "multi button entry item"
 msgstr "çoklu düğme giriş öğesi"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "çoklu düğme girişi"
 
@@ -290,19 +290,19 @@ msgid "Title"
 msgstr "Başlık"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Geri"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Sonraki"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Pencere başlığı"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Pencere gövde metni"
 
@@ -358,21 +358,21 @@ msgstr "takvim ayı"
 msgid "calendar year"
 msgstr "takvim yılı"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Durum: Açık"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Durum: Kapalı"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Durum"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Kontrol et"
 
@@ -416,11 +416,11 @@ msgstr ""
 msgid "color selector palette item"
 msgstr "renk seçici paleti öğesi"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "varsayılan:LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "gün seçici ögesi"
 
@@ -428,27 +428,27 @@ msgstr "gün seçici ögesi"
 msgid "diskselector item"
 msgstr "disk seçici öğesi"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Kes"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Kopyala"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Seç"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Girdi"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Izgara öğesi"
 
@@ -460,7 +460,7 @@ msgstr "Dizin"
 msgid "Index Item"
 msgstr "fihrist öğesi"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Etiket"
 
@@ -493,7 +493,7 @@ msgid "Radio"
 msgstr "Radyo"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Durum: Seçili"
 
@@ -534,22 +534,22 @@ msgstr "değiştirici azaltma düğmesi"
 msgid "spinner text"
 msgstr "değiştirici"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Seçili"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Ayraç"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "menü"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Seçili değil"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Araç Çubuğu Öğesi"
diff --git a/po/vi.po b/po/vi.po
index 4510ed6919..b865d7ca29 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -3,12 +3,12 @@
 # This file is put in the public domain.
 # Thiep Ha <thiepha@gmail.com>, 2015.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2015-09-29 18:06+0900\n"
 "Last-Translator: Thiep Ha <thiepha@gmail.com>\n"
 "Language-Team: General\n"
@@ -208,69 +208,69 @@ msgstr "LỖI: giá trị hình học không đúng '%s'\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "LỖI: giá trị kích thước không đúng '%s'\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "Màn Hình Nền"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "Tải Về"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "Mẫu"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "Công Cộng"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "Tài Liệu"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "Âm Nhạc"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "Hình Ảnh"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "Video"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "Trên"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "Trang Chủ"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr "Tìm Kiếm"
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "Hủy"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "Đồng Ý"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "Trạng Thái: Không Khả Dụng"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr "Nhãn Của Bộ Nhập Nhiều Nút"
 msgid "multi button entry item"
 msgstr "Mục Của Bộ Nhập Nhiều Nút"
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr "Bộ Nhập Nhiều Nút"
 
@@ -291,19 +291,19 @@ msgid "Title"
 msgstr "Đề Mục"
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr "Quay Lại"
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr "Tiếp"
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr "Tiêu Đề Hộp Thoại"
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr "Văn Bản Thân Hộp Thoại"
 
@@ -359,21 +359,21 @@ msgstr "Lịch Tháng"
 msgid "calendar year"
 msgstr "Lịch Năm"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "Trạng Thái: Bật"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "Trạng Thái: Tắt"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "Trạng Thái"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "Chọn"
 
@@ -417,11 +417,11 @@ msgstr "Độ Mờ:"
 msgid "color selector palette item"
 msgstr "Mục Của Bảng Chọn Màu"
 
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "Mặc Định: Trái Sang Phải"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 msgid "day selector item"
 msgstr "Mục Của Bảng Chọn Ngày"
 
@@ -429,27 +429,27 @@ msgstr "Mục Của Bảng Chọn Ngày"
 msgid "diskselector item"
 msgstr "Mục Của Bộ Chọn Đĩa"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "Cắt"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "Sao Chép"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "Dán"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "Chọn"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "Bộ Nhập"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr "Mục Của Gengrid"
 
@@ -461,7 +461,7 @@ msgstr "Chỉ Mục"
 msgid "Index Item"
 msgstr "Mục Của Bộ Chỉ Mục"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "Nhãn"
 
@@ -494,7 +494,7 @@ msgid "Radio"
 msgstr "Đài"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "Trạng Thái: Đã Chọn"
 
@@ -534,22 +534,22 @@ msgstr "Nút Giảm Bộ Xoay"
 msgid "spinner text"
 msgstr "Văn Bản Bộ Xoay"
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "Đã Chọn"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "Bộ Tách"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "Có Bảng Chọn"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "Không Chọn"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "Mục Của Thanh Công Cụ"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c521bc2c9c..b6e9086b3b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,12 +4,12 @@
 # This file is distributed under the same license as the Efl package.
 # Aron Xu <happyaron.xu@gmail.com>, 2012.
 #
-#: src/lib/elementary/elm_config.c:3770
+#: src/lib/elementary/elm_config.c:3747
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-01-20 08:38+0900\n"
+"POT-Creation-Date: 2017-05-19 16:43+0900\n"
 "PO-Revision-Date: 2012-12-22 03:55+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -208,69 +208,69 @@ msgstr "错误：不正确的形状 %s\n"
 msgid "ERROR: incorrect size value '%s'\n"
 msgstr "错误：不正确的大小 %s\n"
 
-#: src/lib/efreet/efreet_base.c:123
+#: src/lib/efreet/efreet_base.c:126
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/lib/efreet/efreet_base.c:131
+#: src/lib/efreet/efreet_base.c:134
 msgid "Downloads"
 msgstr "下载"
 
-#: src/lib/efreet/efreet_base.c:140
+#: src/lib/efreet/efreet_base.c:143
 msgid "Templates"
 msgstr "模板"
 
-#: src/lib/efreet/efreet_base.c:149
+#: src/lib/efreet/efreet_base.c:152
 msgid "Public"
 msgstr "公共"
 
-#: src/lib/efreet/efreet_base.c:158
+#: src/lib/efreet/efreet_base.c:161
 msgid "Documents"
 msgstr "文档"
 
-#: src/lib/efreet/efreet_base.c:166
+#: src/lib/efreet/efreet_base.c:169
 msgid "Music"
 msgstr "音乐"
 
-#: src/lib/efreet/efreet_base.c:174
+#: src/lib/efreet/efreet_base.c:177
 msgid "Pictures"
 msgstr "图片"
 
-#: src/lib/efreet/efreet_base.c:183
+#: src/lib/efreet/efreet_base.c:186
 msgid "Videos"
 msgstr "视频"
 
-#: src/lib/elementary/elc_fileselector.c:1902
+#: src/lib/elementary/elc_fileselector.c:1892
 msgid "Up"
 msgstr "向上"
 
-#: src/lib/elementary/elc_fileselector.c:1916
+#: src/lib/elementary/elc_fileselector.c:1906
 msgid "Home"
 msgstr "主目录"
 
-#: src/lib/elementary/elc_fileselector.c:1935
+#: src/lib/elementary/elc_fileselector.c:1925
 msgid "Search"
 msgstr ""
 
-#: src/lib/elementary/elc_fileselector.c:2230
-#: src/lib/elementary/elm_entry.c:1707 src/lib/elementary/elm_entry.c:1732
+#: src/lib/elementary/elc_fileselector.c:2216
+#: src/lib/elementary/elm_entry.c:1709 src/lib/elementary/elm_entry.c:1734
 msgid "Cancel"
 msgstr "取消"
 
-#: src/lib/elementary/elc_fileselector.c:2240
+#: src/lib/elementary/elc_fileselector.c:2226
 msgid "OK"
 msgstr "确定"
 
-#: src/lib/elementary/elc_hoversel.c:420 src/lib/elementary/elm_button.c:278
-#: src/lib/elementary/elm_check.c:212 src/lib/elementary/elm_gengrid.c:1442
-#: src/lib/elementary/elm_genlist.c:1729 src/lib/elementary/elm_list.c:2176
+#: src/lib/elementary/elc_hoversel.c:439 src/lib/elementary/elm_button.c:278
+#: src/lib/elementary/efl_ui_check.c:212 src/lib/elementary/elm_gengrid.c:1440
+#: src/lib/elementary/elm_genlist.c:1720 src/lib/elementary/elm_list.c:2176
 #: src/lib/elementary/elm_radio.c:216
 #: src/lib/elementary/elm_segment_control.c:529
-#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2377
+#: src/lib/elementary/elm_spinner.c:1002 src/lib/elementary/elm_toolbar.c:2344
 msgid "State: Disabled"
 msgstr "状态：已禁用"
 
-#: src/lib/elementary/elc_hoversel.c:619
+#: src/lib/elementary/elc_hoversel.c:638
 msgid "Hoversel"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "multi button entry item"
 msgstr ""
 
-#: src/lib/elementary/elc_multibuttonentry.c:1607
+#: src/lib/elementary/elc_multibuttonentry.c:1611
 msgid "multi button entry"
 msgstr ""
 
@@ -291,19 +291,19 @@ msgid "Title"
 msgstr ""
 
 #: src/lib/elementary/elc_naviframe.c:993
-#: src/lib/elementary/elc_naviframe.c:1210
+#: src/lib/elementary/elc_naviframe.c:1211
 msgid "Back"
 msgstr ""
 
-#: src/lib/elementary/elc_naviframe.c:1308
+#: src/lib/elementary/elc_naviframe.c:1309
 msgid "Next"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:298 src/lib/elementary/elc_popup.c:956
+#: src/lib/elementary/elc_popup.c:299 src/lib/elementary/elc_popup.c:959
 msgid "Popup Title"
 msgstr ""
 
-#: src/lib/elementary/elc_popup.c:308 src/lib/elementary/elc_popup.c:1032
+#: src/lib/elementary/elc_popup.c:309 src/lib/elementary/elc_popup.c:1035
 msgid "Popup Body Text"
 msgstr ""
 
@@ -364,21 +364,21 @@ msgstr "日历月"
 msgid "calendar year"
 msgstr "日历条目"
 
-#: src/lib/elementary/elm_check.c:64 src/lib/elementary/elm_check.c:225
+#: src/lib/elementary/efl_ui_check.c:64 src/lib/elementary/efl_ui_check.c:225
 #: src/lib/elementary/elm_radio.c:120 src/lib/elementary/elm_radio.c:217
 msgid "State: On"
 msgstr "状态：开启"
 
-#: src/lib/elementary/elm_check.c:75 src/lib/elementary/elm_check.c:237
+#: src/lib/elementary/efl_ui_check.c:75 src/lib/elementary/efl_ui_check.c:237
 #: src/lib/elementary/elm_radio.c:219
 msgid "State: Off"
 msgstr "状态：关闭"
 
-#: src/lib/elementary/elm_check.c:221 src/lib/elementary/elm_check.c:234
+#: src/lib/elementary/efl_ui_check.c:221 src/lib/elementary/efl_ui_check.c:234
 msgid "State"
 msgstr "状态"
 
-#: src/lib/elementary/elm_check.c:315
+#: src/lib/elementary/efl_ui_check.c:315
 msgid "Check"
 msgstr "检查"
 
@@ -423,11 +423,11 @@ msgid "color selector palette item"
 msgstr "色彩选择器项目"
 
 # Don't change it!
-#: src/lib/elementary/elm_config.c:3787
+#: src/lib/elementary/elm_config.c:3764
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: src/lib/elementary/elm_dayselector.c:408
+#: src/lib/elementary/elm_dayselector.c:405
 #, fuzzy
 msgid "day selector item"
 msgstr "磁盘选择器项目"
@@ -436,27 +436,27 @@ msgstr "磁盘选择器项目"
 msgid "diskselector item"
 msgstr "磁盘选择器项目"
 
-#: src/lib/elementary/elm_entry.c:1697
+#: src/lib/elementary/elm_entry.c:1699
 msgid "Cut"
 msgstr "粘贴"
 
-#: src/lib/elementary/elm_entry.c:1700
+#: src/lib/elementary/elm_entry.c:1702
 msgid "Copy"
 msgstr "复制"
 
-#: src/lib/elementary/elm_entry.c:1704 src/lib/elementary/elm_entry.c:1726
+#: src/lib/elementary/elm_entry.c:1706 src/lib/elementary/elm_entry.c:1728
 msgid "Paste"
 msgstr "粘贴"
 
-#: src/lib/elementary/elm_entry.c:1719
+#: src/lib/elementary/elm_entry.c:1721
 msgid "Select"
 msgstr "选择"
 
-#: src/lib/elementary/elm_entry.c:3804
+#: src/lib/elementary/elm_entry.c:3806
 msgid "Entry"
 msgstr "条目"
 
-#: src/lib/elementary/elm_gengrid.c:1472
+#: src/lib/elementary/elm_gengrid.c:1470
 msgid "Gengrid Item"
 msgstr ""
 
@@ -468,7 +468,7 @@ msgstr "索引"
 msgid "Index Item"
 msgstr "索引条目"
 
-#: src/lib/elementary/elm_label.c:399
+#: src/lib/elementary/elm_label.c:408
 msgid "Label"
 msgstr "标签"
 
@@ -501,7 +501,7 @@ msgid "Radio"
 msgstr "无线电"
 
 #: src/lib/elementary/elm_segment_control.c:532
-#: src/lib/elementary/elm_toolbar.c:2379
+#: src/lib/elementary/elm_toolbar.c:2346
 msgid "State: Selected"
 msgstr "状态：已选择"
 
@@ -542,23 +542,23 @@ msgstr ""
 msgid "spinner text"
 msgstr ""
 
-#: src/lib/elementary/elm_toolbar.c:1834 src/lib/elementary/elm_toolbar.c:2435
+#: src/lib/elementary/elm_toolbar.c:1801 src/lib/elementary/elm_toolbar.c:2408
 msgid "Selected"
 msgstr "已选择"
 
-#: src/lib/elementary/elm_toolbar.c:2375
+#: src/lib/elementary/elm_toolbar.c:2342
 msgid "Separator"
 msgstr "分隔符"
 
-#: src/lib/elementary/elm_toolbar.c:2381
+#: src/lib/elementary/elm_toolbar.c:2348
 msgid "Has menu"
 msgstr "有菜单"
 
-#: src/lib/elementary/elm_toolbar.c:2430
+#: src/lib/elementary/elm_toolbar.c:2403
 msgid "Unselected"
 msgstr "未选择"
 
-#: src/lib/elementary/elm_toolbar.c:2447
+#: src/lib/elementary/elm_toolbar.c:2420
 msgid "Toolbar Item"
 msgstr "工具栏项目"