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

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

Browse Source 
Conflicts:
	Vector/Utils/AvatarGenerator.m
	Vector/ViewController/HomeViewController.m
This commit is contained in:
manuroe
2015-12-23 11:05:46 +01:00
parent cbc86ecdd4 5995b94453
commit 4ec9d21924
17 changed files with 808 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Assets/en.lproj/Vector.strings
+8
View File
@@ -85,6 +85,14 @@
"room_participants_admin_name" = "%@ (admin)";
"room_participants_invite_another_user" = "Invite another user";
"room_participants_active" = "Active";
"room_participants_invite" = "Invite";
"room_participants_leave" = "Left";
"room_participants_ban" = "Banned";
"room_participants_active_less_1_hour" = "Active less 1 hour ago";
"room_participants_active_less_x_hours" = "Active less %lu hours ago";
"room_participants_active_less_x_days" = "Active less %lu days ago";
// Chat
"room_one_user_is_typing" = "%@ is typing...";
"room_two_users_are_typing" = "%@ & %@ are typing...";