Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

# Conflicts:
#	src/cdrom/cdrom_image.c
#	src/cdrom/cdrom_image_backend.c
#	src/include/86box/cdrom.h
#	src/include/86box/cdrom_image_backend.h
#	src/include/86box/resource.h
#	src/qt/qt_mediamenu.cpp
#	src/qt/qt_mediamenu.hpp
#	src/unix/unix.c
#	src/win/win.c
#	src/win/win_devconf.c
#	src/win/win_dialog.c
#	src/win/win_joystick_rawinput.c
#	src/win/win_media_menu.c
#	src/win/win_mouse.c
#	src/win/win_settings.c
#	src/win/win_ui.c

src/qt/languages/ru-RU.po

@@ -229,8 +229,8 @@ msgstr "&Снова загрузить предыдущий образ"
 msgid "&Image"
 msgstr "&Образ..."
 
-msgid "&Folder"
-msgstr "&Folder"
+msgid "&Folder..."
+msgstr "&Folder..."
 
 msgid "Target &framerate"
 msgstr "Целевая &частота кадров"