diff --git a/CHANGES.rst b/CHANGES.rst index 4f026c6d97..aacada1151 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,12 @@ +Changes in 0.6.15 (2018-04-23) +=============================================== + +Improvements: + * Upgrade MatrixKit version (v0.7.11). + +Bug fix: + * Regression: Sending a photo from the photo library causes a crash. + Changes in 0.6.14 (2018-04-20) =============================================== diff --git a/Podfile b/Podfile index e938d26e03..5a7f90730f 100644 --- a/Podfile +++ b/Podfile @@ -9,7 +9,7 @@ source 'https://github.com/CocoaPods/Specs.git' # Different flavours of pods to MatrixKit # The current MatrixKit pod version -$matrixKitVersion = '0.7.10' +$matrixKitVersion = '0.7.11' # The develop branch version #$matrixKitVersion = 'develop' diff --git a/Podfile.lock b/Podfile.lock index bece7ff90a..756593f9a7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -43,34 +43,34 @@ PODS: - GZIP (1.2.1) - HPGrowingTextView (1.1) - libPhoneNumber-iOS (0.9.13) - - MatrixKit (0.7.10): + - MatrixKit (0.7.11): - cmark (~> 0.24.1) - DTCoreText (~> 1.6.21) - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixKit/Core (= 0.7.10) - - MatrixSDK (= 0.10.8) - - MatrixKit/AppExtension (0.7.10): + - MatrixKit/Core (= 0.7.11) + - MatrixSDK (= 0.10.9) + - MatrixKit/AppExtension (0.7.11): - cmark (~> 0.24.1) - DTCoreText (~> 1.6.21) - DTCoreText/Extension - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.10.8) - - MatrixKit/Core (0.7.10): + - MatrixSDK (= 0.10.9) + - MatrixKit/Core (0.7.11): - cmark (~> 0.24.1) - DTCoreText (~> 1.6.21) - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.10.8) - - MatrixSDK (0.10.8): - - MatrixSDK/Core (= 0.10.8) - - MatrixSDK/Core (0.10.8): + - MatrixSDK (= 0.10.9) + - MatrixSDK (0.10.9): + - MatrixSDK/Core (= 0.10.9) + - MatrixSDK/Core (0.10.9): - AFNetworking (~> 3.2.0) - GZIP (~> 1.2.1) - OLMKit (~> 2.2.2) - Realm (~> 3.3.2) - - MatrixSDK/JingleCallStack (0.10.8): + - MatrixSDK/JingleCallStack (0.10.9): - MatrixSDK/Core - WebRTC (= 63.11.20455) - OLMKit (2.2.2): @@ -90,8 +90,8 @@ DEPENDENCIES: - cmark - DTCoreText - GBDeviceInfo (~> 5.1.0) - - MatrixKit (= 0.7.10) - - MatrixKit/AppExtension (= 0.7.10) + - MatrixKit (= 0.7.11) + - MatrixKit/AppExtension (= 0.7.11) - MatrixSDK/JingleCallStack - OLMKit - PiwikTracker (from `https://github.com/manuroe/matomo-sdk-ios.git`, branch `feature/CustomVariables`) @@ -115,13 +115,13 @@ SPEC CHECKSUMS: GZIP: 7ee835f989fb3c6ea79005fc90b8fa6af710a70d HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19 libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa - MatrixKit: 524aa527ce302731ce322f8ab01724c226e538e6 - MatrixSDK: 9a974388ae38996f639358aea9cc442163012dc7 + MatrixKit: fa148ae8eef4e60e65d36af0af1be28fc8264935 + MatrixSDK: 5c3a0ddfa141775d88565e627f491a066dd1e87c OLMKit: b9d8c0ffee9ea8c45bc0aaa9afb47f93fba7efbd PiwikTracker: 42862c7b13028065c3dfd36b4dc38db8a5765acf Realm: d927fbf66df5532cfafc08afb5f7e53ded37b894 WebRTC: f2a6203584745fe53532633397557876b5d71640 -PODFILE CHECKSUM: ebbd8236ca52d1c288efd2a3eb5d5ef0b05ffc1b +PODFILE CHECKSUM: a3ec9e9795d74a34aeaa86fdbc1983a365e93e9a COCOAPODS: 1.4.0 diff --git a/Riot/Assets/eu.lproj/Vector.strings b/Riot/Assets/eu.lproj/Vector.strings index b6cd88a5a2..bbcd2f139e 100644 --- a/Riot/Assets/eu.lproj/Vector.strings +++ b/Riot/Assets/eu.lproj/Vector.strings @@ -517,3 +517,5 @@ "group_rooms_filter_rooms" = "Iragazi komunitateko gelak"; "e2e_room_key_request_message_new_device" = "'%@' gailu berria gehitu duzu, eta zifratze-gakoak eskatzen ari da."; "room_do_not_have_permission_to_post" = "Ez duzu gela honetara mezuak bidaltzeko baimenik"; +"room_event_action_kick_prompt_reason" = "Erabiltzaile hau kanporatzeko arrazoia"; +"room_event_action_ban_prompt_reason" = "Erabiltzaile hau debekatzeko arrazoia"; diff --git a/Riot/Assets/is.lproj/Vector.strings b/Riot/Assets/is.lproj/Vector.strings index f96c68b5b2..a88f25b7bd 100644 --- a/Riot/Assets/is.lproj/Vector.strings +++ b/Riot/Assets/is.lproj/Vector.strings @@ -73,7 +73,7 @@ "room_recents_start_chat_with" = "Hefja spjall"; "room_recents_create_empty_room" = "Búa til spjallrás"; "room_recents_join_room" = "Taka þátt í spjallrás"; -"room_recents_join_room_title" = "Taka þátt í spjallsvæði"; +"room_recents_join_room_title" = "Taka þátt í spjallrás"; // People tab "people_invites_section" = "BOÐSGESTIR"; "people_conversation_section" = "SAMTÖL"; @@ -306,7 +306,7 @@ "room_creation_keep_private" = "Halda einka"; // Rooms tab "room_directory_no_public_room" = "Engar opinberar spjallrásir tiltækar"; -"search_people_placeholder" = "Leita eftir notandauðkenni, nafni eða tölvupóstfangi"; +"search_people_placeholder" = "Leita eftir notandaauðkenni, nafni eða tölvupóstfangi"; "directory_search_fail" = "Ekki tókst að sækja gögn"; "contacts_address_book_no_contact" = "Engir tengiliðir á tæki"; // Chat participants @@ -353,3 +353,41 @@ "settings_show_decrypted_content" = "Sýna afkóðað efni"; "settings_enable_callkit" = "Innbyggð hringing"; "room_details_flair_section" = "Sýna hlutverksmerki fyrir samfélög"; +"room_participants_invited_section" = "BOÐIÐ"; +"room_details_access_section" = "Hver hefur aðgang að þessari spjallrás?"; +"room_details_advanced_e2e_encryption_enabled" = "Dulritun er virk í þessari spjallrás"; +"e2e_room_key_request_start_verification" = "Hefja sannvottun..."; +"e2e_room_key_request_share_without_verifying" = "Deila án sannvottunar"; +"room_creation_appearance_picture" = "Mynd spjalls (valfrjálst)"; +"room_creation_invite_another_user" = "Leita/Bjóða eftir notandaauðkenni, nafni eða tölvupóstfangi"; +// Room recents +"room_recents_directory_section" = "SKRÁ YFIR SPJALLRÁSIR"; +"directory_searching_title" = "Leita í yfirlitsskrá.…"; +"contacts_user_directory_section" = "SKRÁ YFIR NOTENDUR"; +"contacts_user_directory_offline_section" = "SKRÁ YFIR NOTENDUR (ónettengd)"; +"room_details_mute_notifs" = "Þagga tilkynningar"; +"room_details_advanced_room_id" = "Auðkenni spjallrásar:"; +"room_details_copy_room_id" = "Afrita auðkenni spjallrásar"; +"room_details_copy_room_address" = "Afrita vistfang spjallrásar"; +"room_details_copy_room_url" = "Afrita slóð spjallrásar"; +"group_participants_leave_prompt_title" = "Yfirgefa hóp"; +"auth_email_not_found" = "Gat ekki sent tölvupóst: Þetta tölvupóstfang fannst ekki"; +"auth_reset_password_missing_password" = "Það verður að setja inn nýtt lykilorð."; +"auth_reset_password_next_step_button" = "Ég hef staðfest tölvupóstfangið mitt"; +"room_creation_wait_for_creation" = "Verið er að útbúa spjallrás. Bíddu aðeins."; +"room_recents_join_room_prompt" = "Settu inn auðkenni eða samheiti spjallrásar"; +"room_participants_invite_another_user" = "Leita/Bjóða eftir notandauðkenni, nafni eða tölvupóstfangi"; +"room_event_action_kick_prompt_reason" = "Ástæða fyrir að sparka þessum notanda"; +"room_event_action_ban_prompt_reason" = "Ástæða fyrir að banna þennan notanda"; +"settings_unignore_user" = "Sýna öll skilaboð frá %@?"; +"settings_labs_create_conference_with_jitsi" = "Búa til ráðstefnusamtöl með Jitsi"; +"room_details_history_section_members_only" = "Einungis meðlimir (síðan þessi kostur var valinn)"; +"room_details_history_section_members_only_since_invited" = "Einungis meðlimir (síðan þeim var boðið)"; +"room_details_history_section_members_only_since_joined" = "Einungis meðlimir (síðan þeir skráðu sig)"; +"room_details_new_flair_placeholder" = "Bæta við nýjui samfélag (t.d. +foo%@)"; +"room_details_flair_invalid_id_prompt_msg" = "%@ er ekki gilt auðkenni samfélags"; +"room_details_advanced_e2e_encryption_disabled" = "Dulritun er ekki virk í þessari spjallrás."; +"room_details_save_changes_prompt" = "Viltu vista breytingarnar?"; +"group_participants_leave_prompt_msg" = "Ertu viss um að þú viljir fara út úr hópnum?"; +"group_participants_remove_prompt_msg" = "Ertu viss um að þú viljir fjarlægja %@ úr hópnum ?"; +"group_participants_invite_another_user" = "Leita/Bjóða eftir notandaauðkenni eða nafni"; diff --git a/Riot/Assets/zh_Hans.lproj/InfoPlist.strings b/Riot/Assets/zh_Hans.lproj/InfoPlist.strings index 4b43ea74d1..bd5557878b 100644 --- a/Riot/Assets/zh_Hans.lproj/InfoPlist.strings +++ b/Riot/Assets/zh_Hans.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ // Permissions usage explanations -"NSCameraUsageDescription" = "用来拍照、拍视频和视频聊天的摄像头。"; -"NSPhotoLibraryUsageDescription" = "用来发送图片和视频的图片文件夹。"; -"NSMicrophoneUsageDescription" = "用来拍视频和通话的麦克风。"; -"NSContactsUsageDescription" = "在 Riot 里通过电子邮件或电话搜索用户的通讯录。"; +"NSCameraUsageDescription" = "Riot 需要使用摄像头权限以拍摄照片、录制视频或进行视频聊天。"; +"NSPhotoLibraryUsageDescription" = "Riot 需要使用图库权限以发送图片与视频。"; +"NSMicrophoneUsageDescription" = "Riot 需要使用麦克风权限以便录制视频或进行通话。"; +"NSContactsUsageDescription" = "Riot 需要使用通讯录权限以 Riot 内部通过邮箱地址或手机号码搜索用户。"; diff --git a/Riot/Assets/zh_Hans.lproj/Localizable.strings b/Riot/Assets/zh_Hans.lproj/Localizable.strings new file mode 100644 index 0000000000..d102ed8690 --- /dev/null +++ b/Riot/Assets/zh_Hans.lproj/Localizable.strings @@ -0,0 +1,40 @@ +/* New message from a specific person, not referencing a room */ +"MSG_FROM_USER" = "来自 %@ 的消息"; +/* New message from a specific person in a named room */ +"MSG_FROM_USER_IN_ROOM" = "%@ 在 %@ 发送了消息"; +/* New message from a specific person, not referencing a room. Content included. */ +"MSG_FROM_USER_WITH_CONTENT" = "%@：%@"; +/* New message from a specific person in a named room. Content included. */ +"MSG_FROM_USER_IN_ROOM_WITH_CONTENT" = "%@ (%@)：%@"; +/* New action message from a specific person, not referencing a room. */ +"ACTION_FROM_USER" = "* %@ %@"; +/* New action message from a specific person in a named room. */ +"ACTION_FROM_USER_IN_ROOM" = "%@：* %@ %@"; +/* New action message from a specific person, not referencing a room. */ +"IMAGE_FROM_USER" = "%@ 给您发了一张图片：%@"; +/* New action message from a specific person in a named room. */ +"IMAGE_FROM_USER_IN_ROOM" = "%@ 发了一张图片：%@ (来自聊天室 %@)"; +/* A single unread message in a room */ +"SINGLE_UNREAD_IN_ROOM" = "你收到了一条消息 (来自聊天室 %@)"; +/* A single unread message */ +"SINGLE_UNREAD" = "你收到了一条消息"; +/* Multiple unread messages in a room */ +"UNREAD_IN_ROOM" = "%@ 条未读消息 (来自聊天室 %@)"; +/* Multiple unread messages from a specific person, not referencing a room */ +"MSGS_FROM_USER" = "%@ 条未读消息 (来自 %@)"; +/* Multiple unread messages from two people */ +"MSGS_FROM_TWO_USERS" = "%@ 条未读消息 (来自 %@ 和 %@）"; +/* Multiple unread messages from three people */ +"MSGS_FROM_THREE_USERS" = "%@ 条未读消息 (来自 %@、%@ 和 %@)"; +/* Multiple unread messages from two plus people (ie. for 4+ people: 'others' replaces the third person) */ +"MSGS_FROM_TWO_PLUS_USERS" = "%@ 条未读消息 (来自 %@、%@ 和更多)"; +/* Multiple messages in two rooms */ +"MSGS_IN_TWO_ROOMS" = "%@ 条未读消息 (来自聊天室 %@ 和 %@)"; +/* Look, stuff's happened, alright? Just open the app. */ +"MSGS_IN_TWO_PLUS_ROOMS" = "%@ 条未读消息 (来自聊天室 %@、%@ 和更多)"; +/* A user has invited you to a chat */ +"USER_INVITE_TO_CHAT" = "%@ 邀请您加入私聊"; +/* A user has invited you to an (unamed) group chat */ +"USER_INVITE_TO_CHAT_GROUP_CHAT" = "%@ 邀请您加入聊天室"; +/* A user has invited you to a named room */ +"USER_INVITE_TO_NAMED_ROOM" = "%@ 邀请您加入聊天室 %@"; diff --git a/Riot/Assets/zh_Hans.lproj/Vector.strings b/Riot/Assets/zh_Hans.lproj/Vector.strings index 48ce763533..eff8069713 100644 --- a/Riot/Assets/zh_Hans.lproj/Vector.strings +++ b/Riot/Assets/zh_Hans.lproj/Vector.strings @@ -11,7 +11,7 @@ "continue" = "继续"; "create" = "新建"; "start" = "开始"; -"leave" = "离开"; +"leave" = "退出"; "remove" = "移除"; "invite" = "邀请"; "retry" = "重试"; @@ -26,9 +26,9 @@ "camera" = "摄像头"; "voice" = "语音"; "video" = "视频"; -"active_call" = "激活的通话"; -"active_call_details" = "激活的通话 (%@)"; -"later" = "之后"; +"active_call" = "当前通话"; +"active_call_details" = "当前通话 (%@)"; +"later" = "稍后再说"; "rename" = "重命名"; // Authentication "auth_login" = "登录"; @@ -36,53 +36,53 @@ "auth_submit" = "提交"; "auth_skip" = "跳过"; "auth_send_reset_email" = "发送重置邮件"; -"auth_return_to_login" = "返回登录屏幕"; -"auth_user_id_placeholder" = "电子邮件或名字"; +"auth_return_to_login" = "返回登录界面"; +"auth_user_id_placeholder" = "邮箱地址或用户名"; "auth_password_placeholder" = "密码"; "auth_new_password_placeholder" = "新密码"; "auth_user_name_placeholder" = "用户名"; -"auth_optional_email_placeholder" = "电子邮件地址（可选）"; -"auth_email_placeholder" = "电子邮件地址"; -"auth_optional_phone_placeholder" = "电话号码（可选）"; -"auth_phone_placeholder" = "电话号码"; +"auth_optional_email_placeholder" = "邮箱地址（可选）"; +"auth_email_placeholder" = "邮箱地址"; +"auth_optional_phone_placeholder" = "手机号码（可选）"; +"auth_phone_placeholder" = "手机号码"; "auth_repeat_password_placeholder" = "重复密码"; "auth_repeat_new_password_placeholder" = "确认您的新密码"; "auth_invalid_login_param" = "无效的用户名和/或密码"; -"auth_invalid_user_name" = "用户名只能包含字母、数字、短横（-）和下划线（_）"; -"auth_invalid_password" = "密码太短（最少 6 位）"; -"auth_invalid_email" = "这看起来不像一个有效的电子邮件地址"; -"auth_invalid_phone" = "这看起来不像一个有效的电话号码"; +"auth_invalid_user_name" = "用户名只能包含字母、数字、短横（-）与下划线（_）"; +"auth_invalid_password" = "密码太短（至少 6 个字符）"; +"auth_invalid_email" = "这不像是一个有效的邮箱地址"; +"auth_invalid_phone" = "这不像是一个有效的手机号码"; "auth_missing_password" = "缺少密码"; -"auth_add_email_message" = "添加一个电子邮件地址这样可以其他用户用户发现你，并让你可以重置密码。"; -"auth_add_phone_message" = "添加一个电话号码让其他用户能够发现你。"; -"auth_add_email_phone_message" = "添加一个电子邮件地址和/或一个电话号码这样可以其他用户用户发现你，并让你可以利用电子邮件重置密码。"; -"auth_add_email_and_phone_message" = "添加一个电子邮件地址和一个电话号码这样可以其他用户用户发现你，并让你可以利用电子邮件重置密码。"; +"auth_add_email_message" = "添加一个邮箱地址这样可以其他用户用户发现你，并让你可以重置密码。"; +"auth_add_phone_message" = "添加一个手机号码让其他用户能够发现你。"; +"auth_add_email_phone_message" = "添加一个邮箱地址和/或一个手机号码这样可以其他用户用户发现你，并让你可以利用电子邮件重置密码。"; +"auth_add_email_and_phone_message" = "添加一个邮箱地址和一个手机号码这样可以其他用户用户发现你，并让你可以利用电子邮件重置密码。"; "auth_missing_email" = "缺少电子邮件"; -"auth_missing_phone" = "缺少电话号码"; -"auth_missing_email_or_phone" = "缺少电子邮件或电话号码"; +"auth_missing_phone" = "缺少手机号码"; +"auth_missing_email_or_phone" = "缺少电子邮件或手机号码"; "auth_password_dont_match" = "密码不匹配"; "auth_username_in_use" = "用户名已被占用"; "auth_forgot_password" = "忘记密码？"; "auth_use_server_options" = "使用自定义服务器选项（高级）"; -"auth_email_validation_message" = "请检查您的电子有见以便继续注册"; +"auth_email_validation_message" = "请检查我们发给您的电子邮件以继续注册"; "auth_msisdn_validation_title" = "等待验证中"; -"auth_msisdn_validation_message" = "我们通过短信发送了一个激活麻，请在下面输入这个激活码。"; -"auth_msisdn_validation_error" = "不能验证电子邮件。"; -"auth_recaptcha_message" = "此主服务器要求确认您不是一个机器人"; -"auth_reset_password_message" = "要重置您的密码，输入与您帐号关联的电子邮件地址："; -"auth_reset_password_missing_email" = "必须输入您账户关联的电子邮件地址。"; +"auth_msisdn_validation_message" = "我们通过短信向您发送了一条验证码，请在下方输入它。"; +"auth_msisdn_validation_error" = "无法验证此手机号。"; +"auth_recaptcha_message" = "此主服务器想确认你不是机器人"; +"auth_reset_password_message" = "为了重置您的密码，请输入与您帐号关联的邮箱地址："; +"auth_reset_password_missing_email" = "必须输入与您的账户关联的邮箱地址。"; "auth_reset_password_missing_password" = "必须输入新的密码。"; "auth_reset_password_email_validation_message" = "一封邮件已经发送到了 %@。当您已经按照其中的链接操作以后，请点下面。"; -"auth_reset_password_next_step_button" = "我已经验证了我的电子邮件地址"; -"auth_reset_password_error_unauthorized" = "验证电子邮件地址失败：请确认您已经点击了邮件里的链接"; -"auth_reset_password_error_not_found" = "您的电子邮件貌似并不是此主服务器上关联的 Matrix ID。"; -"auth_reset_password_success_message" = "您的密码已经重置。\n\n您的所有设备都会登出并且不会收到推送通知。要重新启用通知，请在每个设备上重新登录。"; -"auth_add_email_and_phone_warning" = "在 API 实现以前还不支持使用电子邮件和电话号码一次性注册。只会在帐号里加入电话号码。您可以在您的设置里加入电子邮件地址。"; +"auth_reset_password_next_step_button" = "我已经验证了我的邮箱地址"; +"auth_reset_password_error_unauthorized" = "验证邮箱地址失败：请确认您已经点击了邮件里的链接"; +"auth_reset_password_error_not_found" = "您的邮箱地址貌似没有与此主服务器上的 Matrix ID 绑定。"; +"auth_reset_password_success_message" = "已重置您的密码。\n\n您的所有设备都会被登出并且不会收到推送通知。要想重新收到通知，请在每个设备上重新登录。"; +"auth_add_email_and_phone_warning" = "在 API 出现之前，还不支持使用邮箱地址或手机号码直接注册。只有手机号码会和此账户绑定。您可以在设置中添加邮箱地址。"; // Chat creation -"room_creation_title" = "新的聊天"; +"room_creation_title" = "创建聊天"; "room_creation_account" = "账户"; "room_creation_appearance" = "外观"; -"room_creation_appearance_name" = "名字"; +"room_creation_appearance_name" = "名称"; "room_creation_appearance_picture" = "聊天图片（可选）"; "room_creation_privacy" = "因此"; "room_creation_private_room" = "此聊天是私密的"; @@ -93,7 +93,7 @@ "room_creation_keep_private" = "保持私密"; "room_creation_make_private" = "使其变成私密"; "room_creation_wait_for_creation" = "已经创建了一个聊天室。请等待。"; -"room_creation_invite_another_user" = "通过用户 ID、名字或电子邮件搜索 / 邀请"; +"room_creation_invite_another_user" = "通过用户 ID、名称或电子邮件搜索 / 邀请"; // Room recents "room_recents_directory_section" = "聊天室目录"; "room_recents_directory_section_network" = "网络"; @@ -120,7 +120,7 @@ "search_people" = "联系人"; "search_files" = "文件"; "search_default_placeholder" = "搜索"; -"search_people_placeholder" = "通过用户 ID、名字或电子邮件搜索"; +"search_people_placeholder" = "通过用户 ID、名称或电子邮件搜索"; "search_no_result" = "没有结果"; // Directory "directory_cell_title" = "浏览目录"; @@ -142,15 +142,15 @@ "room_participants_add_participant" = "添加参加者"; "room_participants_one_participant" = "1 个参加者"; "room_participants_multi_participants" = "%d 个参加者"; -"room_participants_leave_prompt_title" = "离开聊天室"; -"room_participants_leave_prompt_msg" = "您确定要离开此聊天室吗？"; +"room_participants_leave_prompt_title" = "退出聊天室"; +"room_participants_leave_prompt_msg" = "您确定要退出此聊天室吗？"; "room_participants_remove_prompt_title" = "确认"; "room_participants_remove_prompt_msg" = "您确定要将 %@ 从此聊天室里移除？"; "room_participants_remove_third_party_invite_msg" = "在 API 实现之前还不支持移除第三方邀请"; "room_participants_invite_prompt_title" = "确认"; "room_participants_invite_prompt_msg" = "确定要邀请 %@ 加入此聊天？"; "room_participants_filter_room_members" = "筛选聊天室成员"; -"room_participants_invite_another_user" = "通过用户 ID、名字或电子邮件搜索 / 邀请"; +"room_participants_invite_another_user" = "通过用户 ID、名称或电子邮件搜索 / 邀请"; "room_participants_invite_malformed_id_title" = "邀请错误"; "room_participants_invite_malformed_id" = "ID 格式错误。必须是一个电子邮件或者 Matrix ID 类似“@本地部分:域名”"; "room_participants_invited_section" = "已邀请"; @@ -165,7 +165,7 @@ "room_participants_action_section_devices" = "设备"; "room_participants_action_section_other" = "其他"; "room_participants_action_invite" = "邀请"; -"room_participants_action_leave" = "离开此聊天室"; +"room_participants_action_leave" = "退出此聊天室"; "room_participants_action_remove" = "从此聊天室移除"; "room_participants_action_ban" = "从此聊天室封禁"; "room_participants_action_unban" = "解封"; @@ -180,8 +180,8 @@ "room_participants_action_mention" = "提及"; // Chat "room_jump_to_first_unread" = "跳到第一条未读信息"; -"room_new_message_notification" = "%d 条新消息"; -"room_new_messages_notification" = "%d 条新消息"; +"room_new_message_notification" = "%d 条未读消息"; +"room_new_messages_notification" = "%d 条未读消息"; "room_one_user_is_typing" = "%@ 正在打字…"; "room_two_users_are_typing" = "%@ 和 %@ 正在打字…"; "room_many_users_are_typing" = "%@、%@ 和 %@ 正在打字…"; @@ -223,11 +223,11 @@ "unknown_devices_title" = "未知设备"; // Room Title "room_title_new_room" = "新聊天室"; -"room_title_multiple_active_members" = "%@/%@ 活跃成员"; -"room_title_one_active_member" = "%@/%@ 活跃成员"; +"room_title_multiple_active_members" = "%@/%@ 人在线"; +"room_title_one_active_member" = "%@/%@ 人在线"; "room_title_invite_members" = "邀请成员"; -"room_title_members" = "%@ 个成员"; -"room_title_one_member" = "1 个成员"; +"room_title_members" = "%@ 位成员"; +"room_title_one_member" = "1 位成员"; // Room Preview "room_preview_invitation_format" = "您已经通过 %@ 的邀请而加入此聊天室"; "room_preview_subtitle" = "这是此聊天室的一个预览。聊天室交互已禁用。"; @@ -238,10 +238,10 @@ "settings_title" = "设置"; "account_logout_all" = "登出所有帐号"; "settings_config_no_build_info" = "没有编译信息"; -"settings_mark_all_as_read" = "将所有信息标记为已读"; +"settings_mark_all_as_read" = "将所有消息标记为已读"; "settings_report_bug" = "报告 bug"; -"settings_config_home_server" = "主服务器是 %@"; -"settings_config_identity_server" = "身份服务器是 %@"; +"settings_config_home_server" = "主服务器为 %@"; +"settings_config_identity_server" = "身份认证服务器为 %@"; "settings_config_user_id" = "以 %@ 登录"; "settings_user_settings" = "用户设置"; "settings_notifications_settings" = "通知设置"; @@ -257,16 +257,16 @@ "settings_sign_out_e2e_warn" = "您将丢失所有端对端加密密钥。这就意味着在您的设备上将无法阅读已加密的消息。"; "settings_profile_picture" = "档案图片"; "settings_display_name" = "显示名"; -"settings_first_name" = "名字"; +"settings_first_name" = "名称"; "settings_surname" = "姓氏"; "settings_remove_prompt_title" = "确认"; -"settings_remove_email_prompt_msg" = "你确定要移除电子邮件地址 %@？"; -"settings_remove_phone_prompt_msg" = "你确定要移除电话号码地址 %@？"; +"settings_remove_email_prompt_msg" = "你确定要移除邮箱地址 %@？"; +"settings_remove_phone_prompt_msg" = "你确定要移除手机号码地址 %@？"; "settings_email_address" = "电子邮件"; -"settings_email_address_placeholder" = "输入您的电子邮件地址"; -"settings_add_email_address" = "添加电子邮件地址"; -"settings_phone_number" = "电话"; -"settings_add_phone_number" = "添加电话号码"; +"settings_email_address_placeholder" = "输入您的邮箱地址"; +"settings_add_email_address" = "添加邮箱地址"; +"settings_phone_number" = "手机号码"; +"settings_add_phone_number" = "添加手机号码"; "settings_night_mode" = "午夜模式"; "settings_fail_to_update_profile" = "更新档案失败"; "settings_enable_push_notif" = "在此设备上通知"; @@ -275,7 +275,7 @@ "settings_pin_rooms_with_unread" = "按未读的消息固定聊天室"; "settings_on_denied_notification" = "给 %@ 的通知已被拒绝，请在设备设置里允许"; "settings_unignore_user" = "显示所有来自 %@ 的消息？"; -"settings_contacts_discover_matrix_users" = "使用电子邮件和电话号码来发现用户"; +"settings_contacts_discover_matrix_users" = "使用电子邮件和手机号码来发现用户"; "settings_contacts_phonebook_country" = "电话本国家"; "settings_labs_e2e_encryption" = "端对端加密"; "settings_labs_e2e_encryption_prompt_message" = "要完成加密设置您须重新登录。"; @@ -296,7 +296,7 @@ "settings_confirm_password" = "确认密码"; "settings_fail_to_update_password" = "更新密码失败"; "settings_password_updated" = "您的密码已经更新"; -"settings_crypto_device_name" = "设备名字： "; +"settings_crypto_device_name" = "设备名称： "; "settings_crypto_device_id" = "\n设备 ID： "; "settings_crypto_device_key" = "\n设备密钥： "; "settings_crypto_export" = "导出密钥"; @@ -307,7 +307,7 @@ "room_details_files" = "文件"; "room_details_settings" = "设置"; "room_details_photo" = "聊天室图片"; -"room_details_room_name" = "聊天室名字"; +"room_details_room_name" = "聊天室名称"; "room_details_topic" = "话题"; "room_details_favourite_tag" = "收藏夹"; "room_details_low_priority_tag" = "低优先级"; @@ -342,13 +342,13 @@ "room_details_advanced_e2e_encryption_blacklist_unverified_devices" = "只加密到已验证的设备"; "room_details_advanced_e2e_encryption_prompt_message" = "端对端加密依然在测试阶段，可能不可靠。\n\n你不应该相信它来保护你的数据。\n\n将无法解密设备加入聊天室之前的历史记录。\n\n一旦加密对一个聊天室启用了，它不能再关闭（对于现在来说）。\n\n加密消息对还没有实现加密的客户端将会不可见。"; "room_details_fail_to_update_avatar" = "更新聊天室图片失败"; -"room_details_fail_to_update_room_name" = "更新聊天室名字失败"; +"room_details_fail_to_update_room_name" = "更新聊天室名称失败"; "room_details_fail_to_update_topic" = "更新话题失败"; "room_details_fail_to_update_room_guest_access" = "更新聊天室访客访问失败"; "room_details_fail_to_update_room_join_rule" = "更新加入规则失败"; "room_details_fail_to_update_room_directory_visibility" = "更新聊天室目录可见性失败"; "room_details_fail_to_update_history_visibility" = "更新历史可见性失败"; -"room_details_fail_to_add_room_aliases" = "添加新的聊天室地址失败"; +"room_details_fail_to_add_room_aliases" = "添加新聊天室地址失败"; "room_details_fail_to_remove_room_aliases" = "移除聊天室地址失败"; "room_details_fail_to_update_room_canonical_alias" = "更新主地址失败"; "room_details_fail_to_enable_encryption" = "为此聊天室启用加密失败"; @@ -411,10 +411,10 @@ "bug_report_progress_zipping" = "正在收集日志"; "bug_report_progress_uploading" = "正在上传报告"; "collapse" = "折叠"; -"auth_email_in_use" = "此电子邮件地址已被占用"; -"auth_phone_in_use" = "此电话号码已被使用"; -"auth_untrusted_id_server" = "此身份服务器不可信"; -"auth_email_not_found" = "发送邮件失败。找不到此邮件地址"; +"auth_email_in_use" = "此邮箱地址已被占用"; +"auth_phone_in_use" = "此手机号码已被使用"; +"auth_untrusted_id_server" = "此身份认证服务器不受信任"; +"auth_email_not_found" = "发送邮件失败：找不到此邮箱地址"; "settings_user_interface" = "用户界面"; "settings_ui_language" = "语言"; "settings_ui_light_theme" = "浅色主题"; @@ -427,8 +427,8 @@ "contacts_user_directory_offline_section" = "用户目录（离线）"; "room_ongoing_conference_call_with_close" = "收到会议通话。以 %@ 或 %@.%@ 加入。"; "room_ongoing_conference_call_close" = "关闭"; -"send_to" = "发送到 %@"; -"sending" = "发送中"; +"send_to" = "发送至 %@"; +"sending" = "正在发送"; "search_in_progress" = "正在搜索…"; "room_conference_call_no_power" = "你需要此聊天室的管理会议通话的权限"; "room_event_action_cancel_send" = "取消发送"; @@ -489,3 +489,16 @@ "e2e_room_key_request_start_verification" = "开始验证…"; "e2e_room_key_request_share_without_verifying" = "在不验证的情况下分享"; "e2e_room_key_request_ignore_request" = "忽略请求"; +"room_event_action_kick_prompt_reason" = "移除此用户的原因"; +"room_event_action_ban_prompt_reason" = "封禁此用户的原因"; +"room_details_new_flair_placeholder" = "添加新的社区 ID（例如 +foo%@）"; +"room_details_flair_invalid_id_prompt_title" = "格式无效"; +"room_details_flair_invalid_id_prompt_msg" = "%@ 不是有效的社区 ID"; +"room_details_fail_to_update_room_communities" = "相关社区更新失败"; +"group_invitation_format" = "%@ 邀请您加入此社区"; +"group_participants_invite_malformed_id" = "ID 格式错误。一个 Matrix ID 看起来应该像是 “@localpart:domain”"; +// Widget +"widget_no_power_to_manage" = "你需要相关权限以管理此聊天室的小部件"; +"widget_creation_failure" = "小部件创建失败"; +// Room key request dialog +"e2e_room_key_request_title" = "密钥共享请求"; diff --git a/Riot/Info.plist b/Riot/Info.plist index 93a3e982e9..ac347a01c2 100644 --- a/Riot/Info.plist +++ b/Riot/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.6.14 + 0.6.15 CFBundleSignature ???? CFBundleVersion - 0.6.14 + 0.6.15 ITSAppUsesNonExemptEncryption ITSEncryptionExportComplianceCode diff --git a/RiotShareExtension/Info.plist b/RiotShareExtension/Info.plist index a4705a96ab..adae233be3 100644 --- a/RiotShareExtension/Info.plist +++ b/RiotShareExtension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.6.14 + 0.6.15 CFBundleVersion 1 NSExtension diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist index 2b55db8f74..25ff2e906e 100644 --- a/SiriIntents/Info.plist +++ b/SiriIntents/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 0.6.14 + 0.6.15 CFBundleVersion 1 NSExtension