Skip to content

Commit ab2157e

Browse files
committed
Added spaces between CJK words and ASCII
1 parent 9564c7b commit ab2157e

File tree

31 files changed

+133
-133
lines changed

31 files changed

+133
-133
lines changed

scripts/add_block_manual/add_block_manual.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ function add_block_manual(argument0, argument1, argument2, argument3, argument4,
3434

3535
if ((key < 33 || key > 57) && warning_octaves = 0) {
3636
if (language != 1) message("NOTE: Since this block is outside the 2 octave limit, you won't be able to import it into Minecraft without a resource pack.\n\nThis warning will never be shown again.", "Warning")
37-
else message("注意:由于此方块在2八度的范围外,您将无法不使用资源包将该歌曲导入进Minecraft中\n此消息将不再提示。", "警告")
37+
else message("注意:由于此方块在 2 八度的范围外,您将无法不使用资源包将该歌曲导入进 Minecraft 中\n此消息将不再提示。", "警告")
3838
warning_octaves = 1
3939
save_settings()
4040
} else if (ins.user && warning_instrument = 0) {
4141
if (language != 1) message("NOTE: Since this block has a custom instrument, you won't be able to import it into Minecraft without mods or resource packs.\n\nThis warning will never be shown again.", "Warning")
42-
else message("注意:由于此方块包含自定义音色,您将无法不使用模组或资源包将该歌曲导入进Minecraft中\n此消息将不再提示。", "警告")
42+
else message("注意:由于此方块包含自定义音色,您将无法不使用模组或资源包将该歌曲导入进 Minecraft 中\n此消息将不再提示。", "警告")
4343
warning_instrument = 1
4444
save_settings()
4545
}

scripts/calculate_size/calculate_size.gml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ function calculate_size() {
2525
}
2626
} else {
2727
if (warning_schematic == 0) {
28-
message("导出的schematic目前之和Minecraft: Java Edition 1.12及以下兼容。如想在1.13和以上使用,请使用结构方块格式导出。\n\n此警告将不再提示。", "警告")
28+
message("导出的 schematic 目前之和 Minecraft: Java Edition 1.12 及以下兼容。如想在 1.13 和以上使用,请使用结构方块格式导出。\n\n此警告将不再提示。", "警告")
2929
warning_schematic = 1
3030
save_settings()
3131
}
3232
if (block_outside > 0) {
33-
if (!question("一些方块在Minecraft的2八度范围外。你想无视这些方块导出Schematic吗", "Minecraft兼容性")) return 0
33+
if (!question("一些方块在 Minecraft 的2八度范围外。你想无视这些方块导出 Schematic 吗", "Minecraft 兼容性")) return 0
3434
}
3535
if (block_custom > 0) {
36-
if (!question("一些方块带有自定义音色。继续导出吗?", "Minecraft兼容性")) return 0
36+
if (!question("一些方块带有自定义音色。继续导出吗?", "Minecraft 兼容性")) return 0
3737
}
3838
if (block_pitched > 0) {
39-
if (!question("一些方块带有音符盒不支持的微分音。继续导出吗?", "Minecraft兼容性")) return 0
39+
if (!question("一些方块带有音符盒不支持的微分音。继续导出吗?", "Minecraft 兼容性")) return 0
4040
}
4141
if (tempo != 10 && tempo != 5 && tempo != 2.5) {
42-
message("歌曲的速度与Minecraft不兼容。所以,在游戏内的播放会和软件内的有差别。", "速度")
42+
message("歌曲的速度与 Minecraft 不兼容。所以,在游戏内的播放会和软件内的有差别。", "速度")
4343
}
4444
selection_place(0)
4545
if (totalblocks - block_outside <= 0) {

scripts/control_draw/control_draw.gml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,13 +1478,13 @@ function control_draw() {
14781478
icon(icons.OPEN)+"Ctrl+O$打开歌曲......|最近歌曲......|\\|" + str + condstr(recent_song[0] != "", "-|清除最近歌曲") + condstr(recent_song[0] = "", "^!无最近歌曲") + "|/|-|"+
14791479
icon(icons.SAVE)+"Ctrl+S$保存歌曲|"+
14801480
icon(icons.SAVE_AS)+"另存为|保存选项......|-|"+
1481-
"导入片段......|"+"导出片段......|"+"从MIDI文件导入......|从Schematic文件导入......|-|"+
1482-
inactive(totalblocks = 0) + "导出为MP3......|"+
1483-
inactive(totalblocks = 0) + "导出为schematic......|"+
1484-
inactive(totalblocks = 0) + "导出为分支schematic......|"+
1481+
"导入片段......|"+"导出片段......|"+"从 MIDI 文件导入......|从 Schematic 文件导入......|-|"+
1482+
inactive(totalblocks = 0) + "导出为 MP3......|"+
1483+
inactive(totalblocks = 0) + "导出为 schematic......|"+
1484+
inactive(totalblocks = 0) + "导出为分支 schematic......|"+
14851485
inactive(totalblocks = 0) + "导出为数据包......|-|" +
14861486
"Alt + F4$退出")
1487-
else show_menu_ext("filep", 0, 19, icon(icons.OPEN)+"Ctrl+O$打开歌曲......|最近歌曲......|\\|" + str + condstr(recent_song[0] != "", "-|清除最近歌曲") + condstr(recent_song[0] = "", "^!无最近歌曲") + "|/|-|"+"从MIDI文件导入......|从Schematic文件导入......|-|" + "Alt + F4$退出")
1487+
else show_menu_ext("filep", 0, 19, icon(icons.OPEN)+"Ctrl+O$打开歌曲......|最近歌曲......|\\|" + str + condstr(recent_song[0] != "", "-|清除最近歌曲") + condstr(recent_song[0] = "", "^!无最近歌曲") + "|/|-|"+"从 MIDI 文件导入......|从 Schematic 文件导入......|-|" + "Alt + F4$退出")
14881488

14891489
}
14901490
if (!isplayer) if (draw_tab("编辑")) {
@@ -1546,11 +1546,11 @@ function control_draw() {
15461546
}
15471547
}
15481548
if (!isplayer) show_menu_ext("settings", 59, 19, "音色|\\|" + str + condstr(customstr != "", "-|") + customstr + string_repeat("/|", insmenu) +
1549-
icon(icons.INSTRUMENTS)+"音色设置......|/|-|" + icon(icons.INFORMATION) + "歌曲信息......|" + icon(icons.PROPERTIES) + "歌曲属性......|歌曲数据......|-|" + icon(icons.MIDI_INPUT) + "MIDI设备管理器|Ctrl+P$首选项......")
1549+
icon(icons.INSTRUMENTS)+"音色设置......|/|-|" + icon(icons.INFORMATION) + "歌曲信息......|" + icon(icons.PROPERTIES) + "歌曲属性......|歌曲数据......|-|" + icon(icons.MIDI_INPUT) + "MIDI 设备管理器|Ctrl+P$首选项......")
15501550
else show_menu_ext("settingsp", 29, 19, icon(icons.INFORMATION) + "歌曲信息......|" + "歌曲数据......|-|" + "Ctrl+P$首选项......")
15511551
}
15521552
if (draw_tab("帮助")) {
1553-
show_menu_ext("help", 109 - 30 * isplayer, 19, icon(icons.HELP) + "教程视频|\\|Part 1: Composing note block music|Part 2: Opening MIDI files|Part 3: Importing songs into Minecraft|Part 4: Editing songs made in Minecraft |-|F1$观看所有|/|-|" + icon(icons.INTERNET) + "官方网站......|GitHub......|Discord服务器......|反馈bug......|-|更新历史......|关于......")
1553+
show_menu_ext("help", 109 - 30 * isplayer, 19, icon(icons.HELP) + "教程视频|\\|Part 1: Composing note block music|Part 2: Opening MIDI files|Part 3: Importing songs into Minecraft|Part 4: Editing songs made in Minecraft |-|F1$观看所有|/|-|" + icon(icons.INTERNET) + "官方网站......|GitHub......|Discord 服务器......|反馈 bug......|-|更新历史......|关于......")
15541554
}
15551555
}
15561556

@@ -1724,12 +1724,12 @@ function control_draw() {
17241724
if (draw_icon(icons.INFORMATION, xx, yy, "歌曲信息")) {if (!isplayer) playing = 0 window = w_songinfoedit * !isplayer + w_songinfo * isplayer} xx += 25 if (xx > rw - 312) break
17251725
if (!isplayer) {if (draw_icon(icons.PROPERTIES, xx, yy, "歌曲属性")) {playing = 0 window = w_properties} xx += 25 if (xx > rw - 312) break}
17261726
if (!isplayer) {if (draw_icon(icons.INSTRUMENTS, xx, yy, "音色设置")) {playing = 0 window = w_instruments} xx += 25 if (xx > rw - 312) break}
1727-
if (!isplayer) {if (draw_icon(icons.MIDI_INPUT, xx, yy, "MIDI设备管理器")) {playing = 0 window = w_mididevices} xx += 25 if (xx > rw - 312) break}
1727+
if (!isplayer) {if (draw_icon(icons.MIDI_INPUT, xx, yy, "MIDI 设备管理器")) {playing = 0 window = w_mididevices} xx += 25 if (xx > rw - 312) break}
17281728
xx += 4 draw_separator(xx, yy + 3) xx += 4 if (xx > rw - 312) break
17291729
if (draw_icon(icons.HELP, xx, yy, "教程视频")) {
17301730
open_url("https://www.bilibili.com/video/BV1Mx411a76p")
17311731
} xx += 25 if (xx > rw - 312) break
1732-
if (draw_icon(icons.INTERNET, xx, yy, "访问Open Note Block Studio官方网站")) {open_url(link_website)} xx += 25 if (xx > rw - 312) break
1732+
if (draw_icon(icons.INTERNET, xx, yy, "访问 Open Note Block Studio 官方网站")) {open_url(link_website)} xx += 25 if (xx > rw - 312) break
17331733
break
17341734
}
17351735
}
@@ -1759,7 +1759,7 @@ function control_draw() {
17591759
draw_theme_color()
17601760
draw_theme_font(font_main)
17611761
if (language != 1) popup_set(rw - compx, 24, compx, 25, "This song is compatible with both schematics and data packs.\n(Click for more info.)")
1762-
else popup_set(rw - compx, 24, compx, 25, "此歌曲兼容schematic和数据包\n(点击查看更多)")
1762+
else popup_set(rw - compx, 24, compx, 25, "此歌曲兼容 schematic 和数据包\n(点击查看更多)")
17631763
} else if (compatible = 2) {
17641764
if (theme != 3) {
17651765
draw_sprite(spr_minecraft, 0, rw - 30, 25)
@@ -1888,7 +1888,7 @@ function control_draw() {
18881888
draw_theme_color()
18891889
xx += 4
18901890
if (language != 1) draw_text_dynamic(xx, rh - 18, "Next auto-save: " + string(ceil(tonextsave)) + " minute" + condstr(ceil(tonextsave)<>1, "s"))
1891-
else draw_text_dynamic(xx, rh - 18, "下次自动保存: " + string(ceil(tonextsave)) + "分钟")
1891+
else draw_text_dynamic(xx, rh - 18, "下次自动保存: " + string(ceil(tonextsave)) + " 分钟")
18921892
xx += 210
18931893
draw_separator(xx, rh - 20)
18941894
draw_theme_color()
@@ -1912,8 +1912,8 @@ function control_draw() {
19121912
if (midi_devices = 0) str = "No connected MIDI devices"
19131913
else str = "MIDI devices: " + str
19141914
} else {
1915-
if (midi_devices = 0) str = "无MIDI设备"
1916-
else str = "MIDI设备: " + str
1915+
if (midi_devices = 0) str = "无 MIDI 设备"
1916+
else str = "MIDI 设备: " + str
19171917
}
19181918
draw_text_dynamic(rw - 6, rh - 18, str)
19191919
draw_set_halign(fa_left)

scripts/draw_window_branch_export/draw_window_branch_export.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ function draw_window_branch_export() {
144144
draw_text_dynamic(x1 + 170, y1 + 240, "主层数:")
145145
sch_exp_layer1 = median(1, draw_dragvalue(15, x1 + 260, y1 + 240, sch_exp_layer1, 1), sch_exp_maxheight[0] + 1)
146146
sch_exp_layer_index[0] = sch_exp_layer1
147-
draw_text_dynamic(x1 + 170, y1 + 260, "和弦层1")
148-
draw_text_dynamic(x1 + 170, y1 + 280, "和弦层2")
147+
draw_text_dynamic(x1 + 170, y1 + 260, "和弦层 1")
148+
draw_text_dynamic(x1 + 170, y1 + 280, "和弦层 2")
149149
if (sch_exp_polyphony > 1 ) {
150150
sch_exp_layer2 = median(1, draw_dragvalue(16, x1 + 260, y1 + 260, sch_exp_layer2, 1), sch_exp_maxheight[0] + 1)
151151
sch_exp_layer_index[1] = sch_exp_layer2

scripts/draw_window_datapack_export/draw_window_datapack_export.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,13 @@ function draw_window_datapack_export() {
271271
if (draw_radiobox(x1 + 264, y1 + 304, dat_source = "weather", "天气", "由天气音量控制")) dat_source = "weather"
272272

273273
//Export as ZIP
274-
if (draw_checkbox(x1 + 192, y1 + 334, dat_usezip, "导出为ZIP", "是否导出为ZIP格式的文件"+br+"如关闭,将导出为文件夹。", false, true)) dat_usezip=!dat_usezip
274+
if (draw_checkbox(x1 + 192, y1 + 334, dat_usezip, "导出为 ZIP", "是否导出为 ZIP 格式的文件"+br+"如关闭,将导出为文件夹。", false, true)) dat_usezip=!dat_usezip
275275

276276
//Locked layers
277277
if (draw_checkbox(x1 + 362, y1 + 213, dat_includelocked, "包括已静音的层", "是否在数据包内包括已静音的层。", false, true)) dat_includelocked=!dat_includelocked
278278

279279
//Out-of-range notes
280-
if (draw_checkbox(x1 + 362, y1 + 238, dat_includeoutofrange, "包括超范围音符", "是否包括超过Minecraft的2八度限制的音符"+br+"此选项需要安装额外的数据包。", false, true)) dat_includeoutofrange = !dat_includeoutofrange
280+
if (draw_checkbox(x1 + 362, y1 + 238, dat_includeoutofrange, "包括超范围音符", "是否包括超过 Minecraft 的 2 八度限制的音符"+br+"此选项需要安装额外的数据包。", false, true)) dat_includeoutofrange = !dat_includeoutofrange
281281

282282
//Radius
283283
if (draw_checkbox(x1 + 362, y1 + 263, dat_enableradius, "共享音乐", "是否共享音乐给一定范围内的玩家。", false, true)) dat_enableradius = !dat_enableradius

scripts/draw_window_greeting/draw_window_greeting.gml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function draw_window_greeting() {
1414
var dev_label_offset = (is_prerelease) ? 15 : 0
1515
if (RUN_FROM_IDE != 1) {
1616
if (language != 1) draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "Running from the GameMaker IDE.")
17-
else draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "在IDE中运行")
17+
else draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "在 IDE 中运行")
1818
} else if (check_update) {
1919
if (update = -1) {
2020
draw_set_color(c_red)
@@ -54,7 +54,7 @@ function draw_window_greeting() {
5454
else draw_text_center(x1 + 132, y1 + 233, "本地版本")
5555
} else {
5656
if (language != 1) draw_text_center(x1 + 132, y1 + 233, "Version " + version + " - Released " + version_date)
57-
else draw_text_center(x1 + 132, y1 + 233, "版本" + version + " - 发布于" + version_date)
57+
else draw_text_center(x1 + 132, y1 + 233, "版本 " + version + " - 发布于 " + version_date)
5858
}
5959
if (is_prerelease) {
6060
if (language != 1) draw_text_center(x1 + 132, y1 + 248, "(Development version)")
@@ -182,7 +182,7 @@ function draw_window_greeting() {
182182
else draw_sprite(spr_bigicons_d, 2, b + (a > 1), c + (a > 1))
183183
}
184184
if (language != 1) draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "Generate song out of MIDI file")
185-
else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "从MIDI文件生成")
185+
else draw_text_dynamic(b + 48 + (a > 1), c + 9 + (a > 1), "从 MIDI 文件生成")
186186
if (a = 2 && mouse_check_button_released(mb_left)) {
187187
if (windowsound && theme = 3) play_sound(soundinvoke, 45, 100, 50, 0)
188188
windowalpha = 0

scripts/draw_window_instruments/draw_window_instruments.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function draw_window_instruments() {
107107
}
108108
} else {
109109
if (draw_button2(x1 + 194, y1 + 318, 80, "移除", userselect < 0) && wmenu = 0) {
110-
if ((userselect.num_blocks == 0) || (message_yesnocancel("这将移除使用该音色的" + string(userselect.num_blocks) + "个方块并且不能撤销。确定吗?", "警告"))) {
110+
if ((userselect.num_blocks == 0) || (message_yesnocancel("这将移除使用该音色的 " + string(userselect.num_blocks) + " 个方块并且不能撤销。确定吗?", "警告"))) {
111111
instrument_remove(userselect)
112112
insselect = min(ds_list_size(instrument_list) - 1, insselect)
113113
if (instrument = userselect)
@@ -128,7 +128,7 @@ function draw_window_instruments() {
128128
if (draw_button2(x1 + 456, y1 + 318, 80, "确定") && wmenu = 0 && (windowopen = 1 || theme != 3)) {
129129
windowclose = 1
130130
if (save_version < 5 && user_instruments > 18) {
131-
show_message("此歌曲含有多于18个音色,无法保存为版本" + string(save_version) + "。将保存为版本" + string(nbs_version) + "")
131+
show_message("此歌曲含有多于18个音色,无法保存为版本 " + string(save_version) + "。将保存为版本 " + string(nbs_version) + "")
132132
save_version = nbs_version
133133
}
134134
save_settings()

scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function draw_window_macro_portamento() {
1919
draw_rectangle(x1 + 6, y1 + 26, x1 + 134, y1 + 92, 1)
2020
}
2121
if (language != 1) {if (draw_checkbox(x1 + 10, y1 + 30, porta_reverse, "Reversed", "Portamento is done in the inverse direction.")) porta_reverse=!porta_reverse}
22-
else {if (draw_checkbox(x1 + 10, y1 + 30, porta_reverse, "反转", "反方向应用Portamento")) porta_reverse=!porta_reverse}
22+
else {if (draw_checkbox(x1 + 10, y1 + 30, porta_reverse, "反转", "反方向应用 Portamento")) porta_reverse=!porta_reverse}
2323
if (language != 1) draw_areaheader(x1 + 10, y1 + 53, 120, 35, "Cent shift")
2424
else draw_areaheader(x1 + 10, y1 + 53, 120, 35, "偏移")
2525
port_cent = median(-1200, draw_dragvalue(11, x1 + 55, y1 + 65, port_cent, 0.1), 1200)

scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function draw_window_macro_stagger() {
3939
}
4040
if string_count("-", pattern) != 0 {
4141
if (language != 1) message("Stagger can only extend downwards!", "Error")
42-
else message("Stagger只能向下延伸", "错误")
42+
else message("Stagger 只能向下延伸", "错误")
4343
return -1
4444
}
4545
windowalpha = 0

scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function draw_window_macro_tremolo() {
6464
if (draw_button2(x1 + 10, y1 + 215, 60, condstr(language != 1, "OK", "确定"))) {
6565
if (leg_dec > 100 || leg_dec < 0|| leg_sus > 100|| leg_sus < 0) {
6666
if (language != 1) message("Values must be between 1 and 100.", "Error")
67-
else message("所有值必须在1到100之间", "错误")
67+
else message("所有值必须在 1 到 100 之间", "错误")
6868
return 1
6969
}
7070
if tremolotype = 0 macro_tremolo()

0 commit comments

Comments
 (0)