vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update russian translation. Get rid of untranslated strings in layouts. Remove build.sh script.

Browse source
This commit is contained in:
Alibek Omarov 2018-02-04 17:00:10 +03:00
parent 0637008eec
commit 4d7018bfde
7 changed files with 17 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build.sh
View file

@ -1,10 +0,0 @@
#!/bin/sh
ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 V=0 XASH_SDL=0 -j 8 APP_CFLAGS="-w -Wl,--no-undefined" APP_LDFLAGS="-Wl,--no-undefined"
./gen-config.sh release sign
./gen-version.sh default-release
rm assets/extras.pak 2>/dev/null
python2 makepak.py xash-extras assets/extras.pak
ant release
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid
/home/a1ba/.android/android-sdk-linux/build-tools/24.0.1/zipalign -f 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk

11
debug.sh
View file

@ -1,11 +0,0 @@
#!/bin/sh
ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3" XASH_SDL=0
sh gen-version.sh default-debug
rm assets/extras.pak 2>/dev/null
python2 makepak.py xash-extras assets/extras.pak
ant debug
#jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid -storepass 529459
adb install -r -f bin/xashdroid-debug.apk
#rm bin/xashdroid-release.apk
#/opt/android-sdk-update-manager/build-tools/19.1.0/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk

10
res/layout/activity_tutorial.xml
View file

@ -13,12 +13,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- <View
android:layout_width="match_parent"
android:layout_height="24dp"
android:background="#20000000" />-->
<RelativeLayout
android:id="@+id/buttonContainer"
android:layout_width="match_parent"
@ -36,7 +30,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:text="Back"
android:text="@string/back"
android:textColor="#FFF" />
@ -48,7 +42,7 @@
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="Finish"
android:text="@string/finish"
android:textColor="#FFF" />

2
res/layout/notify.xml
View file

@ -25,7 +25,7 @@
android:id="@+id/status_exit_button"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:text="Exit"
android:text="@string/exit"
android:layout_weight="0"
android:layout_alignParentLeft="true"
android:layout_gravity="center_vertical"

2
res/layout/notify_21.xml
View file

@ -27,7 +27,7 @@
android:id="@+id/status_exit_button_21"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:text="EXIT"
android:text="@string/exit"
android:layout_weight="0"
android:layout_alignParentLeft="true"
android:layout_gravity="center_vertical"

37
res/values-ru/strings.xml
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--<string name="app_name" translatable="false">Xash3D</string>
<string name="launcher_name" translatable="false">Xash3D</string>
<string name="launcher_name_test" translatable="false">Xash3D (test)</string>-->
<string name="launch_button">Запустить Xash3D</string>
<string name="cmd_args_text">Аргументы командной строки(только для экспертов)</string>
<string name="use_controls">Включить экранное управление</string>
@ -18,35 +14,14 @@
<string name="gamedir">Каталог мода</string>
<string name="pkgname">Пакет мода (только для экспертов)</string>
<string name="shortcut_name">Название ярлыка</string>
<!--<string name="about_main" translatable="false">Xash3D Android</string>-->
<string name="about_copyright">FWGS не связан с Valve или с любыми из их партнеров. Все авторские права принадлежат их соотвественным обладателям.</string>
<!-- Seems Android skips any line breaks and tabs here. -->
<string name="about_authors">
Порт на Android осуществлен командой FWGS:\n
&#8226; a1batross\n
&#8226; mittorn\n
&#8226; nicknekit\n
Особые благодарности:\n
&#8226; Дяде Мише за Xash3D\n
&#8226; Valve за Half-Life\n
</string>
<string name="about_links">
Подпишись на нас: \n
&#8226; <a href="https://vk.com/xashdroid">VK</a>\n
&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>\n
&#8226; <a href="https://github.com/FWGS">GitHub</a>
</string>
<string name="about_button">О Xash3D Android</string>
<string name="create_shortcut_button">Создать ярлык</string>
<string name="select_folder">Выбрать путь игровых файлов</string>
<string name="text_tab1">Стандартный</string>
<string name="text_tab2">Продвинутый</string>
<string name="text_res_tittle2">Стандартные настройки</string>
<string name="text_res_tittle3">Продвинутые настройки</string>
<string name="update_button">Проверять обновления при запуске</string>
<string name="update_to_beta">Обновлять до нестабильной версии, если доступно</string>
<string name="update_message">%s доступен! Скачай его сейчас!</string>
@ -55,16 +30,16 @@
<string name="no_updates">Обновления не найдены</string>
<string name="checking_updates">Работаю...</string>
<string name="immersive_mode">Включить Immersive Mode(Полноэкранный режим, для KitKat и старше)</string>
<string name="write_failed">Тест чтения не удался</string>
<string name="ask_about_new_basedir_msg">Переместите файлы игры куда-нибудь ещё. Например, в Android/data/in.celest.xash3d.hl или во внутренюю память. На следующий запуск я снова спрошу местоположение файлов игры.</string>
<!-- <string name="lollipop_select_folder_btn">Select folder</string> -->
<!-- These strings must be concat with a "ask_about_new_basedir" string -->
<string name="lollipop_request_permission_fail_msg">Тест записи не удался дважды. </string>
<string name="lollipop_write_fail_msg">Из-за политик записи в новых версиях Android, полноценно воспользоваться внешней памятью невозможно. </string>
<string name="kitkat_write_fail_msg">Из-за политик записи Android 4.4, вы не можете воспользоваться внешней памятью. </string>
<string name="readonly_fs_fail_msg">Похоже, ваша файловая система в режиме только для чтения. </string>
<string name="firstrun">Открыть руководство по установке</string>
<string name="next">Далее</string>
<string name="prev">Назад</string>
<string name="skip">Пропустить</string>
<string name="finish">Конец</string>
<string name="exit">Выход</string>
</resources>

14
res/values/strings.xml
View file

@ -19,7 +19,7 @@
<string name="about_main" translatable="false">Xash3D Android</string>
<string name="about_copyright">FWGS is not affiliated with Valve or any of their partners. All copyrights reserved to their respective owners.</string>
<!-- Seems Android skips any line breaks and tabs here. -->
<string name="about_authors">
<string name="about_authors" translatable="false">
Port to Android by FWGS team: \n
&#8226; a1batross\n
&#8226; mittorn \n
@ -27,12 +27,12 @@
&#8226; nekonomicon.\n
Special thanks to:\n
&#8226; Beloko for some touch controls textures
&#8226; Uncle Mike for Xash3D engine\n
&#8226; Valve for Half-Life\n
&#8226; msayan for tutorial-view library\n
</string>
<string name="about_links">
Follow us in: \n
<string name="about_links" translatable="false">
&#8226; <a href="https://vk.com/xashdroid">VK</a>\n
&#8226; <a href="http://moddb.com/game/xash3d-android">ModDB</a>\n
&#8226; <a href="https://github.com/FWGS">GitHub</a>
@ -60,25 +60,23 @@
<string name="write_failed">Write test has failed</string>
<string name="ask_about_new_basedir_msg">Move your game files somewhere else, for example Android/data/in.celest.xash3d.hl or internal memory. At next run I will ask you about folder again.</string>
<!--<string name="lollipop_request_permission_msg">Due to writing politics of newer Android versions, you need to select a root folder of storage where game data is located.</string>
<string name="lollipop_select_folder_btn">Select folder</string>-->
<!-- These strings must be concat with a "ask_about_new_basedir" string -->
<string name="lollipop_request_permission_fail_msg">Write test has been failed twice. </string>
<string name="lollipop_write_fail_msg">Due to writing politics of newer Android versions, you can\'t use this storage. </string>
<string name="kitkat_write_fail_msg">Due to writing politics of Android 4.4, you can\'t use this storage. </string>
<string name="readonly_fs_fail_msg">Seems you have read-only filesystem. </string>
<string name="resolution">Fixed screen resolution (experimental)</string>
<string name="resolution_scale">Scale screen keeping aspect ratio</string>
<string name="resolution_custom">Specify custom screen width and height</string>
<string name="resolution_result">Resolution: </string>
<string name="resolution_mod_warn"><img src="https://ya.ru/favicon.ico" /> <br />Use with caution! Some games does not support too low resolution, in case of bugs increase resolution to 640x480 or higher.\n
Resolution lower than 320x240 is not allowed.</string>
<string name="firstrun">Show firstrun dialog</string>
<string name="firstrun">Open installation guide</string>
<string name="next">Next</string>
<string name="prev">Prev</string>
<string name="skip">Skip</string>
<string name="finish">Finish</string>
<string name="exit">Exit</string>
</resources>