diff options
| author | lookshe <github@lookshe.org> | 2016-04-17 17:37:43 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-17 17:37:43 +0200 |
| commit | ad6208e53095e3a9870cdc0eae9b7c068a42829a (patch) | |
| tree | d5216f567722d4d6a959ab262c6cbef22f1931e7 /src/main/res/values-zh-rCN | |
| parent | 1f81683d26eba69d7e4373bbda6295d5d7843777 (diff) | |
| parent | de7631e300eb9e578336d642dd279faecdb09391 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Conflicts:
build.gradle
src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
src/main/res/values-bg/strings.xml
src/main/res/values-cs/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pt/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res/values-zh-rCN')
| -rw-r--r-- | src/main/res/values-zh-rCN/strings.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 250f1a5d..76f73f06 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -71,6 +71,8 @@ <string name="send_failed">传递失败</string> <string name="send_rejected">拒绝</string> <string name="preparing_image">准备传输图像</string> + <string name="preparing_images">正在传输图像</string> + <string name="sharing_files_please_wait">正在分享文件，请稍候…</string> <string name="action_clear_history">清除历史记录</string> <string name="clear_conversation_history">清除会话记录</string> <string name="clear_histor_msg">删除该会话中所有信息？\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息。</string> @@ -352,6 +354,7 @@ <string name="choose_file">选择文件</string> <string name="receiving_x_file">接收中 %1$s (已完成 %2$d%%)</string> <string name="download_x_file">下载 %s</string> + <string name="delete_x_file">删除 %s</string> <string name="file">文件</string> <string name="open_x_file"> 打开 %s</string> <string name="sending_file">发送中 (已完成 %1$d%%)</string> @@ -506,7 +509,7 @@ <string name="pref_xa_on_silent_mode_summary">当设备进入静音模式时把资源标识改为不可用</string> <string name="pref_treat_vibrate_as_silent">静音模式开启振动</string> <string name="pref_treat_vibrate_as_silent_summary">当设备进入振动模式时把资源标识改为不可用</string> - <string name="pref_show_connection_options">高级边接设置</string> + <string name="pref_show_connection_options">高级连接设置</string> <string name="pref_show_connection_options_summary">注册账户时显示主机名和端口</string> <string name="hostname_example">xmpp.example.com</string> <string name="action_add_account_with_certificate">使用证书添加账户</string> @@ -536,6 +539,7 @@ </plurals> <string name="shared_file_with_x">用 %s 分享文件</string> <string name="shared_image_with_x">用 %s 分享图片</string> + <string name="shared_images_with_x">图片分享自 %s</string> <string name="no_storage_permission">Conversations+ 需要访问外部存储</string> <string name="sync_with_contacts">与联系人同步</string> <string name="sync_with_contacts_long">Conversations+ 会匹配你的 XMPP 花名册与你的联系人，以显示他们的全名和头像。\n\nConversations+ 只会读取你的联系人并在本地匹配，不会上传到你的服务器。\n\n现在将要询问你是否给予访问你联系人的权限。</string> |