From b92d3b819fabb9e5ddeed390261a6e204552aee0 Mon Sep 17 00:00:00 2001
From: ovari123 <ovari123@zoho.com>
Date: Wed, 25 Dec 2024 17:04:55 -0400
Subject: [PATCH] Localizable.strings: merge "clearConversation" with
"deleteConversation"
https://review.jami.net/c/jami-client-qt/+/29863
Change-Id: I0b71df204778e85d3a8fe3c943f136b5ec438531
---
Ring/Ring/Dialpad/DialpadViewController.swift | 2 +-
Ring/Ring/Resources/en.lproj/Localizable.strings | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Ring/Ring/Dialpad/DialpadViewController.swift b/Ring/Ring/Dialpad/DialpadViewController.swift
index 9a3821df0..b18ae22df 100644
--- a/Ring/Ring/Dialpad/DialpadViewController.swift
+++ b/Ring/Ring/Dialpad/DialpadViewController.swift
@@ -98,7 +98,7 @@ class DialpadViewController: UIViewController, StoryboardBased, ViewModelBased {
func applyL10n() {
self.backButton.setTitle(L10n.Actions.backAction, for: .normal)
- self.clearButton.setTitle(L10n.Actions.clearAction, for: .normal)
+ self.clearButton.setTitle(L10n.Actions.deleteAction, for: .normal)
}
}
diff --git a/Ring/Ring/Resources/en.lproj/Localizable.strings b/Ring/Ring/Resources/en.lproj/Localizable.strings
index 1adc0aa83..02ad4ee81 100644
--- a/Ring/Ring/Resources/en.lproj/Localizable.strings
+++ b/Ring/Ring/Resources/en.lproj/Localizable.strings
@@ -238,9 +238,7 @@
"alerts.confirmBlockContact" = "Do you want to block this contact? The conversation history with this contact will also be deleted permanently.";
"alerts.confirmDeleteConversation" = "Do you want to delete this conversation permanently?";
"alerts.confirmDeleteConversationFromContact" = "Do you want to delete the conversation with this contact?";
-"alerts.confirmDeleteConversationTitle" = "Delete Conversation";
-"alerts.confirmClearConversation" = "Do you want to clear the conversation with this contact?";
-"alerts.confirmClearConversationTitle" = "Clear Conversation";
+"alerts.confirmDeleteConversationTitle" = "Delete conversation";
"alerts.noMediaPermissionsTitle" = "Media permission not granted";
"alerts.noLibraryPermissionsTitle" = "Access to photo library not granted";
"alerts.noLocationPermissionsTitle" = "Access to location not granted";
@@ -261,7 +259,6 @@
// Actions
"actions.deleteAction" = "Delete";
-"actions.clearAction" = "Clear";
"actions.backAction" = "Back";
"actions.doneAction" = "Done";
"alerts.incomingCallAllertTitle" = "Incoming call from ";
@@ -440,7 +437,6 @@
"contactPage.startAudioCall" = "Start audio call";
"contactPage.startVideoCall" = "Start video call";
"contactPage.send" = "Send";
-"contactPage.clearConversation" = "Clear Chat";
"contactPage.leaveConversation" = "Leave conversation";
// DataTransfer
--
GitLab