Merge version 1.6

Merge version 1.6

.gitignore

@@ -7,4 +7,5 @@
 *_.qys
 /*.docx
 *.png
-/Songs/interlude.qys
+/Songs/interlude.qys
+*.txt

Lang/chs.json

@@ -7,8 +7,10 @@
         "Adapter": "改编",
         "Comment": "备注",
         "Abstract": "摘要",
+        "Origin": "原曲",
         "Format": "格式",
-        "TrackCount": "音轨数",
+        "SectionCount": "乐章数",
+        "RealTrackCount": "实际音轨数",
         "Duration": "时长",
         "Instruments": "乐器",
 		"URL": "地址",
@@ -61,22 +63,9 @@
 		"Whistle": "口哨",
         "Xylophone": "木琴"
     },
-	"Error": {
-		"FileNotFound": "未找到文件\"$1\"",
-		"TerminatorAbsent": "(章节&1,音轨&2) 缺少终止符",
-		"RepeatError": "(章节&1,音轨&2) 反复标记不匹配",
-		"InvalidTonality": "(章节&1,音轨&2,小节&3) 声明了无效调名\"$4\"",
-		"InvalidInstrument": "(章节&1,音轨&2,小节&3) 声明了无效乐器\"$4\"",
-		"InvalidCharacter": "(章节&1,音轨&2,小节&3) 匹配到无效字符\"$4\"",
-		"InvalidFunction": "(章节&1,音轨&2,小节&3) 声明了无效函数名\"$4\"",
-		"BarLengthError": "(章节&1,音轨&2,小节&3) 拍数错误: 应为&4拍, 实际为&5拍",
-		"NoFormerPitch": "(章节&1,音轨&2,小节&3) %缺少前一个音符",
-		"ExpectPitch": "(章节&1,音轨&2,小节&3) 应该使用音高1~7或和弦",
-		"ExpectPrecussion": "(章节&1,音轨&2,小节&3) 应该使用打击乐标记x或X",
-		"DiffDuration": "(章节&1) 各音轨长度不统一：#2"
-	},
 	"Caption": {
 		"QYMP": "青云播放器",
+		"Playlist": "歌单",
 		"Settings": "设置",
 		"About": "关于",		
 		"ModifySong": "修改歌曲",
@@ -113,7 +102,20 @@
 		"AboutQYMP": {
 			"Version": "1.5",
 			"Producer": "鄂毕工作室",
-			"Website": "www.qymp.tk"
-		}
+			"Website": "http://qymp.ob-studio.cn/"
+		},
+		"Section": "章节&1",
+		"Track": "音轨&1",
+		"Bar": "小节&1",
+		"FileNotFound": "未找到文件$1",
+		"TerminatorAbsent": "缺少终止符",
+		"InvalidTonality": "声明了无效调名$1",
+		"InvalidInstrument": "声明了无效乐器$1",
+		"InvalidCharacter": "匹配到无效字符$1",
+		"InvalidFunction": "声明了无效函数名$1",
+		"BarLengthError": "拍数错误: 应为&1拍, 实际为&2拍",
+		"ExpectPitch": "应该使用音高1~7或和弦",
+		"ExpectPrecussion": "应该使用打击乐标记x",
+		"DiffDuration": "各音轨长度不统一：#1"
 	}
 }

Lang/eng.json

@@ -7,8 +7,10 @@
         "Adapter": "Adapter",
         "Comment": "Comment",
         "Abstract": "Abstract",
+        "Origin": "Origin",
         "Format": "Format",
-        "TrackCount": "Number of Tracks",
+        "SectionCount": "Number of Sections",
+        "RealTrackCount": "Number of Actual Tracks",
         "Duration": "Duration",
         "Instruments": "Instruments",
 		"URL": "URL",
@@ -61,22 +63,9 @@
 		"Whistle": "Whistle",
         "Xylophone": "Xylophone"
     },
-	"Error": {
-		"FileNotFound": "Cannot find file \"$1\".",
-		"TerminatorAbsent": "(Section &1, Track &2) Terminator cannot be found.",
-		"RepeatError": "(Section &1, Track &2) Cannot match the repeat marks.",
-		"InvalidTonality": "(Section &1, Track &2, Measure &3) Invalid tonality\"$4\".",
-		"InvalidInstrument": "(Section &1, Track &2, Measure &3) Invalid instrument\"$4\".",
-		"InvalidCharacter": "(Section &1, Track &2, Measure &3) Invalid character\"$4\".",
-		"InvalidFunction": "(Section &1, Track &2, Measure &3) Invalid function\"$4\".",
-		"BarLengthError": "(Section &1, Track &2, Measure &3) Wrong number of beats: should be &4, but actually is &5.",
-		"NoFormerPitch": "(Section &1, Track &2, Measure &3) Operator \"%\" needs a previous pitch.",
-		"ExpectPitch": "(Section &1, Track &2, Measure &3) Expect a pitch (1~7 or chord[]).",
-		"ExpectPrecussion": "(Section &1, Track &2, Measure &3) Expect a precussion sign (x or X).",
-		"DiffDuration": "(Section &1) The length of each track is not uniform：#2."
-	},
 	"Caption": {
 		"QYMP": "Qingyun Music Player",
+		"Playlist": "Playlist",
 		"Settings": "Settings",
 		"About": "About",		
 		"ModifySong": "Modify Song",
@@ -113,7 +102,20 @@
 		"AboutQYMP": {
 			"Version": "1.5",
 			"Producer": "Ob Studio",
-			"Website": "www.qymp.tk"
-		}
+			"Website": "http://qymp.ob-studio.cn/"
+		},
+		"Section": "Section &1",
+		"Track": "Track &1",
+		"Bar": "Measure &1",
+		"FileNotFound": "Cannot find file $1.",
+		"TerminatorAbsent": "Terminator cannot be found.",
+		"InvalidTonality": "Invalid tonality $1 was found.",
+		"InvalidInstrument": "Invalid instrument $1 was found.",
+		"InvalidExpression": "Invalid expression $1 was found.",
+		"InvalidFunction": "Invalid function $1 was found.",
+		"BarLengthError": "Number of beats is expected to be &1, but &2 was found.",
+		"ExpectPitch": "Expect a pitch (1~7 or chord[]).",
+		"ExpectPrecussion": "Expect a precussion sign (x).",
+		"DiffDuration": "The length of each track is not uniform：#2."
 	}
 }