Merge branch 'develop' into refactor_update_filelist_from_database

res/values-bn-rIN/strings.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>

res/values-es-rPY/strings.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>

res/values-es-rUS/strings.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>

res/values-tr/strings.xml

@@ -34,8 +34,8 @@
   <string name="recommend_text">\"Sana, akıllı telefonunda kullanmak üzere %1$s daveti yapıyorum!\nBuradan indirebilirsin: %2$s\"</string>
   <string name="auth_check_server">Sunucuyu kontrol et</string>
   <string name="auth_host_url">Sunucu adresi https://…</string>
-  <string name="auth_username">Kullanıcı Adı:</string>
-  <string name="auth_password">Parola:</string>
+  <string name="auth_username">Kullanıcı Adı</string>
+  <string name="auth_password">Parola</string>
   <string name="auth_register">%1$s senin için yeni mi?</string>
   <string name="sync_string_files">Dosyalar</string>
   <string name="setup_btn_connect">Bağlan</string>

res/values-zh-rCN/strings.xml

@@ -19,14 +19,17 @@
   <string name="prefs_pincode_summary">保护您的App客户端</string>
   <string name="prefs_instant_upload">即时图片上传</string>
   <string name="prefs_instant_upload_summary">即时上传相机拍摄的图片</string>
+  <string name="prefs_instant_video_upload">立即上传视频</string>
   <string name="prefs_log_title">开启日志</string>
   <string name="prefs_log_summary">这过去是日志问题</string>
   <string name="prefs_log_title_history">日志历史</string>
   <string name="prefs_log_summary_history">这显示已经保存的日志</string>
   <string name="prefs_log_delete_history_button">删除历史</string>
   <string name="prefs_help">帮助</string>
+  <string name="prefs_recommend">推荐给朋友</string>
   <string name="prefs_feedback">反馈</string>
   <string name="prefs_imprint">版本说明</string>
+  <string name="recommend_subject">在您的智能手机上试用一下 %1$s！</string>
   <string name="auth_check_server">检查服务器</string>
   <string name="auth_host_url">服务器地址 https://...</string>
   <string name="auth_username">用户名</string>
@@ -93,6 +96,7 @@
   <string name="sync_fail_in_favourites_ticker">文件同步失败</string>
   <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(与 %2$d 冲突)</string>
   <string name="sync_foreign_files_forgotten_ticker">某些本地文件已被遗忘</string>
+  <string name="sync_current_folder_was_removed">文件夹%1$s 不存在</string>
   <string name="foreign_files_move">移动所有</string>
   <string name="foreign_files_success">所有文件已被移动</string>
   <string name="foreign_files_fail">某些文件无法被移动</string>
@@ -118,6 +122,7 @@
   <string name="media_err_unsupported">不支持的编码格式</string>
   <string name="media_err_io">文件不可读</string>
   <string name="media_err_malformed">文件编码错误</string>
+  <string name="media_err_timeout">播放超时</string>
   <string name="media_err_invalid_progressive_playback">文件不支持流播</string>
   <string name="media_err_unknown">当前媒体播放器不支持。</string>
   <string name="media_err_security_ex">尝试播放%1$s时保护错误</string>
@@ -148,7 +153,11 @@
   <string name="auth_oauth_error_access_denied">访问被认证服务器拒绝</string>
   <string name="auth_wtf_reenter_URL">意外状态；请再次输入服务器的地址</string>
   <string name="auth_expired_basic_auth_toast">请输入当前密码：</string>
+  <string name="auth_expired_saml_sso_token_toast">您的会话超时了，请重新连接</string>
+  <string name="auth_unsupported_auth_method">服务器不支持这种验证方式</string>
+  <string name="auth_unsupported_multiaccount">%1$s不支持多个账户</string>
   <string name="auth_fail_get_user_name">您的服务器没有返回一个正确的用户 id，请联系管理员\n\t</string>
+  <string name="auth_can_not_auth_against_server">当前服务器验证失败</string>
   <string name="fd_keep_in_sync">保证文件更新</string>
   <string name="common_rename">重命名</string>
   <string name="common_remove">删除</string>
@@ -166,10 +175,12 @@
   <string name="sync_file_fail_msg">无法核实远程文件</string>
   <string name="sync_file_nothing_to_do_msg">文件内容已同步</string>
   <string name="create_dir_fail_msg">文件夹无法创建</string>
+  <string name="filename_forbidden_characters">禁用字符: / \\ &lt; &gt; : \" | ? *</string>
   <string name="wait_a_moment">请稍候</string>
   <string name="filedisplay_unexpected_bad_get_content">未知问题；请试试用其他程序选择此文件</string>
   <string name="filedisplay_no_file_selected">未选择文件。</string>
   <string name="activity_chooser_title">发送链接给 …</string>
+  <string name="oauth_check_onoff">使用oAuth2登陆</string>
   <string name="oauth_login_connection">连接oAuth2 服务器...</string>
   <string name="ssl_validator_header">站点身份无法验证</string>
   <string name="ssl_validator_reason_cert_not_trusted">不受信任的服务器证书</string>