diff --git a/Ring/Ring/Constants/Generated/Strings.swift b/Ring/Ring/Constants/Generated/Strings.swift index cb068d9748b50bf400a03b88d3ceb4790bef18e3..3e06315dd797eca89ee0476459e03d50878101fc 100644 --- a/Ring/Ring/Constants/Generated/Strings.swift +++ b/Ring/Ring/Constants/Generated/Strings.swift @@ -616,8 +616,8 @@ internal enum L10n { internal static let missedOutgoingCall = L10n.tr("Localizable", "generatedMessage.missedOutgoingCall", fallback: "Missed outgoing call") /// Outgoing call internal static let outgoingCall = L10n.tr("Localizable", "generatedMessage.outgoingCall", fallback: "Outgoing call") - /// Group created - internal static let swarmCreated = L10n.tr("Localizable", "generatedMessage.swarmCreated", fallback: "Group created") + /// Conversation created + internal static let swarmCreated = L10n.tr("Localizable", "generatedMessage.swarmCreated", fallback: "Conversation created") /// You joined the conversation internal static let youJoined = L10n.tr("Localizable", "generatedMessage.youJoined", fallback: "You joined the conversation") } @@ -864,8 +864,8 @@ internal enum L10n { internal static let jamsResults = L10n.tr("Localizable", "smartlist.jamsResults", fallback: "Search result") /// New contact internal static let newContact = L10n.tr("Localizable", "smartlist.newContact", fallback: "New contact") - /// Create new group - internal static let newGroup = L10n.tr("Localizable", "smartlist.newGroup", fallback: "Create new group") + /// New group + internal static let newGroup = L10n.tr("Localizable", "smartlist.newGroup", fallback: "New group") /// New message internal static let newMessage = L10n.tr("Localizable", "smartlist.newMessage", fallback: "New message") /// No conversations @@ -950,8 +950,6 @@ internal enum L10n { internal enum Swarmcreation { /// Add description internal static let addDescription = L10n.tr("Localizable", "swarmcreation.addDescription", fallback: "Add description") - /// Create new group - internal static let newGroup = L10n.tr("Localizable", "swarmcreation.newGroup", fallback: "Create new group") /// Search for contact… internal static let searchBar = L10n.tr("Localizable", "swarmcreation.searchBar", fallback: "Search for contact…") } diff --git a/Ring/Ring/Resources/en.lproj/Localizable.strings b/Ring/Ring/Resources/en.lproj/Localizable.strings index d86fe5858a875861aada2c26a01e813edbbe9ea5..80799eddbf8d0dfaaab80a4efd9f80f4f9521342 100644 --- a/Ring/Ring/Resources/en.lproj/Localizable.strings +++ b/Ring/Ring/Resources/en.lproj/Localizable.strings @@ -64,7 +64,6 @@ // SwarmCreation "swarmcreation.searchBar" = "Search for contact…"; -"swarmcreation.newGroup" = "Create new group"; "swarmcreation.addDescription" = "Add description"; // Swarm "swarm.muteConversation" = "Mute conversation"; @@ -103,7 +102,7 @@ "smartlist.conversations" = "Conversations"; "smartlist.noConversationsFound" = "No conversations match your search"; "smartlist.newContact" = "New contact"; -"smartlist.newGroup" = "Create new group"; +"smartlist.newGroup" = "New group"; "smartlist.accounts" = "Accounts"; "smartlist.invitationReceived" = "Invitations received"; "smartlist.noResults" = "No results"; @@ -467,7 +466,7 @@ // Generated Message "generatedMessage.contactAdded" = "Invitation received"; -"generatedMessage.swarmCreated" = "Group created"; +"generatedMessage.swarmCreated" = "Conversation created"; "generatedMessage.invitationReceived" = "was invited to join the conversation"; "generatedMessage.invitationAccepted" = "joined the conversation"; "generatedMessage.youJoined" = "You joined the conversation"; diff --git a/Ring/Ring/SwarmCreation/SwarmCreationUI.swift b/Ring/Ring/SwarmCreation/SwarmCreationUI.swift index 3541e83023d6547da4676b179a3bd5e89a392d6d..5999ba9ba1292df6aa39cbbe13a5659a6f101e76 100644 --- a/Ring/Ring/SwarmCreation/SwarmCreationUI.swift +++ b/Ring/Ring/SwarmCreation/SwarmCreationUI.swift @@ -180,17 +180,6 @@ struct SwarmCreationUI: View { .padding(.horizontal) }) } - - func createTheSwarmButtonView() -> some View { - return Button(action: { - self.hideKeyboard() - list.createTheSwarm() - }, label: { - Text(L10n.Swarmcreation.newGroup) - .swarmButtonTextStyle() - }) - .swarmButtonStyle() - } } struct ImagePicker: UIViewControllerRepresentable {