Commit Graph

1109 Commits

Author SHA1 Message Date
duduluu
81309350d1 SocialFighting 经确认是动手打架。
生长期:一年当中可以生长的时间段。如一年中春夏秋适合作物种植,冬天太冷不适合,作物停止生长!
2016-10-21 13:52:49 +08:00
风之起灵
97a01f9ee8 Merge pull request #22 from cainiaowu/working
spacing, wording, terminology.
2016-10-21 13:34:46 +08:00
cainiaowu
5d4dadfeee spacing, wording, terminology. 2016-10-20 17:58:48 +08:00
风之起灵
7cafa0de37 Update README.txt
Add the translator cainiaowu
2016-10-19 23:29:17 +08:00
风之起灵
eb647a4063 Merge pull request #21 from cainiaowu/working
question mark & terminology
2016-10-19 23:27:27 +08:00
cainiaowu
290e3ee341 Unify terminology 2016-10-19 18:36:44 +08:00
cainiaowu
52bcb007c5 question mark 2016-10-19 15:53:02 +08:00
风之起灵
3d07245072 Merge pull request #20 from cainiaowu/merge-recover
Recover from merge, Keyed sorting and punctuation
2016-10-19 15:42:58 +08:00
cainiaowu
8431208571 punctuation and "storage area" wording. 2016-10-19 15:37:24 +08:00
cainiaowu
cda2c59ecd punctuation 2016-10-19 14:46:49 +08:00
cainiaowu
13f3e92719 Recover from merge 2016-10-19 14:15:33 +08:00
风之起灵
d458880497 Psychoid leaves 2016-10-18 15:46:04 +08:00
风之起灵
43bfe77754 Merge pull request #19 from cainiaowu/patch-4
Punctuation and wording fix
2016-10-18 15:21:35 +08:00
cainiaowu
44def11431 indoor unroofed text 2016-10-18 15:19:33 +08:00
cainiaowu
2207c3c9ca remove ellipsis 2016-10-18 15:18:07 +08:00
cainiaowu
5171d6d3e7 credit 2016-10-18 14:45:45 +08:00
cainiaowu
2e8cd52356 Punctuation and wording 2016-10-18 14:42:14 +08:00
cainiaowu
6db6d69fb1 Punctuation fix 2016-10-18 14:36:58 +08:00
风之起灵
c797117f62 Merge pull request #17 from cainiaowu/patch-2
change some wording to match others
2016-10-17 13:56:20 +08:00
风之起灵
05d02e9fd7 Merge pull request #16 from cainiaowu/patch-3
re-translate some obscured wording
2016-10-17 13:55:21 +08:00
cainiaowu
b60c9b6fbe some obscured wording
re-translate some obscured wording from english.
2016-10-17 13:43:09 +08:00
cainiaowu
b5ee427475 change some wording to match others 2016-10-17 13:36:59 +08:00
风之起灵
ca899efee6 Merge pull request #15 from cainiaowu/patch-1
proper chinese
2016-10-17 13:31:37 +08:00
cainiaowu
f5f1630eae proper chinese 2016-10-17 13:23:11 +08:00
风之起灵
d8ac18999d Typo fix 2016-10-17 08:40:22 +08:00
风之起灵
455123aa64 Typo 2016-10-15 12:32:19 +08:00
风之起灵
c3ecb02a5c Update Races_Animal_Pet.xml 2016-10-14 23:16:29 +08:00
SerGawen
7e149791dd typo fix 2016-10-12 09:17:25 +08:00
风之起灵
b90dc0ebea Merge pull request #14 from Ludeon/duduluu
Fix Smokeleaf
Smokeleaf: 烟叶 -> 大麻
质量 -> 品质
2016-10-10 08:20:25 +08:00
风之起灵
3a65c5dd5d Fix Smokeleaf
Smokeleaf: 烟叶 -> 大麻
质量 -> 品质
2016-10-10 08:06:24 +08:00
风之起灵
3ff85c4849 Typesetting
上一次误点了Revert
2016-10-08 20:45:33 +08:00
风之起灵
4a89f71564 Revert "Typesetting and some changing"
This reverts commit 00e7b424e5.
2016-10-08 20:35:25 +08:00
风之起灵
00e7b424e5 Typesetting and some changing
Yayo: 椰油 -> Y粉

Slag: 钢渣块 -> 钢渣
2016-10-08 20:30:12 +08:00
风之起灵
5447427f14 Update ScenParts.xml 2016-10-05 20:47:17 +08:00
风之起灵
3620d7aa76 Update Dialog_StatsReports.xml 2016-10-05 20:28:55 +08:00
风之起灵
5eecea36ba Update Dialogs_Various.xml 2016-10-05 20:23:00 +08:00
风之起灵
8f631cf595 Update Thoughts_Situation_Social.xml 2016-10-05 20:11:00 +08:00
风之起灵
65db0d20f9 Update Buildings_Misc.xml 2016-10-05 20:04:25 +08:00
风之起灵
c11d01e0eb Update ResearchProjects_Tier3_Misc.xml 2016-10-05 20:01:14 +08:00
风之起灵
c8f3e134d1 Update Recipes_Surgery.xml 2016-10-05 19:59:22 +08:00
风之起灵
207a51324e Update Instructions.xml 2016-10-05 19:55:36 +08:00
风之起灵
969d57fda9 Update Jobs_Work.xml 2016-10-05 19:49:22 +08:00
风之起灵
878a87a2d1 Update Jobs_Work.xml 2016-10-05 19:48:33 +08:00
风之起灵
c21d6d4973 Update Concepts_NotedSelfshow.xml 2016-10-05 19:37:16 +08:00
风之起灵
49098d5134 Update Menus_Main.xml 2016-10-05 01:44:34 +08:00
风之起灵
08bedd2f08 Update RulePacks_NameMakers_People.xml 2016-10-05 01:37:47 +08:00
风之起灵
20ee505701 Update Jobs_Misc.xml 2016-10-05 01:31:22 +08:00
风之起灵
d248b84556 Update Psychite_Yayo.xml 2016-10-05 00:08:28 +08:00
风之起灵
9503988eb5 Update Psychite_Yayo.xml 2016-10-05 00:08:08 +08:00
风之起灵
56e13cb520 Update Recipes_Add.xml 2016-10-05 00:07:40 +08:00