Merge remote-tracking branch 'upstream/master' into feature/ich2

src/config.c

@@ -494,8 +494,8 @@ load_machine(void)
     mem_size = (((machine_has_bus(machine, MACHINE_AT) && (machines[machine].ram_granularity < 128)) ? machines[machine].min_ram*1024 : machines[machine].min_ram);
 #endif
 
-    if (mem_size > 2097152)
-        mem_size = 2097152;
+    if (mem_size > machine_get_max_ram(machine))
+        mem_size = machine_get_max_ram(machine);
 
     cpu_use_dynarec = !!ini_section_get_int(cat, "cpu_use_dynarec", 0);
 

src/qt/languages/zh-TW.po

@@ -1,5 +1,5 @@
 msgid "&Action"
-msgstr "操作(&A)"
+msgstr "動作(&A)"
 
 msgid "&Keyboard requires capture"
 msgstr "鍵盤需要捕捉(&K)"
@@ -584,7 +584,7 @@ msgid "CD-ROM drives:"
 msgstr "光碟機:"
 
 msgid "Earlier drive"
-msgstr "早先的驅動器"
+msgstr "早先的光碟機"
 
 msgid "MO drives:"
 msgstr "磁光碟機:"

src/qt/qt_harddiskdialog.cpp

@@ -328,6 +328,7 @@ void HarddiskDialog::onCreateNewFile() {
     }
     QFileInfo fi(fileName);
     fileName = (fi.isRelative() && !fi.filePath().isEmpty()) ? usr_path + fi.filePath() : fi.filePath();
+    ui->fileField->setFileName(fileName);
 
     QFile file(fileName);
     if (! file.open(QIODevice::WriteOnly)) {

src/win/languages/zh-TW.rc

@@ -15,7 +15,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 MainMenu MENU DISCARDABLE 
 BEGIN
-    POPUP "操作(&A)"
+    POPUP "動作(&A)"
     BEGIN
         MENUITEM "鍵盤需要捕捉(&K)",	IDM_ACTION_KBD_REQ_CAPTURE
         MENUITEM "將右 CTRL 鍵映射為左 ALT 鍵(&R)",	IDM_ACTION_RCTRL_IS_LALT
@@ -351,7 +351,7 @@ END
 #define STR_CHECKBPB		"檢查 BPB"
 #define STR_CDROM_DRIVES	"光碟機:"
 #define STR_CD_SPEED		"速度:"
-#define STR_EARLY		"早先的驅動器"
+#define STR_EARLY		"早先的光碟機"
 
 #define STR_MO_DRIVES		"磁光碟機:"
 #define STR_ZIP_DRIVES		"ZIP 磁碟機:"
@@ -521,7 +521,7 @@ BEGIN
     IDS_2159	"硬重設"
     IDS_2160	"ACPI 關機"
     IDS_2161	"設定"
-    IDS_2162    "早先的驅動器"
+    IDS_2162    "早先的光碟機"
 END
 
 STRINGTABLE DISCARDABLE