diff --git a/input/HSK/HSK1/HSK1-3.dictionary.txt b/input/HSK/HSK1/HSK1-3.dictionary.txt index f4785b6..cf126e4 100644 --- a/input/HSK/HSK1/HSK1-3.dictionary.txt +++ b/input/HSK/HSK1/HSK1-3.dictionary.txt @@ -1,4 +1,4 @@ -叫 jiao4 + jiao4 什么 shen2 me5 名字 ming2 zi5 我 wo3 @@ -9,4 +9,4 @@ 人 ren2 李明 ERROR 中国 Zhong1 guo2 -美国 Mei3 guo2 \ No newline at end of file +美国 Mei3 guo2 diff --git a/input/HSK/HSK1/HSK1-4.dictionary.txt b/input/HSK/HSK1/HSK1-4.dictionary.txt index d642296..2d64e96 100644 --- a/input/HSK/HSK1/HSK1-4.dictionary.txt +++ b/input/HSK/HSK1/HSK1-4.dictionary.txt @@ -1,12 +1,12 @@ -她 ta1 -他 ta1 -谁 shei2 -的 de5 -汉语 Han4 yu3 -哪 na3 -国 guo2 -呢 ne5 -他 ta1 -同学 tong2 xue2 -朋友 peng2 you5 -委内瑞拉 Wei3 nei4 rui4 la1 +她 ta1 +他 ta1 +谁 shei2 +的 de5 +汉语 Han4 yu3 +哪 na3 +国 guo2 +呢 ne5 +他 ta1 +同学 tong2 xue2 +朋友 peng2 you5 +委内瑞拉 Wei3 nei4 rui4 la1 diff --git a/resources/HSK/HSK1/HSK1-3.dictionary/dictionary.en.tsv b/resources/HSK/HSK1/HSK1-3.dictionary/dictionary.en.tsv index 3588da4..eac5ac4 100644 --- a/resources/HSK/HSK1/HSK1-3.dictionary/dictionary.en.tsv +++ b/resources/HSK/HSK1/HSK1-3.dictionary/dictionary.en.tsv @@ -7,6 +7,12 @@ simplified traditional pinyin meaning 老师 老師 lao3 shi1 teacher 吗 嗎 ma5 (question particle for 'yes-no' questions) 学生 學生 xue2 sheng5 student +<<<<<<< HEAD 人 人 ren2 person; people 中国 中國 Zhong1 guo2 China -美国 美國 Mei3 guo2 United States; USA; US \ No newline at end of file +美国 美國 Mei3 guo2 United States; USA; US +======= +人 人 ren2 person; people +中国 中國 Zhong1 guo2 China +美国 美國 Mei3 guo2 United States; USA; US +>>>>>>> 1be9c00 (add files hsk 3 4 dictionary) diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/Han4 yu3.wav b/resources/HSK/HSK1/HSK1-4.dictionary/Han4 yu3.wav new file mode 100644 index 0000000..d045944 Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/Han4 yu3.wav differ diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/Wei3 nei4 rui4 la1.wav b/resources/HSK/HSK1/HSK1-4.dictionary/Wei3 nei4 rui4 la1.wav new file mode 100644 index 0000000..fc1d940 Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/Wei3 nei4 rui4 la1.wav differ diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/de5.wav b/resources/HSK/HSK1/HSK1-4.dictionary/de5.wav new file mode 100644 index 0000000..0becbe2 Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/de5.wav differ diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/dictionary.en.tsv b/resources/HSK/HSK1/HSK1-4.dictionary/dictionary.en.tsv index 6bcad2d..41a69f9 100644 --- a/resources/HSK/HSK1/HSK1-4.dictionary/dictionary.en.tsv +++ b/resources/HSK/HSK1/HSK1-4.dictionary/dictionary.en.tsv @@ -1,3 +1,4 @@ +<<<<<<< HEAD simplified traditional pinyin meaning 她 她 ta1 she 他 他 ta1 (third-person singular) (since the early 20th century, usu. male) he; him; his @@ -30,3 +31,17 @@ simplified traditional pinyin meaning 朋友 朋友 peng2 you5 friend 朋友 朋友 peng2 you5 CL:個|个[ge4],位[wei4] 委内瑞拉 委內瑞拉 Wei3 nei4 rui4 la1 Venezuela +======= +simplified traditional pinyin meaning +她 她 ta1 she +谁 誰 shei2 who +的 的 de5 of; ~'s (possessive particle) +汉语 漢語 Han4 yu3 Chinese language +哪 哪 na3 how, which +国 國 guo2 country; nation; state +呢 呢 ne5 particle indicating that a previously asked question is to be applied to the preceding word ('What about ...?', 'And ...?') +他 他 ta1 (third-person singular) (since the early 20th century, usu. male) he; him; his +同学 同學 tong2 xue2 classmate +朋友 朋友 peng2 you5 friend +委内瑞拉 委內瑞拉 Wei3 nei4 rui4 la1 Venezuela +>>>>>>> 1be9c00 (add files hsk 3 4 dictionary) diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/guo2.wav b/resources/HSK/HSK1/HSK1-4.dictionary/guo2.wav new file mode 100644 index 0000000..fcaefef Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/guo2.wav differ diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/na3.wav b/resources/HSK/HSK1/HSK1-4.dictionary/na3.wav new file mode 100644 index 0000000..e9fdf6d Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/na3.wav differ diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/ne5.wav b/resources/HSK/HSK1/HSK1-4.dictionary/ne5.wav new file mode 100644 index 0000000..cc86345 Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/ne5.wav differ diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/peng2 you5.wav b/resources/HSK/HSK1/HSK1-4.dictionary/peng2 you5.wav new file mode 100644 index 0000000..13eea9b Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/peng2 you5.wav differ diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/shei2.wav b/resources/HSK/HSK1/HSK1-4.dictionary/shei2.wav new file mode 100644 index 0000000..d581e51 Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/shei2.wav differ diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/ta1.wav b/resources/HSK/HSK1/HSK1-4.dictionary/ta1.wav new file mode 100644 index 0000000..dee30b2 Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/ta1.wav differ diff --git a/resources/HSK/HSK1/HSK1-4.dictionary/tong2 xue2.wav b/resources/HSK/HSK1/HSK1-4.dictionary/tong2 xue2.wav new file mode 100644 index 0000000..fcd040e Binary files /dev/null and b/resources/HSK/HSK1/HSK1-4.dictionary/tong2 xue2.wav differ