CNLive Android Team / CNLiveApp · Commits

Commit 3da9ee34faa2e649f387d18ae2b80da30cb450db

Authored by 朱显松
1 parent 27796a7a

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp 

Conflicts:
	app/build.gradle
	app/libs/libcnlivelive.jar
	app/libs/libcnliveutil.jar
	app/src/main/AndroidManifest.xml
	app/src/main/jniLibs/arm64-v8a/libRongIMLib.so
	app/src/main/jniLibs/arm64-v8a/libksylive.so
	app/src/main/jniLibs/armeabi-v7a/libRongIMLib.so
	app/src/main/jniLibs/armeabi-v7a/libksylive.so
	app/src/main/jniLibs/armeabi/libRongIMLib.so
	app/src/main/jniLibs/armeabi/libksylive.so
	app/src/main/jniLibs/x86/libRongIMLib.so
	app/src/main/jniLibs/x86/libksylive.so
	app/src/main/res/values/strings.xml
Inline Side-by-side
Showing 1 changed file with 19 additions and 0 deletions
app/src/main/res/values/strings.xml
  View file @3da9ee3
... ... @@ -12,4 +12,23 @@
12 12  
13 13 <!-- TODO: Remove or change this placeholder text -->
14 14 <string name="hello_blank_fragment">Hello blank fragment</string>
  15 +
  16 +
  17 + <string name="player_loading">正在加载，请稍等...</string>
  18 + <string name="player_retry">重试</string>
  19 + <string name="player_replay">重新播放</string>
  20 + <string name="player_status_leave">主播暂时离开</string>
  21 + <string name="player_status_end">直播已结束</string>
  22 + <string name="player_mobile_net">温馨提示：您正在使用手机流量观看</string>
  23 + <string name="player_mobile_net_toast">您正在使用手机流量观看</string>
  24 + <string name="player_error_net">网络异常</string>
  25 + <string name="player_error">播放异常</string>
  26 + <string name="player_continue_play">继续播放</string>
  27 +
  28 + <string name="loading_rate_pre">提醒您正在切换到</string>
  29 + <string name="loading_rate_last">，请稍等...</string>
  30 + <string name="loaded_rate_pre">提醒您已切换到</string>
  31 + <string name="loaded_rate_last">""</string>
  32 + <string name="loaded_rate_error_pre">提醒您切换</string>
  33 + <string name="loaded_rate_error_last">失败，请重试</string>
15 34 </resources>
... ...