change pofile binding config location

SVN revision: 83659

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1da717e..81ce7eb 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -156,9 +156,9 @@ src/modules/conf_display/e_int_config_desklock.c
 src/modules/conf_display/e_int_config_screensaver.c
 src/modules/conf_display/e_int_config_dpms.c
 src/modules/conf_display/e_mod_main.c
-src/modules/conf_edgebindings/e_int_config_edgebindings.c
-src/modules/conf_edgebindings/e_int_config_signalbindings.c
-src/modules/conf_edgebindings/e_mod_main.c
+src/modules/conf_bindings/e_int_config_edgebindings.c
+src/modules/conf_bindings/e_int_config_signalbindings.c
+src/modules/conf_bindings/e_mod_main.c
 src/modules/conf_interaction/e_int_config_interaction.c
 src/modules/conf_interaction/e_int_config_mouse.c
 src/modules/conf_interaction/e_mod_main.c
@@ -166,10 +166,10 @@ src/modules/conf_intl/e_int_config_imc.c
 src/modules/conf_intl/e_int_config_imc_import.c
 src/modules/conf_intl/e_int_config_intl.c
 src/modules/conf_intl/e_mod_main.c
-src/modules/conf_keybindings/e_int_config_acpibindings.c
-src/modules/conf_keybindings/e_int_config_keybindings.c
-src/modules/conf_keybindings/e_int_config_mousebindings.c
-src/modules/conf_keybindings/e_mod_main.c
+src/modules/conf_bindings/e_int_config_acpibindings.c
+src/modules/conf_bindings/e_int_config_keybindings.c
+src/modules/conf_bindings/e_int_config_mousebindings.c
+src/modules/conf_bindings/e_mod_main.c
 src/modules/conf_menus/e_int_config_menus.c
 src/modules/conf_menus/e_mod_main.c
 src/modules/conf_paths/e_int_config_paths.c

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 445a8da..b31f07e 100644 (file)
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -18,7 +18,7 @@ src/modules/conf_icon_theme/module.desktop.in
 src/modules/conf_imc/module.desktop.in
 src/modules/conf_interaction/module.desktop.in
 src/modules/conf_intl/module.desktop.in
-src/modules/conf_keybindings/module.desktop.in
+src/modules/conf_bindings/module.desktop.in
 src/modules/conf_menus/module.desktop.in
 src/modules/conf_mime/module.desktop.in
 src/modules/conf_mouse/module.desktop.in

diff --git a/po/ar.po b/po/ar.po
index 3b92ef4..3db5d9f 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -28,7 +28,7 @@ msgstr "عن إنلايتنمينت"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "أتريد بالفعل تعليق تشغيل الحاسب؟"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "أسبِت"
 
@@ -163,7 +163,7 @@ msgstr "تحجيم"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "القائمة"
 
@@ -802,7 +802,7 @@ msgstr "حدد"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -867,7 +867,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -977,7 +977,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -989,7 +989,7 @@ msgid "Basic"
 msgstr "أساسي"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "طبق"
 
@@ -1192,11 +1192,11 @@ msgstr "اختر ملف تنفيذي"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1906,13 +1906,13 @@ msgid "Module %s needs to support %s"
 msgstr "الوحدة %s تحتاج لدعم %s"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr "رجاءا اضغط تسلسل المفتاح,<br><br>أو <hilight>Esc</hilight> للإلغاء."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2128,7 +2128,7 @@ msgid "Remember these Locks"
 msgstr "تذكر هذه اﻷقفال"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "نافذة"
 
@@ -2349,7 +2349,7 @@ msgstr "ثابت"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2897,7 +2897,7 @@ msgid "Hide duration"
 msgstr "إخفاء الوقت"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f ثواني"
@@ -3987,10 +3987,10 @@ msgstr[5] "الدقائق %li الماضية"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "غير معروف"
@@ -4123,11 +4123,11 @@ msgstr "%li دقيقة/دقائق"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4381,7 +4381,7 @@ msgid "Hardware"
 msgstr "العتاد"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "البطارية"
 
@@ -5387,17 +5387,17 @@ msgstr "قفل الشاشة"
 msgid "Desk"
 msgstr "المكتب"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<دون>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5407,81 +5407,81 @@ msgstr ""
 "تحديد أو تأخير<br> إجراء يستخدم slider, أو إجعله<br>يستجيب لنقرات edge "
 "clicks:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "إعدادات ترابط الحد"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "ترابط الحد"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "تعديل"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "حذف الكل"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "استعادة اﻹرتباطات اﻹفتراضية"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "اﻹجراء"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "زر الفأرة"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "دوال اﻹجراء"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "الخيارات العامة"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "اسمح بتفعيل الترابط مع نوافذ ملء الشاشة"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "اسمح بتفعيل الترابط مع الشاشات المتعددة (خطر!)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "تتابع ترابط الحد"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "حد قابل للنقر"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "خطأ في ترابط الحد"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5490,115 +5490,115 @@ msgstr ""
 "ارتباط edge الذي إخترته, لازال قيد الاستخدام بواسطة <br>العملية<hilight>%s</"
 "hilight><br>رجاء اختر edge آخر للربط"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "الحد الأيسر"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "الحد اﻷعلى"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "الحد اﻷيمن"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "الحد الأسفل"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "الحد العلوي اﻷيسر"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "الحد العلوي اﻷيمن"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "الحد السفلي الأيمن"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "الحد السفلي اﻷيسر"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(قابل للنقر اﻷيسر)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(قابل للنقر)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "ارتباطات فردية"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr "المصدر الذي أدخلته  قيد الاستخدام بواسطة <br><hilight>%s</hilight><br>"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "ارتباطات فردية"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "المصدر :"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "ارتباطات فردية"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "إعدادات ترابط signal"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5815,107 +5815,107 @@ msgstr "المحليات"
 msgid "Language"
 msgstr "اللغة"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "ارتباطات واجهة اعدادات الطاقة المتقدمة"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "فُصل محول التيار الكهربائي"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "وُصل محول التيار الكهربائي"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "محول التيار الكهربائي"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "زر"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "مروحة"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "غير معروف"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "إغلاق"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "زر التشغيل"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "المعالج"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "زر النوم"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "حراري"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "فيديو"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "اﻹتصال اللاسيلكي"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "بعِّد"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "قرِّب"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "تقليل اﻹضاءة"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "زيادة اﻹضاءة"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr "مساعدة"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "ارتباطات واجهة اﻹعدادات المتقدمة للطاقة"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
@@ -5923,24 +5923,24 @@ msgstr ""
 "رجاء ابدأ حالة ACPI و التي ترغب بالترابط بها, <br><br>أو <hilight>أخرج</"
 "hilight> لإلغاء العملية."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "مفتاح مفرد"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "إعدادات إرتباطات المفاتيح"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "ربط المفاتيح"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "خطأ في مفتاح اﻹرتباط"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -5949,11 +5949,11 @@ msgstr ""
 "تسلسل مفتاح اﻹرتباط, الذي إخترته, قد استخدم بواسطة اﻹجراء <br><hilight>%s</"
 "hilight>.<br>رجاء اختر تسلسل مفتاح إرتباط آخر."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "خيارات ارتباطات الفأرة"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -5961,20 +5961,20 @@ msgstr ""
 "لا يمكن ضبط ترابط عجلة الفأرة بدون معدِّلات<br>على نافذة: لسبب تعارضها مع "
 "ترابط فردي لـ edje موجود مسبقا.<br>أصلحني!!!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "خطأ ترابط الفأرة"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "خيارات الفأرة"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "سياق اﻹجراء"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -5982,82 +5982,82 @@ msgstr "سياق اﻹجراء"
 msgid "Any"
 msgstr "أيّ"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "قائمة النوافذ"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "نافذة منبثقة"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "منطقة"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "حاوي"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "المدير"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "أزرار الفأرة"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "عجلة الفأرة"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, c-format
 msgid "Left button"
 msgstr "الزر اﻷيسر"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, c-format
 msgid "Right button"
 msgstr "الزر اﻷيمن"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "الزر %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, c-format
 msgid "Middle button"
 msgstr "الزر اﻷوسط"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "زر إضافي (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "عجلة الفأرة ﻷعلى"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "عجلة الفأرة ﻷسفل"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "العجلة اﻹضافية (%d) ﻷعلى"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "العجلة اﻹضافية (%d) ﻷسفل"

diff --git a/po/bg.po b/po/bg.po
index e320179..d344c88 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -26,7 +26,7 @@ msgstr "За Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -136,7 +136,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Сигурни ли сте, че искате да излезнете?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Режим \"Hibernate\""
 
@@ -165,7 +165,7 @@ msgstr "Оразмеряване"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Меню"
 
@@ -868,7 +868,7 @@ msgstr "Настройки"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -921,7 +921,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1049,7 +1049,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1061,7 +1061,7 @@ msgid "Basic"
 msgstr "Прости"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Прилагане"
 
@@ -1273,11 +1273,11 @@ msgstr "Избиране на изпълним файл"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2037,14 +2037,14 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 "Натиснете клавишна комбинация,<br>или <hilight>Escape</hilight>за отказ."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2277,7 +2277,7 @@ msgid "Remember these Locks"
 msgstr "Запомняне на тези забрани"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Прозорци"
@@ -2508,7 +2508,7 @@ msgstr "Фаза"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3074,7 +3074,7 @@ msgid "Hide duration"
 msgstr "Продължителност"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -4238,10 +4238,10 @@ msgstr[1] "Преди %li минути"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Незнаен"
@@ -4379,11 +4379,11 @@ msgstr "Преди %li минути"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4660,7 +4660,7 @@ msgid "Hardware"
 msgstr "Хардуер"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Батерия"
 
@@ -5764,108 +5764,108 @@ msgstr "Заключване на екрана"
 msgid "Desk"
 msgstr "Поле"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Без>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Край автомати Настройки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "край Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Промяна на клавиш"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Изтриване на всички клавиши"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Връщане на стандартните настройки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Действия"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Бутони"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Параметри на действие"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 #, fuzzy
 msgid "General Options"
 msgstr "Общи опции"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Оставя се обвързващо активиране с цял екран на Windows"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Оставя се обвързващо активиране с цял екран на Windows"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Edge Обвързващата Последователност"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "Clickable ръба"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Бутони на мишката"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5874,84 +5874,84 @@ msgstr ""
 "Серията от бързи клавиши която избрахте се използва от действие.<br><hilight>"
 "%s</hilight>.Изберете друга серия."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Право:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "Clickable ръба"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "край Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5960,34 +5960,34 @@ msgstr ""
 "Серията от бързи клавиши която избрахте се използва от действие.<br><hilight>"
 "%s</hilight>.Изберете друга серия."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "край Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Преместване на текст"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "край Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Край автомати Настройки"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6222,119 +6222,119 @@ msgstr "Локал"
 msgid "Language"
 msgstr "Език"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Добавяне"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Бутони"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Далечни"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Незнаен"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Затваряне"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Бутони"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Бутони"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Нормално"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Изход"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Приближаване"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Изключване на компютъра"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Backlight Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Възлагане"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Добавяне"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6342,26 +6342,26 @@ msgid ""
 msgstr ""
 "Натиснете клавишна комбинация,<br>или <hilight>Escape</hilight>за отказ."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Използване на единично натискане на бутона"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Ключови Настройки автомати"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Бързи клавиши"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Грешка в настройката"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6370,32 +6370,32 @@ msgstr ""
 "Серията от бързи клавиши която избрахте се използва от действие.<br><hilight>"
 "%s</hilight>.Изберете друга серия."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Мишки автомати Настройки"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Бутони на мишката"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Бутони на мишката"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Контекст на действие"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6403,85 +6403,85 @@ msgstr "Контекст на действие"
 msgid "Any"
 msgstr "Всеки"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Списък с прозорци"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Изкачащ прозорец"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Зона"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Контейнер"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Манипулатор"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Бутони"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Най-често употребяван"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Бутони"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Радиобутони"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Бутон %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Бутони"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Бутон %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Преместване"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/ca.po b/po/ca.po
index cee7835..76ffe3b 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -25,7 +25,7 @@ msgstr "Sobre Enlightenment"
 #: src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81
 #: src/bin/e_theme_about.c:24
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2529
 #: src/modules/mixer/app_mixer.c:550
@@ -145,7 +145,7 @@ msgstr "Segur que vols suspendre l'ordinador ?"
 
 #: src/bin/e_actions.c:2467
 #: src/bin/e_actions.c:3418
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hiberna"
 
@@ -186,7 +186,7 @@ msgstr "Re-dimensiona"
 #: src/bin/e_actions.c:3334
 #: src/bin/e_actions.c:3336
 #: src/bin/e_actions.c:3338
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menú"
 
@@ -922,7 +922,7 @@ msgstr "Selecciona"
 #: src/bin/e_fm_prop.c:625
 #: src/bin/e_import_dialog.c:195
 #: src/bin/e_import_config_dialog.c:540
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -973,7 +973,7 @@ msgstr "Enlightenment ha tingut un error mentre movia fitxers de configuració<b
 #: src/bin/e_sys.c:619
 #: src/bin/e_sys.c:660
 #: src/bin/e_utils.c:695
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436
@@ -1071,7 +1071,7 @@ msgstr "Enlightenment ha tingut un error mentre escrivia <br>el seu fitxer de co
 
 #: src/bin/e_config_dialog.c:226
 #: src/modules/battery/e_mod_main.c:810
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1084,7 +1084,7 @@ msgid "Basic"
 msgstr "Bàsic"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Aplica"
 
@@ -1286,11 +1286,11 @@ msgstr "Seleccioneu un Executable "
 #: src/bin/e_shelf.c:2482
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2060,12 +2060,12 @@ msgid "Module %s needs to support %s"
 msgstr "El mòdul %s necessita suport %s"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr "Si us plau, pitja la seqüència de tecles,<br><br> o <hilight> Escape </hilight> per avortar."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid "Please hold any modifier you want<br>and press any button on your mouse,<br> or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</highlight> to abort."
 msgstr "Si us plau espera qualsevol modificaor que tu vols<br> i pitja qualsevol butó en el teu ratolí.<br> o fes rodar la roda, per assignar dreçera de ratolí.<br>Pitja<hilight>Escape</hilight> per abortar."
 
@@ -2290,7 +2290,7 @@ msgid "Remember these Locks"
 msgstr "Recorda aquesta aparença"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Finestra"
 
@@ -2527,7 +2527,7 @@ msgstr "Estàtic"
 #: src/bin/e_int_border_prop.c:298
 #: src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2884,11 +2884,11 @@ msgstr "Artefactes Carregats"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -3080,7 +3080,7 @@ msgid "Hide duration"
 msgstr "Durada de l'ocultació "
 
 #: src/bin/e_int_shelf_config.c:244
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%2.2f segons"
@@ -4124,10 +4124,10 @@ msgstr[1] "Fa %li Minuts"
 #: src/bin/e_widget_filepreview.c:571
 #: src/bin/e_widget_filepreview.c:582
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Desconegut"
@@ -4468,7 +4468,7 @@ msgstr "Maquinari"
 
 #: src/modules/battery/e_mod_main.c:146
 #: src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Bateria"
 
@@ -5486,232 +5486,232 @@ msgstr "Bloqueig de Pantalla"
 msgid "Desk"
 msgstr "Desk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "Cap"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid "Please select an edge,<br>or click <hilight>Close</hilight> to abort.<br><br>You can either specify a delay of this<br> action using the slider, or make it<br>respond to edge clicks:"
 msgstr "Si us plau selecciona cantonada,<br>o pitja<hilight>Tanca</hilight> per abortar.<br><br>Podeu especificar una demora d'aquesta <br>acció usant el desllisador, o fent que<br> respongui als clicks de Vora:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Preferències Tecles Cantonada"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Bindatje de tecles de Cantonada"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Modifica"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Elimina-ho Tot"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Ajusta a predeterminat"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Acció"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Butó de Ratolí"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Paràmetres d'Acció "
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Opcions Generals"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permetre dreçera activació  amb finestres de pantalla completa"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Permetre dreçera activació amb multiples escriptoris (PERILLÓS!)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Seqüència de Dreçera de Cantonada"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Cantonada Pitjable "
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Error Dreçera Cantonada"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid "The edge binding that you chose is already used by<br><hilight>%s</hilight> action.<br>Please choose another edge to bind."
 msgstr "La dreçera de cantonada que ha escollit està  essent usat per l'acció<br><hilight>%s</hilight>. <br>Si us plau tria una altra seqüència."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Cantonada Esquerra"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Cantonada Dalt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Cantonada Dreta"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Vora de Baix"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Vora Dalt Esquerra"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Vora Dalt Dreta"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Vora Baix Dreta"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Vora Baix Esquerra"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(clicable esquerra)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(pitjable)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "Error de Dreçera de Senyal"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "Senyal i font no poden ser blancs!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid "The signal and source that you entered are already used by<br><hilight>%s</hilight> action.<br>"
 msgstr "La senyal i la seqüència de tecles que ha escollit està  essent usat per l'acció<br><hilight>%s</hilight>. <br>"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "Afegir Dreçera de Senyal"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "Font:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "Senyal"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Senyals de Tecles"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "Preferències Tecles Senyal"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308
 #: src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
 msgstr "Entrada"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge bindings"
 msgstr "Dreceres de cantonada"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "Screen edge binding settings"
 msgstr "Preferències dreçeres de cantonada de pantalla"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
 #: src/modules/conf_intl/e_mod_main.c:45
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "input"
 msgstr "entrada"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge"
 msgstr "Cantonada"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 #: src/modules/conf_randr/e_mod_main.c:37
 #: src/modules/notification/e_mod_main.c:245
 #: src/modules/notification/e_mod_main.c:249
@@ -5719,28 +5719,28 @@ msgstr "Cantonada"
 msgid "screen"
 msgstr "pantalla"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "binding"
 msgstr "Dreçeres"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "signal bindings"
 msgstr "Dreceres de senyals"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "Edje signal binding settings"
 msgstr "Preferències de dreçeres de senyal de vora"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "edje"
 msgstr "vora"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse"
 msgstr "ratolí"
 
@@ -5971,152 +5971,152 @@ msgstr "mètode entrada"
 msgid "Input method settings"
 msgstr "Paràmetres del mètode entrada"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Dreçeres ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "Adaptador CA Desendollat"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "Adaptador CA Endollat"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "Adaptador CA "
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Botó"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Ventilador "
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "Tapa Desconeguda"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "Tapa Tancada"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "Lid Obert"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "Lid"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "Botó Engegada"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Processador"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "Botó Dormir"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "Tèrmic "
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "wiFi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Zoom Fora"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Zoom dins"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Baixar Brillantor"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Pujar Brillantor"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr "Ajuda"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "Dreçera ACPI "
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid "Please trigger the ACPI event you wish to bind to, <br><br>or <hilight>Escape</hilight> to abort."
 msgstr "Si us plau, dispara l'even ACPI que vols lligar,<br><br> o <hilight> Escape </hilight> per avortar."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Única tecla"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Preferències Dreceres Tecles"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Dreceres de tecles"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Error de Dreçera de Tecles"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid "The binding key sequence, that you choose, is already used by <br><hilight>%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr "La seqüència de dreçera de tecles, que ha escollit, està essent usat per l'acció<br><hilight>%s</hilight>. Si us plau tria una altra drecera de seqüència de tecles."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Preferències Dreceres Tecles Ratolí"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid "Unable to set a mouse wheel binding without modifiers<br>on a window: conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr "No es poden carregar la dreçera de roda de ratolí sense modificacors<br> a la finestra;El conflicte existeix en la senyal de drecera de vora.<br>FIXA'M!!!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Error Drecera de Ratolí "
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Drecera del Ratolí "
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Acció de Context"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6124,54 +6124,54 @@ msgstr "Acció de Context"
 msgid "Any"
 msgstr "Qualsevol"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Llistat de Finestres"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141
 #: src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Programa Adicional"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zona"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Contenidor"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Managador"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Butons de Mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Roda Ratolí"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:374
 #: src/modules/pager/e_mod_config.c:400
 #, c-format
 msgid "Left button"
 msgstr "Botó Esquerra"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:379
 #: src/modules/pager/e_mod_config.c:395
 #, c-format
 msgid "Right button"
 msgstr "Botó Dret"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:384
 #: src/modules/pager/e_mod_config.c:405
 #: src/modules/pager/e_mod_config.c:410
@@ -6179,67 +6179,67 @@ msgstr "Botó Dret"
 msgid "Button %i"
 msgstr "Botó %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:389
 #, c-format
 msgid "Middle button"
 msgstr "Botó Mig"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Extra Botó %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Roda Ratolí Amunt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Roda Ratolí Avall"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Roda Extra (%d) Amunt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Roda Extra (%d) Avall"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "key bindings"
 msgstr "Drecera tecla"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "Key binding settings"
 msgstr "Preferències Drecera Tecla"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 #: src/modules/fileman/e_mod_main.c:430
 #: src/modules/tiling/e_mod_tiling.c:3919
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "key"
 msgstr "Tecla"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse bindings"
 msgstr "Drecera de Ratolí "
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "Mouse binding settings"
 msgstr "Preferències drecera de Ratolí "
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI bindings"
 msgstr "Drecera ACPI"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI binding settings"
 msgstr "Preferències Drecera ACPI"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "acpi"
 msgstr "acpi"
 

diff --git a/po/cs.po b/po/cs.po
index a7e9f92..bcc28a5 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -27,7 +27,7 @@ msgstr "O Enlightenmentu"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Opravdu chcete uspat váš počítač?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernovat"
 
@@ -163,7 +163,7 @@ msgstr "Změnit velikost"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Nabídka"
 
@@ -801,7 +801,7 @@ msgstr "Vybrat"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -868,7 +868,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -979,7 +979,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -991,7 +991,7 @@ msgid "Basic"
 msgstr "Základní"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Použít"
 
@@ -1199,11 +1199,11 @@ msgstr "Vyberte spustitelný soubor"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1902,14 +1902,14 @@ msgid "Module %s needs to support %s"
 msgstr "Modul %s potřebuje podporovat %s"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 "Prosím zadejte zkratku,<br><br>nebo klávesou <hilight>Esc</hilight> zrušte."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2127,7 +2127,7 @@ msgid "Remember these Locks"
 msgstr "Zapamatovat tyto zámky"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Okno"
 
@@ -2347,7 +2347,7 @@ msgstr "Statický"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2899,7 +2899,7 @@ msgid "Hide duration"
 msgstr "Doba skrývání"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekund"
@@ -4007,10 +4007,10 @@ msgstr[2] "Před %li minutami"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Neznámý"
@@ -4145,11 +4145,11 @@ msgstr "%li minut"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4402,7 +4402,7 @@ msgid "Hardware"
 msgstr "Hardware"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Baterie"
 
@@ -5410,17 +5410,17 @@ msgstr "Zamčení obrazovky"
 msgid "Desk"
 msgstr "Plocha"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Žádný>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5430,81 +5430,81 @@ msgstr ""
 "zrušení.<br><br>Můžete také vybrat zpoždění<br> činnosti použitím posuvníku "
 "nebo jej přimět<br>reagovat na kliky na okraji:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Nastavení vazeb pro okraje obrazovky"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Vazby pro okraje obrazovky"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Upravit"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Smazat vše"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Obnovit výchozí vazby"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Činnost"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Tlačítko myši"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Parametry činnosti"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Obecné možnosti"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Povolit aktivaci vazeb s maximalizovanými okny"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Povolit aktivaci vazeb s maximalizovanými okny"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Sekvence vazeb na okraje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Okraj reagující na kliknutí"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Chyba vazby okraje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5513,82 +5513,82 @@ msgstr ""
 "Vybraná okraj má již nastavenu vazbu<br><hilight>%s</hilight> akcí."
 "<br>Prosím vyberte jiný okraj."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "Ctrl"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "Alt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "Shift"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "Win"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Levý okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Horní okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Pravý okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Spodní okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Levý horní roh"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Pravý horní roh"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Pravý dolní roh"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Levý dolní roh"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(okraj reagující na kliknutí levým tlačitkem)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(okraj reagující na kliknutí)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "Chyba vazby na signál"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "Signál a zdroj NESMÍ být prázdné!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5597,30 +5597,30 @@ msgstr ""
 "Signál a zdroj, který jste vybralí již má nastavenu vazbu<br><hilight>%s</"
 "hilight> na akci.<br>"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "Přidat vazbu na signál"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "Zdroj:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "Signál:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Vazby na signály"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "Nastavení vazeb na signály"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5837,105 +5837,105 @@ msgstr "Lokalizace"
 msgid "Language"
 msgstr "Jazyk"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Vazby na ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "Zdroj odpojen"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "Zdroj připojen"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "Zdroj"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Tlačítko"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Větrák"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "Neznámý stav víka"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "Víko zavřené"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "Víko otevřené"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "Víko"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "Vypínač počítače"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Procesor"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "Tlačítko uspání"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "Teplotní čidlo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Video"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "WiFi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Oddálit"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Přiblížit"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Snížit úroveň Podsvícení"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Zvýšit úroveň podsvícení"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr "Assist"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "Vazby na ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
@@ -5943,24 +5943,24 @@ msgstr ""
 "Prosím, vyvolejte událost ACPI, kterou si přejete svázat,<br><br>nebo "
 "klávesou <hilight>Esc</hilight> zrušte."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Jedna klávesa"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Nastavení klávesových zkratek"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Klávesové zkratky"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Chyba klávesové zkratky"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -5969,11 +5969,11 @@ msgstr ""
 "Klávesová zkratka, kterou jste zadali, je již použita <br><hilight>%s</"
 "hilight> akcí.<br>Prosím vyberte si jinou zkratku."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Nastavení vazeb myši"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -5981,20 +5981,20 @@ msgstr ""
 "Nemohu nastavit vazbu na kolečko myši bez modifikátoru<br> na okno: konflikt "
 "mezi existujícími vazbami signálů Edje.<br>FIXME!!!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Chyba vazby myši"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Vazby myši"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Kontext činnosti"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6002,82 +6002,82 @@ msgstr "Kontext činnosti"
 msgid "Any"
 msgstr "Libovolný"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Seznam oken"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Pop-up"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zóna"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Kontejner"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Správce"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Tlačítka myši"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Kolečko myši"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, c-format
 msgid "Left button"
 msgstr "Levé tlačítko"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, c-format
 msgid "Right button"
 msgstr "Pravé tlačítko"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Tlačítko %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, c-format
 msgid "Middle button"
 msgstr "Prostřední tlačítko"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Extra tlačítko (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Kolečko myši nahoru"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Kolečko myši dolů"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Extra kolečko (%d) nahoru"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Extra kolečko (%d) dolů"

diff --git a/po/da.po b/po/da.po
index f6c4483..97b9551 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -25,7 +25,7 @@ msgstr "Om Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Er du sikker på du vil logge af?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 #, fuzzy
 msgid "Hibernate"
 msgstr "dvale"
@@ -166,7 +166,7 @@ msgstr "Skift størrelse"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menu"
 
@@ -884,7 +884,7 @@ msgstr "Vælg et vindue"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -937,7 +937,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1065,7 +1065,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1077,7 +1077,7 @@ msgid "Basic"
 msgstr "Grundlæggende"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Anvend"
 
@@ -1297,11 +1297,11 @@ msgstr "Vælg en kørbar fil"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2061,13 +2061,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2302,7 +2302,7 @@ msgid "Remember these Locks"
 msgstr "Husk disse låsninger"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Vindue"
 
@@ -2540,7 +2540,7 @@ msgstr "stat"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3175,7 +3175,7 @@ msgid "Hide duration"
 msgstr "Skjul varighed"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -4333,10 +4333,10 @@ msgstr[1] ""
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 #, fuzzy
 msgid "Unknown"
@@ -4475,11 +4475,11 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4766,7 +4766,7 @@ msgid "Hardware"
 msgstr "Hardware"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 #, fuzzy
 msgid "Battery"
 msgstr "batteri"
@@ -5915,235 +5915,235 @@ msgstr "Skærmlås"
 msgid "Desk"
 msgstr "Desk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 #, fuzzy
 msgid "<None>"
 msgstr "<Ingen>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Edge bindinger Indstillinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Edge Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "modificeret:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 #, fuzzy
 msgid "Delete All"
 msgstr "Slet alle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 #, fuzzy
 msgid "Restore Default Bindings"
 msgstr "Restore Default Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 #, fuzzy
 msgid "Action"
 msgstr "Action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Fokusindstillinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 #, fuzzy
 msgid "Action Params"
 msgstr "Action Parametre"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 #, fuzzy
 msgid "General Options"
 msgstr "generelle indstillinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Tillade binding aktivering med fuldskærm vinduer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Tillade binding aktivering med fuldskærm vinduer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Kant bindingssekvens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "klikbart kant"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "musebindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 #, fuzzy
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 #, fuzzy
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 #, fuzzy
 msgid "SHIFT"
 msgstr "SKIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 #, fuzzy
 msgid "WIN"
 msgstr "VIND"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Højre:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "klikbart kant"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Edge Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Edge Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Træk"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Edge Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Edge bindinger Indstillinger"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6393,180 +6393,180 @@ msgstr "Landestandard"
 msgid "Language"
 msgstr "Sprog"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Tilføj Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "knapper"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Fjern"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Ukendt"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Luk"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Fokusindstillinger"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Fokusindstillinger"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normal"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Log af"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Baggrundslys Down"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Baggrundslys Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Tildel"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Tilføj Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "enkelt tast"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Tastebindinger Indstillinger"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Key Bindings"
 msgstr "Vigtige Bindinger"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 #, fuzzy
 msgid "Binding Key Error"
 msgstr "Binding Key Fejl"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Musebindinger Indstillinger"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "musebindinger"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Mouse Bindings"
 msgstr "musebindinger"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 #, fuzzy
 msgid "Action Context"
 msgstr "Action Context"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6575,90 +6575,90 @@ msgstr "Action Context"
 msgid "Any"
 msgstr "enhver"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 #, fuzzy
 msgid "Win List"
 msgstr "Vind List"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 #, fuzzy
 msgid "Popup"
 msgstr "Popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 #, fuzzy
 msgid "Zone"
 msgstr "Zone"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 #, fuzzy
 msgid "Container"
 msgstr "container"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 #, fuzzy
 msgid "Manager"
 msgstr "manager"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Fokusindstillinger"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Træk"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Fokusindstillinger"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Radio knapper"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Fokusindstillinger"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Træk"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/de.po b/po/de.po
index 18ba065..0713491 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -44,7 +44,7 @@ msgstr "Über Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -153,7 +153,7 @@ msgstr ""
 "Möchten Sie Ihren Computer wirklich in den Bereitschaftsmodus versetzen?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Ruhezustand"
 
@@ -181,7 +181,7 @@ msgstr "Größe ändern"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menü"
 
@@ -821,7 +821,7 @@ msgstr "Auswählen"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -890,7 +890,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1005,7 +1005,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1017,7 +1017,7 @@ msgid "Basic"
 msgstr "Einfach"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Übernehmen"
 
@@ -1226,11 +1226,11 @@ msgstr "Wählen Sie eine ausführbare Datei aus"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1931,7 +1931,7 @@ msgid "Module %s needs to support %s"
 msgstr "Das Modul %s muss %s unterstützen"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1939,7 +1939,7 @@ msgstr ""
 "abzubrechen."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2160,7 +2160,7 @@ msgid "Remember these Locks"
 msgstr "Diese Sperren merken"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Fenster"
 
@@ -2381,7 +2381,7 @@ msgstr "Statisch"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2929,7 +2929,7 @@ msgid "Hide duration"
 msgstr "Ausblenddauer"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f Sekunden"
@@ -4053,10 +4053,10 @@ msgstr[1] "Vor %li Minuten"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -4195,11 +4195,11 @@ msgstr "%li Minuten"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4455,7 +4455,7 @@ msgid "Hardware"
 msgstr "Hardware"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Batterie"
 
@@ -5468,17 +5468,17 @@ msgstr "Bildschirmsperre"
 msgid "Desk"
 msgstr "Arbeitsfläche"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Nichts>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5489,82 +5489,82 @@ msgstr ""
 "diese Aktion über den Schieber angeben<br>oder auf Kantenklicks reagieren "
 "lassen."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Einstellungen für Kantenbelegungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Kantenbelegungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Ändern"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Alle entfernen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Standardbelegung wiederherstellen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Aktion"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Maustaste"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Aktionsparameter"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Allgemeine Einstellungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Aktivierung der Belegungen bei Vollbildfenstern erlauben"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr ""
 "Aktivierung der Belegung mit mehreren Bildschirmen aktivieren (GEFÄHRLICH!)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Abfolge bei Kantenbelegungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Klickbare Bildschirmkante"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Kantenbelegungsfehler"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5573,82 +5573,82 @@ msgstr ""
 "Die Kantenbelegung welche Sie wählten ist bereits durch die<br><hilight>%s</"
 "hilight> Aktion belegt.<br>Bitte wählen Sie eine andere Kante."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "STRG"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Linke Kante"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Obere Kante"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Rechte Kante"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Rand Unten"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Rand Oben-Links"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Rand Oben-Rechts"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Rand Unten-Rechts"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Rand Unten-Links"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(links klickbar)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(klickbar)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "Signalbelegungsfehler"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "Signal und Quelle dürfen NICHT leer sein!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5657,30 +5657,30 @@ msgstr ""
 "Die von Ihnen eingegebenen Signal und Quelle werden bereits von "
 "der<br><hilight>%s</hilight>-Aktion verwendet.<br>"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "Signalbelegung hinzufügen"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "Quelle:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "Signal:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Signalbelegung"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "Signalbelegungseinstellungen"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5899,107 +5899,107 @@ msgstr "Spracheinstellung"
 msgid "Language"
 msgstr "Sprache"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "ACPI Belegungen"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "Netzteil abgesteckt"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "Netzteil Eingesteckt"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "Netzteil"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Knopf"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Lüfter"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "Bildschirmdeckel Unbekannt"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "Bildschirm geschlossen"
 
 # Lid has been translated with "Bildschirm" (Display), as the term "Deckel/Abdeckung" (lid,cover) is rarely used and thus confusing.
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "Bildschirm aufgeklappt"
 
 # Lid has been translated with "Bildschirm" (Display), as the term "Deckel/Abdeckung" (lid,cover) is rarely used and thus confusing.
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "Bildschirm"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "Einschaltknopf"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Prozessor"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "Bereitschaftstaste"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "Thermal"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Grafikkarte"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "WLAN"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Verkleinern"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Vergrößern"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Dunkler"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Heller"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr "Unterstützen"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "ACPI Belegung"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
@@ -6007,24 +6007,24 @@ msgstr ""
 "Bitte zu belegenden ACPI-Vorgang auslösen<br><br>oder <hilight>Escape</"
 "hilight> drücken um abzubrechen."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Einfacher Klick"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Tastenbelegungseinstellungen"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Tastenbelegungen"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Tastenbelegungsfehler"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6033,11 +6033,11 @@ msgstr ""
 "gewählte Die Tastenbelegungsabfolge wird bereits von der <br><hilight>%s</"
 "hilight>-Aktion verwendet.<br>Bitte wählen Sie eine andere Abfolge."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Einstellungen zur Maustastenbelegung"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -6045,20 +6045,20 @@ msgstr ""
 "Mausrad-Belegung ohne Modifikatoren können nicht auf<br>ein Fenster gelegt "
 "werden: Konflikt mit existierenden Edje Signal-Belegungen.<br>FIXME!!!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Fehler bei Mausbelegung"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Maustastenbelegungen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Aktionskontext"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6066,82 +6066,82 @@ msgstr "Aktionskontext"
 msgid "Any"
 msgstr "Beliebig"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Fensterliste"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zone"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Container"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Manager"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Maustasten"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Mausräder"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, c-format
 msgid "Left button"
 msgstr "Linke Taste"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, c-format
 msgid "Right button"
 msgstr "Rechte Taste"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Schaltfläche %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, c-format
 msgid "Middle button"
 msgstr "Mittlere Taste"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Zusatztaste (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Mausrad nach Oben"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Mausrad nach Unten"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Extra Rad (%d) nach Oben"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Extra Rad (%d) nach Unten"

diff --git a/po/el.po b/po/el.po
index 0091464..d164526 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -31,7 +31,7 @@ msgstr "Περί Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194\r
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24\r
 #: src/modules/conf/e_conf.c:179\r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877\r
 #: src/modules/everything/evry_plug_windows.c:452\r
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550\r
 msgid "Close"\r
@@ -140,7 +140,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Επιθυμείτε σίγουρα την αναστολή του υπολογιστή σας;"\r
 \r
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421\r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379\r
 msgid "Hibernate"\r
 msgstr "Αδρανοποίηση"\r
 \r
@@ -168,7 +168,7 @@ msgstr "Αλλαγή μεγέθους"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335\r
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341\r
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336\r
 msgid "Menu"\r
 msgstr "Μενού"\r
 \r
@@ -807,7 +807,7 @@ msgstr "Επιλογή"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959\r
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194\r
 #: src/bin/e_import_config_dialog.c:537\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637\r
 #: src/modules/conf_intl/e_int_config_imc_import.c:124\r
 #: src/modules/conf_theme/e_int_config_theme_import.c:123\r
 #: src/modules/fileman/e_int_config_mime_edit.c:316\r
@@ -878,7 +878,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431\r
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659\r
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636\r
 #: src/modules/conf_intl/e_int_config_imc_import.c:120\r
 #: src/modules/conf_theme/e_int_config_theme_import.c:119\r
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465\r
@@ -992,7 +992,7 @@ msgstr ""
 \r
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817\r
 #: src/modules/conf/e_mod_main.c:283\r
-#: src/modules/conf_edgebindings/e_mod_main.c:19\r
+#: src/modules/conf_bindings/e_mod_main.c:19\r
 #: src/modules/conf_paths/e_mod_main.c:17\r
 #: src/modules/conf_performance/e_mod_main.c:17\r
 #: src/modules/syscon/e_mod_main.c:36\r
@@ -1004,7 +1004,7 @@ msgid "Basic"
 msgstr "Βασικά"\r
 \r
 #: src/bin/e_config_dialog.c:280\r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876\r
 msgid "Apply"\r
 msgstr "Εφαρμογή"\r
 \r
@@ -1213,11 +1213,11 @@ msgstr "Επιλογή ενός Εκτελέσιμου"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475\r
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135\r
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339\r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812\r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294\r
 #: src/modules/conf_paths/e_int_config_env.c:317\r
 #: src/modules/conf_shelves/e_int_config_shelf.c:137\r
 #: src/modules/conf_shelves/e_int_config_shelf.c:392\r
@@ -1918,7 +1918,7 @@ msgid "Module %s needs to support %s"
 msgstr "Το άρθρωμα %s χρειάζεται για την υποστήριξη %s"\r
 \r
 #: src/bin/e_grab_dialog.c:3\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4\r
 msgid ""\r
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."\r
 msgstr ""\r
@@ -1926,7 +1926,7 @@ msgstr ""
 "για ακύρωση."\r
 \r
 #: src/bin/e_grab_dialog.c:5\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7\r
 msgid ""\r
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "\r
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"\r
@@ -2146,7 +2146,7 @@ msgid "Remember these Locks"
 msgstr "Απομνημόνευση αυτών των Κλειδωμάτων"\r
 \r
 #: src/bin/e_int_border_menu.c:127\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332\r
 msgid "Window"\r
 msgstr "Παράθυρο"\r
 \r
@@ -2366,7 +2366,7 @@ msgstr "Στατικό"
 \r
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103\r
 #: src/modules/clock/e_mod_config.c:141\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360\r
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196\r
 #: src/modules/conf_theme/e_int_config_fonts.c:689\r
 #: src/modules/conf_theme/e_int_config_transitions.c:199\r
@@ -2922,7 +2922,7 @@ msgid "Hide duration"
 msgstr "Διάρκεια απόκρυψης"\r
 \r
 #: src/bin/e_int_shelf_config.c:247\r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888\r
 #, c-format\r
 msgid "%.2f seconds"\r
 msgstr "%.2f δευτερόλεπτα"\r
@@ -4059,10 +4059,10 @@ msgstr[1] "%li Λεπτά πριν"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582\r
 #: src/modules/comp/e_mod_config.c:516\r
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298\r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587\r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170\r
 #: src/modules/wizard/page_020.c:24\r
 msgid "Unknown"\r
 msgstr "Άγνωστο"\r
@@ -4202,11 +4202,11 @@ msgstr "%li Λεπτά"
 #: src/modules/conf_applications/e_int_config_apps.c:287\r
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93\r
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133\r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809\r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292\r
 #: src/modules/conf_paths/e_int_config_env.c:311\r
 #: src/modules/conf_shelves/e_int_config_shelf.c:135\r
 #: src/modules/ibar/e_mod_config.c:110\r
@@ -4459,7 +4459,7 @@ msgid "Hardware"
 msgstr "Υλικό"\r
 \r
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455\r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354\r
 msgid "Battery"\r
 msgstr "Μπαταρία"\r
 \r
@@ -5465,17 +5465,17 @@ msgstr "Κλείδωμα Οθόνης"
 msgid "Desk"\r
 msgstr "Επιφάνεια Εργασίας"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4\r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3\r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3\r
 msgid "<None>"\r
 msgstr "<Κανένα>"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5\r
 msgid ""\r
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."\r
 "<br><br>You can either specify a delay of this<br> action using the slider, "\r
@@ -5486,82 +5486,82 @@ msgstr ""
 "<br>ενέργειας με την χρήση της μπάρας κύλισης, ή ρυθμίστε την<br>να "\r
 "ανταποκρίνεται στα κλικ στην άκρη:"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105\r
 msgid "Edge Bindings Settings"\r
 msgstr "Ρυθμίσεις Συνδυασμών Άκρων"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258\r
-#: src/modules/conf_edgebindings/e_mod_main.c:21\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258\r
+#: src/modules/conf_bindings/e_mod_main.c:21\r
 msgid "Edge Bindings"\r
 msgstr "Συνδυασμοί άκρων"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298\r
 #: src/modules/conf_paths/e_int_config_env.c:314\r
 msgid "Modify"\r
 msgstr "Τροποποίηση"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302\r
 msgid "Delete All"\r
 msgstr "Διαγραφή όλων"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306\r
 msgid "Restore Default Bindings"\r
 msgstr "Επαναφορά Προκαθορισμένων Συνδυασμών"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825\r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312\r
 msgid "Action"\r
 msgstr "Ενέργεια"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290\r
 msgid "Mouse Button"\r
 msgstr "Πλήκτρο Ποντικιού"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832\r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319\r
 msgid "Action Params"\r
 msgstr "Παράμετροι Ενέργειας"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306\r
 msgid "General Options"\r
 msgstr "Γενικές επιλογές"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307\r
 msgid "Allow binding activation with fullscreen windows"\r
 msgstr "Να επιτρέπεται ενεργοποίηση συνδυασμών σε παράθυρα σε πλήρη οθόνη"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309\r
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"\r
 msgstr ""\r
 "Να επιτρέπεται ενεργοποίηση συνδυασμών με πολλαπλές οθόνες (ΕΠΙΚΙΝΔΥΝΟ!)"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874\r
 msgid "Edge Binding Sequence"\r
 msgstr "Ακολουθία συντόμευσης άκρων"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893\r
 msgid "Clickable edge"\r
 msgstr "Άκρη που μπορείτε να κάνετε κλικ"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214\r
 msgid "Edge Binding Error"\r
 msgstr "Σφάλμα Συνδυασμού Άκρης"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215\r
 #, c-format\r
 msgid ""\r
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "\r
@@ -5570,83 +5570,83 @@ msgstr ""
 "Ο συνδυασμός της άκρης που επιλέξατε χρησιμοποιείται ήδη από την ενέργεια "\r
 "<br><hilight>%s</hilight>. <br>Παρακαλώ επιλέξτε άλλη άκρη να συνδυάσετε."\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337\r
 msgid "CTRL"\r
 msgstr "CTRL"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342\r
 msgid "ALT"\r
 msgstr "ALT"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348\r
 msgid "SHIFT"\r
 msgstr "SHIFT"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322\r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354\r
 msgid "WIN"\r
 msgstr "WIN"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377\r
 msgid "Left Edge"\r
 msgstr "Αριστερή Άκρη"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381\r
 msgid "Top Edge"\r
 msgstr "Επάνω Άκρη"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385\r
 msgid "Right Edge"\r
 msgstr "Δεξιά Άκρη"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389\r
 msgid "Bottom Edge"\r
 msgstr "Κάτω Άκρη"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393\r
 msgid "Top Left Edge"\r
 msgstr "Επάνω Αριστερή Άκρη"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397\r
 msgid "Top Right Edge"\r
 msgstr "Επάνω Δεξιά Άκρη"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401\r
 msgid "Bottom Right Edge"\r
 msgstr "Κάτω Δεξιά Άκρη"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405\r
 msgid "Bottom Left Edge"\r
 msgstr "Κάτω Αριστερή Άκρη"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419\r
 #, c-format\r
 msgid "(left clickable)"\r
 msgstr ""\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421\r
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421\r
 #, fuzzy, c-format\r
 msgid "(clickable)"\r
 msgstr "(μπορείτε να κάνετε κλικ)"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574\r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584\r
 #, fuzzy\r
 msgid "Signal Binding Error"\r
 msgstr "Συνδυασμοί Σήματος"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574\r
 msgid "Signal and Source must NOT be blank!"\r
 msgstr ""\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585\r
 #, fuzzy, c-format\r
 msgid ""\r
 "The signal and source that you entered are already used by<br><hilight>%s</"\r
@@ -5655,33 +5655,33 @@ msgstr ""
 "Ο συνδυασμός της άκρης που επιλέξατε χρησιμοποιείται ήδη από την ενέργεια "\r
 "<br><hilight>%s</hilight>. <br>Παρακαλώ επιλέξτε άλλη άκρη να συνδυάσετε."\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634\r
 #, fuzzy\r
 msgid "Add Signal Binding"\r
 msgstr "Συνδυασμοί Σήματος"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645\r
 #, fuzzy\r
 msgid "Source:"\r
 msgstr "Μετακίνηση Πηγής"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650\r
 msgid "Signal:"\r
 msgstr ""\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804\r
-#: src/modules/conf_edgebindings/e_mod_main.c:25\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804\r
+#: src/modules/conf_bindings/e_mod_main.c:25\r
 msgid "Signal Bindings"\r
 msgstr "Συνδυασμοί Σήματος"\r
 \r
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865\r
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865\r
 #, fuzzy\r
 msgid "Signal Bindings Settings"\r
 msgstr "Ρυθμίσεις Συνδυασμών Άκρων"\r
 \r
-#: src/modules/conf_edgebindings/e_mod_main.c:17\r
+#: src/modules/conf_bindings/e_mod_main.c:17\r
 #: src/modules/conf_interaction/e_mod_main.c:17\r
-#: src/modules/conf_keybindings/e_mod_main.c:17\r
+#: src/modules/conf_bindings/e_mod_main.c:17\r
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326\r
 #: src/modules/xkbswitch/e_mod_main.c:71\r
 msgid "Input"\r
@@ -5903,106 +5903,106 @@ msgstr "Εντοπιότητα"
 msgid "Language"\r
 msgstr "Γλώσσα"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71\r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190\r
-#: src/modules/conf_keybindings/e_mod_main.c:29\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190\r
+#: src/modules/conf_bindings/e_mod_main.c:29\r
 msgid "ACPI Bindings"\r
 msgstr "Συνδυασμοί ACPI"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349\r
 msgid "AC Adapter Unplugged"\r
 msgstr "Αποσυνδεδεμένος προσαρμογέας ρεύματος"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350\r
 msgid "AC Adapter Plugged"\r
 msgstr "Συνδεδεμένος προσαρμογέας ρεύματος"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351\r
 msgid "Ac Adapter"\r
 msgstr "Προσαρμογέας Ρεύματος"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356\r
 msgid "Button"\r
 msgstr "Κουμπί"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358\r
 msgid "Fan"\r
 msgstr "Ανεμιστήρας"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361\r
 msgid "Lid Unknown"\r
 msgstr "Καπάκι Άγνωστο"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362\r
 msgid "Lid Closed"\r
 msgstr "Καπάκι Κλειστό"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363\r
 msgid "Lid Opened"\r
 msgstr "Ανοικτό Καπάκι"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364\r
 msgid "Lid"\r
 msgstr "Καπάκι"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367\r
 msgid "Power Button"\r
 msgstr "Κουμπί Ρεύματος"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369\r
 msgid "Processor"\r
 msgstr "Επεξεργαστής"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371\r
 msgid "Sleep Button"\r
 msgstr "Κουμπί Αναστολής"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373\r
 #, fuzzy\r
 msgid "Thermal"\r
 msgstr "Θερμικό"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375\r
 msgid "Video"\r
 msgstr "Βίντεο"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377\r
 msgid "Wifi"\r
 msgstr "Ασύρματο"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381\r
 msgid "Zoom Out"\r
 msgstr "Σμίκρυνση"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383\r
 msgid "Zoom In"\r
 msgstr "Μεγέθυνση"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385\r
 msgid "Brightness Down"\r
 msgstr "Χαμήλωμα Οπίσθιου Φωτισμού"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387\r
 msgid "Brightness Up"\r
 msgstr "Ανύψωση Οπίσθιου Φωτισμού"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389\r
 msgid "Assist"\r
 msgstr "Βοηθός"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391\r
 msgid "S1"\r
 msgstr "S1"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393\r
 msgid "Vaio"\r
 msgstr "Vaio"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497\r
 msgid "ACPI Binding"\r
 msgstr "Συνδυασμοί ACPI"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500\r
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500\r
 msgid ""\r
 "Please trigger the ACPI event you wish to bind to, <br><br>or "\r
 "<hilight>Escape</hilight> to abort."\r
@@ -6010,24 +6010,24 @@ msgstr ""
 "Παρακαλώ ενεργοποιήστε την ενέργεια ACPI που θέλετε να συνδέσετε,<br><br>ή "\r
 "<hilight>Escape</hilight> για ματαίωση."\r
 \r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8\r
 msgid "Single key"\r
 msgstr "Ένα πλήκτρο"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106\r
 msgid "Key Bindings Settings"\r
 msgstr "Ρυθμίσεις Συνδυασμών Πλήκτρων"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239\r
-#: src/modules/conf_keybindings/e_mod_main.c:21\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239\r
+#: src/modules/conf_bindings/e_mod_main.c:21\r
 msgid "Key Bindings"\r
 msgstr "Συνδυασμοί Πλήκτρων"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165\r
 msgid "Binding Key Error"\r
 msgstr "Σφάλμα Συντόμευσης Πληκτρολογίου"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166\r
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166\r
 #, c-format\r
 msgid ""\r
 "The binding key sequence, that you choose, is already used by <br><hilight>"\r
@@ -6036,30 +6036,30 @@ msgstr ""
 "Ο συνδυασμός συντόμευσης πληκτρολογίου που επιλέξατε, χρησιμοποιείται ήδη "\r
 "από το <br><hilight>%s</hilight>. <br>Παρακαλώ επιλέξτε έναν άλλο συνδυασμό."\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109\r
 msgid "Mouse Bindings Settings"\r
 msgstr "Ρυθμίσεις Συνδυασμών Ποντικιού"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247\r
 msgid ""\r
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "\r
 "conflict with existing edje signal bindings.<br>FIXME!!!"\r
 msgstr ""\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250\r
 msgid "Mouse Binding Error"\r
 msgstr "Σφάλμα Συνδυασμών Ποντικιού"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286\r
-#: src/modules/conf_keybindings/e_mod_main.c:25\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286\r
+#: src/modules/conf_bindings/e_mod_main.c:25\r
 msgid "Mouse Bindings"\r
 msgstr "Συνδυασμοί Ποντικιού"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326\r
 msgid "Action Context"\r
 msgstr "Περιεχόμενο Ενέργειας"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328\r
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348\r
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352\r
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356\r
@@ -6067,84 +6067,84 @@ msgstr "Περιεχόμενο Ενέργειας"
 msgid "Any"\r
 msgstr "Οτιδήποτε"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340\r
 msgid "Win List"\r
 msgstr "Λίστα παραθύρων"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344\r
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261\r
 msgid "Popup"\r
 msgstr "Αναδυόμενο"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348\r
 msgid "Zone"\r
 msgstr "Ζώνη"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352\r
 msgid "Container"\r
 msgstr "Υποδοχέας"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356\r
 msgid "Manager"\r
 msgstr "Διαχειριστής"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745\r
 msgid "Mouse Buttons"\r
 msgstr "Πλήκτρα Ποντικιού"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805\r
 msgid "Mouse Wheels"\r
 msgstr "Ροδέλες Ποντικιού"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196\r
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399\r
 #, c-format\r
 msgid "Left button"\r
 msgstr "Αριστερό πλήκτρο"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194\r
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394\r
 #, c-format\r
 msgid "Right button"\r
 msgstr "Δεξί πλήκτρο"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183\r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199\r
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404\r
 #: src/modules/pager/e_mod_config.c:409\r
 #, c-format\r
 msgid "Button %i"\r
 msgstr "Πλήκτρο %i"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189\r
 #: src/modules/pager/e_mod_config.c:388\r
 #, c-format\r
 msgid "Middle button"\r
 msgstr "Μεσαίο πλήκτρο"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211\r
 #, c-format\r
 msgid "Extra button (%d)"\r
 msgstr "Πρόσθετο πλήκτρο (%d)"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227\r
 #, fuzzy\r
 msgid "Mouse Wheel Up"\r
 msgstr "Μετακίνηση Ροδέλας Ποντικιού Επάνω"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229\r
 #, fuzzy\r
 msgid "Mouse Wheel Down"\r
 msgstr "Μετακίνηση Ροδέλας Ποντικιού Κάτω"\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233\r
 #, c-format\r
 msgid "Extra Wheel (%d) Up"\r
 msgstr ""\r
 \r
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235\r
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235\r
 #, c-format\r
 msgid "Extra Wheel (%d) Down"\r
 msgstr ""\r

diff --git a/po/eo.po b/po/eo.po
index 53eacc6..f57627d 100644 (file)
--- a/po/eo.po
+++ b/po/eo.po
@@ -34,7 +34,7 @@ msgstr "Pri Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2529 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -143,7 +143,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Ĉu vi certe volas prokrasti vian komputilon?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3426
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Pasivumigi"
 
@@ -171,7 +171,7 @@ msgstr "Regrandigi"
 #: src/bin/e_actions.c:2974 src/bin/e_actions.c:3338 src/bin/e_actions.c:3340
 #: src/bin/e_actions.c:3342 src/bin/e_actions.c:3344 src/bin/e_actions.c:3346
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:757
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menuo"
 
@@ -810,7 +810,7 @@ msgstr "Elekti"
 #: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9949
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:196
 #: src/bin/e_import_config_dialog.c:541
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -878,7 +878,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -991,7 +991,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1003,7 +1003,7 @@ msgid "Basic"
 msgstr "Baza"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Apliki"
 
@@ -1210,11 +1210,11 @@ msgstr "Elektu plenumeblon"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1915,7 +1915,7 @@ msgid "Module %s needs to support %s"
 msgstr "Modulo %s bezonas eltenon de %s"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1923,7 +1923,7 @@ msgstr ""
 "klavon</hilight> por ĉesigi."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press "
@@ -2141,7 +2141,7 @@ msgid "Remember these Locks"
 msgstr "Memorigi ĉi tiujn ŝlosojn"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Fenestro"
 
@@ -2361,7 +2361,7 @@ msgstr "Fiksa"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2725,11 +2725,11 @@ msgstr "Ŝargitaj akcesoraĵoj"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -2916,7 +2916,7 @@ msgid "Hide duration"
 msgstr "Kaŝi daŭron"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekundoj"
@@ -4038,10 +4038,10 @@ msgstr[1] "Antaŭ %li minutoj"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Nekonata"
@@ -4401,7 +4401,7 @@ msgid "Hardware"
 msgstr "Aparataro"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Baterio"
 
@@ -5407,17 +5407,17 @@ msgstr "Ekranŝloso"
 msgid "Desk"
 msgstr "Labortablo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Neniom>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to "
 "abort.<br><br>You can either specify a delay of this<br> action using the "
@@ -5427,81 +5427,81 @@ msgstr ""
 "ĉesigi.<br><br>Por ŝanĝi la tempolimon de tiu agado,<br>uzu la ŝovilon, aŭ "
 "igi ĝin<br>respondi al randaj klakoj:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Agordoj de bindoj de Edge"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Bindoj de Edje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Modifi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Forigi ĉiujn"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Restaŭrigu la apriorajn bindojn"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Ago"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Mus-butono"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Agaj Parametroj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Ĝeneralaj elektebloj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permesi ebligadon de bindoj kun plenekranaj fenestroj."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Permesi ebligadon de bindoj en pluraj ekranoj (DANĜERE!)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Sekvenco de bindoj de Edje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Alklakebla rando"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Eraro de bindo de Edje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5510,140 +5510,140 @@ msgstr ""
 "La bindo de edje kiun vi elektis estis jam uzita de<br> agado de "
 "<hilight>%s</hilight>.<br>Bonvole elektu alian Edje por bindo."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "KTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "MAJUSKL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "VIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Maldekstra flanko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Supra flanko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Dekstra flanko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Suba flanko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Supromaldekstra flanko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Suprodekstra flanko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Subodekstra flanko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Suprodekstra flanko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(maldekstre alklakebla)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(alklakebla)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "Eraro de signala bindo"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used "
 "by<br><hilight>%s</hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "Aldoni signalan bindon"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "Fonto:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "Signalo:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Signalaj bindoj"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "Agordoj de signalaj bindoj"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
 msgstr "Enigo"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "Screen edge binding settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
 #: src/modules/conf_intl/e_mod_main.c:45
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "input"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 #: src/modules/conf_randr/e_mod_main.c:37
 #: src/modules/notification/e_mod_main.c:245
 #: src/modules/notification/e_mod_main.c:249
@@ -5651,28 +5651,28 @@ msgstr ""
 msgid "screen"
 msgstr "ekrano"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "signal bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "Edje signal binding settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "edje"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse"
 msgstr "muso"
 
@@ -5909,128 +5909,128 @@ msgstr "enigmetodo"
 msgid "Input method settings"
 msgstr "Agordoj de enigmetodo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Bindoj de ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "AK adaptilo malkonektita"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "AK adaptilo konektita"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "AK adaptilo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Butono"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Ventumilo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "En/elŝalto butono"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Procesoro"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Video"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "Sendrata reto"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Elzomi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Enzomi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Malpli da brileco"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Pli da brileco"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "Bindo de ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Agordoj de klavaraj bindoj"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Klavaraj bindoj"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Eraro de klava bindo"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by "
@@ -6041,30 +6041,30 @@ msgstr ""
 "\"<br><hilight>%s</hilight>\".<br>Bonvole elektu alian bindon de klava "
 "sekvenco."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Agordoj de musaj bindoj"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Eraro de musaj bindoj"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Musaj bindoj"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Agaj Kunteksto"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6072,117 +6072,117 @@ msgstr "Agaj Kunteksto"
 msgid "Any"
 msgstr "Ajn"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Fenestrolisto"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Ŝprucfenestro"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zono"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Ujo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Administrilo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Mus-butonoj"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Musaj radoj"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, c-format
 msgid "Left button"
 msgstr "Maldekstra butono"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, c-format
 msgid "Right button"
 msgstr "Dekstra butono"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Butono %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, c-format
 msgid "Middle button"
 msgstr "Meza butono"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Kroma butono (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Musa rado supre"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Musa rado sube"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Kroma butono (%d) supren"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Kroma butono (%d) suben"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "key bindings"
 msgstr "klavaj bindoj"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "Key binding settings"
 msgstr "Agordoj de klavaj bindoj"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 #: src/modules/fileman/e_mod_main.c:430 src/modules/tiling/e_mod_tiling.c:3919
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "key"
 msgstr "klavo"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse bindings"
 msgstr "musaj bindoj"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "Mouse binding settings"
 msgstr "Agordoj de musaj bindoj"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI binding settings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "acpi"
 msgstr ""
 

diff --git a/po/es.po b/po/es.po
index 65cc3ce..50af42a 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@ msgstr "Acerca de Enlightenment"
 #: src/bin/e_about.c:20 src/bin/e_actions.c:2987 src/bin/e_config_dialog.c:288
 #: src/bin/e_fm.c:1060 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2529 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -138,7 +138,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "¿Está seguro de que desea suspender el equipo?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3418
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernar"
 
@@ -165,7 +165,7 @@ msgstr "Redimensionar"
 
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3330 src/bin/e_actions.c:3332
 #: src/bin/e_actions.c:3334 src/bin/e_actions.c:3336 src/bin/e_actions.c:3338
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menú"
 
@@ -806,7 +806,7 @@ msgstr "Seleccionar"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:193
 #: src/bin/e_import_config_dialog.c:536
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -874,7 +874,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:568
 #: src/bin/e_module.c:975 src/bin/e_sys.c:619 src/bin/e_sys.c:660
 #: src/bin/e_utils.c:695
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -988,7 +988,7 @@ msgstr ""
 "Dicho archivo ha sido eliminado para evitar corrupción de datos.<br>"
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:810
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1000,7 +1000,7 @@ msgid "Basic"
 msgstr "Básico"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1208,11 +1208,11 @@ msgstr "Seleccione un ejecutable"
 #: src/bin/e_shelf.c:1797 src/bin/e_shelf.c:2482
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1911,7 +1911,7 @@ msgid "Module %s needs to support %s"
 msgstr "El módulo %s necesita %s"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1919,7 +1919,7 @@ msgstr ""
 "abortar."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2144,7 +2144,7 @@ msgid "Remember these Locks"
 msgstr "Recordar estos bloqueos"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Ventana"
 
@@ -2364,7 +2364,7 @@ msgstr "Estático"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2725,11 +2725,11 @@ msgstr "Utilidades cargadas"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -2916,7 +2916,7 @@ msgid "Hide duration"
 msgstr "Duración:"
 
 #: src/bin/e_int_shelf_config.c:244
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f segundos"
@@ -4032,10 +4032,10 @@ msgstr[1] "Hace %li minutos"
 #: src/bin/e_widget_filepreview.c:539 src/bin/e_widget_filepreview.c:540
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Desconocido"
@@ -4393,7 +4393,7 @@ msgid "Hardware"
 msgstr "Hardware"
 
 #: src/modules/battery/e_mod_main.c:146 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Batería"
 
@@ -5415,17 +5415,17 @@ msgstr "Bloqueo de pantalla"
 msgid "Desk"
 msgstr "Escritorio"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<None>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5435,82 +5435,82 @@ msgstr ""
 "abortar.<br><br>Tambien puede seleccionar un retardo para esta acción usando "
 "el deslizador, <br> o hacer que responda a los clicks en los bordes: "
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Configuración de atajos de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Atajos de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Borrar todos"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Restaurar predeterminados"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Acción"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Botón del ratón"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Parámetros de la acción"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Opciones Generales"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permitir activación en ventanas a pantalla completa"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Permitir activación con múltiples pantallas (PELIGROSO!)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Combinación de teclas para el atajo de borde"
 
 # Mucho mejor que borde clickable o cosas similares
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Activar al hacer click"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Error al asignar atajo al borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5519,84 +5519,84 @@ msgstr ""
 "La combinación de teclas que eligió ya se está usando para la acción<hilight>"
 "%s</hilight>.<br>Por favor, elija otra combinación de teclas."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "MAYUS"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "Super"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Borde izquierdo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Borde superior"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Borde derecho"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Borde inferior"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Borde superior izquierdo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Borde superior derecho"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Borde inferior derecho"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Borde inferior izquierdo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(Se puede hacer click izquierdo)"
 
 # Queda mejor
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(click)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Error al asignar atajo al borde"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "La señal y el origen NO pueden estar vacios!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5604,60 +5604,60 @@ msgid ""
 msgstr ""
 "La señal y el origen ya se está usando para<br><hilight>%s</hilight><br>"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Atajos de los bordes"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "Origen:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "Señal:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Configuración de atajos de los bordes"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
 msgstr "Entrada"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge bindings"
 msgstr "atajos de borde"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "Screen edge binding settings"
 msgstr "Configuración de atajos de borde"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
 #: src/modules/conf_intl/e_mod_main.c:45
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "input"
 msgstr "entrada"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge"
 msgstr "edge"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 #: src/modules/conf_randr/e_mod_main.c:37
 #: src/modules/notification/e_mod_main.c:245
 #: src/modules/notification/e_mod_main.c:249
@@ -5665,31 +5665,31 @@ msgstr "edge"
 msgid "screen"
 msgstr "pantalla"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 #, fuzzy
 msgid "binding"
 msgstr "Atajo ACPI"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 #, fuzzy
 msgid "signal bindings"
 msgstr "Atajos de los bordes"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 #, fuzzy
 msgid "Edje signal binding settings"
 msgstr "Configuración de atajos de los bordes"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "edje"
 msgstr "edje"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse"
 msgstr "ratón"
 
@@ -5932,128 +5932,128 @@ msgstr "método de entrada"
 msgid "Input method settings"
 msgstr "Configuración del método de entrada"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Atajos ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "Adaptador de corriente desenchufado"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "Adaptador de corriente enchufado"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "Adaptador de corriente"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Botón"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Ventilador"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "Tapa desconocida"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "Tapa cerrada"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "Tapa abierta"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "Tapa"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "Botón de encendido"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Procesador"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "Botón de suspensión"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "Térmico"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Disminuir zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Aumentar zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Disminuir brillo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Aumentar brillo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "Atajo ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr "Ejecute el atajo ACPI<br> o pulse <hilight>Esc</hilight>para salir."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Tecla única"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Configuración de los atajos de teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Atajos de teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Error de atajo de teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6062,11 +6062,11 @@ msgstr ""
 "La combinación de teclas que eligió, ya está siendo usada para <br>la acción "
 "<hilight>%s</hilight>. <br>Elija otra combinación de teclas para el atajo."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Configuración de atajos de ratón"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -6074,21 +6074,21 @@ msgstr ""
 "No se puede asignar un atajo a la rueda del ratón sin modificadores de "
 "ventana: Hay un conflicto con los atajos"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Error de atajo de ratón"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Atajos de ratón"
 
 # Mucho mejor que "Contexto de la acción"
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Lugar de la acción"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6096,117 +6096,117 @@ msgstr "Lugar de la acción"
 msgid "Any"
 msgstr "Cualquiera"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Lista de ventanas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Ventana Emergente"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zona"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Panel"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Gestor"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Botones del ratón"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Ruedas del ratón"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:374 src/modules/pager/e_mod_config.c:400
 #, c-format
 msgid "Left button"
 msgstr "Botón izquierdo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:379 src/modules/pager/e_mod_config.c:395
 #, c-format
 msgid "Right button"
 msgstr "Botón derecho"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:384 src/modules/pager/e_mod_config.c:405
 #: src/modules/pager/e_mod_config.c:410
 #, c-format
 msgid "Button %i"
 msgstr "Botón %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:389
 #, c-format
 msgid "Middle button"
 msgstr "Botón central"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Botón Extra (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Rueda del ratón arriba"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Rueda del ratón abajo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Rueda Extra (%d) arriba"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Rueda Extra (%d) abajo"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "key bindings"
 msgstr "atajos de teclado"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "Key binding settings"
 msgstr "Configuración de atajos de teclado"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 #: src/modules/fileman/e_mod_main.c:430 src/modules/tiling/e_mod_tiling.c:3919
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "key"
 msgstr "tecla"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse bindings"
 msgstr "atajos de ratón"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "Mouse binding settings"
 msgstr "Configuración de atajos de ratón"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI bindings"
 msgstr "Atajos ACPI"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI binding settings"
 msgstr "Configuración de atajos ACPI"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "acpi"
 msgstr "acpi"
 

diff --git a/po/et.po b/po/et.po
index 86f8e3a..863eb40 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -26,7 +26,7 @@ msgstr "Teave Enlightment'ist"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -140,7 +140,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Oled sa kindel, et soovid välja logida."
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 #, fuzzy
 msgid "Hibernate"
 msgstr "talveund magama"
@@ -173,7 +173,7 @@ msgstr "resize"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 #, fuzzy
 msgid "Menu"
 msgstr "menüü"
@@ -939,7 +939,7 @@ msgstr "valimine"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -993,7 +993,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1120,7 +1120,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1134,7 +1134,7 @@ msgid "Basic"
 msgstr "põhi-"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 #, fuzzy
 msgid "Apply"
 msgstr "kohaldama"
@@ -1364,11 +1364,11 @@ msgstr "ValiTeostatavad"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2158,13 +2158,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2413,7 +2413,7 @@ msgid "Remember these Locks"
 msgstr "Pea meeles, need lukud"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "aken"
@@ -2660,7 +2660,7 @@ msgstr "riik"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3301,7 +3301,7 @@ msgid "Hide duration"
 msgstr "Peida kestus"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -4387,10 +4387,10 @@ msgstr[1] ""
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 #, fuzzy
 msgid "Unknown"
@@ -4527,11 +4527,11 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4819,7 +4819,7 @@ msgid "Hardware"
 msgstr "riistvara"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 #, fuzzy
 msgid "Battery"
 msgstr "aku"
@@ -5968,235 +5968,235 @@ msgstr "Screen Lock"
 msgid "Desk"
 msgstr "kirjutuslaud"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 #, fuzzy
 msgid "<None>"
 msgstr "<none>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Edge Seosed Settings"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Edge Sidemed"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "muutmine:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 #, fuzzy
 msgid "Delete All"
 msgstr "Kustuta kõik"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 #, fuzzy
 msgid "Restore Default Bindings"
 msgstr "Taastada vaikekiirklahvid"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 #, fuzzy
 msgid "Action"
 msgstr "tegevus"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Hiirenupud"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 #, fuzzy
 msgid "Action Params"
 msgstr "Action Parameetrid"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 #, fuzzy
 msgid "General Options"
 msgstr "Üldised valikud"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Laske siduv aktiveerimist koos fullscreen aknaid"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Laske siduv aktiveerimist koos fullscreen aknaid"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Edge Binding Sequence"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "klikitav serv"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "hiireseoseid"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 #, fuzzy
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 #, fuzzy
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 #, fuzzy
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 #, fuzzy
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "õigus:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "klikitav serv"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Edge Sidemed"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Edge Sidemed"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Minna"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Edge Sidemed"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Edge Seosed Settings"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6446,180 +6446,180 @@ msgstr "locale"
 msgid "Language"
 msgstr "keel"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Lisa Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "nupud"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "kaugele"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "tundmatu"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Sulge"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Hiirenupud"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Hiirenupud"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "normaalne"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Logi välja"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Backlight Down"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Backlight Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "määrama"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Lisa Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "ühe võtme"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Kiirklahvid Settings"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Key Bindings"
 msgstr "kiirklahvid"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 #, fuzzy
 msgid "Binding Key Error"
 msgstr "Siduv Key viga"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Hiireseoseid Settings"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "hiireseoseid"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Mouse Bindings"
 msgstr "hiireseoseid"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 #, fuzzy
 msgid "Action Context"
 msgstr "Action Context"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6628,90 +6628,90 @@ msgstr "Action Context"
 msgid "Any"
 msgstr "iga"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 #, fuzzy
 msgid "Win List"
 msgstr "võida nimekiri"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 #, fuzzy
 msgid "Popup"
 msgstr "popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 #, fuzzy
 msgid "Zone"
 msgstr "tsoon"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 #, fuzzy
 msgid "Container"
 msgstr "konteiner"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 #, fuzzy
 msgid "Manager"
 msgstr "juht"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Hiirenupud"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Sulge"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Hiirenupud"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Raadio nupud"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Hiirenupud"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Nihuta alla"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index 325b238..cd7661d 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -25,7 +25,7 @@ msgstr "Tietoa Enlightenmentista"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Haluatko varmasti uloskirjautua?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Lepotila"
 
@@ -164,7 +164,7 @@ msgstr "Muuta kokoa"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Valikko"
 
@@ -836,7 +836,7 @@ msgstr "Valitse jokin"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -905,7 +905,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1035,7 +1035,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1047,7 +1047,7 @@ msgid "Basic"
 msgstr "Perusasetukset"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Käytä"
 
@@ -1265,11 +1265,11 @@ msgstr "Valitse suoritettava ohjelma"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2000,7 +2000,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -2008,7 +2008,7 @@ msgstr ""
 "keskeyttääksesi, kiitos."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2242,7 +2242,7 @@ msgid "Remember these Locks"
 msgstr "Muista nämä lukot"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Ikkunat"
@@ -2472,7 +2472,7 @@ msgstr "Tila"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3040,7 +3040,7 @@ msgid "Hide duration"
 msgstr "Piiloutumisen kesto"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekuntia"
@@ -4219,10 +4219,10 @@ msgstr[1] "%li minuuttia sitten"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -4360,11 +4360,11 @@ msgstr "%li minuuttia sitten"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4631,7 +4631,7 @@ msgid "Hardware"
 msgstr "Laitteisto"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Akku"
 
@@ -5715,17 +5715,17 @@ msgstr "Näytön lukitus"
 msgid "Desk"
 msgstr "Työpöytä"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Ei mitään>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5735,86 +5735,86 @@ msgstr ""
 "<br><br>Tämän toiminnon viivettä voi säätää<br>liukusäätimellä tai reunan "
 "voi muuttaa<br>hiiren napsautukseen reagoivaksi:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Edge Siteet asetukset"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Reunatoiminnot"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Muokkaa näppäintä"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Poista kaikki"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Palauta oletusnäppäimet"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Toiminto"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Hiiren asetukset"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Toiminnon parametrit"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Yleiset asetukset"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Salli toimintojen aktivointi kokoruudun ikkunoille"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Salli toimintojen aktivointi kokoruudun ikkunoille"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Reunatoiminnon sekvenssi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Napsautettava reuna"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Hiiritoiminnot"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5823,86 +5823,86 @@ msgstr ""
 "Valitsemasi näppäinyhdistelmä on jo toiminnon<br><hilight>%s</hilight> "
 "käytössä.<br>Valitse jokin toinen näppäinyhdistelmä, kiitos."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 #, fuzzy
 msgid "Left Edge"
 msgstr "Poista reuna"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 #, fuzzy
 msgid "Top Edge"
 msgstr "Muokkaa reunaa"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Oikea:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "Napsautettava reuna"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Reunatoiminnot"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5911,34 +5911,34 @@ msgstr ""
 "Valitsemasi näppäinyhdistelmä on jo toiminnon<br><hilight>%s</hilight> "
 "käytössä.<br>Valitse jokin toinen näppäinyhdistelmä, kiitos."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Reunatoiminnot"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Ikkunan siirtoteksti"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Reunatoiminnot"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Edge Siteet asetukset"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -6158,120 +6158,120 @@ msgstr "Lokaali"
 msgid "Language"
 msgstr "Kieli"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Lisää toiminto"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Painikkeet"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Kaukana"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Tuntematon"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Sulje"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Hiiren asetukset"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Hiiren asetukset"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normaali"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Uloskirjaudu"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Vieritys kulmista"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Sammuta"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Taustavalo Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Ota käyttöön"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Lisää toiminto"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6280,26 +6280,26 @@ msgstr ""
 "Painele näppäinsarja,<br><br>tai paina <hilight>Esc</hilight>iä "
 "keskeyttääksesi, kiitos."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Käytä kertanapsautusta"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Keskeiset Siteet asetukset"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Näppäimistötoiminnot"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Näppäimistötoiminnon virhe"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6308,32 +6308,32 @@ msgstr ""
 "Valitsemasi näppäinyhdistelmä on jo toiminnon<br><hilight>%s</hilight> "
 "käytössä.<br>Valitse jokin toinen näppäinyhdistelmä, kiitos."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Hiiri Siteet asetukset"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Hiiritoiminnot"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Hiiritoiminnot"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Toiminnon konteksti"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6341,85 +6341,85 @@ msgstr "Toiminnon konteksti"
 msgid "Any"
 msgstr "Mikä tahansa"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Ikkunalista"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Ponnahdus"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Alue"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Säiliö"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Hallinta"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Hiiren asetukset"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Viimeiseksi käytetty"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Hiiren asetukset"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Valintanapit"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Painike %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Hiiren asetukset"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Painike %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Siirrä"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/fo.po b/po/fo.po
index 781d01a..73dd1e2 100644 (file)
--- a/po/fo.po
+++ b/po/fo.po
@@ -25,7 +25,7 @@ msgstr "Um Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -132,7 +132,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Vil tú útritast?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Dvali"
 
@@ -161,7 +161,7 @@ msgstr "Endurstødda"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Valmynd"
 
@@ -814,7 +814,7 @@ msgstr "Vel ein/eitt"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -867,7 +867,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -973,7 +973,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -985,7 +985,7 @@ msgid "Basic"
 msgstr "Grundleggjandi"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Set í verk"
 
@@ -1178,11 +1178,11 @@ msgstr ""
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1883,13 +1883,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2101,7 +2101,7 @@ msgid "Remember these Locks"
 msgstr ""
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Glugga valmund"
@@ -2325,7 +2325,7 @@ msgstr ""
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2862,7 +2862,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -3893,10 +3893,10 @@ msgstr[1] ""
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr ""
@@ -4018,11 +4018,11 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4281,7 +4281,7 @@ msgid "Hardware"
 msgstr ""
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr ""
 
@@ -5305,214 +5305,214 @@ msgstr ""
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Flyt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Høgru:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Flyt"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Glugga valmund"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5725,165 +5725,165 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Flyt"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Lat aftur"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Flyt"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Flyt"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "vanligt"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Tráðleyst"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Rita út"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -5891,85 +5891,85 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Flyt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Flyt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Flyt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Flyt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Flyt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Flyt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/fr.po b/po/fr.po
index b9b856b..3d00a2a 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -37,7 +37,7 @@ msgstr "À propos d’Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -146,7 +146,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Voulez-vous vraiment Fermer votre session ?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Mettre en hibernation"
 
@@ -175,7 +175,7 @@ msgstr "Redimensionner"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menu"
 
@@ -813,7 +813,7 @@ msgstr "Sélectionner"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -883,7 +883,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -998,7 +998,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1010,7 +1010,7 @@ msgid "Basic"
 msgstr "Basique"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -1221,11 +1221,11 @@ msgstr "Sélectionner un exécutable"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1934,7 +1934,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1942,7 +1942,7 @@ msgstr ""
 "hilight> pour annuler."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2170,7 +2170,7 @@ msgid "Remember these Locks"
 msgstr "Mémoriser ces verrous"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Fenêtre"
 
@@ -2390,7 +2390,7 @@ msgstr "Statique"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2944,7 +2944,7 @@ msgid "Hide duration"
 msgstr "Vitesse du masquage"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f seconde(s)"
@@ -4130,10 +4130,10 @@ msgstr[1] "Il y a %li minutes"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Inconnu"
@@ -4269,11 +4269,11 @@ msgstr "%li minutes"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4528,7 +4528,7 @@ msgid "Hardware"
 msgstr "Interface"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Batterie"
 
@@ -5570,17 +5570,17 @@ msgstr "Verrouillage de l'écran"
 msgid "Desk"
 msgstr "Bureau"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Aucun>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5590,81 +5590,81 @@ msgstr ""
 "annuler.<br><br>Vous avez le choix entre spécifier un délai<br>pour cette "
 "action en utilisant le slider,<br>ou l'activer par un clic :"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Paramétrage des raccourcis des bords de l'écran"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Raccourcis des bords"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Modifier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Tout supprimer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Restaurer les raccourcis par défaut"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Bouton de souris"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Paramètres de l'action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Options générales"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Autoriser l'activation du raccourci avec des fenêtres plein écran"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Autoriser l'activation du raccourci avec plusieurs écrans (DANGER)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Séquence du raccourci des bords"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Bord cliquable"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Erreur de séquence du raccourci souris"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5674,83 +5674,83 @@ msgstr ""
 "l'action <hilight>%s</hilight>.<br>Veuillez choisir une autre séquence pour "
 "le raccourci des bords."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "Ctrl"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "Alt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "Majuscule"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "Logo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Bord gauche"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Bord supérieur"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Bord droit"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Bord inférieur"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Coin gauche en haut"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Coin droit en haut"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Coin droit en bas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Coin gauche en bas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(laissé cliquable)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(cliquable)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Liaisons de signaux"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5760,33 +5760,33 @@ msgstr ""
 "l'action <hilight>%s</hilight>.<br>Veuillez choisir une autre séquence pour "
 "le raccourci des bords."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Liaisons de signaux"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Déplacer la source"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Liaisons de signaux"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Paramétrage des raccourcis des bords de l'écran"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -6005,120 +6005,120 @@ msgstr "Localisation"
 msgid "Language"
 msgstr "Langue"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Raccourcis ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Boutons"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Éloignée"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Inconnu"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Fermer"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Bouton de souris"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Bouton du milieu"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normal(e)"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Wi-Fi Actif"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Fermer la session"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Baisser le rétroéclairage"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Augmenter le rétroéclairage"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Assigner"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 #, fuzzy
 msgid "S1"
 msgstr "S"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Raccourcis ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6127,24 +6127,24 @@ msgstr ""
 "Veuillez composer votre séquence au clavier,<br><br>ou <hilight>Échap</"
 "hilight> pour annuler."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Touche unique"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Paramétrage des raccourcis clavier"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Raccourcis clavier"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Erreur de raccourci clavier"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6154,11 +6154,11 @@ msgstr ""
 "utilisée<br>par l'action <hilight>%s</hilight>.<br>Veuillez choisir une "
 "autre séquence de raccourci clavier."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Paramétrage des raccourcis souris"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -6166,20 +6166,20 @@ msgstr ""
 "Il n'est pas possible de définir un raccourci avec la molette<br>sans "
 "modificateur : il se produirait un signal edje conflictuel.<br>À CORRIGER !"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Erreur de raccourci souris"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Raccourcis souris"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Contexte de l'action"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6187,82 +6187,82 @@ msgstr "Contexte de l'action"
 msgid "Any"
 msgstr "Tous"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Liste de fenêtres"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Pop-up"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zone"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Conteneur"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Gestionnaire"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Boutons de la souris"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Molette(s) de la souris"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Bouton gauche"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Bouton droit"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Bouton %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Bouton du milieu"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Bouton supplémentaire (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Molette vers le haut"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Molette vers le bas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Molette supplémentaire (%d) vers le haut"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Molette supplémentaire (%d) vers le bas"

diff --git a/po/fr_CH.po b/po/fr_CH.po
index 534cd6a..2f3af84 100644 (file)
--- a/po/fr_CH.po
+++ b/po/fr_CH.po
@@ -47,7 +47,7 @@ msgstr "À propos d'Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -157,7 +157,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Êtes-vous sur de vouloir fermer votre session ?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hiberner"
 
@@ -186,7 +186,7 @@ msgstr "Changer la taille (resize)"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menu"
 
@@ -880,7 +880,7 @@ msgstr "Sélectionner une icône"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -954,7 +954,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1067,7 +1067,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1079,7 +1079,7 @@ msgid "Basic"
 msgstr "Benêt"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -1292,11 +1292,11 @@ msgstr "Sélectionner un programme"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2045,7 +2045,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -2053,7 +2053,7 @@ msgstr ""
 "hilight> pour annuler."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2288,7 +2288,7 @@ msgid "Remember these Locks"
 msgstr "Se rappeler ces verrous"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Fenêtre"
 
@@ -2519,7 +2519,7 @@ msgstr "État"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3099,7 +3099,7 @@ msgid "Hide duration"
 msgstr "Caché durant.."
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, fuzzy, c-format
 msgid "%.2f seconds"
 msgstr "%2.2f secondes"
@@ -4344,10 +4344,10 @@ msgstr[1] "il y a %li minutes"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Inconnu"
@@ -4486,11 +4486,11 @@ msgstr "il y a %li minutes"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4765,7 +4765,7 @@ msgid "Hardware"
 msgstr ""
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Batterie"
 
@@ -5876,106 +5876,106 @@ msgstr "Verrouillage d'écran"
 msgid "Desk"
 msgstr "Bureau"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Aucun>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Paramètres de raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Modifier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Tout supprimer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Restaurer les raccourcis-clavier par défaut"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Paramètres du module"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Paramètres de l'action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 #, fuzzy
 msgid "General Options"
 msgstr "Paramètres généraux"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Afficher les fenêtres des autres écrans"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Afficher les fenêtres des autres écrans"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Séquence de raccourci-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Raccourcis-souris"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5985,86 +5985,86 @@ msgstr ""
 "utilisée<br>par l'action <hilight>%s</hilight>.<br>Veuillez choisir une "
 "autre séquence de raccourci-clavier."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "MAJ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 #, fuzzy
 msgid "Left Edge"
 msgstr "Supprimer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 #, fuzzy
 msgid "Top Edge"
 msgstr "Modifier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Clair"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -6074,34 +6074,34 @@ msgstr ""
 "utilisée<br>par l'action <hilight>%s</hilight>.<br>Veuillez choisir une "
 "autre séquence de raccourci-clavier."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Texte de déplacement"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Paramètres de raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6328,119 +6328,119 @@ msgstr "Locale"
 msgid "Language"
 msgstr "Langue"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Ajouter raccourci"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Boutons"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Éloignéé"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Inconnu"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Fermer"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Paramètres du module"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Paramètres du module"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normal"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Contenir"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Fermer la session"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Éteindre"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Atitrer"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Ajouter raccourci"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6449,26 +6449,26 @@ msgstr ""
 "Veuillez composer votre séquence au clavier,<br><br>ou <hilight>Échap</"
 "hilight> pour annuler."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Utiliser un simple clic"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Paramètres de raccourcis-clavier"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Raccourcis-clavier"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Erreur de raccourci-clavier"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6478,32 +6478,32 @@ msgstr ""
 "utilisée<br>par l'action <hilight>%s</hilight>.<br>Veuillez choisir une "
 "autre séquence de raccourci-clavier."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Paramètres des raccourcis-souris"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Raccourcis-souris"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Raccourcis-souris"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Contexte de l'action"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6511,85 +6511,85 @@ msgstr "Contexte de l'action"
 msgid "Any"
 msgstr "Tous"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Liste de fenêtres"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zone"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Conteneur"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Manager"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Paramètres du module"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Le plus récemment utilisé"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Paramètres du module"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Boutons radio"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Bouton %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Paramètres du module"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Bouton %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Descendre"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/gl.po b/po/gl.po
index 457a6c3..12616b0 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -27,7 +27,7 @@ msgstr "Sobre Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Está seguro de que quere suspender o computador?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernar"
 
@@ -163,7 +163,7 @@ msgstr "Redimensionar"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menú"
 
@@ -801,7 +801,7 @@ msgstr "Seleccionar"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -871,7 +871,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -984,7 +984,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -996,7 +996,7 @@ msgid "Basic"
 msgstr "Básico"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1203,11 +1203,11 @@ msgstr "Seleccione un executable"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1907,7 +1907,7 @@ msgid "Module %s needs to support %s"
 msgstr "O módulo %s precisa soporte de %s"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1915,7 +1915,7 @@ msgstr ""
 "cancelar."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2136,7 +2136,7 @@ msgid "Remember these Locks"
 msgstr "Lembrar estes bloqueos"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Xanela"
 
@@ -2356,7 +2356,7 @@ msgstr "Estático"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2906,7 +2906,7 @@ msgid "Hide duration"
 msgstr "Agochar duración"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f segundos"
@@ -4019,10 +4019,10 @@ msgstr[1] "Fai %li minutos"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Descoñecido"
@@ -4159,11 +4159,11 @@ msgstr "%li Minutos"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4417,7 +4417,7 @@ msgid "Hardware"
 msgstr "Hardware"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Batería"
 
@@ -5423,17 +5423,17 @@ msgstr "Bloqueo de pantalla"
 msgid "Desk"
 msgstr "Escritorio"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<None>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5443,81 +5443,81 @@ msgstr ""
 "cancelar.<br><br>Tamén pode especificar un atraso para esta<br> acción "
 "empregando o cursor, ou facendo<br>que responda ós clics nas marxes:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Preferencias da asociación das marxes"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Asociación das marxes"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Eliminar Todo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Restaurar asociacións predefinidas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Acción"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Botón do rato"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Parámetros de acción"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Opcións xerais"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permitir activación da asociación nas xanelas en pantalla completa"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Permitir activación de asociacións en múltiples pantallas (PERIGOSO!)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Secuencia da asociación de marxes"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Marxe premíbel"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Erro na asociación da marxe"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5526,82 +5526,82 @@ msgstr ""
 "A asociación da marxe escollida xa a emprega a acción<br><hilight>%s</"
 "hilight>.<br>Por favor escolla outra marxe para asociar."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "SUPER"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Marxe esquerda"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Marxe superior"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Marxe dereita"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Marxe inferior"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Marxe superior esqueda"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Marxe superior dereita"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Marxe inferior dereita"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Marxe inferior esquerda"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(premíbel á esquerda)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(premíbel)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "Erro de asociación co sinal"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "O sinal e a fonte NON deben estar baleiros!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5610,30 +5610,30 @@ msgstr ""
 "O sinal e a fonte que introduciu xa están sendo usadas pola "
 "acción<br><hilight>%s</hilight>"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "Engadir unha asociación de sinal"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "Fonte:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "Sinal_"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Asociación dos sinais"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "Preferencias da asociación de sinais"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5853,105 +5853,105 @@ msgstr "Locale"
 msgid "Language"
 msgstr "Idioma"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Asociacións ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "Adaptador AC desenchufado"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "Adaptador AC enchufado"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "Adaptador AC"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Botón"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Ventilador"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "Tapa descoñecida"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "Tapa pechada"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "Tapa aberta"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "Tapa"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "Botón do acendido"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Procesador"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "Botón de suspensión"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "Térmico"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "Rede sen fíos"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Reducir"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Diminuír brillo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Aumentar brillo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr "Axuda"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "Asociación ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
@@ -5959,24 +5959,24 @@ msgstr ""
 "Por favor escolla o evento ACPI que desexa asociar<br><br>ou "
 "<hilight>Escape</hilight> para cancelar."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Unha tecla"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Preferencias dos atallos de teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Atallos de teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Erro na asociación de teclas"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -5985,11 +5985,11 @@ msgstr ""
 "A secuencia da asociación do teclado escollida xa se está a empregar pola "
 "acción <br><hilight>%s</hilight>.<br>Por favor escolla outra secuencia."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Preferencias das asociacións do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -5998,20 +5998,20 @@ msgstr ""
 "modificadores: conflito con asociacións de sinais de marxe existentes."
 "<br>CORRÍXAO!!!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Erro na asociación do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Asociacións do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Contexto da acción"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6019,82 +6019,82 @@ msgstr "Contexto da acción"
 msgid "Any"
 msgstr "Calquera"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Lista de xanelas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Alerta"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zona"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Contedor"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Xestor"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Botóns do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Rodas do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, c-format
 msgid "Left button"
 msgstr "Botón esquerdo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, c-format
 msgid "Right button"
 msgstr "Botón dereito"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Botón %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, c-format
 msgid "Middle button"
 msgstr "Botón do medio"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Botón extra (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Roda do rato cara arriba"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Roda do rato cara abaixo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Roda extra (%d) cara arriba"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Roda extra (%d) cara abaixo"

diff --git a/po/he.po b/po/he.po
index 563e24b..70d02b8 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -25,7 +25,7 @@ msgstr "אודות Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -136,7 +136,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "אתה בטוח שברצונך להתנתק?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "עבור למצב שינה"
 
@@ -165,7 +165,7 @@ msgstr "שנה גודל"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "תפריט"
 
@@ -838,7 +838,7 @@ msgstr "הגדרות"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -894,7 +894,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1020,7 +1020,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1032,7 +1032,7 @@ msgid "Basic"
 msgstr "בסיסי"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "החל"
 
@@ -1241,11 +1241,11 @@ msgstr "בחר קובץהפעלה"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1990,13 +1990,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2238,7 +2238,7 @@ msgid "Remember these Locks"
 msgstr "זכור נעילות אלו"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "חלונות"
@@ -2468,7 +2468,7 @@ msgstr "מצב"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3030,7 +3030,7 @@ msgid "Hide duration"
 msgstr "מסך ההסתרה"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -4174,10 +4174,10 @@ msgstr[1] "לפני %li דקות"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "לא ידוע"
@@ -4311,11 +4311,11 @@ msgstr "לפני %li דקות"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4592,7 +4592,7 @@ msgid "Hardware"
 msgstr "חומרה"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "סוללה"
 
@@ -5731,235 +5731,235 @@ msgstr "מסך הנעילה"
 msgid "Desk"
 msgstr "שולחן כתיבה"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 #, fuzzy
 msgid "<None>"
 msgstr "<None>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "איגודי קצה הגדרות"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "קצה Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "שונה:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 #, fuzzy
 msgid "Delete All"
 msgstr "מחק הכל"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 #, fuzzy
 msgid "Restore Default Bindings"
 msgstr "שחזור Bindings ברירת מחדל"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 #, fuzzy
 msgid "Action"
 msgstr "פעולה"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "הגדרות המודול"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 #, fuzzy
 msgid "Action Params"
 msgstr "פעולה params"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 #, fuzzy
 msgid "General Options"
 msgstr "אפשרויות כלליות"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "לאפשר הפעלה מחייב עם חלונות מסך מלא"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "לאפשר הפעלה מחייב עם חלונות מסך מלא"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Edge איגוד רצף"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "ללחיצה קצה"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "עכבר Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 #, fuzzy
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 #, fuzzy
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 #, fuzzy
 msgid "SHIFT"
 msgstr "SHIFT לחוץ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 #, fuzzy
 msgid "WIN"
 msgstr "לנצח"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "נכון;"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "ללחיצה קצה"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "קצה Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "קצה Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "העברת טקסט"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "קצה Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "איגודי קצה הגדרות"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6208,180 +6208,180 @@ msgstr "אזור"
 msgid "Language"
 msgstr "שפה"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "הוסף עקידת"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "לחצנים"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "רחוק"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "לא ידוע"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "סגור"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "הגדרות המודול"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "הגדרות המודול"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "רגיל"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "התנתק"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "זום"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "כיבוי"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "תאורה אחורית עד"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "להקצות"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "הוסף עקידת"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "אחת מפתח"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "מפתח איגודי הגדרות"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Key Bindings"
 msgstr "מפתח Bindings"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 #, fuzzy
 msgid "Binding Key Error"
 msgstr "שגיאה מפתח מחייב"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "איגודי עכבר הגדרות"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "עכבר Bindings"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Mouse Bindings"
 msgstr "עכבר Bindings"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 #, fuzzy
 msgid "Action Context"
 msgstr "פעולה ההקשר"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6390,90 +6390,90 @@ msgstr "פעולה ההקשר"
 msgid "Any"
 msgstr "כל"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 #, fuzzy
 msgid "Win List"
 msgstr "רשימת לנצח"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 #, fuzzy
 msgid "Popup"
 msgstr "קופץ"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 #, fuzzy
 msgid "Zone"
 msgstr "אזור"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 #, fuzzy
 msgid "Container"
 msgstr "מכולה"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 #, fuzzy
 msgid "Manager"
 msgstr "מנהל"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "הגדרות המודול"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "השמישים ביותר"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "הגדרות המודול"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "רדיו לחצנים"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "הגדרות המודול"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "העבר"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/hr.po b/po/hr.po
index ee8fff1..44d27b3 100644 (file)
--- a/po/hr.po
+++ b/po/hr.po
@@ -25,7 +25,7 @@ msgstr "O Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -136,7 +136,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Jeste li sigurni da se želite odjaviti?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernirati"
 
@@ -165,7 +165,7 @@ msgstr "Promijeni veličinu"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Izbornik"
 
@@ -837,7 +837,7 @@ msgstr "Odaberi Jedan"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -907,7 +907,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1038,7 +1038,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1050,7 +1050,7 @@ msgid "Basic"
 msgstr "Osnovno"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Primijeni"
 
@@ -1263,11 +1263,11 @@ msgstr "Odaberi Izvršni"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1996,7 +1996,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -2004,7 +2004,7 @@ msgstr ""
 "abortirate."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2236,7 +2236,7 @@ msgid "Remember these Locks"
 msgstr "Zapamti ove Brave"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Prozori"
@@ -2466,7 +2466,7 @@ msgstr "Stanje"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3033,7 +3033,7 @@ msgid "Hide duration"
 msgstr "Sakrij trajanje"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekunde"
@@ -4210,10 +4210,10 @@ msgstr[1] "prije %li Minuta"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Nepoznat"
@@ -4351,11 +4351,11 @@ msgstr "prije %li Minuta"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4622,7 +4622,7 @@ msgid "Hardware"
 msgstr "Hardver"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Baterija"
 
@@ -5708,104 +5708,104 @@ msgstr "Brava Zaslona"
 msgid "Desk"
 msgstr "Radna Površina"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Nijedan>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Rubni vezovi Postavke"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Povezivanje Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Izmijeni Ključ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Obriši Sve"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Obnovi Zadane Poveznike"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Akcija"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Postavke Miša"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Parametri Akcije"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Generalne Opcije"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Dozvoli aktivaciju povezivanja sa cijelim zaslonom prozora"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Dozvoli aktivaciju povezivanja sa cijelim zaslonom prozora"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Sekvenca Povezivanja Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "kliknuti rub"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Poveznici Miša"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5815,86 +5815,86 @@ msgstr ""
 "<br><hilight>%s</hilight> akcije.<br>Molimo odaberite drugu sekvencu "
 "povezivanja ruba."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 #, fuzzy
 msgid "Left Edge"
 msgstr "Izbriši Rub"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 #, fuzzy
 msgid "Top Edge"
 msgstr "Promijeni Rub"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Desno:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "kliknuti rub"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Povezivanje Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5904,34 +5904,34 @@ msgstr ""
 "<br><hilight>%s</hilight> akcije.<br>Molimo odaberite drugu sekvencu "
 "povezivanja ruba."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Povezivanje Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Premjesti Tekst"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Povezivanje Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Rubni vezovi Postavke"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -6152,120 +6152,120 @@ msgstr "Prostor"
 msgid "Language"
 msgstr "Jezik"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Dodaj Poveznik"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Gumbi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Daleko"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Nepoznat"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Zatvori"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Postavke Miša"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Postavke Miša"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normalno"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Odjava"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Zumiranje"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Pozadinsko svjetlo dolje"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Pozadinsko svjetlo se"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Pripiši"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Dodaj Poveznik"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6274,26 +6274,26 @@ msgstr ""
 "Molimo kliknite ključnu sekvencu,<br><br>ili <hilight>Escape</hilight> da "
 "abortirate."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Upotrijebi Jedan Klik"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Postavke tipki"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Ključni Poveznici"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Greška Povezničkog Ključa"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6303,32 +6303,32 @@ msgstr ""
 "<br><hilight>%s</hilight> akciji.<br>Molimo odaberite drugu povezničku "
 "ključnu sekvencu."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Miš vezovi Postavke"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Poveznici Miša"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Poveznici Miša"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Sadržaj Akcije"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6336,85 +6336,85 @@ msgstr "Sadržaj Akcije"
 msgid "Any"
 msgstr "Bilo koji"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Win Lista"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Pop-up"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zona"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Spremnik"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Upravitelj"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Postavke Miša"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Najskorije upotrijebljen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Postavke Miša"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Radio Gumbi"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Dugme %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Postavke Miša"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Dugme %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Premjesti"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/hu.po b/po/hu.po
index 464138a..ddab987 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -27,7 +27,7 @@ msgstr "Az Enlightenmentrõl"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -138,7 +138,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Tényleg ki akarsz lépni?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernálás"
 
@@ -167,7 +167,7 @@ msgstr "Átméretezés"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menü"
 
@@ -839,7 +839,7 @@ msgstr "Válassz egy"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -906,7 +906,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1036,7 +1036,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1048,7 +1048,7 @@ msgid "Basic"
 msgstr "Alap"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Alkalmaz"
 
@@ -1259,11 +1259,11 @@ msgstr "Egy futtatható kiválasztása"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1996,7 +1996,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -2004,7 +2004,7 @@ msgstr ""
 "<hilight>Escape</hilight> gombot a megszakításhoz."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2240,7 +2240,7 @@ msgid "Remember these Locks"
 msgstr "Emlékezzen a zárolásokra"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Ablakok"
@@ -2470,7 +2470,7 @@ msgstr "Állapot"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3039,7 +3039,7 @@ msgid "Hide duration"
 msgstr "Elrejtés időtartama"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f másodperc"
@@ -4186,10 +4186,10 @@ msgstr[1] "%li perce"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Ismeretlen"
@@ -4326,11 +4326,11 @@ msgstr "%li perce"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4597,7 +4597,7 @@ msgid "Hardware"
 msgstr "Hárdver"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Akkumulátor"
 
@@ -5683,104 +5683,104 @@ msgstr "Képernyõ zárolás"
 msgid "Desk"
 msgstr "Asztal"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<None>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Él Kötések beállítások"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Szegélykötések"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Billentyű módosítása"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Mind törlése"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Alapértelmezettek visszaállítása"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Művelet"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Egér beállítások"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Művelet paraméterei"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Általános beállítások"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Kötés aktiválás jóváhagyása teljes képernyős ablakoknál"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Kötés aktiválás jóváhagyása teljes képernyős ablakoknál"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Szegélykötés sorozat"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "kattintható szélén"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Egér műveletek"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5789,86 +5789,86 @@ msgstr ""
 "Ez a kötés kulcssorozat, amit választottál, már <br>használatban van a "
 "következő folyamat által:<hilight>%s</hilight>.<br>Kérlek válassz másikat."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 #, fuzzy
 msgid "Left Edge"
 msgstr "Szegély törlése"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 #, fuzzy
 msgid "Top Edge"
 msgstr "Szegély módosítása"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Jobb:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "kattintható szélén"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Szegélykötések"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5877,34 +5877,34 @@ msgstr ""
 "Ez a kötés kulcssorozat, amit választottál, már <br>használatban van a "
 "következő folyamat által:<hilight>%s</hilight>.<br>Kérlek válassz másikat."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Szegélykötések"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Szöveg mozgatása"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Szegélykötések"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Él Kötések beállítások"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -6124,120 +6124,120 @@ msgstr "Területi beállítás"
 msgid "Language"
 msgstr "Nyelv"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Művelet hozzáadása"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Gombok"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Távoli"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Ismeretlen"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Bezárás"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Egér beállítások"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Egér beállítások"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normál"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Kijelentkezés"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Nagyítás"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Leállítás"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "háttérvilágítása"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Hozzárendelés"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Művelet hozzáadása"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6246,26 +6246,26 @@ msgstr ""
 "Kérlek üsd le a billentyûkombinációt,<br><br> vagy nyomd meg az "
 "<hilight>Escape</hilight> gombot a megszakításhoz."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Egy kattintás használata"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Billentyűparancsok beállításai"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Gyorsbillentyűk"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Billentyűkombináció hiba"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6274,32 +6274,32 @@ msgstr ""
 "Ez a kombináció már használatban van a <br><hilight>%s</hilight> folyamat "
 "által.<br>Kérlek adj meg egy másik billenytûkombinációt."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Egér beállítások kötés"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Egér műveletek"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Egér műveletek"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Művelet környezet"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6307,85 +6307,85 @@ msgstr "Művelet környezet"
 msgid "Any"
 msgstr "Bármely"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Ablak lista"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Felbukkanó"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zóna"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Tároló"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Kezelő"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Egér beállítások"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Legtöbbet használt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Egér beállítások"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Rádió gombok"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "%i gomb"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Egér beállítások"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "%i gomb"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Mozgatás"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/it.po b/po/it.po
index 9ffe84a..5a21515 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -23,7 +23,7 @@ msgstr "Informazioni su Enlightenment"
 #: src/bin/e_about.c:20 src/bin/e_actions.c:2987 src/bin/e_config_dialog.c:288
 #: src/bin/e_fm.c:1060 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2529 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -131,7 +131,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Siete sicuri di voler sospendere il computer?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3418
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Iberna"
 
@@ -158,7 +158,7 @@ msgstr "Ridimensiona"
 
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3330 src/bin/e_actions.c:3332
 #: src/bin/e_actions.c:3334 src/bin/e_actions.c:3336 src/bin/e_actions.c:3338
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menù"
 
@@ -794,7 +794,7 @@ msgstr "Seleziona"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:195
 #: src/bin/e_import_config_dialog.c:540
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -865,7 +865,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:588
 #: src/bin/e_module.c:995 src/bin/e_sys.c:619 src/bin/e_sys.c:660
 #: src/bin/e_utils.c:695
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -979,7 +979,7 @@ msgstr ""
 "<br>"
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:810
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -991,7 +991,7 @@ msgid "Basic"
 msgstr "Basilari"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Applica"
 
@@ -1200,11 +1200,11 @@ msgstr "Seleziona un'eseguibile"
 #: src/bin/e_shelf.c:1797 src/bin/e_shelf.c:2482
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1902,7 +1902,7 @@ msgid "Module %s needs to support %s"
 msgstr "Il modulo %s ha bisogno del supporto %s"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1910,7 +1910,7 @@ msgstr ""
 "abortire"
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2132,7 +2132,7 @@ msgid "Remember these Locks"
 msgstr "Ricorda questi blocchi"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Finestra"
 
@@ -2350,7 +2350,7 @@ msgstr "Statico"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2714,11 +2714,11 @@ msgstr "Gadget caricati"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -2905,7 +2905,7 @@ msgid "Hide duration"
 msgstr "Durata scomparsa"
 
 #: src/bin/e_int_shelf_config.c:244
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f secondi"
@@ -4100,10 +4100,10 @@ msgstr[1] "%li minuti fa"
 #: src/bin/e_widget_filepreview.c:539 src/bin/e_widget_filepreview.c:540
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -4467,7 +4467,7 @@ msgid "Hardware"
 msgstr "Hardware"
 
 #: src/modules/battery/e_mod_main.c:146 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Battery"
 
@@ -5477,17 +5477,17 @@ msgstr "Bloccaschermo"
 msgid "Desk"
 msgstr "Desktop"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Nessuna>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5498,81 +5498,81 @@ msgstr ""
 "azione usando il cursore,<br>oppure fare in modo che risponda ai<br>clic del "
 "mouse sul bordo:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Configurazione associazioni con i bordi dello schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Associazioni con i bordi dello schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Modifica"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Cancella tutto"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Ripristina associazioni predefinite"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Azione"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Pulsanti del mouse"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Parametri azione"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Opzioni generali"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Consenti associazioni con finestre a tutto schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Consenti associazioni con schermi multipli (PERICOLOSO)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Sequenza bordo dello schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Bordo cliccabile"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Errore associazione con bordi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5581,82 +5581,82 @@ msgstr ""
 "L'associazione con i bordi che avete scelto è già<br>usata dall'azione "
 "<hilight>%s</hilight>.<br>Si prega di scegliere un bordo diverso."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "Ctrl"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "Alt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "Maiuscole"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "Windows"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Bordo sinistro"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Bordo superiore"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Bordo destro"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Bordo inferiore"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Bordo superiore sinistro"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Bordo superiore destro"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Bordo inferiore destro"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Bordo inferiore sinistro"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(cliccabile col destro)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(cliccabile col sinistro)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "Errore associazione con segnale"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "Il segnale e la sorgente NON devono essere vuoti!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5665,58 +5665,58 @@ msgstr ""
 "Il segnale e la sorgente che avete scelto è già usata "
 "dall'azione<br><hilight>%s</hilight>."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "Aggiungi associazione con segnali"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "Sorgente:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "Segnale:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Associazioni con segnali"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "Impostazione associazioni con segnali"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
 msgstr "Input"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge bindings"
 msgstr "associazioni bordi"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "Screen edge binding settings"
 msgstr "Impostazione associazioni con bordi dello schermo"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
 #: src/modules/conf_intl/e_mod_main.c:45
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "input"
 msgstr "input"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge"
 msgstr "bordi"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 #: src/modules/conf_randr/e_mod_main.c:37
 #: src/modules/notification/e_mod_main.c:245
 #: src/modules/notification/e_mod_main.c:249
@@ -5724,28 +5724,28 @@ msgstr "bordi"
 msgid "screen"
 msgstr "schermo"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "binding"
 msgstr "associazioni"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "signal bindings"
 msgstr "associazioni segnali"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "Edje signal binding settings"
 msgstr "Impostazione associazioni con segnali Edje"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "edje"
 msgstr "edje"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse"
 msgstr "mouse"
 
@@ -5989,105 +5989,105 @@ msgstr "metodo input"
 msgid "Input method settings"
 msgstr "Impostazione metodo di input"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Associazioni ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "Disinserimento AC"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "Inserimento AC"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "Alimentazione AC"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Bottone"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Ventola"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "Coperchio (ignoto)"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "Coperchio chiuso"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "Coperchio aperto"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "Coperchio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "Pulsante accensione"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Processore"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "Pulsante sospensione"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "Termica"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Video"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Zoom avanti"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Zoom indietro"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Diminuisci luminosità"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Aumenta luminosità"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr "Pulsante assistenza"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "Associazioni ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
@@ -6095,24 +6095,24 @@ msgstr ""
 "Causare l'evento ACPI che si desidera impostare,<br><br>o <hilight>Escape</"
 "hilight> per abortire"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Tasto singolo"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Configurazione combinazioni della tastiera"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Combinazioni della tastiera"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Errore di associazione"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6121,11 +6121,11 @@ msgstr ""
 "La combinazione di tasti che avete scelto è già usata<br>dall'azione "
 "<hilight>%s</hilight>.<br>Si prega di scegliere una combinazione diversa."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Configurazione associazioni del mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -6134,20 +6134,20 @@ msgstr ""
 "finestra senza modificatori: confligge con le associazioni<br>di segnali "
 "edje esistenti.<br>DA CORREGGERE!!!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Errore associazione del mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Associazioni del mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Contesto azione"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6155,117 +6155,117 @@ msgstr "Contesto azione"
 msgid "Any"
 msgstr "Qualunque"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Lista finestre"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zona"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Contenitore"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Manager"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Pulsanti del mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Rotelle del mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:374 src/modules/pager/e_mod_config.c:400
 #, c-format
 msgid "Left button"
 msgstr "Pulsante sinistro"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:379 src/modules/pager/e_mod_config.c:395
 #, c-format
 msgid "Right button"
 msgstr "Pulsante destro"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:384 src/modules/pager/e_mod_config.c:405
 #: src/modules/pager/e_mod_config.c:410
 #, c-format
 msgid "Button %i"
 msgstr "Bottone %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:389
 #, c-format
 msgid "Middle button"
 msgstr "Pulsante centrale"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Pulsante extra (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Rotella su"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Rotella giù"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Rotella extra (%d) su"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Rotella extra (%d) giù"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "key bindings"
 msgstr "associazioni tastiera"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "Key binding settings"
 msgstr "Impostazione combinazioni della tastiera"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 #: src/modules/fileman/e_mod_main.c:430 src/modules/tiling/e_mod_tiling.c:3919
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "key"
 msgstr "chiave"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse bindings"
 msgstr "associazioni mouse"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "Mouse binding settings"
 msgstr "Impostazione associazioni del mouse"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI bindings"
 msgstr "Associazioni ACPI"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI binding settings"
 msgstr "Impostazione associazioni di ACPI"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "acpi"
 msgstr "acpi"
 

diff --git a/po/ja.po b/po/ja.po
index 96d4e42..51f4950 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -24,7 +24,7 @@ msgstr "Enlightenment について"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -133,7 +133,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "本当にログアウトしますか"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "ハイバネート"
 
@@ -162,7 +162,7 @@ msgstr "サイズ変更"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "メニュー"
 
@@ -844,7 +844,7 @@ msgstr "選択"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -910,7 +910,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1024,7 +1024,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1036,7 +1036,7 @@ msgid "Basic"
 msgstr "基本設定"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "適用"
 
@@ -1249,11 +1249,11 @@ msgstr "プログラムの選択"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1985,7 +1985,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1993,7 +1993,7 @@ msgstr ""
 "して終了して下さい."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2237,7 +2237,7 @@ msgid "Remember these Locks"
 msgstr "以上のロックを記憶する"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "ウィンドウ"
 
@@ -2466,7 +2466,7 @@ msgstr "状態"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3029,7 +3029,7 @@ msgid "Hide duration"
 msgstr "隠蔽に要する時間"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f 秒"
@@ -4208,10 +4208,10 @@ msgstr[1] "%li 分前"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "不明"
@@ -4348,11 +4348,11 @@ msgstr "%li 分前"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4620,7 +4620,7 @@ msgstr "ハードウェア"
 
 #
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "バッテリ"
 
@@ -5701,17 +5701,17 @@ msgstr "スクリーンロック"
 msgid "Desk"
 msgstr "デスク"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "無し"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5721,84 +5721,84 @@ msgstr ""
 "い.<br><br>スライダを使ってこの動作の遅延を指定するか, エッジクリックに応答し"
 "てください"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "エッジバインディング設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "エッジバインディング"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "変更"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "すべて削除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "デフォルトのキーバインドに戻す"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "アクション"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "マウスの設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "アクションパラメータ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "一般オプション"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "全画面ウィンドウでバインディング動作を許可する"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "全画面ウィンドウでバインディング動作を許可する"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "エッジバインドシーケンス"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "クリック可能エッジ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "マウスバインド"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5807,95 +5807,95 @@ msgstr ""
 "そのバインドキーシーケンスはすでに以下のアクションで使われています."
 "<br><hilight>%s</hilight><br>他のエッジバインドシーケンスを選んで下さい."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 #, fuzzy
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 #, fuzzy
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 #, fuzzy
 msgid "SHIFT"
 msgstr "シフト"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 #, fuzzy
 msgid "WIN"
 msgstr "WINの"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 #, fuzzy
 msgid "Left Edge"
 msgstr "キー削除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 #, fuzzy
 msgid "Top Edge"
 msgstr "キー修正"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "右上(縦)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 #, fuzzy
 msgid "Bottom Edge"
 msgstr "左下(横)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 #, fuzzy
 msgid "Top Left Edge"
 msgstr "左上(横)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 #, fuzzy
 msgid "Top Right Edge"
 msgstr "右上(横)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 #, fuzzy
 msgid "Bottom Right Edge"
 msgstr "右下(横)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 #, fuzzy
 msgid "Bottom Left Edge"
 msgstr "左下(横)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "クリック可能エッジ"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "エッジバインディング"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5904,34 +5904,34 @@ msgstr ""
 "そのバインドキーシーケンスはすでに以下のアクションで使われています."
 "<br><hilight>%s</hilight><br>他のエッジバインドシーケンスを選んで下さい."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "エッジバインディング"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "移動先"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "エッジバインディング"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "エッジバインディング設定"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -6152,119 +6152,119 @@ msgstr "ロケール"
 msgid "Language"
 msgstr "言語"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "マウスバインド追加"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "ボタン"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "遠い"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "不明"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "閉じる"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "マウスの設定"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "中ボタン"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "普通"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "ログアウト"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "ズーム"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "シャットダウン"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "ライトアップ"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "設定"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "マウスバインド追加"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6273,24 +6273,24 @@ msgstr ""
 "キーシーケンスを押してください.<br><br>または <hilight>Escape</hilight> を押"
 "して終了して下さい."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "シングルキー"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "キーバインドの設定"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "キーバインド"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "キーシーケンスのバインドエラー"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6299,31 +6299,31 @@ msgstr ""
 "そのキーシーケンスはすでに以下のアクションで使われています.<br><hilight>%s</"
 "hilight><br>他のキーシーケンスを選んで下さい."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "マウスバインドの設定"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "マウスバインド"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "マウスバインド"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "カテゴリー"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6331,84 +6331,84 @@ msgstr "カテゴリー"
 msgid "Any"
 msgstr "無指定"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "ウィンドウリスト"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "ポップアップ"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "ゾーン"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "コンテナ"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "マネージャ"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "マウスの設定"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "ホイール(上)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "左ボタン"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "右ボタン"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "ボタン %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "中ボタン"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "ボタン %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "ホイール(上)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "ホイール(下)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/km.po b/po/km.po
index ab25d95..b314693 100644 (file)
--- a/po/km.po
+++ b/po/km.po
@@ -26,7 +26,7 @@ msgstr "អំពី Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​ចាក​ចេញ ឬ?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr "ផ្លាស់ប្ដូរ​ទំហំ"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "ម៉ឺនុយ"
 
@@ -812,7 +812,7 @@ msgstr "ជ្រើស​ទាំងអស់"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -865,7 +865,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -970,7 +970,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -982,7 +982,7 @@ msgid "Basic"
 msgstr "មូល​ដ្ឋាន"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "អនុវត្ត"
 
@@ -1175,11 +1175,11 @@ msgstr ""
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1882,13 +1882,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2100,7 +2100,7 @@ msgid "Remember these Locks"
 msgstr ""
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "ម៉ឺនុយ បង្អួច"
@@ -2323,7 +2323,7 @@ msgstr ""
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2862,7 +2862,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -3856,10 +3856,10 @@ msgstr[1] ""
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr ""
@@ -3981,11 +3981,11 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4242,7 +4242,7 @@ msgid "Hardware"
 msgstr ""
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr ""
 
@@ -5260,213 +5260,213 @@ msgstr ""
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "ម៉ឺនុយ បង្អួច"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5679,163 +5679,163 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "បិទ"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "ចាក​ចេញ"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -5843,85 +5843,85 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "ផ្លាស់ទី"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/ko.po b/po/ko.po
index 1978f85..824b68c 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -29,7 +29,7 @@ msgstr "인라이튼먼트 정보"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2529 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "정말로 컴퓨터를 대기 모드로 전환하시겠습니까?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "최대 절전 모드"
 
@@ -163,7 +163,7 @@ msgstr "크기 변경"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:757
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "메뉴"
 
@@ -801,7 +801,7 @@ msgstr "선택"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9966
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -868,7 +868,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:799 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -978,7 +978,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -990,7 +990,7 @@ msgid "Basic"
 msgstr "기본"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "적용"
 
@@ -1197,11 +1197,11 @@ msgstr "실행 파일 선택"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1896,7 +1896,7 @@ msgid "Module %s needs to support %s"
 msgstr "%s 모듈은 %s 지원이 필요합니다"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1904,7 +1904,7 @@ msgstr ""
 "시오."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2121,7 +2121,7 @@ msgid "Remember these Locks"
 msgstr "잠금 상태 기억"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "창"
 
@@ -2341,7 +2341,7 @@ msgstr "고정"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2701,11 +2701,11 @@ msgstr "불러온 가젯"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -2894,7 +2894,7 @@ msgid "Hide duration"
 msgstr "숨기기 지속시간"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f 초"
@@ -3992,10 +3992,10 @@ msgstr[0] "%li분 전"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "알 수 없음"
@@ -4370,7 +4370,7 @@ msgid "Hardware"
 msgstr "하드웨어"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "배터리"
 
@@ -5379,17 +5379,17 @@ msgstr "화면 잠금"
 msgid "Desk"
 msgstr "데스크"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<없음>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5399,81 +5399,81 @@ msgstr ""
 "<br><br>슬라이더를 사용하여 이 동작의<br> 지연시간을 지정하거나 테두리를 눌렀"
 "을 때 반응하게 할 수 있습니다:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "가장자리 바인딩 설정"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "가장자리 바인딩"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "수정"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "모두 삭제"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "기본 바인딩 복원"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "동작"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "마우스 버튼"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "동작 인자"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "일반 옵션"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "전체 화면 창과 활성 바인딩 허용"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "다중 화면과 활성 바인딩 허용 (위험!)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "가장자리 바인딩 순서"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "클릭 가능한 가장자리"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "가장자리 바인딩 오류"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5482,82 +5482,82 @@ msgstr ""
 "여러분이 선택한 테두리 바인딩은 <hilight>%s</hilight> 동작에서 이미 사용중입"
 "니다.<br>바인딩할 다른 테두리를 선택하십시오."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "왼쪽 테두리"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "상단 가장자리"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "오른쪽 가장자리"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "하단 가장자리"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "상단 왼쪽 가장자리"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "상단 오른쪽 가장자리"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "하단 오른쪽 가장자리"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "하단 왼쪽 가장자리"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(왼쪽 마우스 버튼 클릭 가능)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(클릭가능)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "시그널 바인딩 오류"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "시그널과 소스가 비어있으면 안됩니다!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5566,30 +5566,30 @@ msgstr ""
 "여러분이 입력한 시그널과 소스를 <hilight>%s</hilight> 동작에서 이미 사용중입"
 "니다.<br>"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "시그널 바인딩 추가"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "소스:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "시그널:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "시그널 바인딩"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "시그널 바인딩 설정"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5804,105 +5804,105 @@ msgstr "로캘"
 msgid "Language"
 msgstr "언어"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "ACPI 바인딩"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "AC 어댑터 빠짐"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "AC 어댑터 연결함"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "AC 어댑터"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "버튼"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "바람날개"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "덮개상태 알 수 없음"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "덮개 닫힘"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "덮개 열림"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "덮개"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "전원 버튼"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "프로세서"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "대기 모드 버튼"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "온도"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "비디오"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "무선랜"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "축소"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "확대"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "어둡게"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "밝게"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr "보조"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "ACPI 바인딩"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
@@ -5910,24 +5910,24 @@ msgstr ""
 "바인드할 ACPI 이벤트를 실행하거나,<br>취소하기 위해 <hilight>ESC</hilight> 키"
 "를 누르십시오."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "단일 키"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "단축키 설정"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "단축키"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "단축키 오류"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -5936,11 +5936,11 @@ msgstr ""
 "선택한 키 조합 시퀀스는 <hilight>%s</hilight> 동작이 이미<br> 사용중입니다."
 "<br>다른 키 조합 시퀀스를 선택해주십시오."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "마우스 바인딩 설정"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -5948,20 +5948,20 @@ msgstr ""
 "창에서 조합 키 없이 마우스 휠 바인딩을 설정할 수 없습니다:<br>이미 존재하는 "
 "edje 시그널 바인딩과 충돌합니다.<br>고쳐주세요!!!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "마우스 바인딩 오류"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "마우스 바인딩"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "동작 컨텍스트"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -5969,82 +5969,82 @@ msgstr "동작 컨텍스트"
 msgid "Any"
 msgstr "어디에서나"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "창 목록"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "팝업"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "영역"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "컨테이너"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "매니저"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "마우스 버튼"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "마우스 휠"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:374 src/modules/pager/e_mod_config.c:400
 #, c-format
 msgid "Left button"
 msgstr "왼쪽 버튼"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:379 src/modules/pager/e_mod_config.c:395
 #, c-format
 msgid "Right button"
 msgstr "오른쪽 버튼"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:384 src/modules/pager/e_mod_config.c:405
 #: src/modules/pager/e_mod_config.c:410
 #, c-format
 msgid "Button %i"
 msgstr "버튼 %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:389
 #, c-format
 msgid "Middle button"
 msgstr "가운데 버튼"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "추가 버튼 (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "마우스 휠 위로 굴리기"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "마우스 휠 아래로 굴리기"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "추가 휠 (%d) 위로 굴리기"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "추가 휠 (%d) 아래로 굴리기"

diff --git a/po/ku.po b/po/ku.po
index 414aa07..569417a 100644 (file)
--- a/po/ku.po
+++ b/po/ku.po
@@ -25,7 +25,7 @@ msgstr ""
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -126,7 +126,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr ""
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgstr ""
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr ""
 
@@ -794,7 +794,7 @@ msgstr ""
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -847,7 +847,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -951,7 +951,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -963,7 +963,7 @@ msgid "Basic"
 msgstr ""
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr ""
 
@@ -1156,11 +1156,11 @@ msgstr ""
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1852,13 +1852,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2069,7 +2069,7 @@ msgid "Remember these Locks"
 msgstr ""
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Guhestin"
@@ -2290,7 +2290,7 @@ msgstr ""
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2824,7 +2824,7 @@ msgid "Hide duration"
 msgstr ""
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -3815,10 +3815,10 @@ msgstr[1] ""
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr ""
@@ -3939,11 +3939,11 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4196,7 +4196,7 @@ msgid "Hardware"
 msgstr ""
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr ""
 
@@ -5193,212 +5193,212 @@ msgstr ""
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Guhestin"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Guhestin"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5610,161 +5610,161 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Guhestin"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Guhestin"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Guhestin"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -5772,85 +5772,85 @@ msgstr ""
 msgid "Any"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Guhestin"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Guhestin"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Guhestin"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Guhestin"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Guhestin"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Guhestin"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/lt.po b/po/lt.po
index e0e497d..5e9896e 100644 (file)
--- a/po/lt.po
+++ b/po/lt.po
@@ -28,7 +28,7 @@ msgstr "Apie Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2529 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -129,7 +129,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Ar tikrai norite pristabdyti šį kompiuterį?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernuoti"
 
@@ -157,7 +157,7 @@ msgstr "Keisti dydį"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:757
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Meniu"
 
@@ -795,7 +795,7 @@ msgstr ""
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9966
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -861,7 +861,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:800 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -965,7 +965,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:797
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -977,7 +977,7 @@ msgid "Basic"
 msgstr "Pagrindinės"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Pritaikyti"
 
@@ -1178,11 +1178,11 @@ msgstr "Parinkti vykdomąjį failą"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1876,7 +1876,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1884,7 +1884,7 @@ msgstr ""
 "norite nutraukti."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press "
@@ -2101,7 +2101,7 @@ msgid "Remember these Locks"
 msgstr "Prisiminti šias blokuotes"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr ""
 
@@ -2321,7 +2321,7 @@ msgstr ""
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2687,11 +2687,11 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -2881,7 +2881,7 @@ msgid "Hide duration"
 msgstr "Slėpimo trukmė"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekundės"
@@ -3943,10 +3943,10 @@ msgstr[1] ""
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Nežinomas"
@@ -4308,7 +4308,7 @@ msgid "Hardware"
 msgstr "Aparatinė įranga"
 
 #: src/modules/battery/e_mod_main.c:143 src/modules/battery/e_mod_main.c:442
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Baterija"
 
@@ -5329,17 +5329,17 @@ msgstr "Ekrano užraktas"
 msgid "Desk"
 msgstr "Darbalaukis"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Nėra>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to "
 "abort.<br><br>You can either specify a delay of this<br> action using the "
@@ -5350,193 +5350,193 @@ msgstr ""
 "veiksmo<br>uždelsimą pasinaudodami slankikliu arba<br>priversti jį reaguoti "
 "į krašto paspaudimus:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Ekrano kraštų saistymo nustatymai"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Krašto saistymas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Pašalinti visus"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Atkurti numatytuosius saistymus"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Veiksmas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Veiksmo parametrai"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Bendros parinktys"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Leisti saistymo aktyvavimą pilno ekrano langams"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Krašto saistymo seka"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Paspaudžiamas kraštas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used "
 "by<br><hilight>%s</hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5750,128 +5750,128 @@ msgstr "Lokalė"
 msgid "Language"
 msgstr "Kalba"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Vienas klavišas"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Klavišų susiejimo nustatymai"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Klavišų saistymas"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Klavišų saistymo klaida"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by "
@@ -5881,30 +5881,30 @@ msgstr ""
 "Jūsų nurodyta klavišų saistymo seka jau naudojama <br><hilight>%s</hilight> "
 "veiksmo.<br>Prašome pasirinkti kitą klavišų saistymo seką."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Pelės saistymo nustatymai"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Pelės saistymas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Veiksmo kontekstas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -5912,82 +5912,82 @@ msgstr "Veiksmo kontekstas"
 msgid "Any"
 msgstr "Bet koks"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Langų sąrašas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Iškylantysis langas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Juosta"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Sudėtinis rodinys"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Tvarkytuvė"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:374 src/modules/pager/e_mod_config.c:400
 #, c-format
 msgid "Left button"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:379 src/modules/pager/e_mod_config.c:395
 #, c-format
 msgid "Right button"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:384 src/modules/pager/e_mod_config.c:405
 #: src/modules/pager/e_mod_config.c:410
 #, c-format
 msgid "Button %i"
 msgstr "Mygtukas %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:389
 #, c-format
 msgid "Middle button"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/ms.po b/po/ms.po
index b3664c2..11f9939 100644 (file)
--- a/po/ms.po
+++ b/po/ms.po
@@ -26,7 +26,7 @@ msgstr "Mengenai Enlightment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -139,7 +139,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Adakah anda pasti untuk log keluar?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 #, fuzzy
 msgid "Hibernate"
 msgstr "hibernate"
@@ -171,7 +171,7 @@ msgstr "mengubah saiz"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menu"
 
@@ -931,7 +931,7 @@ msgstr "memilih"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -985,7 +985,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1114,7 +1114,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1128,7 +1128,7 @@ msgid "Basic"
 msgstr "asas"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 #, fuzzy
 msgid "Apply"
 msgstr "memohon"
@@ -1361,11 +1361,11 @@ msgstr "Pilih laksana"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2155,13 +2155,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2410,7 +2410,7 @@ msgid "Remember these Locks"
 msgstr "Ingatlah ini Kunci"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Menu Tetingkap"
@@ -2657,7 +2657,7 @@ msgstr "Negeri"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3298,7 +3298,7 @@ msgid "Hide duration"
 msgstr "menyembunyikan tempoh"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -4385,10 +4385,10 @@ msgstr[1] ""
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 #, fuzzy
 msgid "Unknown"
@@ -4526,11 +4526,11 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4818,7 +4818,7 @@ msgid "Hardware"
 msgstr "Perkakasan"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 #, fuzzy
 msgid "Battery"
 msgstr "bateri"
@@ -5967,235 +5967,235 @@ msgstr "Kunci skrin"
 msgid "Desk"
 msgstr "meja"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 #, fuzzy
 msgid "<None>"
 msgstr "<none>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Pengikatan kelebihan Tetapan"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "The Edge pengikatan"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "diubahsuai;"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 #, fuzzy
 msgid "Delete All"
 msgstr "Padam Semua"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 #, fuzzy
 msgid "Restore Default Bindings"
 msgstr "Simpan semula pengikatan Default"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 #, fuzzy
 msgid "Action"
 msgstr "tindakan"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Alihkan"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 #, fuzzy
 msgid "Action Params"
 msgstr "tindakan params"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 #, fuzzy
 msgid "General Options"
 msgstr "Pilihan Umum"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Membenarkan pengaktifan mengikat dengan tingkap skrin penuh"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Membenarkan pengaktifan mengikat dengan tingkap skrin penuh"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "The Edge Sequence Binding"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "kelebihan yang boleh diklik"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "tetikus pengikatan"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 #, fuzzy
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 #, fuzzy
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 #, fuzzy
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 #, fuzzy
 msgid "WIN"
 msgstr "MENANG"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "kanan;"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "kelebihan yang boleh diklik"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "The Edge pengikatan"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "The Edge pengikatan"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Alihkan"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "The Edge pengikatan"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Pengikatan kelebihan Tetapan"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6445,180 +6445,180 @@ msgstr "locale"
 msgid "Language"
 msgstr "bahasa"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Tambah Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "butang"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "jauh"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "tidak diketahui"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Tutup"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Alihkan"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Alihkan"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "biasa"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Log Out"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "latar Down"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "latar Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Berikan"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Tambah Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "kunci tunggal"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Pengikatan Tetapan Utama"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Key Bindings"
 msgstr "pengikatan utama"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 #, fuzzy
 msgid "Binding Key Error"
 msgstr "Mengikat Ralat Utama"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Tetikus pengikatan Tetapan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "tetikus pengikatan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Mouse Bindings"
 msgstr "tetikus pengikatan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 #, fuzzy
 msgid "Action Context"
 msgstr "Konteks tindakan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6627,90 +6627,90 @@ msgstr "Konteks tindakan"
 msgid "Any"
 msgstr "mana-mana"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 #, fuzzy
 msgid "Win List"
 msgstr "menang Senarai"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 #, fuzzy
 msgid "Popup"
 msgstr "pop"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 #, fuzzy
 msgid "Zone"
 msgstr "zon"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 #, fuzzy
 msgid "Container"
 msgstr "bekas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 #, fuzzy
 msgid "Manager"
 msgstr "Pengurus"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Alihkan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Alihkan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Alihkan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "radio Butang"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Alihkan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Alihkan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/nb.po b/po/nb.po
index 82c5cbd..9369ba3 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -25,7 +25,7 @@ msgstr "Om Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -134,7 +134,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Vil du virkelig logge ut?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Dvalemodus"
 
@@ -164,7 +164,7 @@ msgstr "Endre Størrelse"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Meny"
 
@@ -841,7 +841,7 @@ msgstr "Velg en"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -894,7 +894,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1022,7 +1022,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1034,7 +1034,7 @@ msgid "Basic"
 msgstr "Grunnleggende"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Bruk"
 
@@ -1247,11 +1247,11 @@ msgstr "Velg et Program"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1993,13 +1993,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2239,7 +2239,7 @@ msgid "Remember these Locks"
 msgstr "Husk disse låsene"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Vindu"
 
@@ -2470,7 +2470,7 @@ msgstr "Tilstand"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3071,7 +3071,7 @@ msgid "Hide duration"
 msgstr "Skjul varighet"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -4233,10 +4233,10 @@ msgstr[1] "%li minutter siden"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Ukjent"
@@ -4372,11 +4372,11 @@ msgstr "%li minutter siden"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4656,7 +4656,7 @@ msgid "Hardware"
 msgstr "maskinvare"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Batteri"
 
@@ -5792,230 +5792,230 @@ msgstr "Skjermlås"
 msgid "Desk"
 msgstr "Desk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Ingen>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Edge Bindinger Innstillinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Edge Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "modifisert:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 #, fuzzy
 msgid "Delete All"
 msgstr "Slett alle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 #, fuzzy
 msgid "Restore Default Bindings"
 msgstr "Gjenopprett standardinnstillinger Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 #, fuzzy
 msgid "Action"
 msgstr "handling"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Knapper"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 #, fuzzy
 msgid "Action Params"
 msgstr "Actionspill Params"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 #, fuzzy
 msgid "General Options"
 msgstr "generelle alternativer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Tillat bindende aktivering med fullskjerm vinduer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Tillat bindende aktivering med fullskjerm vinduer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Edge Binding Sequence"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "klikkbart kanten"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Mus Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Høyre:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "klikkbart kanten"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Edge Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Edge Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Flytt tekst"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Edge Bindinger"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Edge Bindinger Innstillinger"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6258,180 +6258,180 @@ msgstr "locale"
 msgid "Language"
 msgstr "Språk"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Legg Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Knapper"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Langt unna"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Ukjent"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Lukk"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Knapper"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Knapper"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normal"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Logg ut"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Bakgrunnslys Down"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Bakgrunnslys Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "tilordne"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Legg Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Enkel nøkkel"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Tastebindinger Innstillinger"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Key Bindings"
 msgstr "tastebindinger"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 #, fuzzy
 msgid "Binding Key Error"
 msgstr "Binding Key Feil"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Mus Bindinger Innstillinger"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Mus Bindinger"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Mouse Bindings"
 msgstr "Mus Bindinger"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 #, fuzzy
 msgid "Action Context"
 msgstr "handling Kontekst"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6440,89 +6440,89 @@ msgstr "handling Kontekst"
 msgid "Any"
 msgstr "enhver"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 #, fuzzy
 msgid "Win List"
 msgstr "Vinn List"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 #, fuzzy
 msgid "Popup"
 msgstr "popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Sone"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 #, fuzzy
 msgid "Container"
 msgstr "container"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 #, fuzzy
 msgid "Manager"
 msgstr "leder"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Knapper"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Flytt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Knapper"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "radioknappene"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Knapp %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Knapper"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Knapp %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Flytt"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/nl.po b/po/nl.po
index eb62341..9f57983 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -28,7 +28,7 @@ msgstr "Over Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -138,7 +138,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Weet u zeker dat u wilt afmelden?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Slaapstand"
 
@@ -167,7 +167,7 @@ msgstr "Herschalen"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menu"
 
@@ -823,7 +823,7 @@ msgstr "Selecterend"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -893,7 +893,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1009,7 +1009,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1021,7 +1021,7 @@ msgid "Basic"
 msgstr "Eenvoudig"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -1234,11 +1234,11 @@ msgstr "Selecteer een Uitvoerbaar bestand"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1968,7 +1968,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1976,7 +1976,7 @@ msgstr ""
 "higlight> om af te breken."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2213,7 +2213,7 @@ msgid "Remember these Locks"
 msgstr "Onthoud deze Sloten"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Venster"
 
@@ -2435,7 +2435,7 @@ msgstr "Staat"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2993,7 +2993,7 @@ msgid "Hide duration"
 msgstr "Verberg-voortduring"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f seconden"
@@ -4150,10 +4150,10 @@ msgstr[1] "%li minuten geleden"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Onbekend"
@@ -4290,11 +4290,11 @@ msgstr "%li minuten geleden"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4556,7 +4556,7 @@ msgid "Hardware"
 msgstr "Hardware"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Accu"
 
@@ -5627,17 +5627,17 @@ msgstr "Schermvergendeling"
 msgid "Desk"
 msgstr "Bureaublad"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Geen>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5648,85 +5648,85 @@ msgstr ""
 "specificeren gebruikmakende van de slider of laat het<br>beantwoorden via "
 "randklikken:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Randbindingen-instellingen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Randbindingen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Aangepast:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Verwijder alles"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Zet standaardbindingen terug"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Actie"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Muisknoppen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Actie-parameters"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Algemene instellingen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Sta bindingsactivatie toe bij volledig scherm-vensters"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Sta bindingsactivatie toe bij volledig scherm-vensters"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Rand-bindingsvolgorde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Klikbare rand"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Muis-toewijzingen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5736,84 +5736,84 @@ msgstr ""
 "<br><hilight> %s</hilight>-actie. Kies alstublieft een andere "
 "toetsencombinatie-sequentie."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Rechts:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "Klikbare rand"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Randbindingen"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5823,34 +5823,34 @@ msgstr ""
 "<br><hilight> %s</hilight>-actie. Kies alstublieft een andere "
 "toetsencombinatie-sequentie."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Randbindingen"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Verplaatsen naar"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Randbindingen"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Randbindingen-instellingen"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -6072,119 +6072,119 @@ msgstr "Taal"
 msgid "Language"
 msgstr "Taal"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Voeg binding toe"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Knoppen"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Ver"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Onbekend"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Sluiten"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Muisknoppen"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Muisknoppen"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normaal"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Afmelden"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Achtergrondlicht omlaag"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Achtergrondlicht omhoog"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Wijs toe"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Voeg binding toe"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6193,24 +6193,24 @@ msgstr ""
 "Druk alstublieft op een toetsencombinatie,<br><br>of op <hilight>Escape</"
 "higlight> om af te breken."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Enkele toets"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Toetsentoewijzingen-instellingen"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Toetsentoewijzingen"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Toestenbindings-fout"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6220,31 +6220,31 @@ msgstr ""
 "de <br><hilight> %s</hilight>-actie.<br>Kies alstublieft voor een andere "
 "toetsencombinatie-binding."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Muis-toewijzings-instellingen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Muis-toewijzingen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Muis-toewijzingen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Actie-context"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6252,85 +6252,85 @@ msgstr "Actie-context"
 msgid "Any"
 msgstr "Elke"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Vensterlijst"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zone"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Houder"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Beheerder"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Muisknoppen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Muis-overheen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Muisknoppen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Radioknoppen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Knop %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Muisknoppen"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Knop %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Verplaats omlaag"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index c0f68d6..38a43a5 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -29,7 +29,7 @@ msgstr "O Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -146,7 +146,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Czy na pewno chcesz się wylogować?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernacja"
 
@@ -175,7 +175,7 @@ msgstr "Zmień rozmiar"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menu"
 
@@ -849,7 +849,7 @@ msgstr "Ustawienia"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -914,7 +914,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1042,7 +1042,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1054,7 +1054,7 @@ msgid "Basic"
 msgstr "Proste"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Zastosuj"
 
@@ -1271,11 +1271,11 @@ msgstr "Wybierz plik wykonywalny"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2007,7 +2007,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -2015,7 +2015,7 @@ msgstr ""
 "żeby anulować."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2254,7 +2254,7 @@ msgid "Remember these Locks"
 msgstr "Zapamiętaj blokady"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Okno"
 
@@ -2482,7 +2482,7 @@ msgstr "Stan"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3049,7 +3049,7 @@ msgid "Hide duration"
 msgstr "Okres chowania"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -4217,10 +4217,10 @@ msgstr[1] "%li minut temu"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Nieznane"
@@ -4354,11 +4354,11 @@ msgstr "%li minut temu"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4631,7 +4631,7 @@ msgid "Hardware"
 msgstr "Sprzęt"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Bateria"
 
@@ -5719,107 +5719,107 @@ msgstr "Blokada ekranu"
 msgid "Desk"
 msgstr "Pulpit"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "Brak"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Wiązania krawędzi Ustawienia"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Wiązania krawędzi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Ostatnio zmodyfikowany:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Usuń wszystkie"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 #, fuzzy
 msgid "Restore Default Bindings"
 msgstr "Przywracanie domyślnych skrótów"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Akcja"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Opcje myszki"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Parametry akcji"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Opcje ogólne"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Pozwól wiążącej aktywacji w trybie pełnoekranowym okien"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Pozwól wiążącej aktywacji w trybie pełnoekranowym okien"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Edge Binding Sequence"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Klikalna krawędź"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Skróty myszy"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5828,90 +5828,90 @@ msgstr ""
 "Wybrana kombinacja klawiszy jest już używana przez akcję <br><hilight>%s</"
 "hilight>. Proszę wybrać inną kombinację klawiszy."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 #, fuzzy
 msgid "Top Edge"
 msgstr "Góra Lewo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Prawo Góra"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 #, fuzzy
 msgid "Bottom Edge"
 msgstr "Dół Lewo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 #, fuzzy
 msgid "Top Left Edge"
 msgstr "Góra Lewo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 #, fuzzy
 msgid "Top Right Edge"
 msgstr "Góra Prawo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 #, fuzzy
 msgid "Bottom Right Edge"
 msgstr "Dół Prawo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 #, fuzzy
 msgid "Bottom Left Edge"
 msgstr "Dół Lewo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "Klikalna krawędź"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Wiązania krawędzi"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5920,34 +5920,34 @@ msgstr ""
 "Wybrana kombinacja klawiszy jest już używana przez akcję <br><hilight>%s</"
 "hilight>. Proszę wybrać inną kombinację klawiszy."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Wiązania krawędzi"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Opis Przesuwania"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Wiązania krawędzi"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Wiązania krawędzi Ustawienia"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6179,119 +6179,119 @@ msgstr "Lokalizacja"
 msgid "Language"
 msgstr "Język"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Dodaj Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Przyciski"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Daleko"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Nieznane"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Zamknij"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Opcje myszki"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Opcje myszki"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normalny"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Wyloguj"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Powiększanie"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Wyłączanie"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "podświetlenie w górę"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Przypisywanie"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Dodaj Binding"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6300,25 +6300,25 @@ msgstr ""
 "Proszę wcisnąć kombinację klawiszy<br><br>albo <hilight>Escape</hilight> "
 "żeby anulować."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Pojedynczy klawisz"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Kluczowe Wiązania Ustawienia"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Skróty klawiaturowe"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Błąd przypisania kombinacji"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6327,32 +6327,32 @@ msgstr ""
 "Wybrana kombinacja klawiszy jest już używana przez akcję <br><hilight>%s</"
 "hilight>. Proszę wybrać inną kombinację klawiszy."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Ustawienia Wiązania mysz"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Skróty myszy"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Skróty myszy"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Kontekst przypisania"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6360,85 +6360,85 @@ msgstr "Kontekst przypisania"
 msgid "Any"
 msgstr "Dowolny"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Lista okien"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Strefa"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Pojemnik"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Menadżer"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Opcje myszki"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Przesuń"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Lewo Dół"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Prawo Dół"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Opcje myszki"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "W dół"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/pt.po b/po/pt.po
index 4c14400..d8f558f 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -23,7 +23,7 @@ msgstr "Sobre o Enlightenment"
 #: src/bin/e_about.c:20 src/bin/e_actions.c:2987 src/bin/e_config_dialog.c:288
 #: src/bin/e_fm.c:1060 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2529 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -131,7 +131,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Tem a certeza que quer suspender o computador?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3418
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernar"
 
@@ -158,7 +158,7 @@ msgstr "Redimensionar"
 
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3330 src/bin/e_actions.c:3332
 #: src/bin/e_actions.c:3334 src/bin/e_actions.c:3336 src/bin/e_actions.c:3338
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menu"
 
@@ -794,7 +794,7 @@ msgstr "Selecionar"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:193
 #: src/bin/e_import_config_dialog.c:536
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -862,7 +862,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:568
 #: src/bin/e_module.c:975 src/bin/e_sys.c:619 src/bin/e_sys.c:660
 #: src/bin/e_utils.c:695
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -974,7 +974,7 @@ msgstr ""
 "eliminado para evitar a danificação dos dados.<br>"
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:810
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -986,7 +986,7 @@ msgid "Basic"
 msgstr "Básico"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1194,11 +1194,11 @@ msgstr "Escolha o executável"
 #: src/bin/e_shelf.c:1797 src/bin/e_shelf.c:2482
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1896,7 +1896,7 @@ msgid "Module %s needs to support %s"
 msgstr "O módulo %s tem que suportar %s."
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1904,7 +1904,7 @@ msgstr ""
 "abortar."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2125,7 +2125,7 @@ msgid "Remember these Locks"
 msgstr "Memorizar estes bloqueios"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Janela"
 
@@ -2343,7 +2343,7 @@ msgstr "Estático"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2706,11 +2706,11 @@ msgstr "Gadgets carregados"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -2897,7 +2897,7 @@ msgid "Hide duration"
 msgstr "Intervalo para mostrar"
 
 #: src/bin/e_int_shelf_config.c:244
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f segundos"
@@ -4024,10 +4024,10 @@ msgstr[1] "%li minutos atrás"
 #: src/bin/e_widget_filepreview.c:539 src/bin/e_widget_filepreview.c:540
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -4388,7 +4388,7 @@ msgid "Hardware"
 msgstr "Equipamento"
 
 #: src/modules/battery/e_mod_main.c:146 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Bateria"
 
@@ -5396,17 +5396,17 @@ msgstr "Bloqueio de ecrã"
 msgid "Desk"
 msgstr "Área de trabalho"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Nenhuma>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5416,81 +5416,81 @@ msgstr ""
 "<br><br>Pode também especificar<br>um atrasopara esta ação utilizando<br>o "
 "cursor ou fazê-lo responder aos cliques nas margens:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Definições da associação das margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Associação das margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Eliminar tudo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Restaurar associações padrão"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Botão do rato"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Parâmetros da ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Opções gerais"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permitir ativação de associações nas janelas em ecrã completo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Permitir ativação de associações em vários ecrãs (PERIGOSO)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Combinação de associação das margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Margem clicável"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Erro na associação da margem"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5499,82 +5499,82 @@ msgstr ""
 "A associação da margem escolhida já está a ser<br>utilizada pela "
 "ação<br><hilight>%s</hilight>.<br>Por favor escolha outra margem."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Margem esquerda"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Margem superior"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Margem direita"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Margem inferior"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Margem superior esquerda"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Margem superior direita"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Margem inferior direita"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Margem inferior esquerda"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(clicável à esquerda)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(clicável)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "Erro na associação de sinais"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "O sinal e a fonte não podem estar vazios!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5583,58 +5583,58 @@ msgstr ""
 "O sinal e a fonte que introduziu já estão a ser utilizados pela "
 "ação<br><hilight>%s</hilight>.<br>"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "Adicionar associação de sinal"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "Fonte:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "Sinal:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Associação dos sinais"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "Definições da associação de sinais"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
 msgstr "Entrada"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge bindings"
 msgstr "associações de margens"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "Screen edge binding settings"
 msgstr "Definições da associação de margens"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
 #: src/modules/conf_intl/e_mod_main.c:45
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "input"
 msgstr "entrada"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge"
 msgstr "margem"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 #: src/modules/conf_randr/e_mod_main.c:37
 #: src/modules/notification/e_mod_main.c:245
 #: src/modules/notification/e_mod_main.c:249
@@ -5642,28 +5642,28 @@ msgstr "margem"
 msgid "screen"
 msgstr "ecrã"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "binding"
 msgstr "associação"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "signal bindings"
 msgstr "associações de sinais"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "Edje signal binding settings"
 msgstr "Definições da associação de sinais Edje"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "edje"
 msgstr "edje"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse"
 msgstr "rato"
 
@@ -5906,105 +5906,105 @@ msgstr "método de introdução"
 msgid "Input method settings"
 msgstr "Definições do método de introdução"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Associação ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "Adaptador AC desligado"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "Adaptador AC ligado"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "Adaptador AC"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Botão"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Ventoinha"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "Estado desconhecido (tampo)"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "Fechar tampo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "Abrir tampo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "Tampo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "Botão de energia"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Processador"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "Botão de suspensão"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "Térmico"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Reduzir"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Diminuir brilho"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Aumentar brilho"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr "Assistente"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "Associação ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
@@ -6012,24 +6012,24 @@ msgstr ""
 "Por favor escolha o evento ACPI que pretende associar<br><br>ou "
 "<hilight>Escape</hilight> para cancelar."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Uma tecla"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Definições da associação do teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Associação do teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Erro na associação do teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6038,11 +6038,11 @@ msgstr ""
 "A combinação da associação do teclado escolhida já está a ser utilizada pela "
 "ação<br><hilight>%s</hilight>.<br>Por favor escolha outra combinação."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Definições da associação do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -6050,20 +6050,20 @@ msgstr ""
 "Não foi possível definir a associação da rota do rato de<br>uma janela sem "
 "modificadores pois existe um conflito com<br>uma associação edje. Corrija!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Erro na associação do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Associação do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Contexto da ação"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6071,117 +6071,117 @@ msgstr "Contexto da ação"
 msgid "Any"
 msgstr "Qualquer"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Lista de janelas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Alerta"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zona"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Contentor"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Gestor"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Botões do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Rodas do rato"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:374 src/modules/pager/e_mod_config.c:400
 #, c-format
 msgid "Left button"
 msgstr "Botão esquerdo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:379 src/modules/pager/e_mod_config.c:395
 #, c-format
 msgid "Right button"
 msgstr "Botão direito"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:384 src/modules/pager/e_mod_config.c:405
 #: src/modules/pager/e_mod_config.c:410
 #, c-format
 msgid "Button %i"
 msgstr "Botão %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:389
 #, c-format
 msgid "Middle button"
 msgstr "Roda"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Botão extra (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Roda do rato para baixo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Roda do rato para baixo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Roda extra (%d) para cima"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Roda extra (%d) para baixo"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "key bindings"
 msgstr "associações de teclado"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 msgid "Key binding settings"
 msgstr "Definições da associação de teclado"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 #: src/modules/fileman/e_mod_main.c:430 src/modules/tiling/e_mod_tiling.c:3919
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "key"
 msgstr "tecla"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "mouse bindings"
 msgstr "associação do rato"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 msgid "Mouse binding settings"
 msgstr "Definições da associação do rato"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI bindings"
 msgstr "associações ACPI"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "ACPI binding settings"
 msgstr "Definições de associação ACPI"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "acpi"
 msgstr "acpi"
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 452f46a..3eccb08 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -27,7 +27,7 @@ msgstr "Sobre o Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Tem certeza que quer suspender?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernar"
 
@@ -163,7 +163,7 @@ msgstr "Redimensionar"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menu"
 
@@ -801,7 +801,7 @@ msgstr "Selecionar"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -869,7 +869,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -982,7 +982,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -994,7 +994,7 @@ msgid "Basic"
 msgstr "Básico"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1201,11 +1201,11 @@ msgstr "Escolha o executável"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1905,7 +1905,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1913,7 +1913,7 @@ msgstr ""
 "abortar."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2133,7 +2133,7 @@ msgid "Remember these Locks"
 msgstr "Memorizar estes bloqueios"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Janela"
 
@@ -2353,7 +2353,7 @@ msgstr "Estático"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2902,7 +2902,7 @@ msgid "Hide duration"
 msgstr "Intervalo da animação"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f segundos"
@@ -4015,10 +4015,10 @@ msgstr[1] "%li minutos atrás"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -4153,11 +4153,11 @@ msgstr "%li minutos"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4410,7 +4410,7 @@ msgid "Hardware"
 msgstr "Equipamento"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Bateria"
 
@@ -5415,17 +5415,17 @@ msgstr "Bloqueio de tela"
 msgid "Desk"
 msgstr "Área de trabalho"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Nenhum>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5435,81 +5435,81 @@ msgstr ""
 "<br><br>Pode também especificar um atraso para esta ação utilizando o cursor "
 "ou fazê-lo responder aos cliques nas margens:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Definições da associação das margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Associação das margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Apagar tudo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Restaurar associações padrões"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Botão do mouse"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Parâmetros da ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Opções gerais"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permitir ativação de associações nas janelas em tela cheia"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Permitir ativação de associações em vários telas (PERIGOSO)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Sequência da associação das margens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Margem clicável"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Erro na associação da margem"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5518,82 +5518,82 @@ msgstr ""
 "A associação da margem escolhida já está sendo utilizada pela "
 "ação<br><hilight>%s</hilight>.<br>Por favor escolha outra margem."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Margem esquerda"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Margem superior"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Margem direita"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Margem inferior"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Margem superior esquerda"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Margem superior direita"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Margem inferior direita"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Margem inferior esquerda"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(clicável com botão esquerdo)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(clicável)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "Erro de associação dos sinais"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "Sinal e fonte NÃO devem estar vazios!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5602,31 +5602,31 @@ msgstr ""
 "O par sinal-fonte que você introduziu já está em uso<br>pela ação <highlight>"
 "%s</highlight>.<br>"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "Adicionar associação de sinal"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Mover fonte"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Associação dos sinais"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "Definições da associação de sinais"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5844,105 +5844,105 @@ msgstr "Localidade"
 msgid "Language"
 msgstr "Idioma"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Associação ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "Adaptador AC desligado"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "Adaptador AC ligado"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "Adaptador AC"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Botão"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Ventoinha"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "Estado desconhecido (tampo)"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "Tampo fechado"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "Tampo aberto"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "Tampo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "Botão de energia"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Processador"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "Botão de suspensão"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "Térmico"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Reduzir"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Diminuir brilho"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Aumentar brilho"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr "Assistente"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "Associação ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
@@ -5950,24 +5950,24 @@ msgstr ""
 "Por favor escolha o evento ACPI que pretende associar<br><br>ou "
 "<hilight>Escape</hilight> para cancelar."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Uma tecla"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Definições da associação do teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Associações do teclado"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Erro na associação de tecla"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -5976,11 +5976,11 @@ msgstr ""
 "A sequência da associação de tecla escolhida já está sendo utilizada pela "
 "ação<br><hilight>%s</hilight>.<br>Por favor escolha outra sequência."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Definições da associação do mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -5988,20 +5988,20 @@ msgstr ""
 "Não foi possível definir a associação da roda do mouse sem modificadores em "
 "uma janela: conflito com uma associação edje.<br>Corrija!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Erro na associação do mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Associações do mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Contexto da ação"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6009,82 +6009,82 @@ msgstr "Contexto da ação"
 msgid "Any"
 msgstr "Qualquer"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Lista de janelas"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Alerta"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zona"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Contentor"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Gerenciador"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Botões do mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Rodas do mouse"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, c-format
 msgid "Left button"
 msgstr "Botão esquerdo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, c-format
 msgid "Right button"
 msgstr "Botão direito"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Botão %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, c-format
 msgid "Middle button"
 msgstr "Roda"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Botão extra (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Roda do mouse para cima"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Roda do mouse para baixo"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Roda extra (%d) para cima"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Roda extra (%d) para baixo"

diff --git a/po/ro.po b/po/ro.po
index 6761c9e..cd8c723 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -26,7 +26,7 @@ msgstr "Despre Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Sigur doriți să vă deautentificați?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Hibernează"
 
@@ -164,7 +164,7 @@ msgstr "Redimensionează"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Meniu"
 
@@ -866,7 +866,7 @@ msgstr "Selectați o imagine"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -919,7 +919,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1047,7 +1047,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1059,7 +1059,7 @@ msgid "Basic"
 msgstr "Standard"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Aplică"
 
@@ -1278,11 +1278,11 @@ msgstr "Selectaţi un executabil"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2036,13 +2036,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2290,7 +2290,7 @@ msgid "Remember these Locks"
 msgstr "Amintiţi-vă aceste Broaste"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Meniu fereastră"
@@ -2537,7 +2537,7 @@ msgstr "de stat"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3178,7 +3178,7 @@ msgid "Hide duration"
 msgstr "Ascunde durata"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -4265,10 +4265,10 @@ msgstr[1] ""
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 #, fuzzy
 msgid "Unknown"
@@ -4408,11 +4408,11 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4699,7 +4699,7 @@ msgid "Hardware"
 msgstr "hardware"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 #, fuzzy
 msgid "Battery"
 msgstr "acumulator"
@@ -5849,235 +5849,235 @@ msgstr "Blocare ecran"
 msgid "Desk"
 msgstr "birou"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 #, fuzzy
 msgid "<None>"
 msgstr "<Fără>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Legaturi Edge Setări"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Edge Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "modificată:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 #, fuzzy
 msgid "Delete All"
 msgstr "şterge tot"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 #, fuzzy
 msgid "Restore Default Bindings"
 msgstr "Restaurare implicite Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 #, fuzzy
 msgid "Action"
 msgstr "acţiune"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Mută"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 #, fuzzy
 msgid "Action Params"
 msgstr "Actiune Params"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 #, fuzzy
 msgid "General Options"
 msgstr "Opţiuni generale"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permite activarea obligatoriu cu geamuri pe tot ecranul"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Permite activarea obligatoriu cu geamuri pe tot ecranul"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Legarea pe muchia de ordine"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "clickable marginea"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "mouse-ul Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 #, fuzzy
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 #, fuzzy
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 #, fuzzy
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 #, fuzzy
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "drept:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "clickable marginea"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Edge Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Edge Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Mută"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Edge Bindings"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Legaturi Edge Setări"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6327,180 +6327,180 @@ msgstr "Locale"
 msgid "Language"
 msgstr "limbă"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Adauga obligatorii"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "butoane"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "departe"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "necunoscut"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Închide"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Mută"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Mută"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "normal"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Ieşire din cont"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Iluminare din spate jos"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Iluminare din spate Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "atribui"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Adauga obligatorii"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "single -cheie"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Setări cheie legaturi"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Key Bindings"
 msgstr "Bindings cheie"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 #, fuzzy
 msgid "Binding Key Error"
 msgstr "Obligatoriu cheie Eroare"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Legaturi mouse Setări"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "mouse-ul Bindings"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Mouse Bindings"
 msgstr "mouse-ul Bindings"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 #, fuzzy
 msgid "Action Context"
 msgstr "Contextul acţiune"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6509,90 +6509,90 @@ msgstr "Contextul acţiune"
 msgid "Any"
 msgstr "orice"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 #, fuzzy
 msgid "Win List"
 msgstr "Win Lista"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 #, fuzzy
 msgid "Popup"
 msgstr "pop-up"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 #, fuzzy
 msgid "Zone"
 msgstr "zonă"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 #, fuzzy
 msgid "Container"
 msgstr "recipient"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 #, fuzzy
 msgid "Manager"
 msgstr "Manager"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Mută"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Mută"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Mută"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "butoanele radio"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Mută"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Mută"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 8ef6ac5..13b2f90 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -28,7 +28,7 @@ msgstr "Об Enlightenment"
 #: src/bin/e_about.c:20 src/bin/e_actions.c:2987 src/bin/e_config_dialog.c:288
 #: src/bin/e_fm.c:1060 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2529 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Действительно хотите перевести систему в ждущий режим?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3418
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Спящий режим"
 
@@ -162,7 +162,7 @@ msgstr "Изменить размер"
 
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3330 src/bin/e_actions.c:3332
 #: src/bin/e_actions.c:3334 src/bin/e_actions.c:3336 src/bin/e_actions.c:3338
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Меню"
 
@@ -798,7 +798,7 @@ msgstr "Выбрать"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9968
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:195
 #: src/bin/e_import_config_dialog.c:540
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -864,7 +864,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:568
 #: src/bin/e_module.c:975 src/bin/e_sys.c:619 src/bin/e_sys.c:660
 #: src/bin/e_utils.c:695
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -975,7 +975,7 @@ msgstr ""
 "был удалён для предотвращения повреждения данных. <br>"
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:810
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -987,7 +987,7 @@ msgid "Basic"
 msgstr "Базово"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Применить"
 
@@ -1195,11 +1195,11 @@ msgstr "Выбрать исполняемый файл"
 #: src/bin/e_shelf.c:1797 src/bin/e_shelf.c:2482
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1899,7 +1899,7 @@ msgid "Module %s needs to support %s"
 msgstr "Модуль %s должен поддерживать %s"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1907,7 +1907,7 @@ msgstr ""
 "отмены."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2128,7 +2128,7 @@ msgid "Remember these Locks"
 msgstr "Запомнить эти замки"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Окно"
 
@@ -2346,7 +2346,7 @@ msgstr "Неподвижный"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2709,11 +2709,11 @@ msgstr "Загруженные гаджеты"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -2900,7 +2900,7 @@ msgid "Hide duration"
 msgstr "Продолжительность скрытия"
 
 #: src/bin/e_int_shelf_config.c:244
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f секунд"
@@ -4026,10 +4026,10 @@ msgstr[2] "%li минут назад"
 #: src/bin/e_widget_filepreview.c:539 src/bin/e_widget_filepreview.c:540
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Неизвестный"
@@ -4393,7 +4393,7 @@ msgid "Hardware"
 msgstr "Устройства"
 
 #: src/modules/battery/e_mod_main.c:146 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Батарея"
 
@@ -5434,17 +5434,17 @@ msgstr "Блокировка экрана"
 msgid "Desk"
 msgstr "Стол"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Пусто>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5454,81 +5454,81 @@ msgstr ""
 "отмены.<br><br>Вы можете либо указать задержку этого <br>действия с помощью "
 "ползунка, или заставить реагировать на нажатия по краям:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Настройки привязок к краям"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Привязки к краям"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "Изменить"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Удалить все"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Восстановить привязки по умолчанию"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Действие"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "Кнопка мыши"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Параметры действия"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Основные опции"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Разрешить вызов привязок при полноэкранных окнах"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Разрешить вызов привязок при наличии нескольких экранов (ОПАСНО!)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Последовательность привязок к краям"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Интерактивные края"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "Ошибка привязки по краю"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5538,82 +5538,82 @@ msgstr ""
 "<br><hilight>%s</hilight>.<br>Пожалуйста выберите другую последовательность "
 "по краю."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "Левый край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "Верхний край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "Правый край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "Нижний край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "Верхний левый край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "Верхний правый край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "Нижний правый край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "Нижний левый край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(кликабельно левой)"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(кликабельно)"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "Ошибка Привязки сигналов"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "Сигнал и Источник не могут быть пустыми!"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5622,61 +5622,61 @@ msgstr ""
 "Введённые сигнал и источник уже используются<br>действием <hilight>%s</"
 "hilight>."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "Добавить привязку сигнала"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "Источник:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "Сигнал:"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "Привязки сигналов"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "Настройки привязок сигналов"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
 msgstr "Ввод"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 #, fuzzy
 msgid "edge bindings"
 msgstr "Привязки к краям"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 #, fuzzy
 msgid "Screen edge binding settings"
 msgstr "Настройки привязок к краям"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
 #: src/modules/conf_intl/e_mod_main.c:45
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 #: src/modules/xkbswitch/e_mod_main.c:83
 #, fuzzy
 msgid "input"
 msgstr "Ввод"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 msgid "edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:36
 #: src/modules/conf_randr/e_mod_main.c:37
 #: src/modules/notification/e_mod_main.c:245
 #: src/modules/notification/e_mod_main.c:249
@@ -5685,31 +5685,31 @@ msgstr ""
 msgid "screen"
 msgstr "Экран"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:36
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:40
-#: src/modules/conf_keybindings/e_mod_main.c:43
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:36
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:46
 #, fuzzy
 msgid "binding"
 msgstr "Добавить привязку"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 #, fuzzy
 msgid "signal bindings"
 msgstr "Привязки сигналов"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 #, fuzzy
 msgid "Edje signal binding settings"
 msgstr "Настройки привязок сигналов"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:39
 msgid "edje"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_mod_main.c:39
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:39
+#: src/modules/conf_bindings/e_mod_main.c:43
 #, fuzzy
 msgid "mouse"
 msgstr "Мышь"
@@ -5958,106 +5958,106 @@ msgstr "Ошибка метода ввода"
 msgid "Input method settings"
 msgstr "Настройки метода ввода"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "Привязки ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "Адаптер переменного тока отключен"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "Адаптер переменного тока подключен"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "Адаптер переменного тока"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "Кнопка"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "Вентилятор"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "Крышка в неизвестном состоянии"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "Крышка закрыта"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "Крышка открыта"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "Крышка"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "Кнопка питания"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "Процессор"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "Кнопка сна"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "Температура"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "Видео"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "Отдаление изображения"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "Приближение изображения"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "Увеличение подсветки"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "Уменьшение подсветки"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Назначить"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "Привязки ACPI"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
@@ -6065,24 +6065,24 @@ msgstr ""
 "Пожалуйста, задействуйте ACPI-событие, которое вы хотите привязать "
 "<br><br>или нажмите <hilight>Escape</hilight> для отмены."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Одиночная клавиша"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Настройки привязок клавиш"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Привязки клавиш"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Ошибка привязки клавиши"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6091,11 +6091,11 @@ msgstr ""
 "Выбраная вами последовательность уже используется привязкой<br><hilight>%s</"
 "hilight>.<br>Пожалуйста, выберите другую последовательность."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Настройки привязок мыши"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
@@ -6103,20 +6103,20 @@ msgstr ""
 "Не удаётся установить привязку колеса мыши без модификаторов<br>на окне: "
 "конфликт с существующим сигналом привязки edje.<br>FIXME!!!"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "Ошибка привязки мыши"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Привязки мыши"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Контекст исполнения"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6124,123 +6124,123 @@ msgstr "Контекст исполнения"
 msgid "Any"
 msgstr "Любой"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Список окон"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Всплывающее окно"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Зона"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Контейнер"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Менеджер"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "Кнопки мыши"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "Колёсико мыши"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:374 src/modules/pager/e_mod_config.c:400
 #, c-format
 msgid "Left button"
 msgstr "Левая кнопка"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:379 src/modules/pager/e_mod_config.c:395
 #, c-format
 msgid "Right button"
 msgstr "Правая кнопка"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:384 src/modules/pager/e_mod_config.c:405
 #: src/modules/pager/e_mod_config.c:410
 #, c-format
 msgid "Button %i"
 msgstr "Кнопка %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:389
 #, c-format
 msgid "Middle button"
 msgstr "Средняя кнопка"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "Дополнительная кнопка (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "Колёсико мыши вверх"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "Колёсико мыши вниз"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "Дополнительное колёсико (%d) вверх"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "Дополнительное колёсико (%d) вниз"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 #, fuzzy
 msgid "key bindings"
 msgstr "Привязки клавиш"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 #, fuzzy
 msgid "Key binding settings"
 msgstr "Настройки привязок клавиш"
 
-#: src/modules/conf_keybindings/e_mod_main.c:40
+#: src/modules/conf_bindings/e_mod_main.c:40
 #: src/modules/fileman/e_mod_main.c:430 src/modules/tiling/e_mod_tiling.c:3919
 #: src/modules/xkbswitch/e_mod_main.c:83
 msgid "key"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 #, fuzzy
 msgid "mouse bindings"
 msgstr "Привязки мыши"
 
-#: src/modules/conf_keybindings/e_mod_main.c:43
+#: src/modules/conf_bindings/e_mod_main.c:43
 #, fuzzy
 msgid "Mouse binding settings"
 msgstr "Настройки привязок мыши"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 #, fuzzy
 msgid "ACPI bindings"
 msgstr "Привязки ACPI"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 #, fuzzy
 msgid "ACPI binding settings"
 msgstr "Настройки привязок клавиш"
 
-#: src/modules/conf_keybindings/e_mod_main.c:46
+#: src/modules/conf_bindings/e_mod_main.c:46
 msgid "acpi"
 msgstr ""
 

diff --git a/po/sk.po b/po/sk.po
index e08466e..f598408 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -24,7 +24,7 @@ msgstr "O Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Ste si istý, že sa chcete odhlásiť?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Režim spánku"
 
@@ -164,7 +164,7 @@ msgstr "Zmeniť veľkosť"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menu"
 
@@ -837,7 +837,7 @@ msgstr "Vyberte jednu"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -906,7 +906,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1035,7 +1035,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1047,7 +1047,7 @@ msgid "Basic"
 msgstr "Základné"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Použiť"
 
@@ -1260,11 +1260,11 @@ msgstr "Vybrať spustiteľný súbor"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1996,13 +1996,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2241,7 +2241,7 @@ msgid "Remember these Locks"
 msgstr "Zapamätať si Zámky"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Okno"
 
@@ -2470,7 +2470,7 @@ msgstr "Stav"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3051,7 +3051,7 @@ msgid "Hide duration"
 msgstr "Zobraziť trvanie"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekúnd"
@@ -4234,10 +4234,10 @@ msgstr[1] "%li pred minútami"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Neznámy"
@@ -4374,11 +4374,11 @@ msgstr "%li pred minútami"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4647,7 +4647,7 @@ msgstr "Hardwér"
 
 #
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Batéria"
 
@@ -5748,232 +5748,232 @@ msgstr "Uzamykanie Obrazovky"
 msgid "Desk"
 msgstr "Plocha"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Žiadny>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Hrana Viazanie Nastavenie"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Väzby okrajov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Upraviť klávesu"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Odstrániť všetko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Obnoviť predvolené väzby"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Akcia"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Nastavenia myši"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 #, fuzzy
 msgid "Action Params"
 msgstr "akčné params"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Hlavné nastavenia"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Povoliť záväzné aktiváciu režime celej obrazovky okna"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Povoliť záväzné aktiváciu režime celej obrazovky okna"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Hrana Viazanie sekvencie"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "klikacie hrana"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "myš viazanie"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 #, fuzzy
 msgid "Left Edge"
 msgstr "Odstrániť okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 #, fuzzy
 msgid "Top Edge"
 msgstr "Upraviť okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Vpravo Hore"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 #, fuzzy
 msgid "Bottom Edge"
 msgstr "Dole Vľavo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 #, fuzzy
 msgid "Top Left Edge"
 msgstr "Hore Vľavo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 #, fuzzy
 msgid "Top Right Edge"
 msgstr "Hore Vpravo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 #, fuzzy
 msgid "Bottom Right Edge"
 msgstr "Dole Vpravo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 #, fuzzy
 msgid "Bottom Left Edge"
 msgstr "Dole Vľavo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "klikacie hrana"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Väzby okrajov"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Väzby okrajov"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Pohnúť Text"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Väzby okrajov"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Hrana Viazanie Nastavenie"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6204,179 +6204,179 @@ msgstr "Národné prostredie"
 msgid "Language"
 msgstr "Jazyk"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Pridať väzbu"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Tlačítka"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Vzdialené"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Neznámy"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Zatvoriť"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Nastavenia myši"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Nastavenia myši"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normálne"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Odhlásiť sa"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Priblížiť"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "podsvietenie dole"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "podsvietenie Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Priradiť"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Pridať väzbu"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Použi jednoduché kliknutie"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Klávesové skratky nastavenie"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Klávesové Skratky"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Chyba pri priraďovaní skratky"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Myš Viazanie Nastavenie"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "myš viazanie"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Mouse Bindings"
 msgstr "myš viazanie"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 #, fuzzy
 msgid "Action Context"
 msgstr "akcia Kontext"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6384,85 +6384,85 @@ msgstr "akcia Kontext"
 msgid "Any"
 msgstr "Každý"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Zoznam Okien"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zóna"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Kontajnér"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Manažér"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Nastavenia myši"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "V poslednej dobe používané"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Vľavo Dole"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Vpravo Dole"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Tlačitko %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Nastavenia myši"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Tlačitko %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Posunút Hore"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/sl.po b/po/sl.po
index 035686c..babba98 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -28,7 +28,7 @@ msgstr "O Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -139,7 +139,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Ste prepričani, da bi se radi odjavili?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Uspavaj"
 
@@ -168,7 +168,7 @@ msgstr "Spremeni velikost"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Meni"
 
@@ -835,7 +835,7 @@ msgstr "Izbiranje"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -903,7 +903,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1020,7 +1020,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1032,7 +1032,7 @@ msgid "Basic"
 msgstr "Osnovno"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Uveljavi"
 
@@ -1244,11 +1244,11 @@ msgstr "Izberi izvršilno datoteko"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1982,7 +1982,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1990,7 +1990,7 @@ msgstr ""
 "opustitev"
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2224,7 +2224,7 @@ msgid "Remember these Locks"
 msgstr "Zapomni si te zaklepe"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Okno"
 
@@ -2446,7 +2446,7 @@ msgstr "Stanje"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3008,7 +3008,7 @@ msgid "Hide duration"
 msgstr "Trajanje skritja"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%2f sek."
@@ -4194,10 +4194,10 @@ msgstr[3] "Pred %li min."
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Neznan"
@@ -4332,11 +4332,11 @@ msgstr "Pred %li min."
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4601,7 +4601,7 @@ msgid "Hardware"
 msgstr "Strojna oprema"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Baterija"
 
@@ -5671,17 +5671,17 @@ msgstr "Zaklepanje zaslona"
 msgid "Desk"
 msgstr "Namizje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Nič>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5691,85 +5691,85 @@ msgstr ""
 "Preklic<br><br>Lahko določite časovni zamik za to dejanje<br> z uporabo "
 "drsnika, ali izberete<br>odzivanje·robov na klik:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "Nastavitev navez robov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Naveze robov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Spremenjeno:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Izbriši vse"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Obnovi privzete naveze"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Dejanje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Nastavitev miške"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Parametri dejanja"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Splošne nastavitve"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Dovoli uveljavitev navez s celozaslonskimi okni"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Dovoli uveljavitev navez s celozaslonskimi okni"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Zaporedje naveze robov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Vogal na klik"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Naveze miške"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5778,84 +5778,84 @@ msgstr ""
 "Zaporedje tipk, ki ste ga izbrali, že uporablja dejanje<br><hilight>%s</"
 "hilight><br>Prosimo izberite drugo navezo za rob"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Desni:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "Vogal na klik"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Naveze robov"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5864,34 +5864,34 @@ msgstr ""
 "Zaporedje tipk, ki ste ga izbrali, že uporablja dejanje<br><hilight>%s</"
 "hilight><br>Prosimo izberite drugo navezo za rob"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Naveze robov"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Premakni v"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Naveze robov"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Nastavitev navez robov"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -6110,119 +6110,119 @@ msgstr "Prevod"
 msgid "Language"
 msgstr "Jezik"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Dodaj navezo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Gumbi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Daleč"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Neznan"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Zapri"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Nastavitev miške"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Nastavitev miške"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normalno"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Odjavi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Povečava"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "osvetlitev dol"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "osvetlitev Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Dodeli"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Dodaj navezo"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6231,24 +6231,24 @@ msgstr ""
 "Pritisnite željeno zaporedje tipk,<br><br>ali <hilight>Escape</hilight> za "
 "opustitev"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "Ena sama tipka"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "Nastavitev navez tipk"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Naveze tipk"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Napaka naveze tipke"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6257,31 +6257,31 @@ msgstr ""
 "Zaporedje naveze tipk, ki ste ga izbrali, že uporablja<br><hilight>%s</"
 "hilight>dejanje.<br>Prosimo Izberite si novo zaporedje naveze tipk."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "Nastavitev navez miške"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Naveze miške"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Naveze miške"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Kontekst dejanja"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6289,85 +6289,85 @@ msgstr "Kontekst dejanja"
 msgid "Any"
 msgstr "Katerikoli"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Seznam oken"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Pojavno okno"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Območje"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Vsebovalnik"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Upravitelj"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Nastavitev miške"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Največ uporabljano"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Nastavitev miške"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Radijski gumbi"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Gumb·%i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Nastavitev miške"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Gumb·%i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Premakni dol"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/sv.po b/po/sv.po
index c90b3a8..d07b639 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgstr "Om Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -136,7 +136,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Vill du verkligen logga ut?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Viloläge"
 
@@ -165,7 +165,7 @@ msgstr "Ändra storlek"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Meny"
 
@@ -852,7 +852,7 @@ msgstr "Välj en"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -905,7 +905,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1031,7 +1031,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1043,7 +1043,7 @@ msgid "Basic"
 msgstr "Enkelt"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Verkställ"
 
@@ -1260,11 +1260,11 @@ msgstr "Välj en körbar fil"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -2020,13 +2020,13 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2264,7 +2264,7 @@ msgid "Remember these Locks"
 msgstr "Kom ihåg dessa lås"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "Fönster"
 
@@ -2499,7 +2499,7 @@ msgstr "Tillstånd"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3095,7 +3095,7 @@ msgid "Hide duration"
 msgstr "dölja varaktighet"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -4266,10 +4266,10 @@ msgstr[1] "%li minuter sedan"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Okänd"
@@ -4406,11 +4406,11 @@ msgstr "%li minuter sedan"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4686,7 +4686,7 @@ msgid "Hardware"
 msgstr "Hårdvara"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Batteri"
 
@@ -5813,229 +5813,229 @@ msgstr "Skärmlås"
 msgid "Desk"
 msgstr "Desk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Ingen>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Kant Bindningar Settings"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Edge Bindningar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Modifierad:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Ta bort alla"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 #, fuzzy
 msgid "Restore Default Bindings"
 msgstr "Återställ Default Bindningar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Händelse"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Knappar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 #, fuzzy
 msgid "Action Params"
 msgstr "Action Params"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 #, fuzzy
 msgid "General Options"
 msgstr "allmänna alternativ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Medge bindning aktivering med helskärm fönster"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Medge bindning aktivering med helskärm fönster"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Edge bindningssekvens"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 #, fuzzy
 msgid "Clickable edge"
 msgstr "klickbar kanten"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Mus Bindningar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Höger:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "klickbar kanten"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Edge Bindningar"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
 "hilight> action.<br>"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Edge Bindningar"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Flytta text"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 #, fuzzy
 msgid "Signal:"
 msgstr "Signal"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Edge Bindningar"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Kant Bindningar Settings"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 #, fuzzy
@@ -6277,180 +6277,180 @@ msgstr "locale"
 msgid "Language"
 msgstr "Språk"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "tillsätt Bindning"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Knappar"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Avlägsen"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Okänd"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Stäng"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Knappar"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Knappar"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normal"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Trådlöst"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Logga ut"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "bakgrundsbelysning fallande"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "bakgrundsbelysning Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Tilldela"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "tillsätt Bindning"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Använd enkelklick"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Bindningar Settings"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Kortkommando"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 #, fuzzy
 msgid "Binding Key Error"
 msgstr "Bindning nyckel Fel"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
 "%s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Mus Bindningar Settings"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Mus Bindningar"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Mouse Bindings"
 msgstr "Mus Bindningar"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 #, fuzzy
 msgid "Action Context"
 msgstr "Action Context"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6458,85 +6458,85 @@ msgstr "Action Context"
 msgid "Any"
 msgstr "Någon"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Fönsterlista"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Popup"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Zon"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Behållare"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Hanterare"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Knappar"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Flytta"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Knappar"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "alternativknappar"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Knappar"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Flytta upp"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/tr.po b/po/tr.po
index 29a4534..f3f819c 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -28,7 +28,7 @@ msgstr "Enlightenment Hakkında"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -138,7 +138,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Oturumu Kapatmak istediğinizden emin misiniz?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Uykuya Al"
 
@@ -167,7 +167,7 @@ msgstr "Boyutlandır"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Menü"
 
@@ -839,7 +839,7 @@ msgstr "Birini seç"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -892,7 +892,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1017,7 +1017,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1029,7 +1029,7 @@ msgid "Basic"
 msgstr "Basit"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Uygula"
 
@@ -1247,11 +1247,11 @@ msgstr "Çalıştırılabilir Dosya Seç"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1978,7 +1978,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1986,7 +1986,7 @@ msgstr ""
 "tuşuna basın."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2217,7 +2217,7 @@ msgid "Remember these Locks"
 msgstr "Bu kilitlemeleri hatırla"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Pencereler"
@@ -2447,7 +2447,7 @@ msgstr "Durum"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3002,7 +3002,7 @@ msgid "Hide duration"
 msgstr "Gizli kalma süresi"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f saniye"
@@ -4124,10 +4124,10 @@ msgstr[0] "%li Dakika önce"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Bilinmiyor"
@@ -4263,11 +4263,11 @@ msgstr "%li Dakika önce"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4534,7 +4534,7 @@ msgid "Hardware"
 msgstr "Donanım"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Pil"
 
@@ -5620,103 +5620,103 @@ msgstr "Ekran Kilidi"
 msgid "Desk"
 msgstr "Masaüstü"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Yok>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Kenar Bindings Ayarlar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Kenar Bağlayıcıları"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Tuşu Düzenle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Tümünü Sil"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Ön Tanımlı Bağlayıcıları Geri Yükle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Eylem"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Fare Ayarları"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Eylem Parametreleri"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Genel Seçenekler"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Tam ekran pencerelerde kısayol etkinleştirimine izin ver"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Tam ekran pencerelerde kısayol etkinleştirimine izin ver"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Kenar Kısayol Dizisi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Tıklanabilir kenar"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Fare Kısayolları"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5725,86 +5725,86 @@ msgstr ""
 "Seçtiğiniz kısayol tuş dizisi, zaten <br><hilight>%s </hilight> eylemi "
 "tarafından kullanılıyor.<br>Lütfen farklı bir kısayol tuşu dizisi seçin."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 #, fuzzy
 msgid "Left Edge"
 msgstr "Kenarı Sil"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 #, fuzzy
 msgid "Top Edge"
 msgstr "Kenarı Düzenle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Sağ:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "Tıklanabilir kenar"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Kenar Bağlayıcıları"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5813,34 +5813,34 @@ msgstr ""
 "Seçtiğiniz kısayol tuş dizisi, zaten <br><hilight>%s </hilight> eylemi "
 "tarafından kullanılıyor.<br>Lütfen farklı bir kısayol tuşu dizisi seçin."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Kenar Bağlayıcıları"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Metni Taşı"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Kenar Bağlayıcıları"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Kenar Bindings Ayarlar"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -6064,120 +6064,120 @@ msgstr "Yerel"
 msgid "Language"
 msgstr "Dil"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Kısayol Ekle"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Düğmeler"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Uzak"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Bilinmiyor"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Kapat"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Fare Ayarları"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Fare Ayarları"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Normal"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Wifi"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Çık"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Zoom"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "Kapat"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "Arka Up"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Ata"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Kısayol Ekle"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6186,26 +6186,26 @@ msgstr ""
 "Lütfen tuş dizisi girin,<br><br>ya da çıkmak için<hilight>Escape</hilight> "
 "tuşuna basın."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Tek Tık Kullan"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Tuş Bağlantıları Ayarları"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Kısayol Tuşları"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Kısayol Tuşu Hatası"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6214,32 +6214,32 @@ msgstr ""
 "Girdiğiniz kısayol tuşu dizisi, <hilight>%s</hilight> eylemi "
 "için<br>kullanılıyor. Lütfen farklı bir kısayol tuşu dizisi girin."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Fare Bindings Ayarlar"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Fare Kısayolları"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Fare Kısayolları"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Eylem İçeriği"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6247,85 +6247,85 @@ msgstr "Eylem İçeriği"
 msgid "Any"
 msgstr "Herhangi"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Pencere Listesi"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Açılır"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Bölge"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Kapsayıcı"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Yönetici"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Fare Ayarları"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "En son kullanılan"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Fare Ayarları"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Seçim Düğmeleri"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "%i Düğmesi"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Fare Ayarları"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "%i Düğmesi"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Taşı"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/uk.po b/po/uk.po
index 190653d..d7e717b 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -24,7 +24,7 @@ msgstr "Про Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -135,7 +135,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "Завершити сеанс?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "Режим сну"
 
@@ -164,7 +164,7 @@ msgstr "Змінити розмір"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "Меню"
 
@@ -836,7 +836,7 @@ msgstr "Вибрати один"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9959
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -904,7 +904,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -1033,7 +1033,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -1045,7 +1045,7 @@ msgid "Basic"
 msgstr "Базове"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "Застосувати"
 
@@ -1257,11 +1257,11 @@ msgstr "Виберіть виконуваний файл"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1991,7 +1991,7 @@ msgid "Module %s needs to support %s"
 msgstr ""
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
@@ -1999,7 +1999,7 @@ msgstr ""
 "hilight> для скасування."
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2234,7 +2234,7 @@ msgid "Remember these Locks"
 msgstr "Запам'ятати ці замки"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 #, fuzzy
 msgid "Window"
 msgstr "Вікна"
@@ -2464,7 +2464,7 @@ msgstr "Стан"
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -3032,7 +3032,7 @@ msgid "Hide duration"
 msgstr "Тривалість приховування"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f секунд"
@@ -4205,10 +4205,10 @@ msgstr[1] "%li хвилин тому"
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "Невідомий"
@@ -4344,11 +4344,11 @@ msgstr "%li хвилин тому"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4615,7 +4615,7 @@ msgid "Hardware"
 msgstr "Обладнання"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "Батарея"
 
@@ -5701,17 +5701,17 @@ msgstr "Блокувати екран"
 msgid "Desk"
 msgstr "Стільниця"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<None>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5721,86 +5721,86 @@ msgstr ""
 "перервати.<br><br>Можете вказати або затримку цієї<br> дії за допомогою "
 "повзунка, або примусити її<br>реагувати на кліки з країв:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Bindings Settings"
 msgstr "Прикордонний прив'язки параметрів"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "Прив'язки до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 #, fuzzy
 msgid "Modify"
 msgstr "Змінити клавішу"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "Вилучити все"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "Повернути типові прив'язки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "Дія"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 #, fuzzy
 msgid "Mouse Button"
 msgstr "Параметри миші"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "Параметри дії"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "Загальні установки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Дозволити активувати прив'язки в вікнах на повний екран"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "Дозволити активувати прив'язки в вікнах на повний екран"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "Послідовність прив'язок до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "Край, який приймає кліки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 #, fuzzy
 msgid "Edge Binding Error"
 msgstr "Прив'язки миші"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5810,86 +5810,86 @@ msgstr ""
 "<br><hilight>%s</hilight>.<br>Будь ласка, виберіть іншу послідовність "
 "прив'язок."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 #, fuzzy
 msgid "Left Edge"
 msgstr "Вилучити край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 #, fuzzy
 msgid "Top Edge"
 msgstr "Змінити край"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 #, fuzzy
 msgid "Right Edge"
 msgstr "Правий:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, fuzzy, c-format
 msgid "(clickable)"
 msgstr "Край, який приймає кліки"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 #, fuzzy
 msgid "Signal Binding Error"
 msgstr "Прив'язки до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5899,34 +5899,34 @@ msgstr ""
 "<br><hilight>%s</hilight>.<br>Будь ласка, виберіть іншу послідовність "
 "прив'язок."
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 #, fuzzy
 msgid "Add Signal Binding"
 msgstr "Прив'язки до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 #, fuzzy
 msgid "Source:"
 msgstr "Рухати текст"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 #, fuzzy
 msgid "Signal Bindings"
 msgstr "Прив'язки до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 #, fuzzy
 msgid "Signal Bindings Settings"
 msgstr "Прикордонний прив'язки параметрів"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -6147,120 +6147,120 @@ msgstr "Локаль"
 msgid "Language"
 msgstr "Мова"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 #, fuzzy
 msgid "ACPI Bindings"
 msgstr "Додати прив'язку"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 #, fuzzy
 msgid "Button"
 msgstr "Кнопки"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 #, fuzzy
 msgid "Fan"
 msgstr "Далеко"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 #, fuzzy
 msgid "Lid Unknown"
 msgstr "Невідомий"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 #, fuzzy
 msgid "Lid Closed"
 msgstr "Закрити"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 #, fuzzy
 msgid "Power Button"
 msgstr "Параметри миші"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 #, fuzzy
 msgid "Sleep Button"
 msgstr "Параметри миші"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 #, fuzzy
 msgid "Thermal"
 msgstr "Нормально"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 #, fuzzy
 msgid "Wifi"
 msgstr "Бездротова мережа"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 #, fuzzy
 msgid "Zoom Out"
 msgstr "Завершити сеанс"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 #, fuzzy
 msgid "Zoom In"
 msgstr "Збільшення"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 #, fuzzy
 msgid "Brightness Down"
 msgstr "підсвічування вниз"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 #, fuzzy
 msgid "Brightness Up"
 msgstr "підсвічування вверх"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 #, fuzzy
 msgid "Assist"
 msgstr "Призначити"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 #, fuzzy
 msgid "ACPI Binding"
 msgstr "Додати прив'язку"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
@@ -6269,26 +6269,26 @@ msgstr ""
 "Будь ласка, натисніть послідовність клавіш,<br><br>або <hilight>Escape</ "
 "hilight> для скасування."
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 #, fuzzy
 msgid "Single key"
 msgstr "Використовувати один клік"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 #, fuzzy
 msgid "Key Bindings Settings"
 msgstr "Основні параметри прив'язки"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "Прив’язки клавіші"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "Помилка прив'язки клавіші"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6297,32 +6297,32 @@ msgstr ""
 "Обрана Вами послідовність прив'язки клавіші вже використовується прив'язкою "
 "<br><hilight>%s</hilight>.<br>Будь ласка, виберіть іншу послідовність."
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 #, fuzzy
 msgid "Mouse Bindings Settings"
 msgstr "Миша прив'язки параметрів"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 #, fuzzy
 msgid "Mouse Binding Error"
 msgstr "Прив'язки миші"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "Прив'язки миші"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "Контекст дії"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6330,85 +6330,85 @@ msgstr "Контекст дії"
 msgid "Any"
 msgstr "Будь-який"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "Список вікон"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "Підказка"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "Зона"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "Контейнер"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "Менеджер"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 #, fuzzy
 msgid "Mouse Buttons"
 msgstr "Параметри миші"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 #, fuzzy
 msgid "Mouse Wheels"
 msgstr "Використані нещодавно"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, fuzzy, c-format
 msgid "Left button"
 msgstr "Параметри миші"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, fuzzy, c-format
 msgid "Right button"
 msgstr "Радіо-кнопки"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "Кнопка %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, fuzzy, c-format
 msgid "Middle button"
 msgstr "Параметри миші"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, fuzzy, c-format
 msgid "Extra button (%d)"
 msgstr "Кнопка %i"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 #, fuzzy
 msgid "Mouse Wheel Down"
 msgstr "Пересунути"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ada6920..0071481 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -31,7 +31,7 @@ msgstr "关于 Enlightenment"
 #: ../src/bin/e_config_dialog.c:288 ../src/bin/e_fm.c:1059
 #: ../src/bin/e_int_border_menu.c:194 ../src/bin/e_int_border_prop.c:81
 #: ../src/bin/e_theme_about.c:24 ../src/modules/conf/e_conf.c:179
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: ../src/modules/everything/evry_plug_windows.c:452
 #: ../src/modules/fileman/e_fwin.c:2528 ../src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -141,7 +141,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "您确定要挂起您的电脑吗？"
 
 #: ../src/bin/e_actions.c:2467 ../src/bin/e_actions.c:3421
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "休眠"
 
@@ -173,7 +173,7 @@ msgstr "改变大小"
 #: ../src/bin/e_actions.c:3339 ../src/bin/e_actions.c:3341
 #: ../src/modules/comp/e_mod_config.c:452
 #: ../src/modules/comp/e_mod_config.c:761
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "菜单"
 
@@ -844,7 +844,7 @@ msgstr "选择"
 #: ../src/bin/e_desktop_editor.c:925 ../src/bin/e_entry_dialog.c:64
 #: ../src/bin/e_fm.c:9959 ../src/bin/e_fm_prop.c:625
 #: ../src/bin/e_import_dialog.c:194 ../src/bin/e_import_config_dialog.c:537
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: ../src/modules/conf_intl/e_int_config_imc_import.c:124
 #: ../src/modules/conf_theme/e_int_config_theme_import.c:123
 #: ../src/modules/fileman/e_int_config_mime_edit.c:316
@@ -909,7 +909,7 @@ msgstr ""
 #: ../src/bin/e_int_border_remember.c:507 ../src/bin/e_module.c:431
 #: ../src/bin/e_module.c:798 ../src/bin/e_sys.c:618 ../src/bin/e_sys.c:659
 #: ../src/bin/e_utils.c:695 ../src/modules/comp/e_mod_config.c:918
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: ../src/modules/conf_intl/e_int_config_imc_import.c:120
 #: ../src/modules/conf_theme/e_int_config_theme_import.c:119
 #: ../src/modules/cpufreq/e_mod_main.c:436
@@ -1015,7 +1015,7 @@ msgstr ""
 
 #: ../src/bin/e_config_dialog.c:226 ../src/modules/battery/e_mod_main.c:817
 #: ../src/modules/conf/e_mod_main.c:283
-#: ../src/modules/conf_edgebindings/e_mod_main.c:19
+#: ../src/modules/conf_bindings/e_mod_main.c:19
 #: ../src/modules/conf_paths/e_mod_main.c:17
 #: ../src/modules/conf_performance/e_mod_main.c:17
 #: ../src/modules/syscon/e_mod_main.c:36
@@ -1027,7 +1027,7 @@ msgid "Basic"
 msgstr "基本"
 
 #: ../src/bin/e_config_dialog.c:280
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "应用"
 
@@ -1237,11 +1237,11 @@ msgstr "选择一个可执行文件"
 #: ../src/bin/e_shelf.c:1792 ../src/bin/e_shelf.c:2475
 #: ../src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: ../src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: ../src/modules/conf_paths/e_int_config_env.c:317
 #: ../src/modules/conf_shelves/e_int_config_shelf.c:137
 #: ../src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1957,13 +1957,13 @@ msgid "Module %s needs to support %s"
 msgstr "支持 %2$s 需要 %1$s"
 
 #: ../src/bin/e_grab_dialog.c:3
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr "请按下一个按键序列，或者按 <hilight>Esc 键</hilight> 中止。"
 
 #: ../src/bin/e_grab_dialog.c:5
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2179,7 +2179,7 @@ msgid "Remember these Locks"
 msgstr "记住这些行为锁"
 
 #: ../src/bin/e_int_border_menu.c:127
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "窗口"
 
@@ -2404,7 +2404,7 @@ msgstr "静态"
 
 #: ../src/bin/e_int_border_prop.c:298 ../src/modules/clock/e_mod_config.c:103
 #: ../src/modules/clock/e_mod_config.c:141
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: ../src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: ../src/modules/conf_theme/e_int_config_fonts.c:689
 #: ../src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2961,7 +2961,7 @@ msgid "Hide duration"
 msgstr "隐藏持续时间"
 
 #: ../src/bin/e_int_shelf_config.c:247
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f 秒"
@@ -4039,10 +4039,10 @@ msgstr[1] "%li 分钟前"
 #: ../src/bin/e_widget_filepreview.c:571 ../src/bin/e_widget_filepreview.c:582
 #: ../src/modules/comp/e_mod_config.c:516
 #: ../src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: ../src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "未知"
@@ -4173,11 +4173,11 @@ msgstr "%li 分钟"
 #: ../src/modules/conf_applications/e_int_config_apps.c:287
 #: ../src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: ../src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: ../src/modules/conf_paths/e_int_config_env.c:311
 #: ../src/modules/conf_shelves/e_int_config_shelf.c:135
 #: ../src/modules/ibar/e_mod_config.c:110
@@ -4435,7 +4435,7 @@ msgstr "硬件"
 
 #: ../src/modules/battery/e_mod_main.c:152
 #: ../src/modules/battery/e_mod_main.c:455
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "电池"
 
@@ -5517,17 +5517,17 @@ msgstr "屏幕锁定"
 msgid "Desk"
 msgstr "桌面"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<无>"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
@@ -5536,82 +5536,82 @@ msgstr ""
 "请选择一条边，<br>或点击 <hilight>关闭</hilight> 中止。<br><br>您还可以使用滑"
 "块来设定此动作的延迟时间，<br>或者让它响应边缘点击动作。"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "边缘绑定设置"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: ../src/modules/conf_edgebindings/e_mod_main.c:21
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: ../src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "边缘绑定"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: ../src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "修改"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "全部删除"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "恢复默认绑定"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "动作"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "鼠标中键"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "动作参数"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr "常规选项"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr "允许绑定以全屏窗口激活"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:309
 #, fuzzy
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr "允许绑定以全屏窗口激活"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr "边缘绑定顺序"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "可点击的边"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "边缘绑定出错"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, fuzzy, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
@@ -5620,82 +5620,82 @@ msgstr ""
 "您选择的按键绑定序列，<br>已经被<hilight>%s</hilight>动作使用。<br>请选择其他"
 "按键绑定序列。"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "左边缘"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "上边缘"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "右边缘"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "下边缘"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "左上边缘"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "右上边缘"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "右下边缘"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "左下边缘"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr "(左侧可点击)"
 
-#: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: ../src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr "(可点击)"
 
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "信号绑定出错"
 
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr "信号和源不能为空！"
 
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5704,31 +5704,31 @@ msgstr ""
 "您选择的按键绑定序列，<br>已经被<hilight>%s</hilight>动作使用。<br>请选择其他"
 "按键绑定序列。"
 
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "添加信号绑定"
 
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr "源："
 
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr "信号："
 
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: ../src/modules/conf_edgebindings/e_mod_main.c:25
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: ../src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "信号绑定"
 
-#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: ../src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "信号绑定设置"
 
 #. Menus and dialogs
-#: ../src/modules/conf_edgebindings/e_mod_main.c:17
+#: ../src/modules/conf_bindings/e_mod_main.c:17
 #: ../src/modules/conf_interaction/e_mod_main.c:17
-#: ../src/modules/conf_keybindings/e_mod_main.c:17
+#: ../src/modules/conf_bindings/e_mod_main.c:17
 #: ../src/modules/mixer/app_mixer.c:308 ../src/modules/mixer/app_mixer.c:326
 #: ../src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5943,129 +5943,129 @@ msgstr "区域"
 msgid "Language"
 msgstr "语言"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: ../src/modules/conf_keybindings/e_mod_main.c:29
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: ../src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "ACPI 绑定"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr "电源适配器拔出"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr "电源适配器插入"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr "电源适配器"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr "按钮"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "风扇"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr "盖子未知"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr "盖子关闭"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr "盖子打开"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:364
 msgid "Lid"
 msgstr "盖子"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "电源按钮"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "处理器"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr "休眠按钮"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr "散热"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr "视频"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "Wifi"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr "缩小"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr "放大"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr "亮度降低"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr "亮度增加"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr ""
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:393
 msgid "Vaio"
 msgstr "Vaio"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "ACPI 绑定"
 
-#: ../src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: ../src/modules/conf_bindings/e_int_config_acpibindings.c:500
 #, fuzzy
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr "请按下一个按键序列，或者按 <hilight>Esc 键</hilight> 中止。"
 
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr "启用单键"
 
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "键绑定设置"
 
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: ../src/modules/conf_keybindings/e_mod_main.c:21
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: ../src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "键绑定"
 
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "绑定按键错误"
 
-#: ../src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: ../src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -6074,30 +6074,30 @@ msgstr ""
 "您选择的按键绑定序列，<br>已经被<hilight>%s</hilight>动作使用。<br>请选择其他"
 "按键绑定序列。"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "鼠标绑定设置"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr "鼠标绑定出错"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: ../src/modules/conf_keybindings/e_mod_main.c:25
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: ../src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "鼠标绑定"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "动作上下文"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: ../src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: ../src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: ../src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -6105,54 +6105,54 @@ msgstr "动作上下文"
 msgid "Any"
 msgstr "任意"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "窗口列表"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: ../src/modules/pager/e_mod_config.c:141
 #: ../src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "弹出"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "区域"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "容器"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "管理器"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "鼠标按键"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "鼠标滚轮"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: ../src/modules/pager/e_mod_config.c:373
 #: ../src/modules/pager/e_mod_config.c:399
 #, c-format
 msgid "Left button"
 msgstr "左键"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: ../src/modules/pager/e_mod_config.c:378
 #: ../src/modules/pager/e_mod_config.c:394
 #, c-format
 msgid "Right button"
 msgstr "右键"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: ../src/modules/pager/e_mod_config.c:383
 #: ../src/modules/pager/e_mod_config.c:404
 #: ../src/modules/pager/e_mod_config.c:409
@@ -6160,31 +6160,31 @@ msgstr "右键"
 msgid "Button %i"
 msgstr "按键 %i"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: ../src/modules/pager/e_mod_config.c:388
 #, c-format
 msgid "Middle button"
 msgstr "中键"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "额外按键(%d)"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr "鼠标滚轮向上"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr "鼠标滚轮向下"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr "额外滚轮(%d)向上"
 
-#: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: ../src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr "额外滚轮(%d)向下"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5eeeaf4..ba571cf 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -27,7 +27,7 @@ msgstr "關於 Enlightenment"
 #: src/bin/e_fm.c:1059 src/bin/e_int_border_menu.c:194
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24
 #: src/modules/conf/e_conf.c:179
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:877
 #: src/modules/everything/evry_plug_windows.c:452
 #: src/modules/fileman/e_fwin.c:2528 src/modules/mixer/app_mixer.c:550
 msgid "Close"
@@ -131,7 +131,7 @@ msgid "Are you sure you want to suspend your computer?"
 msgstr "您是否確定要讓您的電腦進入待機狀態?"
 
 #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3421
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:379
 msgid "Hibernate"
 msgstr "休眠"
 
@@ -159,7 +159,7 @@ msgstr "改變大小"
 #: src/bin/e_actions.c:2969 src/bin/e_actions.c:3333 src/bin/e_actions.c:3335
 #: src/bin/e_actions.c:3337 src/bin/e_actions.c:3339 src/bin/e_actions.c:3341
 #: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:761
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:336
 msgid "Menu"
 msgstr "選單"
 
@@ -797,7 +797,7 @@ msgstr "選取"
 #: src/bin/e_desktop_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9958
 #: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:194
 #: src/bin/e_import_config_dialog.c:537
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:637
 #: src/modules/conf_intl/e_int_config_imc_import.c:124
 #: src/modules/conf_theme/e_int_config_theme_import.c:123
 #: src/modules/fileman/e_int_config_mime_edit.c:316
@@ -855,7 +855,7 @@ msgstr ""
 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431
 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659
 #: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:918
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:636
 #: src/modules/conf_intl/e_int_config_imc_import.c:120
 #: src/modules/conf_theme/e_int_config_theme_import.c:119
 #: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465
@@ -959,7 +959,7 @@ msgstr ""
 
 #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817
 #: src/modules/conf/e_mod_main.c:283
-#: src/modules/conf_edgebindings/e_mod_main.c:19
+#: src/modules/conf_bindings/e_mod_main.c:19
 #: src/modules/conf_paths/e_mod_main.c:17
 #: src/modules/conf_performance/e_mod_main.c:17
 #: src/modules/syscon/e_mod_main.c:36
@@ -971,7 +971,7 @@ msgid "Basic"
 msgstr "基本設定"
 
 #: src/bin/e_config_dialog.c:280
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:876
 msgid "Apply"
 msgstr "套用"
 
@@ -1167,11 +1167,11 @@ msgstr "選擇一個執行檔"
 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475
 #: src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: src/modules/conf_dialogs/e_int_config_profiles.c:339
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:247
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:266
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:812
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:201
+#: src/modules/conf_bindings/e_int_config_keybindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:294
 #: src/modules/conf_paths/e_int_config_env.c:317
 #: src/modules/conf_shelves/e_int_config_shelf.c:137
 #: src/modules/conf_shelves/e_int_config_shelf.c:392
@@ -1860,13 +1860,13 @@ msgid "Module %s needs to support %s"
 msgstr "需要模組 %s 來支援 %s"
 
 #: src/bin/e_grab_dialog.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:4
+#: src/modules/conf_bindings/e_int_config_keybindings.c:4
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr "請輸入按鍵序列，<br><br>或按 <hilight>Escape</hilight> 鍵放棄。"
 
 #: src/bin/e_grab_dialog.c:5
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:7
 msgid ""
 "Please hold any modifier you want<br>and press any button on your mouse,<br> "
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
@@ -2079,7 +2079,7 @@ msgid "Remember these Locks"
 msgstr "記住這些鎖定值"
 
 #: src/bin/e_int_border_menu.c:127
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:332
 msgid "Window"
 msgstr "視窗"
 
@@ -2299,7 +2299,7 @@ msgstr ""
 
 #: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103
 #: src/modules/clock/e_mod_config.c:141
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:360
 #: src/modules/conf_performance/e_int_config_powermanagement.c:196
 #: src/modules/conf_theme/e_int_config_fonts.c:689
 #: src/modules/conf_theme/e_int_config_transitions.c:199
@@ -2842,7 +2842,7 @@ msgid "Hide duration"
 msgstr "隱藏持續時間"
 
 #: src/bin/e_int_shelf_config.c:247
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:888
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
@@ -3851,10 +3851,10 @@ msgstr[0] ""
 #: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582
 #: src/modules/comp/e_mod_config.c:516
 #: src/modules/conf_dialogs/e_int_config_profiles.c:298
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1218
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:587
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:395
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1170
 #: src/modules/wizard/page_020.c:24
 msgid "Unknown"
 msgstr "未知"
@@ -3980,11 +3980,11 @@ msgstr "%li 分鐘"
 #: src/modules/conf_applications/e_int_config_apps.c:287
 #: src/modules/conf_applications/e_int_config_apps_personal.c:93
 #: src/modules/conf_dialogs/e_int_config_profiles.c:133
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:244
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:263
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:809
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:197
+#: src/modules/conf_bindings/e_int_config_keybindings.c:244
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:292
 #: src/modules/conf_paths/e_int_config_env.c:311
 #: src/modules/conf_shelves/e_int_config_shelf.c:135
 #: src/modules/ibar/e_mod_config.c:110
@@ -4238,7 +4238,7 @@ msgid "Hardware"
 msgstr "硬體"
 
 #: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:354
 msgid "Battery"
 msgstr "電池"
 
@@ -5232,180 +5232,180 @@ msgstr "螢幕鎖定"
 msgid "Desk"
 msgstr "桌面"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:3
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:4
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:11
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:3
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:462
+#: src/modules/conf_bindings/e_int_config_keybindings.c:3
+#: src/modules/conf_bindings/e_int_config_keybindings.c:7
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<無>"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:5
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
 "<br><br>You can either specify a delay of this<br> action using the slider, "
 "or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:105
 msgid "Edge Bindings Settings"
 msgstr "邊緣設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
-#: src/modules/conf_edgebindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Edge Bindings"
 msgstr "邊緣設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:251
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:270
+#: src/modules/conf_bindings/e_int_config_keybindings.c:251
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:298
 #: src/modules/conf_paths/e_int_config_env.c:314
 msgid "Modify"
 msgstr "修改"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:816
+#: src/modules/conf_bindings/e_int_config_keybindings.c:255
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:302
 msgid "Delete All"
 msgstr "全部刪除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:259
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:820
+#: src/modules/conf_bindings/e_int_config_keybindings.c:259
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 msgid "Restore Default Bindings"
 msgstr "回復成預設快速鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:264
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:825
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:209
+#: src/modules/conf_bindings/e_int_config_keybindings.c:264
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:312
 msgid "Action"
 msgstr "動作"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:290
 msgid "Mouse Button"
 msgstr "滑鼠按鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:271
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:296
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:832
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:216
+#: src/modules/conf_bindings/e_int_config_keybindings.c:271
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:319
 msgid "Action Params"
 msgstr "動作參數"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:306
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:307
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:309
 msgid "Allow binding activation with multiple screens (DANGEROUS!)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:874
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:893
 msgid "Clickable edge"
 msgstr "可點選邊緣"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1214
 msgid "Edge Binding Error"
 msgstr "邊緣綁定錯誤"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1215
 #, c-format
 msgid ""
 "The edge binding that you chose is already used by<br><hilight>%s</hilight> "
 "action.<br>Please choose another edge to bind."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1350
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1305
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1337
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1355
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1310
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1342
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1361
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1316
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1348
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1367
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1322
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1354
 msgid "WIN"
 msgstr "WIN"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1377
 msgid "Left Edge"
 msgstr "左邊"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1381
 msgid "Top Edge"
 msgstr "上緣"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1385
 msgid "Right Edge"
 msgstr "右邊"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1389
 msgid "Bottom Edge"
 msgstr "下緣"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1393
 msgid "Top Left Edge"
 msgstr "左上角"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1397
 msgid "Top Right Edge"
 msgstr "右上角"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1401
 msgid "Bottom Right Edge"
 msgstr "右下角"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1405
 msgid "Bottom Left Edge"
 msgstr "左下角"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
+#: src/modules/conf_bindings/e_int_config_edgebindings.c:1421
 #, c-format
 msgid "(clickable)"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:584
 msgid "Signal Binding Error"
 msgstr "信號綁定錯誤"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
 msgid ""
 "The signal and source that you entered are already used by<br><hilight>%s</"
@@ -5414,30 +5414,30 @@ msgstr ""
 "您選擇的快速鍵序列已被 <br><hilight>%s</hilight> 動作使用。<br>請選擇其它快速"
 "鍵序列"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:634
 msgid "Add Signal Binding"
 msgstr "新增信號綁定"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:645
 msgid "Source:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:650
 msgid "Signal:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
-#: src/modules/conf_edgebindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:804
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Signal Bindings"
 msgstr "信號綁定"
 
-#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
+#: src/modules/conf_bindings/e_int_config_signalbindings.c:865
 msgid "Signal Bindings Settings"
 msgstr "信號綁定設定"
 
-#: src/modules/conf_edgebindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
-#: src/modules/conf_keybindings/e_mod_main.c:17
+#: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326
 #: src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
@@ -5649,130 +5649,130 @@ msgstr "Locale"
 msgid "Language"
 msgstr "語言"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190
-#: src/modules/conf_keybindings/e_mod_main.c:29
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:71
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:190
+#: src/modules/conf_bindings/e_mod_main.c:29
 msgid "ACPI Bindings"
 msgstr "ACPI 綁定"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:349
 msgid "AC Adapter Unplugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:350
 msgid "AC Adapter Plugged"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:351
 msgid "Ac Adapter"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:356
 msgid "Button"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:358
 msgid "Fan"
 msgstr "風扇"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:361
 msgid "Lid Unknown"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:362
 msgid "Lid Closed"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:363
 msgid "Lid Opened"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:364
 #, fuzzy
 msgid "Lid"
 msgstr "蓋子"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:367
 msgid "Power Button"
 msgstr "電源按鈕"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:369
 msgid "Processor"
 msgstr "處理器"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:371
 msgid "Sleep Button"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:373
 msgid "Thermal"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:375
 msgid "Video"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:377
 msgid "Wifi"
 msgstr "無線網路"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:381
 msgid "Zoom Out"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:383
 msgid "Zoom In"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:385
 msgid "Brightness Down"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:387
 msgid "Brightness Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:389
 msgid "Assist"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:391
 msgid "S1"
 msgstr "S1"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:393
 #, fuzzy
 msgid "Vaio"
 msgstr "Vaio"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:497
 msgid "ACPI Binding"
 msgstr "ACPI 綁定"
 
-#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500
+#: src/modules/conf_bindings/e_int_config_acpibindings.c:500
 msgid ""
 "Please trigger the ACPI event you wish to bind to, <br><br>or "
 "<hilight>Escape</hilight> to abort."
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:8
+#: src/modules/conf_bindings/e_int_config_keybindings.c:8
 msgid "Single key"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:106
+#: src/modules/conf_bindings/e_int_config_keybindings.c:106
 msgid "Key Bindings Settings"
 msgstr "快速鍵設定"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
-#: src/modules/conf_keybindings/e_mod_main.c:21
+#: src/modules/conf_bindings/e_int_config_keybindings.c:239
+#: src/modules/conf_bindings/e_mod_main.c:21
 msgid "Key Bindings"
 msgstr "快速鍵"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1165
 msgid "Binding Key Error"
 msgstr "設定快速鍵時發生錯誤"
 
-#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166
+#: src/modules/conf_bindings/e_int_config_keybindings.c:1166
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>"
@@ -5781,30 +5781,30 @@ msgstr ""
 "您選擇的快速鍵序列已被 <br><hilight>%s</hilight> 動作使用。<br>請選擇其它快速"
 "鍵序列"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:109
 msgid "Mouse Bindings Settings"
 msgstr "滑鼠綁定設定"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:247
 msgid ""
 "Unable to set a mouse wheel binding without modifiers<br>on a window: "
 "conflict with existing edje signal bindings.<br>FIXME!!!"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:250
 msgid "Mouse Binding Error"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286
-#: src/modules/conf_keybindings/e_mod_main.c:25
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:286
+#: src/modules/conf_bindings/e_mod_main.c:25
 msgid "Mouse Bindings"
 msgstr "滑鼠快速鍵"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:326
 msgid "Action Context"
 msgstr "行動情境"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:328
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:348
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:352
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:356
@@ -5812,82 +5812,82 @@ msgstr "行動情境"
 msgid "Any"
 msgstr "任何"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:340
 msgid "Win List"
 msgstr "視窗列表"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:344
 #: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261
 msgid "Popup"
 msgstr "彈出式選單"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:348
 msgid "Zone"
 msgstr "區域"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:352
 msgid "Container"
 msgstr "容器"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:356
 msgid "Manager"
 msgstr "管理員"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
 msgstr "滑鼠按鍵"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
 msgstr "滑鼠滾輪"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1178
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1196
 #: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399
 #, c-format
 msgid "Left button"
 msgstr "左鍵"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1180
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1194
 #: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394
 #, c-format
 msgid "Right button"
 msgstr "右鍵"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1183
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1199
 #: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404
 #: src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
 msgstr "%i按鈕"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1189
 #: src/modules/pager/e_mod_config.c:388
 #, c-format
 msgid "Middle button"
 msgstr "中鍵"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
 msgstr "其他按鍵 (%d)"
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1229
 msgid "Mouse Wheel Down"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1233
 #, c-format
 msgid "Extra Wheel (%d) Up"
 msgstr ""
 
-#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235
+#: src/modules/conf_bindings/e_int_config_mousebindings.c:1235
 #, c-format
 msgid "Extra Wheel (%d) Down"
 msgstr ""