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

This commit is contained in:
giomfo
2016-05-09 15:44:23 +02:00
15 changed files with 324 additions and 76 deletions
+8 -3
View File
@@ -133,8 +133,10 @@
"room_participants_action_invite" = "Invite";
"room_participants_action_leave" = "Leave this room";
"room_participants_action_remove" = "Remove from this room";
"room_participants_action_ban" = "Block";
"room_participants_action_unban" = "Unblock";
"room_participants_action_ban" = "Ban from this room";
"room_participants_action_unban" = "Unban";
"room_participants_action_ignore" = "Hide all messages from this user";
"room_participants_action_unignore" = "Show all messages from this user";
"room_participants_action_set_default_power_level" = "Reset to normal user";
"room_participants_action_set_moderator" = "Make moderator";
"room_participants_action_set_admin" = "Make admin";
@@ -156,6 +158,9 @@
"room_event_action_share" = "Share";
"room_event_action_redact" = "Redact";
"room_event_action_permalink" = "Permalink";
"room_event_action_report" = "Report content";
"room_event_action_report_prompt_reason" = "Reason for reporting this content";
"room_event_action_report_prompt_ignore_user" = "Do you want to hide all messages from this user?";
"room_event_action_save" = "Save";
"room_event_action_resend" = "Resend";
"room_event_action_delete" = "Delete";
@@ -198,7 +203,7 @@
"settings_phone_number" = "Phone Number";
"settings_night_mode" = "Night Mode";
"settings_enable_push_notif" = "Enable notifications on your device";
"settings_enable_push_notif" = "Notifications on this device";
"settings_global_settings_info" = "Global notification settings are available on your Vector web client";
//"settings_enable_all_notif" = "Enable all notifications";
//"settings_messages_my_display_name" = "Msg containing my display name";