diff --git a/.gitignore b/.gitignore index 586b5bf3..9f7c107f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,45 +1,45 @@ # Compile output -build/ -lib/libgit2/ -*.o -zh_CN.qm -fk_ver +/build/ +/docs/build +/*.o +/zh_CN.qm +/fk_ver # IDE & LSP -.kdev4/ -.vscode/ -*.user +/.kdev4/ +/.vscode/ +/*.user *-swp -*.kdev4 -.cache/ -tags +/*.kdev4 +/.cache/ +/tags # file produced by game /FreeKill +/FreeKill.exe /mymod -FreeKill.exe freekill-wrap.cxx -server/users.db -server/rsa -server/rsa_pub -freekill.client.config.json -freekill.server.config.json -flist.txt +/server/users.db +/server/rsa +/server/rsa_pub +/freekill.client.config.json +/freekill.server.config.json +/flist.txt # windeployqt -bearer/ -iconengines/ -imageformats/ -platforms/ -Qt/ -QtGraphicalEffects/ -QtQuick/ -QtQuick.2/ -Qt5Compat/ -QtQml/ -QtMultimedia/ -sqldrivers/ -styles/ -tls/ -translations/ -*.dll +/bearer/ +/iconengines/ +/imageformats/ +/platforms/ +/Qt/ +/QtGraphicalEffects/ +/QtQuick/ +/QtQuick.2/ +/Qt5Compat/ +/QtQml/ +/QtMultimedia/ +/sqldrivers/ +/styles/ +/tls/ +/translations/ +/*.dll diff --git a/Fk/Splash.qml b/Fk/Splash.qml index 01a7c02d..cc4766a6 100644 --- a/Fk/Splash.qml +++ b/Fk/Splash.qml @@ -36,7 +36,7 @@ Rectangle { Text { id: fktext - text: "FreeKill" + text: qsTr("FreeKill") // color: "#ffffff" font.pixelSize: 40 opacity: 0 @@ -151,7 +151,7 @@ Rectangle { } Text { - text: "常用联机IP:175.178.66.93\nFK联机交流群:531553435" + text: "常用联机IP:175.178.66.93\n新月杀联机交流群:531553435" font.pixelSize: 20 anchors.bottom: parent.bottom anchors.bottomMargin: 20 diff --git a/Fk/main.qml b/Fk/main.qml index b95ee963..bac13d9d 100644 --- a/Fk/main.qml +++ b/Fk/main.qml @@ -13,7 +13,7 @@ Window { height: 540 minimumWidth: 160 minimumHeight: 90 - title: "FreeKill v" + FkVersion + title: qsTr("FreeKill") + " v" + FkVersion property var callbacks: Logic.callbacks property var tipList: [] diff --git a/android/.gitignore b/android/.gitignore index 39a3a6b8..a9935908 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,4 +1,4 @@ assets/ -res/ +res/mipmap build.sh diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 7a50cae2..bff59b9f 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -17,7 +17,7 @@ + + 新月杀 + diff --git a/freekill.desktop b/freekill.desktop index feb90e62..14a911c7 100755 --- a/freekill.desktop +++ b/freekill.desktop @@ -1,6 +1,7 @@ #!/usr/bin/env xdg-open [Desktop Entry] Name=FreeKill +Name[zh_CN]=新月杀 Comment=A Bang!-like card game Comment[zh_CN]=一款玩法类似Bang!的桌游 Icon=freekill_logo diff --git a/image/icon.ico b/image/icon.ico index 6b02991b..a2fb4649 100644 Binary files a/image/icon.ico and b/image/icon.ico differ diff --git a/image/icon.png b/image/icon.png index aed7bc31..53f9e066 100644 Binary files a/image/icon.png and b/image/icon.png differ diff --git a/image/logo/freekill.png b/image/logo/freekill.png deleted file mode 100644 index 3f40fdf0..00000000 Binary files a/image/logo/freekill.png and /dev/null differ diff --git a/image/logo/freekill.png b/image/logo/freekill.png new file mode 120000 index 00000000..350f2e3a --- /dev/null +++ b/image/logo/freekill.png @@ -0,0 +1 @@ +/home/notify/develop/FreeKill/image/icon.png \ No newline at end of file diff --git a/lang/zh_CN.ts b/lang/zh_CN.ts index aad5f756..12ef92d2 100644 --- a/lang/zh_CN.ts +++ b/lang/zh_CN.ts @@ -117,8 +117,20 @@ + + main + + FreeKill + 新月杀 + + + Splash + + FreeKill + 新月杀 + Free 自由 diff --git a/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua index 85e87701..33a34330 100644 --- a/lua/client/i18n/zh_CN.lua +++ b/lua/client/i18n/zh_CN.lua @@ -56,7 +56,7 @@ Fk:loadTranslationTable{ ["Replay"] = "录像", ["About"] = "关于", ["about_freekill_description"] = [[ -# 关于FreeKill +# 关于新月杀 以便于DIY为首要目的的开源三国杀游戏。