Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change license year and Chinese translation of Pokemon's name #1715

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Change license year and Chinese translation of Pokemon's name #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f785f8a
Change license year
felixchong98 Jul 27, 2018
5b41c89
Change translation
felixchong98 Jul 27, 2018
5acf34d
Update LICENSE.txt
felixchong98 Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Version 3, 29 June 2007-2019

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007-2019 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down
6 changes: 3 additions & 3 deletions bin/trans/zh-cn/db/pokes/pokemons.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
9:1 Mega水箭龟
10:0 绿毛虫
11:0 铁甲蛹
12:0 巴大蝴
12:0 巴大蝶
13:0 独角虫
14:0 铁壳昆
15:0:H 大针蜂
Expand Down Expand Up @@ -878,8 +878,8 @@
693:0 钳炮虾
694:0 光电小蜥
695:0 电伞蜥
696:0 小暴龙
697:0 暴君龙
696:0 宝宝暴龙
697:0 怪颚龙
698:0 阿玛鲁斯
699:0 阿玛鲁加
700:0 仙精灵
Expand Down