From 62b765ebc5bf4bf217e779d287e049e50f69f4d5 Mon Sep 17 00:00:00 2001 From: YuWeiWu Date: Sat, 4 Apr 2020 14:58:34 +0800 Subject: [PATCH] Use license compatible font instead --- CHANGELOG.md | 1 + assets/voxygen/font/LICENSE-MIT | 21 ++++++++++++++++++ assets/voxygen/font/Zpix.ttf | 3 --- assets/voxygen/font/bdfUMplus-outline.ttf | 3 +++ assets/voxygen/i18n/zh_TW.ron | 26 +++++++++++------------ 5 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 assets/voxygen/font/LICENSE-MIT delete mode 100644 assets/voxygen/font/Zpix.ttf create mode 100644 assets/voxygen/font/bdfUMplus-outline.ttf diff --git a/CHANGELOG.md b/CHANGELOG.md index ada5e7fbfc..1edd3ace75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added Italian translation - Added Portuguese translation - Added Turkish translation +- Added Traditional Chinese translation - Complete rewrite of the combat system into a state machine - Abilities like Dash and Triplestrike - Armor can now be eqipped as items diff --git a/assets/voxygen/font/LICENSE-MIT b/assets/voxygen/font/LICENSE-MIT new file mode 100644 index 0000000000..4d6af41c45 --- /dev/null +++ b/assets/voxygen/font/LICENSE-MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2012 hikaen2 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/assets/voxygen/font/Zpix.ttf b/assets/voxygen/font/Zpix.ttf deleted file mode 100644 index 1925b12489..0000000000 --- a/assets/voxygen/font/Zpix.ttf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:745e26436dd02a363d26750eba94abbc77048353e6d53f5dc8a90693cb375495 -size 4433844 diff --git a/assets/voxygen/font/bdfUMplus-outline.ttf b/assets/voxygen/font/bdfUMplus-outline.ttf new file mode 100644 index 0000000000..d1487f66ea --- /dev/null +++ b/assets/voxygen/font/bdfUMplus-outline.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c22d4d76426893cbc7d0e93b6685338bc68839a49c45d309abb41ad13359c48 +size 3497900 diff --git a/assets/voxygen/i18n/zh_TW.ron b/assets/voxygen/i18n/zh_TW.ron index 821f0e2eba..ce70d6ac99 100644 --- a/assets/voxygen/i18n/zh_TW.ron +++ b/assets/voxygen/i18n/zh_TW.ron @@ -7,23 +7,23 @@ VoxygenLocalization( convert_utf8_to_ascii: false, fonts: { "opensans": Font ( - asset_key: "voxygen.font.Zpix", + asset_key: "voxygen.font.bdfUMplus-outline", scale_ratio: 1.0, ), "metamorph": Font ( - asset_key: "voxygen.font.Zpix", + asset_key: "voxygen.font.bdfUMplus-outline", scale_ratio: 1.0, ), "alkhemi": Font ( - asset_key: "voxygen.font.Zpix", + asset_key: "voxygen.font.bdfUMplus-outline", scale_ratio: 1.0, ), "wizard": Font ( - asset_key: "voxygen.font.Zpix", + asset_key: "voxygen.font.bdfUMplus-outline", scale_ratio: 1.0, ), "cyri": Font ( - asset_key: "voxygen.font.Zpix", + asset_key: "voxygen.font.bdfUMplus-outline", scale_ratio: 0.9, ), }, @@ -80,7 +80,7 @@ VoxygenLocalization( /// Start Main screen section "main.connecting": "連線中", - "main.creating_world": "產生世界中", + "main.creating_world": "生成世界中", // Welcome notice that appears the first time Veloren is started "main.notice": r#"歡迎加入 Veloren alpha 版！ @@ -193,11 +193,11 @@ Veloren 晚上會特別暗。 "hud.settings.toggle_shortcuts": "顯示快捷鍵", "hud.settings.toggle_bar_experience": "顯示經驗條", "hud.settings.scrolling_combat_text": "戰鬥訊息", - "hud.settings.single_damage_number": "單一傷害數值", - "hud.settings.cumulated_damage": "累積傷害數值", - "hud.settings.incoming_damage": "所受傷害數值", - "hud.settings.cumulated_incoming_damage": "累積所受傷害數值", - "hud.settings.energybar_numbers": "能量條數值", + "hud.settings.single_damage_number": "單一傷害", + "hud.settings.cumulated_damage": "累積傷害", + "hud.settings.incoming_damage": "所受傷害", + "hud.settings.cumulated_incoming_damage": "累積所受傷害", + "hud.settings.energybar_numbers": "能量條", "hud.settings.values": "數字", "hud.settings.percentages": "百分比", "hud.settings.chat": "聊天欄", @@ -307,8 +307,8 @@ Veloren 晚上會特別暗。 /jump - 偏移你的位置 /goto - 傳送到指定位置 /kill - 自殺 -/pig - 產生一隻豬 NPC -/wolf - 產生一隻狼 NPC +/pig - 生成一隻豬 NPC +/wolf - 生成一隻狼 NPC /help - 顯示聊天指令"#, "hud.social": "社交",