rixty
/
Amadeus
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/res/xml/preferences.xml
This commit is contained in:
Yink 2017-03-09 03:25:52 +01:00
parent 4ec15f587c 2adb5c04ea
commit ae320ee120
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/values-ru/strings.xml
View File

@ -7,6 +7,14 @@
<string name="default_recog_lang">ja</string>
<string name="google_app_error">Google App не найден.</string>
<!-- Настройки -->
<string name="pref_recog_lang">Язык распознавания</string>
<string name="pref_recog_lang_desc">Выберите язык распознавания голоса</string>
<string name="pref_lang">Язык</string>
<string name="pref_lang_desc">Выберите язык приложения (требуется перезапуск)</string>
<string name="pref_subtitles">Показывать субтитры</string>
<string name="pref_subtitles_desc">Показывает субтитры с ответами Амадеуса</string>
<!-- Многие фразы были вырваны из контекста, поэтому прошу не пинать -->
<string name="line_hello">Привет.</string>
<string name="line_dont_call_me_like_that">Не называй меня так!</string>

8
app/src/main/res/values/strings.xml
View File

@ -8,6 +8,14 @@
<string name="google_app_error">Google App wasn\'t detected.</string>
<integer name="duration">40</integer>
<!-- Settings -->
<string name="pref_recog_lang">Recognition language</string>
<string name="pref_recog_lang_desc">Select voice recognition language</string>
<string name="pref_lang">Language</string>
<string name="pref_lang_desc">Select app language (app restart required)</string>
<string name="pref_subtitles">Show subtitles</string>
<string name="pref_subtitles_desc">Shows subtitles for Amadeus\' answers</string>
<string name="line_hello">Hello.</string>
<string name="line_dont_call_me_like_that">Don\'t call me like that!</string>
<string name="line_but_i_refuse">But I refuse.</string>