diff --git a/AgileWorks/AgileWorks/ServerSwitching/View/MordalViewController.swift b/AgileWorks/AgileWorks/ServerSwitching/View/MordalViewController.swift index a67e42a69e9db1d9b7a1f1cbc6e75f7033342483..0ca1c7cf8938c23b4a9a9203ebb1d378a1479175 100644 --- a/AgileWorks/AgileWorks/ServerSwitching/View/MordalViewController.swift +++ b/AgileWorks/AgileWorks/ServerSwitching/View/MordalViewController.swift @@ -15,7 +15,8 @@ class MordalViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - accessPoint.text = getDisplayString(key: "ServerTitle", comment: "") + accessPoint.text = getDisplayString(key: "accessPoint", comment: "") + addServer.setTitle(getDisplayString(key: "AddConnection", comment: ""), for: .normal) } static func fromStoryboard(_ storyboard: UIStoryboard = UIStoryboard(name: "ServerSwitchingViewController", bundle: nil)) -> MordalViewController { diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings index e287253416b023937e165246656e4d5e148c62a5..4436813b3988ede0e3bd6e4039350f752aa9587e 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings @@ -24,8 +24,8 @@ "ClientCertificateRemovalCancel" = "取消"; "LoginErrorMessage" = "登录失败。 请重新登录。"; "CameraStartupErrorMessage" = "未能激活摄像机。"; -"LoginServerAlert" = "ログイン済のサーバーです。ログアウトを行ってから再度お試しください。"; -"LoginServerOver" = "ログインできる接続先の上限数を超えました。ログアウトを行ってから再度お試しください。"; +"LoginServerAlert" = "您已登录连接。 请注销后重试。"; +"LoginServerOver" = "已超过您可以登录的最大连接数。\n请退出并重试。"; // WebView "HomeTitle" = "家"; @@ -59,11 +59,13 @@ "OpenLicenseViewTitle" = "开放许可证"; //server -"ServerTitle" = "接続先サーバー"; -"accessPoint" = "接続先"; +"accessPoint" = "接入点"; +"AddConnection" = "+添加连接点"; +"ConnectionName" = "连接名称"; // Notification "DocOverrideConfirm" = "由通知点选的文件已经显示了。\n你想放弃当前的编辑并显示一个新的文件吗？"; +"DocDifferentServer" = "您目前使用的是其他连接登录。\n您想切换到正在查看的文档的连接点吗？"; // Refresh Token Error "RefreshTokenUpdateErrorTitle" = "访问令牌更新错误"; @@ -105,7 +107,7 @@ "CertificateImportSuccess" = "输入的客户证书。"; "IncorrectPassphrase" = "通行证短语是不同的。"; "CertificateImportError" = "在证书导入过程中发生了一个错误。"; -"CertificateStorageLimit" = "証明書の保存上限を超えました。ログイン画面から削除してください。"; +"CertificateStorageLimit" = "超过证书存储限制。\n请从登录界面删除。"; // Widget Status "Draft" = "草稿"; diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings index 881c9f256f7c395160951486d059e0972db769d7..4ea4cb4b55e1c9dd109f48bbb1929e6d8060ed40 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings @@ -59,11 +59,13 @@ "OpenLicenseViewTitle" = "開放許可證"; //server -"ServerTitle" = "接続先サーバー"; "accessPoint" = "接続先"; +"AddConnection" = "+接続先を追加"; +"ConnectionName" = "接続先名"; // Notification "DocOverrideConfirm" = "由通知點選的文件已經顯示了。 \n你想放棄當前的編輯並顯示一個新的文件嗎？"; +"DocDifferentServer" = "現在別の接続先でログイン中です。\n表示中の書類の接続先に切り替えますか？"; // Refresh Token Error "RefreshTokenUpdateErrorTitle" = "訪問令牌更新錯誤"; diff --git a/AgileWorks/AgileWorks/Strings/English.strings b/AgileWorks/AgileWorks/Strings/English.strings index f312efcc469392ecea095569b19322fc0c82d45e..fe0c4399d3d87cf6c614e0ed30c59146ed8d4bd3 100644 --- a/AgileWorks/AgileWorks/Strings/English.strings +++ b/AgileWorks/AgileWorks/Strings/English.strings @@ -24,8 +24,8 @@ "ClientCertificateRemovalCancel" = "cancel"; "LoginErrorMessage" = "Login failed. Please login again."; "CameraStartupErrorMessage" = "Camera failed to start."; -"LoginServerAlert" = "ログイン済のサーバーです。ログアウトを行ってから再度お試しください。"; -"LoginServerOver" = "ログインできる接続先の上限数を超えました。ログアウトを行ってから再度お試しください。"; +"LoginServerAlert" = "You are already logged in to the connection.\nPlease log out and try again."; +"LoginServerOver" = "The maximum number of connections you can log in to has been exceeded.\nPlease log out and try again."; // WebView "HomeTitle" = "HOME"; @@ -59,11 +59,13 @@ "OpenLicenseViewTitle" = "Open license"; //server -"ServerTitle" = "接続先サーバー"; -"accessPoint" = "接続先"; +"accessPoint" = "Access point"; +"AddConnection" = "+Add a connection"; +"ConnectionName" = "Connection name"; // Notification "DocOverrideConfirm" = "A document by a notification tap is already displayed.\nDo you want to discard the current edits and display a new document?"; +"DocDifferentServer" = "You are currently logged in with a different connection.\nWould you like to switch to the connection of the document you are viewing?"; // Refresh Token Error "RefreshTokenUpdateErrorTitle" = "Access token update error"; @@ -105,7 +107,7 @@ "CertificateImportSuccess" = "Client certificate imported."; "IncorrectPassphrase" = "The passphrase is different."; "CertificateImportError" = "An error occurred during certificate import."; -"CertificateStorageLimit" = "証明書の保存上限を超えました。ログイン画面から削除してください。"; +"CertificateStorageLimit" = "Certificate storage limit has been exceeded.\nPlease delete it from the login screen."; // Widget Status "Draft" = "Draft"; diff --git a/AgileWorks/AgileWorks/Strings/Japanese.strings b/AgileWorks/AgileWorks/Strings/Japanese.strings index 77e484ebd01c3fd56ec1d0627c658e50f8eb5c05..dc2a8409f3811b99cb7a37112dfae2f66a5cad6d 100644 --- a/AgileWorks/AgileWorks/Strings/Japanese.strings +++ b/AgileWorks/AgileWorks/Strings/Japanese.strings @@ -59,11 +59,13 @@ "OpenLicenseViewTitle" = "オープンソースライセンス"; //server -"ServerTitle" = "接続先サーバー"; "accessPoint" = "接続先"; +"AddConnection" = "+接続先を追加"; +"ConnectionName" = "接続先名"; // Notification "DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか？"; +"DocDifferentServer" = "現在別の接続先でログイン中です。\n表示中の書類の接続先に切り替えますか？"; // Refresh Token Error "RefreshTokenUpdateErrorTitle" = "アクセストークン更新エラー"; diff --git a/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings index e19a41b6efe9e00c9c50c0b488c9383e978fd19e..40821af2c7ef593fb88f47c36cd4251fd34e128e 100644 --- a/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings @@ -24,8 +24,8 @@ "ClientCertificateRemovalCancel" = "cancel"; "LoginErrorMessage" = "Login failed. Please login again."; "CameraStartupErrorMessage" = "Camera failed to start."; -"LoginServerAlert" = "ログイン済のサーバーです。ログアウトを行ってから再度お試しください。"; -"LoginServerOver" = "ログインできる接続先の上限数を超えました。ログアウトを行ってから再度お試しください。"; +"LoginServerAlert" = "You are already logged in to the connection.\nPlease log out and try again."; +"LoginServerOver" = "The maximum number of connections you can log in to has been exceeded.\nPlease log out and try again."; // WebView "HomeTitle" = "HOME"; @@ -59,11 +59,13 @@ "OpenLicenseViewTitle" = "Open license"; //server -"ServerTitle" = "接続先サーバー"; -"accessPoint" = "接続先"; +"accessPoint" = "Access point"; +"AddConnection" = "+Add a connection"; +"ConnectionName" = "Connection name"; // Notification "DocOverrideConfirm" = "A document by a notification tap is already displayed.\nDo you want to discard the current edits and display a new document?"; +"DocDifferentServer" = "You are currently logged in with a different connection.\nWould you like to switch to the connection of the document you are viewing?"; // Refresh Token Error "RefreshTokenUpdateErrorTitle" = "Access token update error"; @@ -105,7 +107,7 @@ "CertificateImportSuccess" = "Client certificate imported."; "IncorrectPassphrase" = "The passphrase is different."; "CertificateImportError" = "An error occurred during certificate import."; -"CertificateStorageLimit" = "証明書の保存上限を超えました。ログイン画面から削除してください。"; +"CertificateStorageLimit" = "Certificate storage limit has been exceeded.\nPlease delete it from the login screen."; // Widget Status "Draft" = "Draft"; diff --git a/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings index abe990b29f4a7aa2941d70830b56800c6cb0b11e..155bbcc02f30e64b4c96b3d0007662598d505076 100644 --- a/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings @@ -59,11 +59,13 @@ "OpenLicenseViewTitle" = "オープンソースライセンス"; //server -"ServerTitle" = "接続先サーバー"; "accessPoint" = "接続先"; +"AddConnection" = "+接続先を追加"; +"ConnectionName" = "接続先名"; // Notification "DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか？"; +"DocDifferentServer" = "現在別の接続先でログイン中です。\n表示中の書類の接続先に切り替えますか？"; // Refresh Token Error "RefreshTokenUpdateErrorTitle" = "アクセストークン更新エラー"; diff --git a/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings index 0265c05e7ded81f261d2e0780e1e2de792c9113c..2867ee6e688932f830e627e031602b2dc3383cdd 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings @@ -24,8 +24,8 @@ "ClientCertificateRemovalCancel" = "取消"; "LoginErrorMessage" = "登录失败。 请重新登录。"; "CameraStartupErrorMessage" = "未能激活摄像机。"; -"LoginServerAlert" = "ログイン済のサーバーです。ログアウトを行ってから再度お試しください。"; -"LoginServerOver" = "ログインできる接続先の上限数を超えました。ログアウトを行ってから再度お試しください。"; +"LoginServerAlert" = "您已登录连接。 请注销后重试。"; +"LoginServerOver" = "已超过您可以登录的最大连接数。\n请退出并重试。"; // WebView "HomeTitle" = "家"; @@ -59,11 +59,13 @@ "OpenLicenseViewTitle" = "开放许可证"; //server -"ServerTitle" = "接続先サーバー"; -"accessPoint" = "接続先"; +"accessPoint" = "接入点"; +"AddConnection" = "+添加连接点"; +"ConnectionName" = "连接名称"; // Notification "DocOverrideConfirm" = "由通知点选的文件已经显示了。\n你想放弃当前的编辑并显示一个新的文件吗？"; +"DocDifferentServer" = "您目前使用的是其他连接登录。\n您想切换到正在查看的文档的连接点吗？"; // Refresh Token Error "RefreshTokenUpdateErrorTitle" = "访问令牌更新错误"; @@ -105,7 +107,7 @@ "CertificateImportSuccess" = "输入的客户证书。"; "IncorrectPassphrase" = "通行证短语是不同的。"; "CertificateImportError" = "在证书导入过程中发生了一个错误。"; -"CertificateStorageLimit" = "証明書の保存上限を超えました。ログイン画面から削除してください。"; +"CertificateStorageLimit" = "超过证书存储限制。\n请从登录界面删除。"; // Widget Status "Draft" = "草稿"; diff --git a/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings index 6a97f8cf0c41aeb18aa8382b9cc97b9cdc343d9e..6679c80cd24559321f615886ede9fb33149b8c01 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings @@ -59,11 +59,13 @@ "OpenLicenseViewTitle" = "開放許可證"; //server -"ServerTitle" = "接続先サーバー"; "accessPoint" = "接続先"; +"AddConnection" = "+接続先を追加"; +"ConnectionName" = "接続先名"; // Notification "DocOverrideConfirm" = "由通知點選的文件已經顯示了。 \n你想放棄當前的編輯並顯示一個新的文件嗎？"; +"DocDifferentServer" = "現在別の接続先でログイン中です。\n表示中の書類の接続先に切り替えますか？"; // Refresh Token Error "RefreshTokenUpdateErrorTitle" = "訪問令牌更新錯誤"; diff --git a/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift b/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift index c487fbf96129b0eaefb494db23eb34299f5af7a4..f6f1f22d3c5b0827553aac8f87e7111727e598b8 100644 --- a/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift +++ b/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift @@ -58,7 +58,7 @@ class MenuTableViewController: UITableViewController { self.logoutLabel.text = getDisplayString(key: "LogoutTitle", comment: "") self.licenseLabel.text = getDisplayString(key: "LicenseTitle", comment: "") self.openLicenseLabel.text = getDisplayString(key: "OpenLicenseTitle", comment: "") - self.serverLabel.text = getDisplayString(key: "ServerTitle", comment: "") + self.serverLabel.text = getDisplayString(key: "accessPoint", comment: "") } // プロファイルセルタップ処理 private func pushToProfile() { diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift index 6e4143690bd4155f4aa3901ef831fcb08cf5c9c3..edee03256efde2a90d0b9553e141194d43101d2d 100644 --- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift +++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift @@ -382,7 +382,7 @@ class WebViewController: UIViewController { //サーバー切り替え確認アラート func showServerSwichAlert() { - let message = "現在別のサーバーでログイン中です。表示中の書類のサーバーに切り替えますか？" + let message = getDisplayString(key: "DocDifferentServer", comment: "") // OK アクション設定 let defaultAction = UIAlertAction(title: getDisplayString(key: "YES", comment: ""), style: .default) { _ in UserDefaultsDataStore().changeServerList(firstServer: self.displayedServerNumber!)