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

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

Browse Source
This commit is contained in:
manuroe
2016-08-09 14:17:18 +02:00
parent 28b477a00e
commit 80c632dd28
18 changed files with 300 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Assets/en.lproj/Vector.strings
+2
View File
@@ -158,6 +158,7 @@
"room_message_placeholder" = "Type a message...";
"room_offline_notification" = "Connectivity to the server has been lost.";
"room_unsent_messages_notification" = "Messages not sent.";
"room_ongoing_conference_call" = "Ongoing conference call";
"room_prompt_resend" = "Resend now?";
"room_resend_unsent_messages" = "Resend unsent messages";
"room_delete_unsent_messages" = "Delete unsent messages";
@@ -245,6 +246,7 @@
"settings_password_updated" = "Your password has been updated";
"settings_labs_outgoing_voip" = "Placing VoIP/Video calls";
"settings_labs_conference_call" = "Conference Call";
// Room Details
"room_details_title" = "Room Details";