From f6ceba0fc386dc18e30af89785314bf05c405de9 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Thu, 24 Feb 2022 22:58:40 +0800 Subject: [PATCH 1/4] Add files via upload --- .../xercamusic/lang/en_us.json | 71 +++++++++++- .../xercamusic/lang/zh_cn.json | 108 +++++++++++++++++- 2 files changed, 177 insertions(+), 2 deletions(-) diff --git a/projects/1.16/assets/music-maker-mod/xercamusic/lang/en_us.json b/projects/1.16/assets/music-maker-mod/xercamusic/lang/en_us.json index eac22dce996a..e6a1d57cfbc0 100644 --- a/projects/1.16/assets/music-maker-mod/xercamusic/lang/en_us.json +++ b/projects/1.16/assets/music-maker-mod/xercamusic/lang/en_us.json @@ -1,5 +1,6 @@ { "itemGroup.music_tab": "Music", + "item.xercamusic.music_sheet": "Music Sheet", "item.xercamusic.guitar": "Guitar", "item.xercamusic.flute": "Flute", @@ -16,14 +17,21 @@ "item.xercamusic.cello": "Cello", "item.xercamusic.drum_kit": "Drum Kit", "item.xercamusic.cymbal": "Cymbal", + "item.xercamusic.oboe": "Oboe", + "item.xercamusic.redstone_guitar": "Redstone Guitar", + "item.xercamusic.french_horn": "French Horn", + "item.xercamusic.bass_guitar": "Bass Guitar", + "block.xercamusic.block_metronome": "Metronome", "block.xercamusic.music_box": "Music Box", "block.xercamusic.piano": "Piano", "block.xercamusic.drum_kit": "Drum Kit", + "advancements.xercamusic.achievements.root.title": "XercaMusic", "advancements.xercamusic.achievements.root.description": "Music", "advancements.xercamusic.achievements.musician.title": "Musician", "advancements.xercamusic.achievements.musician.description": "Compose your first piece", + "note.byAuthor": "by %1$s", "note.signButton": "Sign", "note.editTitle": "Enter Music Title:", @@ -34,10 +42,71 @@ "note.generation.2": "Copy of copy", "note.upButton": "▲", "note.downButton": "▼", + "note.leftButton": "◀", + "note.rightButton": "▶", "note.startPreviewButton": "►", "note.stopPreviewButton": "■", + "note.exitButton": "❌", "note.hideNeighborsButton": "N", "note.toggleTooltip": "Toggle neighbor sheets", "note.lockTooltip": "Lock preview instrument", - "note.previewTooltip": "Preview music" + "note.previewTooltip": "Preview music", + "note.recordTooltip": "Record music", + "note.length": "Length: %1$s beats", + "note.tempo": "Tempo: %1$s BPM", + "note.preview_instrument": "Instrument: %1$s", + "note.tempoTooltip": "Change tempo (BPM)", + "note.measureTooltip": "Change measure interval", + "note.sheetVolumeTooltip": "Music sheet volume", + "note.noteVolumeTooltip": "Note brush volume", + "note.previewNoteTooltip": "Preview", + "note.closeNoteTooltip": "Close", + "note.helpTooltip": "Show help", + "note.helpText0": "Controls", + "note.helpText1a": "Left Click (and Drag): ", + "note.helpText1b": "Place a note", + "note.helpText2a": "Left Click on a note: ", + "note.helpText2b": "Remove a note", + "note.helpText3a": "Right click: ", + "note.helpText3b": "Set the cursor", + "note.helpText4a": "Middle click on a note: ", + "note.helpText4b": "View and edit a note", + "note.helpText5a": "Scroll up/down: ", + "note.helpText5b": "Look at higher/lower octaves", + "note.helpText6a": "H Key: ", + "note.helpText6b": "Show this help", + "note.helpText7a": "Enter Key: ", + "note.helpText7b": "Start/stop previewing", + "note.helpText8a": "Delete Key: ", + "note.helpText8b": "Delete at the cursor position", + "note.helpText9a": "Backspace Key: ", + "note.helpText9b": "Delete to the left of the cursor position", + "note.helpText10a": "Top row of letter keys: ", + "note.helpText10b": "Write notes at the current octave", + "note.helpText11a": "A/S Keys: ", + "note.helpText11b": "Shift current octave down/up", + "note.helpText12a": "CTRL+C: ", + "note.helpText12b": "Copy selected notes", + "note.helpText13a": "CTRL+V: ", + "note.helpText13b": "Paste notes", + "note.helpText14a": "CTRL+SHIFT+V: ", + "note.helpText14b": "Paste notes without pushing existing notes", + "note.helpText15a": "CTRL+A: ", + "note.helpText15b": "Select All", + "note.helpText16a": "CTRL+Z: ", + "note.helpText16b": "Undo", + "note.helpText17a": "SHIFT+Click Tempo Up: ", + "note.helpText17b": "Double the tempo and stretch notes", + "note.helpText18a": "SHIFT+Click Tempo Down: ", + "note.helpText18b": "Halve the tempo and shrink notes", + "note.helpText19a": "ALT: ", + "note.helpText19b": "Start/stop recording", + + "ins.octaveTooltip": "Change keyboard octave", + + "export.success": "Music sheet exported to %1$s", + "export.fail": "Could not export music sheet", + "import.success": "Music sheet imported", + "import.fail.1": "You must have an empty music sheet item on your main-hand to import a music sheet in survival mode", + "import.fail.4": "Could not parse command or read the music sheet file (%1$s)" } \ No newline at end of file diff --git a/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json b/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json index 59433bb1bec5..332204e53f5d 100644 --- a/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json +++ b/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json @@ -1,6 +1,112 @@ { "itemGroup.music_tab": "音乐", + "item.xercamusic.music_sheet": "乐谱", "item.xercamusic.guitar": "吉他", - "item.xercamusic.flute": "长笛" + "item.xercamusic.flute": "长笛", + "item.xercamusic.banjo": "班卓琴", + "item.xercamusic.drum": "鼓", + "item.xercamusic.lyre": "七弦竖琴", + "item.xercamusic.item_cello": "大提琴", + "item.xercamusic.saxophone": "萨克斯", + "item.xercamusic.god": "上帝之音", + "item.xercamusic.sansula": "拇指琴", + "item.xercamusic.tubular_bell": "编钟", + "item.xercamusic.violin": "小提琴", + "item.xercamusic.xylophone": "木琴", + "item.xercamusic.cello": "大提琴", + "item.xercamusic.drum_kit": "架子鼓", + "item.xercamusic.cymbal": "铙钹", + "item.xercamusic.oboe": "双簧管", + "item.xercamusic.redstone_guitar": "电吉他", + "item.xercamusic.french_horn": "圆号", + "item.xercamusic.bass_guitar": "低音吉他", + + "block.xercamusic.block_metronome": "节拍器", + "block.xercamusic.music_box": "音乐盒", + "block.xercamusic.piano": "钢琴", + "block.xercamusic.drum_kit": "架子鼓", + + "advancements.xercamusic.achievements.root.title": "XercaMusic", + "advancements.xercamusic.achievements.root.description": "音乐", + "advancements.xercamusic.achievements.musician.title": "音乐家", + "advancements.xercamusic.achievements.musician.description": "创作你的第一部作品", + + "note.byAuthor": "由%1$s谱写", + "note.signButton": "签署", + "note.editTitle": "定义乐曲名称：", + "note.finalizeButton": "签署并关闭", + "note.finalizeWarning": "注意！一旦你签署了乐谱，它将不可被再次编辑！", + "note.generation.0": "原谱", + "note.generation.1": "复刻", + "note.generation.2": "再复刻", + "note.upButton": "▲", + "note.downButton": "▼", + "note.leftButton": "◀", + "note.rightButton": "▶", + "note.startPreviewButton": "►", + "note.stopPreviewButton": "■", + "note.exitButton": "❌", + "note.hideNeighborsButton": "N", + "note.toggleTooltip": "切换是否演奏邻近乐谱", + "note.lockTooltip": "锁定预览乐器", + "note.previewTooltip": "预览音乐", + "note.recordTooltip": "录制音乐", + "note.length": "长度：%1$s拍", + "note.tempo": "节奏：%1$s BPM", + "note.preview_instrument": "乐器：%1$s", + "note.tempoTooltip": "改变节奏（BPM）", + "note.measureTooltip": "改变测量间隔", + "note.sheetVolumeTooltip": "乐谱音量", + "note.noteVolumeTooltip": "音符刷音量", + "note.previewNoteTooltip": "预览", + "note.closeNoteTooltip": "关闭", + "note.helpTooltip": "显示帮助", + "note.helpText0": "控制", + "note.helpText1a": "左键点击并拖动：", + "note.helpText1b": "写下音符", + "note.helpText2a": "左键点击音符：", + "note.helpText2b": "移除音符", + "note.helpText3a": "右键点击：", + "note.helpText3b": "将光标移至鼠标处", + "note.helpText4a": "中键点击音符：", + "note.helpText4b": "查看并编辑音符", + "note.helpText5a": "向上/向下滚动：", + "note.helpText5b": "查看更高/更低的八度音阶", + "note.helpText6a": "H键：", + "note.helpText6b": "显示本帮助", + "note.helpText7a": "Enter键：", + "note.helpText7b": "开始/停止预览", + "note.helpText8a": "Delete键：", + "note.helpText8b": "删除光标位置拍子", + "note.helpText9a": "退格键：", + "note.helpText9b": "删除光标左侧拍子", + "note.helpText10a": "第一排字母按键：", + "note.helpText10b": "在当前八度音阶内写下音符", + "note.helpText11a": "A键/S键：", + "note.helpText11b": "调高/调低当前八度音阶", + "note.helpText12a": "CTRL+C：", + "note.helpText12b": "复制选中的音符", + "note.helpText13a": "CTRL+V：", + "note.helpText13b": "粘贴音符", + "note.helpText14a": "CTRL+SHIFT+V：", + "note.helpText14b": "粘贴音符并且不改变原有音符位置", + "note.helpText15a": "CTRL+A：", + "note.helpText15b": "全部选中", + "note.helpText16a": "CTRL+Z：", + "note.helpText16b": "撤销", + "note.helpText17a": "SHIFT+点击加快节奏：", + "note.helpText17b": "使节奏翻倍并拉长音符", + "note.helpText18a": "SHIFT+点击减慢节奏：", + "note.helpText18b": "使节奏减半并缩短音符", + "note.helpText19a": "ALT：", + "note.helpText19b": "开始/停止录制", + + "ins.octaveTooltip": "切换键盘所对应的八度音阶", + + "export.success": "乐谱已导出至%1$s", + "export.fail": "导出乐谱失败", + "import.success": "乐谱已导入", + "import.fail.1": "生存模式下必须主手持空白乐谱以导入", + "import.fail.4": "分析命令或读取乐谱（%1$s）错误" } \ No newline at end of file From a9782c0df85c1844de2c4383e7226f87823cdf34 Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Fri, 25 Feb 2022 01:27:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=20expe?= =?UTF-8?q?cted=20checks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json b/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json index 332204e53f5d..b38f1bab0464 100644 --- a/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json +++ b/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json @@ -109,4 +109,4 @@ "import.success": "乐谱已导入", "import.fail.1": "生存模式下必须主手持空白乐谱以导入", "import.fail.4": "分析命令或读取乐谱（%1$s）错误" -} \ No newline at end of file +} From 261d69ea86685a818ef784d7803e0e4edaafabb2 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Fri, 25 Feb 2022 07:36:07 +0800 Subject: [PATCH 3/4] Update projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json Co-authored-by: mamaruo <37480168+mamaruo@users.noreply.github.com> --- projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json b/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json index b38f1bab0464..bfffb8c81e47 100644 --- a/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json +++ b/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json @@ -34,7 +34,7 @@ "note.byAuthor": "由%1$s谱写", "note.signButton": "签署", - "note.editTitle": "定义乐曲名称：", + "note.editTitle": "键入音乐名称：", "note.finalizeButton": "签署并关闭", "note.finalizeWarning": "注意！一旦你签署了乐谱，它将不可被再次编辑！", "note.generation.0": "原谱", From 9e9b56a54d90cbe730e3333069e200cc2a86f00b Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Fri, 25 Feb 2022 07:42:08 +0800 Subject: [PATCH 4/4] Update zh_cn.json --- .../music-maker-mod/xercamusic/lang/zh_cn.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json b/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json index bfffb8c81e47..67c0780ce126 100644 --- a/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json +++ b/projects/1.16/assets/music-maker-mod/xercamusic/lang/zh_cn.json @@ -32,14 +32,14 @@ "advancements.xercamusic.achievements.musician.title": "音乐家", "advancements.xercamusic.achievements.musician.description": "创作你的第一部作品", - "note.byAuthor": "由%1$s谱写", - "note.signButton": "签署", + "note.byAuthor": "%1$s 谱曲", + "note.signButton": "署名", "note.editTitle": "键入音乐名称：", - "note.finalizeButton": "签署并关闭", - "note.finalizeWarning": "注意！一旦你签署了乐谱，它将不可被再次编辑！", - "note.generation.0": "原谱", - "note.generation.1": "复刻", - "note.generation.2": "再复刻", + "note.finalizeButton": "署名并关闭", + "note.finalizeWarning": "注意！一旦乐谱被署名，它就不可被再次编辑！", + "note.generation.0": "原作", + "note.generation.1": "原作的副本", + "note.generation.2": "副本的副本", "note.upButton": "▲", "note.downButton": "▼", "note.leftButton": "◀", @@ -79,7 +79,7 @@ "note.helpText7b": "开始/停止预览", "note.helpText8a": "Delete键：", "note.helpText8b": "删除光标位置拍子", - "note.helpText9a": "退格键：", + "note.helpText9a": "Backspace键：", "note.helpText9b": "删除光标左侧拍子", "note.helpText10a": "第一排字母按键：", "note.helpText10b": "在当前八度音阶内写下音符",