Merge branch 'mkirk/remove-explanatory-alert'

pull/1/head
Michael Kirk 8 years ago
commit dc69034b64

@ -164,10 +164,7 @@
cell.accessoryView = accessoryLabel; cell.accessoryView = accessoryLabel;
return cell; return cell;
} }
actionBlock:^{ actionBlock:nil]];
[OWSAlerts showAlertWithTitle:NSLocalizedString(@"NETWORK_STATUS_HEADER", @"")
message:NSLocalizedString(@"NETWORK_STATUS_TEXT", @"")];
}]];
} }
[section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_INVITE_TITLE", [section addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_INVITE_TITLE",
@"Settings table view cell label") @"Settings table view cell label")

@ -828,9 +828,6 @@
/* No comment provided by engineer. */ /* No comment provided by engineer. */
"NETWORK_STATUS_OFFLINE" = "Offline"; "NETWORK_STATUS_OFFLINE" = "Offline";
/* No comment provided by engineer. */
"NETWORK_STATUS_TEXT" = "You can check your network status by looking at the colored bar above your inbox.";
/* A label the cell that lets you add a new member to a group. */ /* A label the cell that lets you add a new member to a group. */
"NEW_CONVERSATION_FIND_BY_PHONE_NUMBER" = "Find by Phone Number"; "NEW_CONVERSATION_FIND_BY_PHONE_NUMBER" = "Find by Phone Number";

Loading…
Cancel
Save