keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

copy updates

Browse Source
pull/1/head
Michael Kirk 7 years ago
parent f1e5b1862f
commit b09831d8d0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

6
Signal/src/ViewControllers/AppSettings/BlockListViewController.m
Unescape Escape View File

@ -86,8 +86,8 @@ NS_ASSUME_NONNULL_BEGIN
if (blockedPhoneNumbers.count > 0) {
OWSTableSection *blockedContactsSection = [OWSTableSection new];
blockedContactsSection.headerTitle
= NSLocalizedString(@"BLOCK_LIST_BLOCKED_USERS_SECTION", @"Section header for users that has been blocked");
blockedContactsSection.headerTitle = NSLocalizedString(
@"BLOCK_LIST_BLOCKED_USERS_SECTION", @"Section header for users that have been blocked");
for (NSString *phoneNumber in blockedPhoneNumbers) {
[blockedContactsSection
@ -113,7 +113,7 @@ NS_ASSUME_NONNULL_BEGIN
if (blockedGroupIds.count > 0) {
OWSTableSection *blockedGroupsSection = [OWSTableSection new];
blockedGroupsSection.headerTitle = NSLocalizedString(
@"BLOCK_LIST_BLOCKED_GROUPS_SECTION", @"Section header for groups that has been blocked");
@"BLOCK_LIST_BLOCKED_GROUPS_SECTION", @"Section header for groups that have been blocked");
for (NSData *groupId in blockedGroupIds) {
TSGroupThread *groupThread = [TSGroupThread getOrCreateThreadWithGroupId:groupId];
[blockedGroupsSection addItem:[OWSTableItem

22
Signal/translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -225,31 +225,31 @@
"BACKUP_IMPORT_PHASE_RESTORING_FILES" = "Restoring Files";
/* An explanation of the consequences of blocking a group. */
"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "If you block this group you will no longer receive messages or updates from this group.";
"BLOCK_GROUP_BEHAVIOR_EXPLANATION" = "You will no longer receive messages or updates from this group.";
/* Button label for the 'block' button */
"BLOCK_LIST_BLOCK_BUTTON" = "Block";
/* A format for the 'block group' action sheet title. Embeds the {{group name}}. */
"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Block and Leave the \"%@\" group?";
"BLOCK_LIST_BLOCK_GROUP_TITLE_FORMAT" = "Block and Leave the \"%@\" Group?";
/* A format for the 'block user' action sheet title. Embeds {{the blocked user's name or phone number}}. */
"BLOCK_LIST_BLOCK_USER_TITLE_FORMAT" = "Block %@?";
/* Section header for groups that has been blocked */
/* Section header for groups that have been blocked */
"BLOCK_LIST_BLOCKED_GROUPS_SECTION" = "Blocked Groups";
/* Section header for users that has been blocked */
/* Section header for users that have been blocked */
"BLOCK_LIST_BLOCKED_USERS_SECTION" = "Blocked Users";
/* Button label for the 'unblock' button */
"BLOCK_LIST_UNBLOCK_BUTTON" = "Unblock";
/* Action sheet body when confirming you want to unblock a group */
"BLOCK_LIST_UNBLOCK_GROUP_BODY" = "You will still need to be added to the group by another member to be able to message.";
"BLOCK_LIST_UNBLOCK_GROUP_BODY" = "Existing members will be able to add you to the group again.";
/* Action sheet title when confirming you want to unblock a group. Embeds the {{conversation title}}. */
"BLOCK_LIST_UNBLOCK_GROUP_TITLE_FORMAT" = "Unblock this Group?";
"BLOCK_LIST_UNBLOCK_GROUP_TITLE_FORMAT" = "Unblock This Group?";
/* A format for the 'unblock conversation' action sheet title. Embeds the {{conversation title}}. */
"BLOCK_LIST_UNBLOCK_TITLE_FORMAT" = "Unblock %@?";
@ -522,10 +522,10 @@
"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "Add to Existing Contact";
/* table cell label in conversation settings */
"CONVERSATION_SETTINGS_BLOCK_THIS_GROUP" = "Block this Group";
"CONVERSATION_SETTINGS_BLOCK_THIS_GROUP" = "Block This Group";
/* table cell label in conversation settings */
"CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Block this user";
"CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "Block This User";
/* Navbar title when viewing settings for a 1-on-1 thread */
"CONVERSATION_SETTINGS_CONTACT_INFO_TITLE" = "Contact Info";
@ -1276,13 +1276,13 @@
"MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@ is no longer marked as verified. Tap for options.";
/* Indicates that a single member of this group has been blocked. */
"MESSAGES_VIEW_GROUP_1_MEMBER_BLOCKED" = "You Blocked 1 Member of this Group";
"MESSAGES_VIEW_GROUP_1_MEMBER_BLOCKED" = "You Blocked 1 Member of This Group";
/* Indicates that this group conversation has been blocked. */
"MESSAGES_VIEW_GROUP_BLOCKED" = "You Blocked this Group";
"MESSAGES_VIEW_GROUP_BLOCKED" = "You Blocked This Group";
/* Indicates that some members of this group has been blocked. Embeds {{the number of blocked users in this group}}. */
"MESSAGES_VIEW_GROUP_N_MEMBERS_BLOCKED_FORMAT" = "You Blocked %@ Members of this Group";
"MESSAGES_VIEW_GROUP_N_MEMBERS_BLOCKED_FORMAT" = "You Blocked %@ Members of This Group";
/* Text for banner in group conversation view that offers to share your profile with this group. */
"MESSAGES_VIEW_GROUP_PROFILE_WHITELIST_BANNER" = "Share Your Profile With This Group?";

Write Preview
Loading…
Cancel
Save