diff --git a/api/views.py b/api/views.py index ce66fa5e5..e4cfb0393 100644 --- a/api/views.py +++ b/api/views.py @@ -353,7 +353,6 @@ def loginAPI(request): return HttpResponse(json_data) - def fetchSSHkey(request): try: if request.method == "POST": @@ -365,16 +364,13 @@ def fetchSSHkey(request): if hashPassword.check_password(admin.password, password): - keyPath = "/root/.ssh" + keyPath = os.path.join("/root",".ssh") pubKey = keyPath + "/cyberpanel.pub" execPath = "sudo cat " + pubKey - - data = subprocess.check_output(shlex.split(execPath)) - data_ret = {'pubKeyStatus': 1, 'error_message': "None", "pubKey":data} json_data = json.dumps(data_ret) return HttpResponse(json_data) @@ -412,8 +408,6 @@ def remoteTransfer(request): execPath = execPath + " remoteTransfer --ipAddress " + ipAddress + " --dir " + dir + " --accountsToTransfer " + accountsToTransfer - - subprocess.Popen(shlex.split(execPath)) return HttpResponse(json.dumps({"transferStatus": 1, "dir": dir})) @@ -432,7 +426,6 @@ def remoteTransfer(request): json_data = json.dumps(data) return HttpResponse(json_data) - def fetchAccountsFromRemoteServer(request): try: if request.method == "POST": diff --git a/backup/views.py b/backup/views.py index 553ae254f..47efc802e 100644 --- a/backup/views.py +++ b/backup/views.py @@ -1279,11 +1279,7 @@ def submitRemoteBackups(request): execPath = "sudo python " + virtualHostUtilities.cyberPanel + "/plogical/remoteTransferUtilities.py" - execPath = execPath + " writeAuthKey --pathToKey " + pathToKey - - - output = subprocess.check_output(shlex.split(execPath)) if output.find("1,None") > -1: @@ -1338,7 +1334,10 @@ def starRemoteTransfer(request): accountsToTransfer = data['accountsToTransfer'] try: - ownIP = requests.get('https://api.ipify.org').text + + ipFile = "/etc/cyberpanel/machineIP" + f = open(ipFile) + ownIP = f.read() finalData = json.dumps({'username': "admin", "password": password,"ipAddress": ownIP,"accountsToTransfer":accountsToTransfer}) @@ -1441,10 +1440,10 @@ def remoteBackupRestore(request): execPath = execPath + " remoteBackupRestore --backupDirComplete " + backupDirComplete + " --backupDir " + str(backupDir) - - subprocess.Popen(shlex.split(execPath)) + time.sleep(3) + data = {'remoteRestoreStatus': 1, 'error_message': 'None'} json_data = json.dumps(data) return HttpResponse(json_data) @@ -1474,8 +1473,9 @@ def localRestoreStatus(request): removalPath = "/home/backup/transfer-"+ str(backupDir) - if os.path.isfile(backupLogPath): + time.sleep(3) + if os.path.isfile(backupLogPath): command = "sudo cat " + backupLogPath status = subprocess.check_output(shlex.split(command)) diff --git a/locale/ja/LC_MESSAGES/django.mo b/locale/ja/LC_MESSAGES/django.mo index 10ac14df5..48497e0dc 100644 Binary files a/locale/ja/LC_MESSAGES/django.mo and b/locale/ja/LC_MESSAGES/django.mo differ diff --git a/locale/ja/LC_MESSAGES/django.po b/locale/ja/LC_MESSAGES/django.po index 1a1b3860d..5dd383867 100644 --- a/locale/ja/LC_MESSAGES/django.po +++ b/locale/ja/LC_MESSAGES/django.po @@ -3,12 +3,28 @@ # This file is distributed under the same license as the CyberPanel package. # FIRST AUTHOR , 2017. # +#: baseTemplate/templates/baseTemplate/index.html:95 +#: baseTemplate/templates/baseTemplate/index.html:185 +#: baseTemplate/templates/baseTemplate/index.html:236 +#: baseTemplate/templates/baseTemplate/index.html:242 +#: baseTemplate/templates/baseTemplate/index.html:248 +#: baseTemplate/templates/baseTemplate/index.html:254 +#: baseTemplate/templates/baseTemplate/index.html:260 +#: baseTemplate/templates/baseTemplate/index.html:266 +#: baseTemplate/templates/baseTemplate/indexJavaFixed.html:198 +#: baseTemplate/templates/baseTemplate/indexJavaFixed.html:288 +#: baseTemplate/templates/baseTemplate/indexJavaFixed.html:343 +#: baseTemplate/templates/baseTemplate/indexJavaFixed.html:349 +#: baseTemplate/templates/baseTemplate/indexJavaFixed.html:355 +#: baseTemplate/templates/baseTemplate/indexJavaFixed.html:361 +#: baseTemplate/templates/baseTemplate/indexJavaFixed.html:367 +#: baseTemplate/templates/baseTemplate/indexJavaFixed.html:373 msgid "" msgstr "" "Project-Id-Version: CyberPanel\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-15 13:07+0500\n" -"PO-Revision-Date: 2018-02-20 18:26+0900\n" +"PO-Revision-Date: 2017-10-31 23:38+0900\n" "Last-Translator: @ kazuo210 \n" "Language-Team: LANGUAGE \n" "Language: ja\n" @@ -81,7 +97,7 @@ msgstr "ホーム" #: backup/templates/backup/restore.html:62 #: filemanager/templates/filemanager/index.html:157 msgid "File Name" -msgstr "ファイル名" +msgstr "ファイル名" #: backup/templates/backup/backup.html:61 #: backup/templates/backup/backup.html:106 @@ -164,7 +180,6 @@ msgstr "このページでは、バックアップ先を設定できます。 #: backup/templates/backup/backupDestinations.html:21 msgid "Set up Back up Destinations (SSH port should be 22 on backup server)" msgstr "" -"バックアップ先の設定（バックアップサーバでSSHポート22にする必要があります）" #: backup/templates/backup/backupDestinations.html:30 #: backup/templates/backup/remoteBackups.html:29 @@ -194,7 +209,7 @@ msgstr "ポート" #: backup/templates/backup/backupDestinations.html:47 msgid "Backup server SSH Port, leave empty for 22." -msgstr "バックアップサーバのために22ポートは空けておいてください。" +msgstr "" #: backup/templates/backup/backupDestinations.html:55 #: backup/templates/backup/backupSchedule.html:54 @@ -209,8 +224,10 @@ msgid "Connection to" msgstr "接続" #: backup/templates/backup/backupDestinations.html:69 +#, fuzzy +#| msgid "failed. Please delete and re-add." msgid "failed. Please delete and re-add. " -msgstr "失敗しました。削除して再追加してください。 " +msgstr "失敗しました。削除して再追加してください。" #: backup/templates/backup/backupDestinations.html:73 msgid "successful." @@ -262,7 +279,7 @@ msgstr "接続を確認" #: backup/templates/backup/backupSchedule.html:3 msgid "Schedule Back up - CyberPanel" -msgstr "バックアップスケジュール - CyberPanel" +msgstr "バックアップスケジュール - Cyber​​Panel" #: backup/templates/backup/backupSchedule.html:13 #: backup/templates/backup/backupSchedule.html:20 @@ -363,7 +380,7 @@ msgstr "復元" #: backup/templates/backup/remoteBackups.html:3 msgid "Transfer Websites from Remote Server - CyberPanel" -msgstr "リモートサーバーからWebサイトを転送 - CyberPanel" +msgstr "リモートサーバーからWebサイトを転送 - Cyber​​Panel" #: backup/templates/backup/remoteBackups.html:14 #: backup/templates/backup/remoteBackups.html:21 @@ -445,7 +462,7 @@ msgstr "メール" #: backup/templates/backup/restore.html:3 msgid "Restore Website - CyberPanel" -msgstr "Web サイトの復元 - CyberPanel" +msgstr "Web サイトの復元 - Cyber​​Panel" #: backup/templates/backup/restore.html:14 #: backup/templates/backup/restore.html:21 @@ -467,8 +484,10 @@ msgid "Select Back up" msgstr "バックアップを選択" #: backup/templates/backup/restore.html:61 +#, fuzzy +#| msgid "Configurations" msgid "Condition" -msgstr "条件" +msgstr "設定" #: backup/templates/backup/restore.html:86 #: databases/templates/databases/deleteDatabase.html:64 @@ -781,8 +800,10 @@ msgstr "概要" #: baseTemplate/templates/baseTemplate/index.html:294 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:400 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:401 +#, fuzzy +#| msgid "IP Address" msgid "Server IP Address" -msgstr "サーバの IP アドレス" +msgstr "IP アドレス" #: baseTemplate/templates/baseTemplate/index.html:297 #: baseTemplate/templates/baseTemplate/index.html:299 @@ -848,7 +869,7 @@ msgstr "Web サイトの作成" #: websiteFunctions/templates/websiteFunctions/index.html:63 #: websiteFunctions/templates/websiteFunctions/listWebsites.html:14 msgid "List Websites" -msgstr "Web サイトの一覧" +msgstr "Webサイトの一覧" #: baseTemplate/templates/baseTemplate/index.html:337 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:444 @@ -958,7 +979,7 @@ msgstr "ネームサーバーの作成" #: dns/templates/dns/index.html:31 dns/templates/dns/index.html:84 #: dns/templates/dns/index.html:86 msgid "Create DNS Zone" -msgstr "DNS ゾーンの作成" +msgstr "DNSゾーンの作成" #: baseTemplate/templates/baseTemplate/index.html:388 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:495 @@ -1016,7 +1037,7 @@ msgstr "パスワードの変更" #: baseTemplate/templates/baseTemplate/index.html:408 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:515 msgid "Access Webmail" -msgstr "Web メール アクセス" +msgstr "Webメール アクセス" #: baseTemplate/templates/baseTemplate/index.html:427 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:534 @@ -1054,6 +1075,8 @@ msgstr "バックアップ先の追加/削除" #: baseTemplate/templates/baseTemplate/index.html:449 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:556 +#, fuzzy +#| msgid "Remote Backups" msgid "Remote Back ups" msgstr "リモートバックアップ" @@ -1115,18 +1138,20 @@ msgstr "LiteSpeed の状態" #: serverStatus/templates/serverStatus/index.html:37 #: serverStatus/templates/serverStatus/index.html:39 msgid "CyberPanel Main Log File" -msgstr "CyberPanel メインログファイル" +msgstr "Cyber​​Panel メインログファイル" #: baseTemplate/templates/baseTemplate/index.html:501 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:608 +#, fuzzy +#| msgid "Server Status" msgid "Services Status" -msgstr "サービスの状態" +msgstr "サーバーの状態" #: baseTemplate/templates/baseTemplate/index.html:518 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:625 #: managePHP/templates/managePHP/installExtensions.html:13 msgid "Install PHP Extensions" -msgstr "PHP 拡張機能のインストール" +msgstr "PHP拡張機能のインストール" #: baseTemplate/templates/baseTemplate/index.html:518 #: baseTemplate/templates/baseTemplate/indexJavaFixed.html:625 @@ -1204,7 +1229,7 @@ msgstr "フルスクリーン" #: baseTemplate/templates/baseTemplate/versionManagment.html:3 msgid "Version Management - CyberPanel" -msgstr "バージョン管理 - CyberPanel" +msgstr "バージョン管理 - Cyber​​Panel" #: baseTemplate/templates/baseTemplate/versionManagment.html:11 msgid "" @@ -1255,7 +1280,7 @@ msgstr "接続できませんでした。このページを更新してくださ #: databases/templates/databases/createDatabase.html:3 msgid "Create New Database - CyberPanel" -msgstr "新しいデータベースの作成 - CyberPanel" +msgstr "新しいデータベースの作成 - Cyber​​Panel" #: databases/templates/databases/createDatabase.html:13 msgid "Create a new database on this page." @@ -1284,7 +1309,7 @@ msgstr "データベースが作成されました。" #: databases/templates/databases/deleteDatabase.html:3 msgid "Delete Database - CyberPanel" -msgstr "データベースの削除 - CyberPanel" +msgstr "データベースの削除 - Cyber​​Panel" #: databases/templates/databases/deleteDatabase.html:13 msgid "Delete an existing database on this page." @@ -1300,7 +1325,7 @@ msgstr "データベースが削除されました。" #: databases/templates/databases/index.html:3 msgid "Database Functions - CyberPanel" -msgstr "データベース機能 - CyberPanel" +msgstr "データベース機能 - Cyber​​Panel" #: databases/templates/databases/index.html:13 msgid "Create, edit and delete databases on this page." @@ -1308,7 +1333,7 @@ msgstr "このページでデータベースの作成、編集、削除を行い #: databases/templates/databases/listDataBases.html:3 msgid "List Databases - CyberPanel" -msgstr "データベースの一覧 - CyberPanel" +msgstr "データベースの一覧 - Cyber​​Panel" #: databases/templates/databases/listDataBases.html:14 msgid "List Databases or change their passwords." @@ -1439,7 +1464,7 @@ msgstr "レコードが追加されました。" #: dns/templates/dns/createDNSZone.html:3 msgid "Create DNS Zone - CyberPanel" -msgstr "DNS ゾーンの作成 - CyberPanel" +msgstr "DNSゾーンの作成 - Cyber​​Panel" #: dns/templates/dns/createDNSZone.html:13 msgid "" @@ -1465,7 +1490,7 @@ msgstr "ドメインの DNS ゾーン:" #: dns/templates/dns/createNameServer.html:3 msgid "Create Nameserver - CyberPanel" -msgstr "ネームサーバーの作成 - CyberPanel" +msgstr "ネームサーバーの作成 - Cyber​​Panel" #: dns/templates/dns/createNameServer.html:13 msgid "" @@ -1493,12 +1518,12 @@ msgstr "次のネームサーバーが作成されました:" #: dns/templates/dns/deleteDNSZone.html:3 msgid "Delete DNS Zone - CyberPanel" -msgstr "DNS ゾーンの削除 - CyberPanel" +msgstr "DNSゾーンの削除 - Cyber​​Panel" #: dns/templates/dns/deleteDNSZone.html:12 #: dns/templates/dns/deleteDNSZone.html:18 msgid "Delete DNS Zone" -msgstr "DNS ゾーンの削除" +msgstr "DNSゾーンの削除" #: dns/templates/dns/deleteDNSZone.html:13 msgid "" @@ -1535,7 +1560,7 @@ msgstr "消去されました。" #: dns/templates/dns/index.html:3 msgid "DNS Functions - CyberPanel" -msgstr "DNS 機能 - CyberPanel" +msgstr "DNS 機能 - Cyber​​Panel" #: dns/templates/dns/index.html:12 msgid "DNS Functions" @@ -1543,7 +1568,7 @@ msgstr "DNS 機能" #: dns/templates/dns/index.html:13 msgid "Create, edit and delete DNS zones on this page." -msgstr "このページで DNS ゾーンを作成、編集、削除を行います。" +msgstr "このページでDNSゾーンを作成、編集、削除を行います。" #: dns/templates/dns/index.html:53 dns/templates/dns/index.html:108 msgid "Add Delete Records" @@ -1554,64 +1579,78 @@ msgid "Add Delete/Records" msgstr "削除/レコードを追加" #: filemanager/templates/filemanager/index.html:5 +#, fuzzy +#| msgid "Manage SSL - CyberPanel" msgid "File Manager - CyberPanel" -msgstr "ファイル管理 - CyberPanel" +msgstr "SSL の管理 - Cyber​​Panel" #: filemanager/templates/filemanager/index.html:43 +#, fuzzy +#| msgid "File Manager" msgid " File Manager" -msgstr " ファイル管理" +msgstr "ファイル 管理" #: filemanager/templates/filemanager/index.html:63 #: filemanager/templates/filemanager/index.html:202 #: filemanager/templates/filemanager/index.html:233 +#, fuzzy +#| msgid "Reload" msgid "Upload" -msgstr "アップロード" +msgstr "再読み込み" #: filemanager/templates/filemanager/index.html:66 +#, fuzzy +#| msgid "File" msgid "New File" -msgstr "新しいファイル" +msgstr "ファイル" #: filemanager/templates/filemanager/index.html:69 msgid "New Folder" -msgstr "新しいフォルダ" +msgstr "" #: filemanager/templates/filemanager/index.html:75 #: filemanager/templates/filemanager/index.html:563 msgid "Copy" -msgstr "複写" +msgstr "" #: filemanager/templates/filemanager/index.html:78 #: filemanager/templates/filemanager/index.html:528 msgid "Move" -msgstr "移動" +msgstr "" #: filemanager/templates/filemanager/index.html:81 #: filemanager/templates/filemanager/index.html:593 +#, fuzzy +#| msgid "Username" msgid "Rename" -msgstr "名前を変更" +msgstr "ユーザー名" #: filemanager/templates/filemanager/index.html:84 msgid "Edit" -msgstr "編集" +msgstr "" #: filemanager/templates/filemanager/index.html:87 #: filemanager/templates/filemanager/index.html:438 #: filemanager/templates/filemanager/index.html:465 msgid "Compress" -msgstr "圧縮" +msgstr "" #: filemanager/templates/filemanager/index.html:90 #: filemanager/templates/filemanager/index.html:493 msgid "Extract" -msgstr "抽出" +msgstr "" #: filemanager/templates/filemanager/index.html:108 +#, fuzzy +#| msgid "Current Package:" msgid "Current Path" -msgstr "現在のパス" +msgstr "現在のパッケージ:" #: filemanager/templates/filemanager/index.html:136 +#, fuzzy +#| msgid "Back up" msgid "Back" -msgstr "戻る" +msgstr "バックアップ" #: filemanager/templates/filemanager/index.html:140 #: serverLogs/templates/serverLogs/accessLogs.html:42 @@ -1623,80 +1662,96 @@ msgid "Refresh" msgstr "更新" #: filemanager/templates/filemanager/index.html:144 +#, fuzzy +#| msgid "Select Email" msgid "Select All" -msgstr "すべてを選択" +msgstr "メールを選択" #: filemanager/templates/filemanager/index.html:148 +#, fuzzy +#| msgid "Select Email" msgid "UnSelect All" -msgstr "すべてを選択解除" +msgstr "メールを選択" #: filemanager/templates/filemanager/index.html:158 +#, fuzzy +#| msgid "Size" msgid "Size (KB)" -msgstr "サイズ (KB)" +msgstr "サイズ" #: filemanager/templates/filemanager/index.html:159 msgid "Last Modified" -msgstr "最終更新日" +msgstr "" #: filemanager/templates/filemanager/index.html:160 +#, fuzzy +#| msgid "PHP version " msgid "Permissions" -msgstr "パーミッション" +msgstr "PHP バージョン " #: filemanager/templates/filemanager/index.html:180 msgid "Upload File" -msgstr "ファイルアップロード" +msgstr "" #: filemanager/templates/filemanager/index.html:187 msgid "Upload queue" -msgstr "アップロードキュー" +msgstr "" #: filemanager/templates/filemanager/index.html:188 msgid "Queue length:" -msgstr "キューの長さ:" +msgstr "" #: filemanager/templates/filemanager/index.html:195 msgid "Drop" -msgstr "ドロップ" +msgstr "" #: filemanager/templates/filemanager/index.html:196 msgid "Drop Files here to upload them." -msgstr "アップロードするファイルをここにドロップします。" +msgstr "" #: filemanager/templates/filemanager/index.html:211 msgid "Progress" -msgstr "進行状況" +msgstr "" #: filemanager/templates/filemanager/index.html:213 +#, fuzzy +#| msgid "FTP Functions" msgid "Actions" -msgstr "操作" +msgstr "FTP 機能" #: filemanager/templates/filemanager/index.html:239 msgid "Remove" -msgstr "削除" +msgstr "" #: filemanager/templates/filemanager/index.html:249 msgid "Queue progress:" -msgstr "キューの進行状況:" +msgstr "" #: filemanager/templates/filemanager/index.html:258 +#, fuzzy +#| msgid "Cannot tune. Error message:" msgid "can not be uploaded, Error message:" -msgstr "アップロードできません、エラーメッセージ:" +msgstr "チューニングできません。エラー メッセージ:" #: filemanager/templates/filemanager/index.html:262 msgid "Upload all" -msgstr "すべてをアップロードする" +msgstr "" #: filemanager/templates/filemanager/index.html:265 +#, fuzzy +#| msgid "Cancel" msgid "Cancel all" -msgstr "すべてをキャンセル" +msgstr "キャンセル" #: filemanager/templates/filemanager/index.html:268 msgid "Remove all" -msgstr "すべて削除する" +msgstr "" #: filemanager/templates/filemanager/index.html:304 +#, fuzzy +#| msgid "Rule successfully added." msgid "File Successfully saved." -msgstr "ファイルが保存されました。" +msgstr "ルールが追加されました。" #: filemanager/templates/filemanager/index.html:311 #: firewall/templates/firewall/secureSSH.html:68 @@ -1706,56 +1761,72 @@ msgid "Save Changes" msgstr "変更を保存" #: filemanager/templates/filemanager/index.html:328 +#, fuzzy +#| msgid "Create New User" msgid "Create new folder!" -msgstr "新しいフォルダを作成します！" +msgstr "新しいユーザーの作成" #: filemanager/templates/filemanager/index.html:336 +#, fuzzy +#| msgid "File Name" msgid "New Folder Name" -msgstr "新しいフォルダ名" +msgstr "ファイル名" #: filemanager/templates/filemanager/index.html:338 msgid "Folder will be created in your current directory" -msgstr "現在のディレクトリにフォルダが作成されます" +msgstr "" #: filemanager/templates/filemanager/index.html:340 +#, fuzzy +#| msgid "Create User" msgid "Create Folder" -msgstr "フォルダを作成" +msgstr "ユーザーを作成" #: filemanager/templates/filemanager/index.html:353 +#, fuzzy +#| msgid "is successfully created." msgid "Folder Successfully created." -msgstr "フォルダが作成されました。" +msgstr "作成されました。" #: filemanager/templates/filemanager/index.html:372 +#, fuzzy +#| msgid "Create New User" msgid "Create new file!" -msgstr "新しいファイルを作成します！" +msgstr "新しいユーザーの作成" #: filemanager/templates/filemanager/index.html:380 +#, fuzzy +#| msgid "File Name" msgid "New File Name" -msgstr "新しいファイル名" +msgstr "ファイル名" #: filemanager/templates/filemanager/index.html:382 msgid "" "File will be created in your current directory, if it already exists it will " "not overwirte." msgstr "" -"ファイルは現在のディレクトリに作成されます。すでに存在する場合は上書きされま" -"せん。" #: filemanager/templates/filemanager/index.html:384 +#, fuzzy +#| msgid "Create Email" msgid "Create File" -msgstr "ファイルの作成" +msgstr "メールの作成" #: filemanager/templates/filemanager/index.html:397 +#, fuzzy +#| msgid "is successfully created." msgid "File Successfully created." -msgstr "ファイルが作成されました。" +msgstr "作成されました。" #: filemanager/templates/filemanager/index.html:413 +#, fuzzy +#| msgid "Configurations" msgid "Confirm Deletion!" -msgstr "削除を確認してください！" +msgstr "設定" #: filemanager/templates/filemanager/index.html:422 msgid "Confirm" -msgstr "確認" +msgstr "" #: filemanager/templates/filemanager/index.html:423 #: filemanager/templates/filemanager/index.html:466 @@ -1768,76 +1839,86 @@ msgstr "閉じる" #: filemanager/templates/filemanager/index.html:446 msgid "List of files/folder!" -msgstr "ファイル/フォルダの一覧！" +msgstr "" #: filemanager/templates/filemanager/index.html:450 +#, fuzzy +#| msgid "File Name" msgid "Compressed File Name" -msgstr "圧縮ファイル名" +msgstr "ファイル名" #: filemanager/templates/filemanager/index.html:452 +#, fuzzy +#| msgid "Extension Name" msgid "Enter without extension name!" -msgstr "拡張名なしで入力してください！" +msgstr "拡張機能名" #: filemanager/templates/filemanager/index.html:456 msgid "Compression Type" -msgstr "圧縮タイプ" +msgstr "" #: filemanager/templates/filemanager/index.html:481 msgid "Extracting" -msgstr "抽出" +msgstr "" #: filemanager/templates/filemanager/index.html:489 msgid "Extract in" -msgstr "抽出する" +msgstr "" #: filemanager/templates/filemanager/index.html:491 msgid "You can enter . to extract in current directory!" -msgstr ". を入力することができます。 現在のディレクトリに抽出します！" +msgstr "" #: filemanager/templates/filemanager/index.html:509 +#, fuzzy +#| msgid "Files" msgid "Move Files" -msgstr "ファイルを移動" +msgstr "ファイル" #: filemanager/templates/filemanager/index.html:517 #: filemanager/templates/filemanager/index.html:552 msgid "List of files/folders!" -msgstr "ファイル/フォルダの一覧！" +msgstr "" #: filemanager/templates/filemanager/index.html:521 msgid "Move to" -msgstr "移動する" +msgstr "" #: filemanager/templates/filemanager/index.html:523 msgid "Enter a path to move your files!" -msgstr "ファイルを移動するパスを入力してください！" +msgstr "" #: filemanager/templates/filemanager/index.html:544 +#, fuzzy +#| msgid "Files" msgid "Copy Files" -msgstr "ファイルの複写" +msgstr "ファイル" #: filemanager/templates/filemanager/index.html:556 msgid "Copy to" -msgstr "複写先" +msgstr "" #: filemanager/templates/filemanager/index.html:558 msgid "Enter a path to copy your files to!" -msgstr "ファイルをコピーするパスを入力してください！" +msgstr "" #: filemanager/templates/filemanager/index.html:578 msgid "Renaming" -msgstr "名前の変更" +msgstr "" #: filemanager/templates/filemanager/index.html:586 +#, fuzzy +#| msgid "File Name" msgid "New Name" -msgstr "新しい名前" +msgstr "ファイル名" #: filemanager/templates/filemanager/index.html:588 msgid "Enter new name of file!" -msgstr "ファイルの新しい名前を入力してください！" +msgstr "" #: firewall/templates/firewall/firewall.html:3 msgid "Firewall - CyberPanel" -msgstr "ファイアウォール - CyberPanel" +msgstr "ファイアウォール - Cyber​​Panel" #: firewall/templates/firewall/firewall.html:13 msgid "Add/Delete Firewall Rules" @@ -1886,7 +1967,7 @@ msgstr "ルールが追加されました。" #: firewall/templates/firewall/index.html:3 msgid "Security - CyberPanel" -msgstr "セキュリティ - CyberPanel" +msgstr "セキュリティ - Cyber​​Panel" #: firewall/templates/firewall/index.html:12 msgid "Security Functions" @@ -1898,7 +1979,7 @@ msgstr "このページでサーバーセキュリティを管理します。" #: firewall/templates/firewall/secureSSH.html:3 msgid "Secure SSH - CyberPanel" -msgstr "SSH のセキュリティ - CyberPanel" +msgstr "SSH のセキュリティ - Cyber​​Panel" #: firewall/templates/firewall/secureSSH.html:14 msgid "Secure or harden SSH Configurations." @@ -1954,15 +2035,15 @@ msgstr "SSH キーが削除されました" #: ftp/templates/ftp/createFTPAccount.html:3 msgid "Create FTP Account - CyberPanel" -msgstr "FTP アカウントの作成 - CyberPanel" +msgstr "FTP アカウントの作成 - Cyber​​Panel" #: ftp/templates/ftp/createFTPAccount.html:13 msgid "" "Select the website from list, and its home directory will be set as the path " "to ftp account." msgstr "" -"一覧から Web サイトを選択すると、そのホームディレクトリが ftp アカウントへの" -"パスとして設定されます。" +"一覧から Web サイトを選択すると、そのホームディレクトリがftpアカウントへのパ" +"スとして設定されます。" #: ftp/templates/ftp/createFTPAccount.html:52 msgid "FTP Password" @@ -1998,7 +2079,7 @@ msgstr "作成されました。" #: ftp/templates/ftp/deleteFTPAccount.html:3 msgid "Delete FTP Account - CyberPanel" -msgstr "FTP アカウントの削除 - CyberPanel" +msgstr "FTP アカウントの削除 - Cyber​​Panel" #: ftp/templates/ftp/deleteFTPAccount.html:13 msgid "Select domain and delete its related FTP accounts." @@ -2023,7 +2104,7 @@ msgstr "サーバーに接続できませんでした。 このページを更 #: ftp/templates/ftp/index.html:3 msgid "FTP Functions - CyberPanel" -msgstr "FTP 機能 - CyberPanel" +msgstr "FTP 機能 - Cyber​​Panel" #: ftp/templates/ftp/index.html:13 msgid "Delete and create FTP accounts on this page." @@ -2086,7 +2167,7 @@ msgstr "現在、このドメインにはメールアカウントはありませ #: mailServer/templates/mailServer/createEmailAccount.html:3 msgid "Create Email Account - CyberPanel" -msgstr "メールアカウントの作成 - CyberPanel" +msgstr "メールアカウントの作成 - Cyber​​Panel" #: mailServer/templates/mailServer/createEmailAccount.html:13 msgid "Select a website from the list, to create an email account." @@ -2107,7 +2188,7 @@ msgstr " 作成されました。" #: mailServer/templates/mailServer/deleteEmailAccount.html:3 msgid "Delete Email Account - CyberPanel" -msgstr "メールアカウントの削除 - CyberPanel" +msgstr "メールアカウントの削除 - Cyber​​Panel" #: mailServer/templates/mailServer/deleteEmailAccount.html:13 msgid "Select a website from the list, to delete an email account." @@ -2120,7 +2201,7 @@ msgstr "ID 付きメール: {$ deletedID $}は削除されました。" #: mailServer/templates/mailServer/index.html:3 msgid "Mail Functions - CyberPanel" -msgstr "メール機能 - CyberPanel" +msgstr "メール機能 - Cyber​​Panel" #: mailServer/templates/mailServer/index.html:12 msgid "Mail Functions" @@ -2132,7 +2213,7 @@ msgstr "このページでメールアカウントを管理します。" #: managePHP/templates/managePHP/editPHPConfig.html:3 msgid "Edit PHP Configurations - CyberPanel" -msgstr "PHP 設定の編集 - CyberPanel" +msgstr "PHP 設定の編集 - Cyber​​Panel" #: managePHP/templates/managePHP/editPHPConfig.html:14 #: managePHP/templates/managePHP/editPHPConfig.html:21 @@ -2195,7 +2276,7 @@ msgstr "PHP 設定が保存されました。" #: managePHP/templates/managePHP/index.html:3 msgid "Manage PHP Installations - CyberPanel" -msgstr "PHP インストールの管理 - CyberPanel" +msgstr "PHPインストールの管理 - Cyber​​Panel" #: managePHP/templates/managePHP/index.html:12 msgid "Manage PHP Installations" @@ -2207,11 +2288,11 @@ msgstr "必要に応じて PHP 設定を編集します。" #: managePHP/templates/managePHP/installExtensions.html:3 msgid "Install PHP Extensions - CyberPanel" -msgstr "PHP 拡張機能のインストール - CyberPanel" +msgstr "PHP 拡張機能のインストール - Cyber​​Panel" #: managePHP/templates/managePHP/installExtensions.html:14 msgid "Install/uninstall php extensions on this page." -msgstr "このページで PHP 拡張機能をインストール/アンインストールします。" +msgstr "このページでPHP拡張機能をインストール/アンインストールします。" #: managePHP/templates/managePHP/installExtensions.html:19 #: tuning/templates/tuning/phpTuning.html:19 @@ -2256,7 +2337,7 @@ msgstr "操作を実行できません。エラー メッセージ:" #: manageSSL/templates/manageSSL/index.html:3 msgid "SSL Functions - CyberPanel" -msgstr "SSL 機能 - CyberPanel" +msgstr "SSL 機能 - Cyber​​Panel" #: manageSSL/templates/manageSSL/index.html:13 msgid "SSL Functions" @@ -2268,7 +2349,7 @@ msgstr "Web サイトとホスト名で Let’s Encrypt SSL を発行します #: manageSSL/templates/manageSSL/manageSSL.html:3 msgid "Manage SSL - CyberPanel" -msgstr "SSL の管理 - CyberPanel" +msgstr "SSL の管理 - Cyber​​Panel" #: manageSSL/templates/manageSSL/manageSSL.html:14 msgid "" @@ -2281,7 +2362,7 @@ msgstr "" #: manageSSL/templates/manageSSL/manageSSL.html:42 #: manageSSL/templates/manageSSL/sslForHostName.html:42 msgid "Issue SSL" -msgstr "SSL を発行する" +msgstr "SSLを発行する" #: manageSSL/templates/manageSSL/manageSSL.html:52 #: manageSSL/templates/manageSSL/sslForHostName.html:52 @@ -2290,22 +2371,22 @@ msgstr "SSL を発行できません。エラー メッセージ:" #: manageSSL/templates/manageSSL/manageSSL.html:56 msgid "SSL Issued for" -msgstr "SSL が発行されました" +msgstr "SSLが発行されました" #: manageSSL/templates/manageSSL/sslForHostName.html:3 msgid "Issue SSL For Hostname - CyberPanel" -msgstr "ホスト名の SSL を発行 - CyberPanel" +msgstr "ホスト名のSSLを発行 - Cyber​​Panel" #: manageSSL/templates/manageSSL/sslForHostName.html:13 #: manageSSL/templates/manageSSL/sslForHostName.html:20 msgid "Issue SSL For Hostname" -msgstr "ホスト名に SSL を発行する" +msgstr "ホスト名にSSLを発行する" #: manageSSL/templates/manageSSL/sslForHostName.html:14 msgid "Let’s Encrypt SSL for hostname to access CyberPanel on verified SSL." msgstr "" -"検証済みの SSL で CyberPanel にアクセスするために、ホスト名でLet's Encrypt " -"SSL を申請する。" +"検証済みのSSLでCyber​​Panelにアクセスするために、ホスト名でLet’s Encrypt SSLを" +"申請する。" #: manageSSL/templates/manageSSL/sslForHostName.html:56 #: manageSSL/templates/manageSSL/sslForHostName.html:60 @@ -2314,7 +2395,7 @@ msgstr "SSL が発行されました。 CyberPanel にアクセスできるよ #: packages/templates/packages/createPackage.html:3 msgid "Create Package - CyberPanel" -msgstr "パッケージの作成 - CyberPanel" +msgstr "パッケージの作成 - Cyber​​Panel" #: packages/templates/packages/createPackage.html:14 #: packages/templates/packages/deletePackage.html:13 @@ -2379,7 +2460,7 @@ msgstr "作成されました" #: packages/templates/packages/deletePackage.html:3 msgid "Delete Package - CyberPanel" -msgstr "パッケージの削除 - CyberPanel" +msgstr "パッケージの削除 - Cyber​​Panel" #: packages/templates/packages/deletePackage.html:27 #: packages/templates/packages/modifyPackage.html:24 @@ -2399,11 +2480,11 @@ msgstr " 削除されました" #: packages/templates/packages/index.html:3 msgid "Packages - CyberPanel" -msgstr "パッケージ - CyberPanel" +msgstr "パッケージ - Cyber​​Panel" #: packages/templates/packages/modifyPackage.html:3 msgid "Modify Package - CyberPanel" -msgstr "パッケージの変更 - CyberPanel" +msgstr "パッケージの変更 - Cyber​​Panel" #: packages/templates/packages/modifyPackage.html:104 msgid "Cannot fetch package details. Error message:" @@ -2461,7 +2542,7 @@ msgstr "" #: serverLogs/templates/serverLogs/emailLogs.html:3 #: serverLogs/templates/serverLogs/errorLogs.html:3 msgid "Error Logs - CyberPanel" -msgstr "エラーログ - CyberPanel" +msgstr "エラーログ - Cyber​​Panel" #: serverLogs/templates/serverLogs/emailLogs.html:15 msgid "Email Logs for main web server." @@ -2473,7 +2554,7 @@ msgstr "メイン Web サーバーのエラーログ。" #: serverLogs/templates/serverLogs/ftplogs.html:3 msgid "FTP Logs - CyberPanel" -msgstr "FTP ログ - CyberPanel" +msgstr "FTP ログ - Cyber​​Panel" #: serverLogs/templates/serverLogs/ftplogs.html:15 msgid "FTP Logs for main web server." @@ -2481,7 +2562,7 @@ msgstr "メイン Web サーバーの FTP ログ。" #: serverLogs/templates/serverLogs/index.html:3 msgid "Server Logs - CyberPanel" -msgstr "サーバーログ - CyberPanel" +msgstr "サーバーログ - Cyber​​Panel" #: serverLogs/templates/serverLogs/index.html:13 msgid "Server Logs" @@ -2497,14 +2578,14 @@ msgstr "" #: serverStatus/templates/serverStatus/cybercpmainlogfile.html:3 msgid "CyberPanel Main Log File - CyberPanel" -msgstr "CyberPanel メインログファイル - CyberPanel" +msgstr "Cyber​​Panel メインログファイル - Cyber​​Panel" #: serverStatus/templates/serverStatus/cybercpmainlogfile.html:16 msgid "" "This log file corresponds to errors generated by CyberPanel for your domain " "errors log you can look into /home/domain/logs." msgstr "" -"このログファイルは CyberPanel によってドメインエラーログ用に生成されたエラー" +"このログファイルは Cyber​​Panel によってドメインエラーログ用に生成されたエラー" "に対応しており、 /home/domain/logs で調べることができます。" #: serverStatus/templates/serverStatus/index.html:3 @@ -2517,7 +2598,7 @@ msgstr "LiteSpeed の状態とログファイルを表示します。" #: serverStatus/templates/serverStatus/litespeedStatus.html:3 msgid "LiteSpeed Status - CyberPanel" -msgstr "LiteSpeed の状態 - CyberPanel" +msgstr "LiteSpeed の状態 - Cyber​​Panel" #: serverStatus/templates/serverStatus/litespeedStatus.html:16 msgid "LiteSpeed Status:" @@ -2554,7 +2635,7 @@ msgid "" "occurred, please see CyberPanel Main log file." msgstr "" "詳細を取得できませんでした.LiteSpeedが実行されていないか、何らかのエラーが発" -"生しました。 CyberPanel メインログファイルを参照してください。" +"生しました。Cyber​​Panelメインログファイルを参照してください。" #: serverStatus/templates/serverStatus/litespeedStatus.html:72 msgid "Reboot Litespeed" @@ -2574,12 +2655,14 @@ msgid "Could not connect to server." msgstr "サーバーに接続できませんでした。" #: serverStatus/templates/serverStatus/services.html:3 +#, fuzzy +#| msgid "Server Logs - CyberPanel" msgid "Services - CyberPanel" -msgstr "サービス - CyberPanel" +msgstr "サーバーログ - Cyber​​Panel" #: tuning/templates/tuning/index.html:3 msgid "Server Tuning - CyberPanel" -msgstr "サーバーのチューニング - CyberPanel" +msgstr "サーバーのチューニング - Cyber​​Panel" #: tuning/templates/tuning/index.html:13 msgid "" @@ -2591,14 +2674,14 @@ msgstr "" #: tuning/templates/tuning/liteSpeedTuning.html:3 msgid "LiteSpeed Tuning - CyberPanel" -msgstr "LiteSpeed チューニング - CyberPanel" +msgstr "LiteSpeed チューニング - Cyber​​Panel" #: tuning/templates/tuning/liteSpeedTuning.html:13 msgid "" "You can use this page to tweak your server according to your website " "requirments." msgstr "" -"このページを使用して、Web サイトの要件に従ってサーバーを調整することができま" +"このページを使用して、Webサイトの要件に従ってサーバーを調整することができま" "す。" #: tuning/templates/tuning/liteSpeedTuning.html:18 @@ -2655,7 +2738,7 @@ msgid "" "Cannot fetch Current Value, but you can still submit new changes, error " "reported from server:" msgstr "" -"現在の値は取得できませんが、サーバーから報告された新しい変更を送信できます:" +"現在の値は取得できませんが、サーバーから報告された新しい変更を送信できます：" #: tuning/templates/tuning/liteSpeedTuning.html:97 msgid "Cannot save details, Error Message: " @@ -2667,11 +2750,11 @@ msgstr "Web サーバーをチューニングしました。" #: tuning/templates/tuning/phpTuning.html:3 msgid "PHP Tuning - CyberPanel" -msgstr "PHP チューニング - CyberPanel" +msgstr "PHP チューニング - Cyber​​Panel" #: tuning/templates/tuning/phpTuning.html:14 msgid "Set how each version of PHP behaves in your server here." -msgstr "PHP の各バージョンがサーバー上でどのように動作するかを設定します。" +msgstr "PHPの各バージョンがサーバー上でどのように動作するかを設定します。" #: tuning/templates/tuning/phpTuning.html:42 msgid "Initial Request Timeout (secs)" @@ -2699,7 +2782,7 @@ msgstr "永続的な接続" #: tuning/templates/tuning/phpTuning.html:102 msgid "Tune PHP" -msgstr "PHP をチューニング" +msgstr "PHPをチューニング" #: tuning/templates/tuning/phpTuning.html:115 msgid "Cannot tune. Error message:" @@ -2710,8 +2793,10 @@ msgid "Details Successfully fetched." msgstr "詳細が取得されました。" #: tuning/templates/tuning/phpTuning.html:124 +#, fuzzy +#| msgid "PHP version " msgid "PHP for " -msgstr "PHP 用 " +msgstr "PHP バージョン " #: tuning/templates/tuning/phpTuning.html:124 msgid "Successfully tuned." @@ -2719,7 +2804,7 @@ msgstr "調整されました。" #: userManagment/templates/userManagment/createUser.html:3 msgid "Create New User - CyberPanel" -msgstr "新しいユーザーの作成する - CyberPanel" +msgstr "新しいユーザーの作成する - Cyber​​Panel" #: userManagment/templates/userManagment/createUser.html:13 msgid "Create root, reseller or normal users on this page." @@ -2825,7 +2910,7 @@ msgstr "結合された姓と名の長さは20文字以下でなければなり #: userManagment/templates/userManagment/deleteUser.html:3 msgid "Delete User - CyberPanel" -msgstr "ユーザーの削除 - CyberPanel" +msgstr "ユーザーの削除 - Cyber​​Panel" #: userManagment/templates/userManagment/deleteUser.html:14 msgid "Websites owned by this user will automatically transfer to the root." @@ -2845,7 +2930,7 @@ msgstr "ユーザー " #: userManagment/templates/userManagment/index.html:3 msgid "User Functions - CyberPanel" -msgstr "ユーザ機能 - CyberPanel" +msgstr "ユーザ機能 - Cyber​​Panel" #: userManagment/templates/userManagment/index.html:14 msgid "Create, edit and delete users on this page." @@ -2853,7 +2938,7 @@ msgstr "このページでユーザーを作成、編集、削除を行います #: userManagment/templates/userManagment/modifyUser.html:3 msgid "Modify User - CyberPanel" -msgstr "ユーザーの変更 - CyberPanel" +msgstr "ユーザーの変更 - Cyber​​Panel" #: userManagment/templates/userManagment/modifyUser.html:13 msgid "Modify existing user settings on this page." @@ -2900,7 +2985,7 @@ msgstr "( 0 = 無制限 )" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:3 msgid "Create New Website - CyberPanel" -msgstr "新しい Web サイトの作成する - CyberPanel" +msgstr "新しい Web サイトの作成する - Cyber​​Panel" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:13 #: websiteFunctions/templates/websiteFunctions/index.html:14 @@ -2923,14 +3008,14 @@ msgstr "所有者を選択" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:54 msgid "Do not enter WWW, it will be auto created!" -msgstr "WWW を入力しないでください、自動的に作成されます！" +msgstr "" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:56 #: websiteFunctions/templates/websiteFunctions/website.html:293 #: websiteFunctions/templates/websiteFunctions/website.html:304 msgid "Invalid Domain (Note: You don't need to add 'http' or 'https')" msgstr "" -"無効なドメイン（注: 'http' または 'https' を追加する必要はありません）" +"無効なドメイン（注： 'http' または 'https' を追加する必要はありません）" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:84 #: websiteFunctions/templates/websiteFunctions/website.html:325 @@ -2949,7 +3034,7 @@ msgstr "" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:113 #: websiteFunctions/templates/websiteFunctions/website.html:354 msgid "Cannot create website. Error message:" -msgstr "Web サイトを作成できません。エラーメッセージ:" +msgstr "Web サイトを作成できません。エラーメッセージ：" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 #: websiteFunctions/templates/websiteFunctions/website.html:358 @@ -2963,7 +3048,7 @@ msgstr " 作成されました" #: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:3 msgid "Delete Website - CyberPanel" -msgstr "Web サイトの削除 - CyberPanel" +msgstr "Web サイトの削除 - Cyber​​Panel" #: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:13 msgid "" @@ -2983,7 +3068,7 @@ msgstr "削除されました。" #: websiteFunctions/templates/websiteFunctions/index.html:3 msgid "Website Functions - CyberPanel" -msgstr "Web サイト機能 - CyberPanel" +msgstr "Web サイト機能 - Cyber​​Panel" #: websiteFunctions/templates/websiteFunctions/index.html:89 #: websiteFunctions/templates/websiteFunctions/index.html:91 @@ -2994,7 +3079,7 @@ msgstr "Web サイトの休止/休止解除" #: websiteFunctions/templates/websiteFunctions/listWebsites.html:3 msgid "Websites Hosted - CyberPanel" -msgstr "ホストされているWebサイト - CyberPanel" +msgstr "ホストされているWebサイト - Cyber​​Panel" #: websiteFunctions/templates/websiteFunctions/listWebsites.html:53 msgid "Cannot list websites. Error message:" @@ -3002,7 +3087,7 @@ msgstr "Web サイトの一覧が表示できません。エラーメッセー #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:3 msgid "Modify Website - CyberPanel" -msgstr "Web サイトの変更 - CyberPanel" +msgstr "Web サイトの変更 - Cyber​​Panel" #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:51 msgid "Current Package:" @@ -3026,7 +3111,7 @@ msgstr "Web サイトの詳細が取得されました" #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:3 msgid "Suspend/Unsuspend Website - CyberPanel" -msgstr "Web サイトの休止/休止解除 - CyberPanel" +msgstr "Web サイトの休止/休止解除 - Cyber​​Panel" #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:14 msgid "This page can be used to suspend/unsuspend website." @@ -3057,8 +3142,10 @@ msgid "Successfully " msgstr "成功しました " #: websiteFunctions/templates/websiteFunctions/website.html:13 +#, fuzzy +#| msgid "Previous" msgid "Preview" -msgstr "プレビュー" +msgstr "前へ" #: websiteFunctions/templates/websiteFunctions/website.html:14 msgid "All functions related to a particular site." @@ -3148,7 +3235,7 @@ msgstr "削除済み:" #: websiteFunctions/templates/websiteFunctions/website.html:394 msgid "SSL Issued:" -msgstr "SSL の発行:" +msgstr "SSLの発行:" #: websiteFunctions/templates/websiteFunctions/website.html:449 msgid "Issue" @@ -3198,8 +3285,10 @@ msgstr "現在の設定を取得できませんでした。エラー メッセ #: websiteFunctions/templates/websiteFunctions/website.html:593 #: websiteFunctions/templates/websiteFunctions/website.html:648 +#, fuzzy +#| msgid "SSH Configurations Saved." msgid "Configurations saved." -msgstr "設定が保存されました。" +msgstr "SSH の設定が保存されました。" #: websiteFunctions/templates/websiteFunctions/website.html:634 msgid "Current rewrite rules in the file fetched." @@ -3239,12 +3328,14 @@ msgid "Wordpress with LSCache" msgstr "Wordpress の LSCache" #: websiteFunctions/templates/websiteFunctions/website.html:756 +#, fuzzy +#| msgid "Install wordpress with LSCache" msgid "Install Joomla with(?) LSCache" -msgstr "LSCache で Joomla をインストールする" +msgstr "LSCache で Wordpress をインストールする" #: websiteFunctions/templates/websiteFunctions/website.html:758 msgid "Joomla" -msgstr "Joomla" +msgstr "" #: websiteFunctions/templates/websiteFunctions/website.html:792 #: websiteFunctions/templates/websiteFunctions/website.html:871 @@ -3258,19 +3349,25 @@ msgstr "インストールに成功しました。 セットアップを完了 #: websiteFunctions/templates/websiteFunctions/website.html:828 msgid "Site name" -msgstr "サイト名" +msgstr "" #: websiteFunctions/templates/websiteFunctions/website.html:835 +#, fuzzy +#| msgid "Username" msgid "Admin Username" -msgstr "管理者ユーザー名" +msgstr "ユーザー名" #: websiteFunctions/templates/websiteFunctions/website.html:842 +#, fuzzy +#| msgid "Password" msgid "Admin Password" -msgstr "管理者パスワード" +msgstr "パスワード" #: websiteFunctions/templates/websiteFunctions/website.html:849 +#, fuzzy +#| msgid "Database Name" msgid "Database prefix" -msgstr "データベースプレフィックス" +msgstr "データベース名" #~ msgid "Configuration saved. Restart LiteSpeed put them in effect." #~ msgstr "設定が保存されました。 LiteSpeed を再起動して有効にします。" diff --git a/plogical/backupSchedule.py b/plogical/backupSchedule.py index 7c3010ebc..d8100b3b1 100644 --- a/plogical/backupSchedule.py +++ b/plogical/backupSchedule.py @@ -47,7 +47,7 @@ class backupSchedule: backupSchedule.sendBackup(backupPath+".tar.gz", ipAddress,writeToFile,port) writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + " Backup for: " + virtualHost + " is sent to " + ipAddress + "\n") + "%I-%M-%S-%a-%b-%Y") + "]" + " Backup for: " + virtualHost + " is sent to " + ipAddress + "\n") writeToFile.writelines("\n") writeToFile.writelines("\n") diff --git a/plogical/remoteBackup.py b/plogical/remoteBackup.py index c7c7bf2c2..2ff013ae6 100644 --- a/plogical/remoteBackup.py +++ b/plogical/remoteBackup.py @@ -221,7 +221,6 @@ class remoteBackup: ## complete path is a path to the file need to send command = 'sudo rsync -avz -e "ssh -i /root/.ssh/cyberpanel -o StrictHostKeyChecking=no" ' + completedPathToSend + ' root@' + IPAddress + ':/home/backup/transfer-'+folderNumber - logging.CyberCPLogFileWriter.writeToFile(command) subprocess.call(shlex.split(command), stdout=writeToFile) except BaseException, msg: diff --git a/plogical/remoteTransferUtilities.py b/plogical/remoteTransferUtilities.py index 75f7cf226..fc491cad4 100644 --- a/plogical/remoteTransferUtilities.py +++ b/plogical/remoteTransferUtilities.py @@ -5,6 +5,11 @@ import remoteBackup as rBackup import backupUtilities as backupUtil import time from multiprocessing import Process +import json +import requests +import subprocess +import shlex +from shutil import move class remoteTransferUtilities: @@ -44,54 +49,7 @@ class remoteTransferUtilities: logging.CyberCPLogFileWriter.writeToFile("For remote transfer, I am not able to write key to auth file, Error Message: "+str(msg)) print "0,"+"For remote transfer, I am not able to write key to auth file, Error Message: "+str(msg) - @staticmethod - def remoteBackupRestore(backupDir, dir): - try: - - ## dir is transfer-### - # backupDir is /home/backup/transfer-### - - backupLogPath = backupDir + "/backup_log" - - writeToFile = open(backupLogPath, "a+") - - writeToFile.writelines("\n") - writeToFile.writelines("\n") - writeToFile.writelines("############################\n") - writeToFile.writelines(" Starting Backup Restore\n") - writeToFile.writelines(" Start date: " + time.strftime("%I-%M-%S-%a-%b-%Y") + "\n") - writeToFile.writelines("############################\n") - writeToFile.writelines("\n") - writeToFile.writelines("\n") - writeToFile.close() - - if os.path.exists(backupDir): - pass - else: - writeToFile = open(backupLogPath, "w+") - writeToFile.writelines("No such directory found (Local directory where backups are placed does not exists)' [5010]" + "\n") - writeToFile.close() - return - - - p = Process(target=rBackup.remoteBackup.startRestore, args=(backupDir, backupLogPath,dir,)) - p.start() - - - pid = open(backupDir + '/pid', "w") - pid.write(str(p.pid)) - pid.close() - - return - - except BaseException, msg: - backupLogPath = backupDir + "/backup_log" - writeToFile = open(backupLogPath, "w+") - writeToFile.writelines(str(msg) + " [5010]" + "\n") - writeToFile.close() - logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [remoteRestore]") - return [0, msg] - + ## house keeping function to run remote backups @staticmethod def remoteTransfer(ipAddress,dir,accountsToTransfer): try: @@ -130,7 +88,12 @@ class remoteTransferUtilities: writeToFile.close() - p = Process(target=rBackup.remoteBackup.backupProcess, + ## destination = /home/backup/transfer-2558 + ## backupLogPath = /home/backup/transfer-2558/backup_log + ## dir = 2558 + ## Array of domains to be transferred + + p = Process(target=remoteTransferUtilities.backupProcess, args=(ipAddress, destination, backupLogPath, dir, accountsToTransfer)) p.start() @@ -148,10 +111,242 @@ class remoteTransferUtilities: return [0, msg] + ## destination = /home/backup/transfer-2558 + ## backupLogPath = /home/backup/transfer-2558/backup_log + ## dir = 2558 + ## Array of domains to be transferred + + @staticmethod + def backupProcess(ipAddress, dir, backupLogPath, folderNumber, accountsToTransfer): + try: + ## dir is without forward slash + + for virtualHost in accountsToTransfer: + + try: + + if virtualHost == "vmail" or virtualHost == "backup": + continue + + writeToFile = open(backupLogPath, "a") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Currently generating local backups for: " + virtualHost + "\n") + writeToFile.close() + + finalData = json.dumps({'websiteToBeBacked': virtualHost}) + r = requests.post("http://localhost:5003/backup/submitBackupCreation", data=finalData, + verify=False) + + data = json.loads(r.text) + + fileName = data['tempStorage'] + ".tar.gz" + + completePathToBackupFile = fileName + + while (1): + time.sleep(2) + r = requests.post("http://localhost:5003/backup/backupStatus", data=finalData, verify=False) + data = json.loads(r.text) + + writeToFile = open(backupLogPath, "a") + + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Waiting for backup to complete.. " + "\n") + + writeToFile.close() + + if data['backupStatus'] == 0: + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + "Failed to generate local backup for: " + virtualHost + ". Error message: " + + data['error_message'] + "\n") + break + + elif data['abort'] == 1: + + writeToFile = open(backupLogPath, "a") + + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Local Backup Completed for: " + virtualHost + " with status: " + + data['status'] + "\n") + + ## move the generated backup file to specified destination + + if os.path.exists(completePathToBackupFile): + move(completePathToBackupFile, dir) + + completedPathToSend = dir + "/" + completePathToBackupFile.split("/")[-1] + + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Sending " + completedPathToSend + " to " + ipAddress + ".\n") + + remoteTransferUtilities.sendBackup(completedPathToSend, ipAddress, str(folderNumber), writeToFile) + + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Sent " + completedPathToSend + " to " + ipAddress + ".\n") + + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " #############################################" + "\n") + + writeToFile.close() + break + except: + pass + + writeToFile = open(backupLogPath, "a") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Backups are successfully generated and received on: " + ipAddress + "\n") + writeToFile.close() + + ## removing local directory where backups were generated + #time.sleep(5) + # rmtree(dir) + + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [backupProcess]") + + @staticmethod + def sendBackup(completedPathToSend, IPAddress, folderNumber,writeToFile): + try: + ## complete path is a path to the file need to send + + command = "sudo scp -i /root/.ssh/cyberpanel " + completedPathToSend + " root@" + IPAddress + ":/home/backup/transfer-" + folderNumber + "/" + subprocess.call(shlex.split(command), stdout=writeToFile) + + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startBackup]") + + @staticmethod + def remoteBackupRestore(backupDir, dir): + try: + + ## dir is transfer-### + # backupDir is /home/backup/transfer-### + + backupLogPath = backupDir + "/backup_log" + + writeToFile = open(backupLogPath, "a+") + + writeToFile.writelines("\n") + writeToFile.writelines("\n") + writeToFile.writelines("############################\n") + writeToFile.writelines(" Starting Backup Restore\n") + writeToFile.writelines(" Start date: " + time.strftime("%I-%M-%S-%a-%b-%Y") + "\n") + writeToFile.writelines("############################\n") + writeToFile.writelines("\n") + writeToFile.writelines("\n") + writeToFile.close() + + if os.path.exists(backupDir): + pass + else: + writeToFile = open(backupLogPath, "w+") + writeToFile.writelines( + "No such directory found (Local directory where backups are placed does not exists)' [5010]" + "\n") + writeToFile.close() + return + + p = Process(target=remoteTransferUtilities.startRestore, args=(backupDir, backupLogPath, dir,)) + p.start() + + pid = open(backupDir + '/pid', "w") + pid.write(str(p.pid)) + pid.close() + + return + + except BaseException, msg: + backupLogPath = backupDir + "/backup_log" + writeToFile = open(backupLogPath, "w+") + writeToFile.writelines(str(msg) + " [5010]" + "\n") + writeToFile.close() + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [remoteRestore]") + return [0, msg] + + @staticmethod + def startRestore(backupDir, backupLogPath, dir): + try: + ext = ".tar.gz" + + for backup in os.listdir(backupDir): + + if backup.endswith(ext): + + writeToFile = open(backupLogPath, "a") + + writeToFile.writelines("\n") + writeToFile.writelines("\n") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Starting restore for: " + backup + ".\n") + writeToFile.close() + + finalData = json.dumps({'backupFile': backup, "dir": dir}) + r = requests.post("http://localhost:5003/backup/submitRestore", data=finalData, verify=False) + data = json.loads(r.text) + + if data['restoreStatus'] == 1: + while (1): + time.sleep(1) + finalData = json.dumps({'backupFile': backup, "dir": dir}) + r = requests.post("http://localhost:5003/backup/restoreStatus", data=finalData, + verify=False) + data = json.loads(r.text) + + if data['abort'] == 1 and data['running'] == "Error": + writeToFile = open(backupLogPath, "a") + writeToFile.writelines("\n") + writeToFile.writelines("\n") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Restore aborted for: " + backup + ". Error message: " + + data['status'] + "\n") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " #########################################\n") + writeToFile.close() + break + elif data['abort'] == 1 and data['running'] == "Completed": + writeToFile = open(backupLogPath, "a") + writeToFile.writelines("\n") + writeToFile.writelines("\n") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Restore Completed for: " + backup + ".\n") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " #########################################\n") + writeToFile.close() + break + else: + writeToFile = open(backupLogPath, "a") + writeToFile.writelines("\n") + writeToFile.writelines("\n") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Waiting for restore to complete.\n") + writeToFile.close() + time.sleep(3) + pass + else: + logging.CyberCPLogFileWriter.writeToFile("Could not start restore process for: " + backup) + writeToFile = open(backupLogPath, "a") + writeToFile.writelines("\n") + writeToFile.writelines("\n") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + "Could not start restore process for: " + backup + "\n") + writeToFile.close() + + writeToFile = open(backupLogPath, "a") + + writeToFile.writelines("\n") + writeToFile.writelines("\n") + writeToFile.writelines("[" + time.strftime( + "%I-%M-%S-%a-%b-%Y") + "]" + " Backup Restore complete\n") + writeToFile.writelines("completed[success]") + + + except BaseException, msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [initiateRestore]") + + def main(): parser = argparse.ArgumentParser(description='CyberPanel Installer') - parser.add_argument('function', help='Specific a function to call!') + parser.add_argument('function', help='Specific function to call!') parser.add_argument('--pathToKey', help='')