Skip to content

Commit

Permalink
Finish v0.6.15
Browse files Browse the repository at this point in the history
  • Loading branch information
manuroe committed Apr 23, 2018
2 parents 6d35cf6 + 5dc75f6 commit ded1159
Show file tree
Hide file tree
Showing 11 changed files with 195 additions and 93 deletions.
9 changes: 9 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -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)
===============================================

Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
32 changes: 16 additions & 16 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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`)
Expand All @@ -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
2 changes: 2 additions & 0 deletions Riot/Assets/eu.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -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";
42 changes: 40 additions & 2 deletions Riot/Assets/is.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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";
8 changes: 4 additions & 4 deletions Riot/Assets/zh_Hans.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Permissions usage explanations
"NSCameraUsageDescription" = "用来拍照、拍视频和视频聊天的摄像头。";
"NSPhotoLibraryUsageDescription" = "用来发送图片和视频的图片文件夹。";
"NSMicrophoneUsageDescription" = "用来拍视频和通话的麦克风。";
"NSContactsUsageDescription" = "Riot 里通过电子邮件或电话搜索用户的通讯录。";
"NSCameraUsageDescription" = "Riot 需要使用摄像头权限以拍摄照片、录制视频或进行视频聊天。";
"NSPhotoLibraryUsageDescription" = "Riot 需要使用图库权限以发送图片与视频。";
"NSMicrophoneUsageDescription" = "Riot 需要使用麦克风权限以便录制视频或进行通话。";
"NSContactsUsageDescription" = "Riot 需要使用通讯录权限以 Riot 内部通过邮箱地址或手机号码搜索用户。";
40 changes: 40 additions & 0 deletions Riot/Assets/zh_Hans.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -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" = "%@ 邀请您加入聊天室 %@";
Loading

0 comments on commit ded1159

Please sign in to comment.