felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-01 05:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into public_rooms_search

Browse Source 
Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/Model/RoomList/RecentsDataSource.m
This commit is contained in:
manuroe
2015-12-21 10:35:48 +01:00
parent 92e0fdbe92
commit 68fd187509
64 changed files with 2452 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Assets/en.lproj/Vector.strings
+23 -1
View File
@@ -89,6 +89,16 @@
"room_one_user_is_typing" = "%@ is typing...";
"room_two_users_are_typing" = "%@ & %@ are typing...";
"room_many_users_are_typing" = "%@, %@ & others are typing...";
"room_message_placeholder" = "Type a message...";
"room_event_action_edit" = "Edit";
"room_event_action_copy" = "Copy";
"room_event_action_share" = "Share";
"room_event_action_redact" = "Redact";
"room_event_action_save" = "Save";
"room_event_action_resend" = "Resend";
"room_event_action_delete" = "Delete";
"room_event_action_cancel_upload" = "Cancel Upload";
"room_event_action_cancel_download" = "Cancel Download";
// Settings
"account_logout_all" = "Logout all accounts";
@@ -138,12 +148,17 @@
// Room Details
"room_details_title" = "Room Details";
"room_details_mute_notifs" = "Mute notifications";
"room_details_photo" = "Room Photo";
"room_details_room_name" = "Room Name";
"room_details_topic" = "Topic";
"room_details_people" = "People";
"room_details_settings" = "Settings";
"room_details_fail_to_update_topic" = "Fail to update the topic";
"room_details_fail_to_update_room_name" = "Fail to update the room name";
"room_details_with_updates" = "The updates will be lost : are you sure to leave ?";
"room_details_room_is_public" = "This room is public";
"room_details_room_is_private" = "This room is private";
"notification_settings_global_notification_settings" = "Global Notification Settings";
@@ -166,4 +181,11 @@
"public_room_section_title" = "Public Rooms (at %@):";
"bug_report_prompt" = "The application has crashed last time. Would you like to submit a crash report?";
"rage_shake_prompt" = "You seem to be shaking the phone in frustration. Would you like to submit a bug report?";
"camera_access_not_granted" = "Vector doesn't have permission to use Camera, please change privacy settings";
"camera_access_not_granted" = "Vector doesn't have permission to use Camera, please change privacy settings";
// room display name
"room_displayname_invite_from" = "Invite from %@";
"room_displayname_room_invite" = "Room Invite";
"room_displayname_two_members" = "%@ and %@";
"room_displayname_more_than_two_members" = "%@ and %u others";