diff --git a/NextcloudTalk/PollCreationViewController.swift b/NextcloudTalk/PollCreationViewController.swift index e0bebaaeb..e9c79ed26 100644 --- a/NextcloudTalk/PollCreationViewController.swift +++ b/NextcloudTalk/PollCreationViewController.swift @@ -87,7 +87,7 @@ import UIKit let alert = UIAlertController(title: NSLocalizedString("Creating poll failed", comment: ""), message: NSLocalizedString("An error occurred while creating the poll", comment: ""), preferredStyle: .alert) - alert.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: ""), style: .cancel, handler: nil)) + alert.addAction(UIAlertAction(title: NSLocalizedString("Close", comment: ""), style: .cancel, handler: nil)) self.present(alert, animated: true) footerView.primaryButton.setButtonEnabled(enabled: true) } diff --git a/NextcloudTalk/QRCodeLoginController.swift b/NextcloudTalk/QRCodeLoginController.swift index 47446a853..04fd95149 100644 --- a/NextcloudTalk/QRCodeLoginController.swift +++ b/NextcloudTalk/QRCodeLoginController.swift @@ -72,7 +72,7 @@ import QRCodeReader } })) - alert.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: ""), style: .cancel, handler: nil)) + alert.addAction(UIAlertAction(title: NSLocalizedString("Close", comment: ""), style: .cancel, handler: nil)) default: alert = UIAlertController( title: NSLocalizedString("Not supported", comment: ""), diff --git a/NextcloudTalk/SettingsTableViewController.swift b/NextcloudTalk/SettingsTableViewController.swift index afb9de40e..2f4f66594 100644 --- a/NextcloudTalk/SettingsTableViewController.swift +++ b/NextcloudTalk/SettingsTableViewController.swift @@ -389,7 +389,7 @@ class SettingsTableViewController: UITableViewController, UITextFieldDelegate, U } failedPhoneNumberDialog.addAction(retryAction) - let cancelAction = UIAlertAction(title: NSLocalizedString("Cancel", comment: ""), style: .default, handler: nil) + let cancelAction = UIAlertAction(title: NSLocalizedString("Close", comment: ""), style: .default, handler: nil) failedPhoneNumberDialog.addAction(cancelAction) self.present(failedPhoneNumberDialog, animated: true, completion: nil) diff --git a/NextcloudTalk/ShareLocationViewController.m b/NextcloudTalk/ShareLocationViewController.m index a4d3b9521..1bc98e384 100644 --- a/NextcloudTalk/ShareLocationViewController.m +++ b/NextcloudTalk/ShareLocationViewController.m @@ -150,7 +150,7 @@ - (void)showAuthorizationStatusDeniedAlert [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil]; }]; [alert addAction:settingsButton]; - [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleCancel handler:nil]]; + [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Close", nil) style:UIAlertActionStyleCancel handler:nil]]; [self presentViewController:alert animated:YES completion:nil]; } diff --git a/NextcloudTalk/UserStatusSwiftUIView.swift b/NextcloudTalk/UserStatusSwiftUIView.swift index c3b328110..6d46d9392 100644 --- a/NextcloudTalk/UserStatusSwiftUIView.swift +++ b/NextcloudTalk/UserStatusSwiftUIView.swift @@ -54,7 +54,7 @@ struct UserStatusSwiftUIView: View { Button(action: { dismiss() }) { - Text("Cancel") + Text("Close") .foregroundColor(Color(NCAppBranding.themeTextColor())) } } diff --git a/NextcloudTalk/VoiceMessageTranscribeViewController.m b/NextcloudTalk/VoiceMessageTranscribeViewController.m index 992b855a3..985ba2097 100644 --- a/NextcloudTalk/VoiceMessageTranscribeViewController.m +++ b/NextcloudTalk/VoiceMessageTranscribeViewController.m @@ -172,7 +172,7 @@ - (void)showSpeechRecognitionNotAvailable [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil]; }]; [alert addAction:settingsButton]; - [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) + [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Close", nil) style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { [self closeViewController];