Skip to content

Commit

Permalink
#4801 "Log out" text changes
Browse files Browse the repository at this point in the history
  • Loading branch information
hosy committed Oct 19, 2021
1 parent c2aa1ca commit b073acc
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 11 deletions.
Binary file modified ownCloud/Resources/ar.lproj/Localizable.strings
Binary file not shown.
Binary file modified ownCloud/Resources/de.lproj/Localizable.strings
Binary file not shown.
6 changes: 3 additions & 3 deletions ownCloud/Resources/en-GB.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"Edit Login" = "Edit Login";
"Manage Storage" = "Manage Storage";
"Access Files" = "Access Files";
"Logout" = "Logout";
"Log out" = "Log out";

/* Client */
"Browse" = "Browse";
Expand Down Expand Up @@ -128,11 +128,11 @@
"'%@' is currently locked" = "'%@' is currently locked";
"An operation is currently performed that prevents connecting to '%@'. Please try again later." = "An operation is currently performed that prevents connecting to '%@'. Please try again later.";
"Really delete '%@'?" = "Really delete '%@'?";
"Really logout from '%@'?" = "Really logout from '%@'?";
"Do you want to log out from '%@'?" = "Do you want to log out from '%@'?";
"This will also delete all locally stored file copies." = "This will also delete all locally stored file copies.";
"Delete" = "Delete";
"Deletion of '%@' failed" = "Deletion of '%@' failed";
"Logout of '%@' failed" = "Logout of '%@' failed";
"Log out of '%@' failed" = "Log out of '%@' failed";
"Accounts" = "Accounts";

"Help" = "Help";
Expand Down
4 changes: 2 additions & 2 deletions ownCloud/Resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"Edit Login" = "Edit Login";
"Manage Storage" = "Manage Storage";
"Access Files" = "Access Files";
"Logout" = "Logout";
"Log out" = "Log out";

/* Bookmark Info */
"Bookmark Metadata" = "Bookmark Metadata";
Expand Down Expand Up @@ -187,7 +187,7 @@
"Do you really want to disconnect from your '%@' account?" = "Do you really want to disconnect from your '%@' account?";
"This will remove all locally stored file copies from your device." = "This will remove all locally stored file copies from your device.";
"Really delete '%@'?" = "Really delete '%@'?";
"Really logout from '%@'?" = "Really logout from '%@'?";
"Do you want to log out from '%@'?" = "Do you want to log out from '%@'?";
"This will also delete all locally stored file copies." = "This will also delete all locally stored file copies.";
"Delete" = "Delete";
"Remove" = "Remove";
Expand Down
Binary file modified ownCloud/Resources/es.lproj/Localizable.strings
Binary file not shown.
Binary file modified ownCloud/Resources/fr.lproj/Localizable.strings
Binary file not shown.
Binary file modified ownCloud/Resources/pt-BR.lproj/Localizable.strings
Binary file not shown.
Binary file modified ownCloud/Resources/ru.lproj/Localizable.strings
Binary file not shown.
Binary file modified ownCloud/Resources/sq.lproj/Localizable.strings
Binary file not shown.
Binary file modified ownCloud/Resources/th-TH.lproj/Localizable.strings
Binary file not shown.
10 changes: 5 additions & 5 deletions ownCloud/Server List/ServerListTableViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -454,9 +454,9 @@ class ServerListTableViewController: UITableViewController, Themeable, StateRest
var destructiveTitle = "Delete".localized
var failureTitle = "Deletion of '%@' failed".localized
if VendorServices.shared.isBranded {
alertTitle = "Really logout from '%@'?".localized
destructiveTitle = "Logout".localized
failureTitle = "Logout of '%@' failed".localized
alertTitle = "Do you want to log out from '%@'?".localized
destructiveTitle = "Log out".localized
failureTitle = "Log out of '%@' failed".localized
}

let alertController = ThemedAlertController(title: NSString(format: alertTitle as NSString, bookmark.shortName) as String,
Expand Down Expand Up @@ -734,7 +734,7 @@ class ServerListTableViewController: UITableViewController, Themeable, StateRest

var destructiveTitle = "Delete".localized
if VendorServices.shared.isBranded {
destructiveTitle = "Logout".localized
destructiveTitle = "Log out".localized
}
let delete = UIAction(title: destructiveTitle, image: UIImage(systemName: "trash"), attributes: .destructive) { _ in
self.delete(bookmark: bookmark, at: indexPath ) {
Expand Down Expand Up @@ -796,7 +796,7 @@ class ServerListTableViewController: UITableViewController, Themeable, StateRest

var destructiveTitle = "Delete".localized
if VendorServices.shared.isBranded {
destructiveTitle = "Logout".localized
destructiveTitle = "Log out".localized
}

let deleteRowAction = UITableViewRowAction(style: .destructive, title: destructiveTitle, handler: { (_, indexPath) in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class StaticLoginSingleAccountServerListViewController: ServerListTableViewContr
}

case .logout:
bookmarkCell.textLabel?.text = "Logout".localized
bookmarkCell.textLabel?.text = "Log out".localized

if #available(iOS 13.0, *) {
bookmarkCell.imageView?.image = UIImage(systemName: "power")
Expand Down

0 comments on commit b073acc

Please sign in to comment.