diff --git a/api/urls.py b/api/urls.py index 1c865fd72..52c9485ed 100644 --- a/api/urls.py +++ b/api/urls.py @@ -19,4 +19,7 @@ urlpatterns = [ url(r'^cancelRemoteTransfer', views.cancelRemoteTransfer, name='cancelRemoteTransfer'), + + url(r'^cyberPanelVersion', views.cyberPanelVersion, name='cyberPanelVersion'), + ] \ No newline at end of file diff --git a/api/views.py b/api/views.py index 4f64c00cf..2bb979083 100644 --- a/api/views.py +++ b/api/views.py @@ -15,11 +15,12 @@ from databases.models import Databases from baseTemplate.views import renderBase from random import randint import plogical.remoteBackup as rBackup -from websiteFunctions.models import Websites +from websiteFunctions.models import Websites,ChildDomains import os import signal from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging from shutil import rmtree +from baseTemplate.models import version # Create your views here. @@ -103,7 +104,7 @@ def createWebsite(request): return HttpResponse(json_data) if virtualHostUtilities.createDirectoryForVirtualHost(domain, adminEmail, phpSelection) != 1: - numberOfWebsites = Websites.objects.count() + numberOfWebsites = Websites.objects.count()+ChildDomains.objects.count() virtualHostUtilities.deleteVirtualHostConfigurations(domain, numberOfWebsites) data_ret = {"existsStatus": 1, 'createWebSiteStatus': 0, 'error_message': "Can not create configurations, see CyberCP main log file."} @@ -111,7 +112,7 @@ def createWebsite(request): return HttpResponse(json_data) if virtualHostUtilities.createConfigInMainVirtualHostFile(domain) != 1: - numberOfWebsites = Websites.objects.count() + numberOfWebsites = Websites.objects.count()+ChildDomains.objects.count() virtualHostUtilities.deleteVirtualHostConfigurations(domain, numberOfWebsites) data_ret = {"existsStatus": 1, 'createWebSiteStatus': 0, 'error_message': "Can not create configurations, see CyberCP main log file."} @@ -136,7 +137,7 @@ def createWebsite(request): return HttpResponse(json_data) except BaseException, msg: - numberOfWebsites = Websites.objects.count() + numberOfWebsites = Websites.objects.count()+ChildDomains.objects.count() virtualHostUtilities.deleteVirtualHostConfigurations(domain, numberOfWebsites) data_ret = {'createWebSiteStatus': 0, 'error_message': str(msg), "existsStatus": 0} json_data = json.dumps(data_ret) @@ -356,6 +357,7 @@ def fetchSSHkey(request): def remoteTransfer(request): try: if request.method == "POST": + data = json.loads(request.body) username = data['username'] password = data['password'] @@ -368,15 +370,11 @@ def remoteTransfer(request): transferRequest = rBackup.remoteBackup.remoteTransfer(ipAddress, dir,accountsToTransfer) if transferRequest[0] == 1: - pass + return HttpResponse(json.dumps({"transferStatus": 1, "dir": dir})) else: data_ret = {'transferStatus': 0, 'error_message': transferRequest[1]} json_data = json.dumps(data_ret) return HttpResponse(json_data) - - return HttpResponse(json.dumps({"transferStatus": 1, "dir":dir})) - - else: data_ret = {'transferStatus': 0, 'error_message': "Invalid Credentials"} json_data = json.dumps(data_ret) @@ -504,3 +502,39 @@ def cancelRemoteTransfer(request): json_data = json.dumps(data) return HttpResponse(json_data) + +def cyberPanelVersion(request): + try: + if request.method == 'POST': + + data = json.loads(request.body) + + adminUser = data['username'] + adminPass = data['password'] + + + admin = Administrator.objects.get(userName=adminUser) + + if hashPassword.check_password(admin.password, adminPass): + + Version = version.objects.get(pk=1) + + data_ret = {"getVersion": 1, + 'error_message': "Could not authorize access to API", + 'currentVersion':Version.currentVersion, + 'build':Version.build} + + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + else: + data_ret = {"getVersion": 0, + 'error_message': "Could not authorize access to API"} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + + except BaseException, msg: + data_ret = {"getVersion": 0, + 'error_message': "Could not authorize access to API"} + json_data = json.dumps(data_ret) + return HttpResponse(json_data) + diff --git a/backup/static/backup/backup.js b/backup/static/backup/backup.js index ae8c7cef4..cf81eb4bd 100644 --- a/backup/static/backup/backup.js +++ b/backup/static/backup/backup.js @@ -1216,6 +1216,8 @@ app.controller('remoteBackupControl', function($scope, $http, $timeout) { return; } + // disable fetch accounts button + $scope.fetchAccountsBtn = true; $scope.backupLoading = false; diff --git a/backup/views.py b/backup/views.py index c0d1ff2c3..6d14ed0f2 100644 --- a/backup/views.py +++ b/backup/views.py @@ -19,6 +19,7 @@ import subprocess import signal import plogical.remoteBackup as rBackup import requests +from baseTemplate.models import version def loadBackupHome(request): try: @@ -1053,6 +1054,44 @@ def submitRemoteBackups(request): ipAddress = data['ipAddress'] password = data['password'] + ## ask for remote version + + try: + finalData = json.dumps({'username': "admin","password": password}) + + url = "https://" + ipAddress + ":8090/api/cyberPanelVersion" + + r = requests.post(url, data=finalData, verify=False) + + data = json.loads(r.text) + + + if data['getVersion'] == 1: + + Version = version.objects.get(pk=1) + + if data['currentVersion'] == Version.currentVersion and data['build'] == Version.build: + pass + else: + json_data = data['data'] + data_ret = {'status': 0, 'error_message': "Your version does not match with version of remote server.", + "dir": "Null", } + data_ret = json.dumps(data_ret) + return HttpResponse(data_ret) + + else: + data_ret = {'status': 0, 'error_message': "Not able to fetch version of remote server. Error Message: "+data['error_message'], "dir": "Null"} + data_ret = json.dumps(data_ret) + return HttpResponse(data_ret) + except BaseException,msg: + data_ret = {'status': 0, + 'error_message': "Not able to fetch version of remote server. Error Message: " + str(msg), "dir": "Null"} + data_ret = json.dumps(data_ret) + return HttpResponse(data_ret) + + + ## setup ssh key + sshkey = rBackup.remoteBackup.getKey(ipAddress, password) if sshkey[0] == 1: @@ -1091,29 +1130,31 @@ def submitRemoteBackups(request): writeToFile.writelines("\n") writeToFile.close() - #ownIP = requests.get('https://api.ipify.org').text + try: + finalData = json.dumps({'username': "admin","password": password}) - finalData = json.dumps({'username': "admin","password": password}) + url = "https://" + ipAddress + ":8090/api/fetchAccountsFromRemoteServer" - url = "https://" + ipAddress + ":8090/api/fetchAccountsFromRemoteServer" + r = requests.post(url, data=finalData, verify=False) - r = requests.post(url, data=finalData, verify=False) - - data = json.loads(r.text) + data = json.loads(r.text) - if data['fetchStatus'] == 1: - json_data = data['data'] - data_ret = {'status': 1, 'error_message': "None", - "dir": "Null",'data':json_data} + if data['fetchStatus'] == 1: + json_data = data['data'] + data_ret = {'status': 1, 'error_message': "None", + "dir": "Null",'data':json_data} + data_ret = json.dumps(data_ret) + return HttpResponse(data_ret) + else: + data_ret = {'status': 0, 'error_message': "Not able to fetch accounts from remote server. Error Message: "+data['error_message'], "dir": "Null"} + data_ret = json.dumps(data_ret) + return HttpResponse(data_ret) + except BaseException,msg: + data_ret = {'status': 0, + 'error_message': "Not able to fetch accounts from remote server. Error Message: " + str(msg), "dir": "Null"} data_ret = json.dumps(data_ret) return HttpResponse(data_ret) - else: - data_ret = {'status': 0, 'error_message': "Not able to fetch accounts from remote server. Error Message: "+data['error_message'], "dir": "Null"} - data_ret = json.dumps(data_ret) - return HttpResponse(data_ret) - - else: return HttpResponse("This URL only accepts POST requests") @@ -1132,33 +1173,41 @@ def starRemoteTransfer(request): password = data['password'] accountsToTransfer = data['accountsToTransfer'] + try: + ownIP = requests.get('https://api.ipify.org').text - ownIP = requests.get('https://api.ipify.org').text + finalData = json.dumps({'username': "admin", "password": password,"ipAddress": ownIP,"accountsToTransfer":accountsToTransfer}) - finalData = json.dumps({'username': "admin", "password": password,"ipAddress": ownIP,"accountsToTransfer":accountsToTransfer}) + url = "https://" + ipAddress + ":8090/api/remoteTransfer" - url = "https://" + ipAddress + ":8090/api/remoteTransfer" + r = requests.post(url, data=finalData, verify=False) - r = requests.post(url, data=finalData, verify=False) - - data = json.loads(r.text) + data = json.loads(r.text) - if data['transferStatus'] == 1: + if data['transferStatus'] == 1: - ## create local directory that will host backups + ## create local directory that will host backups - localStoragePath = "/home/backup/transfer-" + str(data['dir']) + localStoragePath = "/home/backup/transfer-" + str(data['dir']) - if not os.path.exists(localStoragePath): - os.makedirs(localStoragePath) + if not os.path.exists(localStoragePath): + os.makedirs(localStoragePath) - final_json = json.dumps({'remoteTransferStatus': 1, 'error_message': "None","dir":data['dir']}) - return HttpResponse(final_json) - else: - final_json = json.dumps({'remoteTransferStatus': 0, 'error_message':"Can not initiate remote transfer. Error message: "+ data['error_message']}) + final_json = json.dumps({'remoteTransferStatus': 1, 'error_message': "None","dir":data['dir']}) + return HttpResponse(final_json) + else: + final_json = json.dumps({'remoteTransferStatus': 0, 'error_message':"Can not initiate remote transfer. Error message: "+ data['error_message']}) + return HttpResponse(final_json) + + except BaseException,msg: + final_json = json.dumps({'remoteTransferStatus': 0, + 'error_message': "Can not initiate remote transfer. Error message: " + + str(msg)}) return HttpResponse(final_json) + + except BaseException,msg: final_json = json.dumps({'remoteTransferStatus': 0, 'error_message': str(msg)}) return HttpResponse(final_json) diff --git a/firewall/models.py b/firewall/models.py index c2e5cb579..9ce57c2c9 100644 --- a/firewall/models.py +++ b/firewall/models.py @@ -7,3 +7,4 @@ class FirewallRules(models.Model): name = models.CharField(unique=True, max_length=32) # Field name made lowercase. proto = models.CharField(max_length=10) port = models.CharField(max_length=25) + ipAddress = models.CharField(max_length=30,default="0.0.0.0/0") diff --git a/firewall/static/firewall/firewall.js b/firewall/static/firewall/firewall.js index e0e7a71b6..fd35d3d32 100644 --- a/firewall/static/firewall/firewall.js +++ b/firewall/static/firewall/firewall.js @@ -54,6 +54,7 @@ app.controller('firewallController', function($scope,$http) { ruleName:ruleName, ruleProtocol:ruleProtocol, rulePort:rulePort, + ruleIP:$scope.ruleIP, }; var config = { @@ -165,7 +166,7 @@ app.controller('firewallController', function($scope,$http) { - $scope.deleteRule = function(id,proto,port){ + $scope.deleteRule = function(id,proto,port,ruleIP){ @@ -178,6 +179,7 @@ app.controller('firewallController', function($scope,$http) { id:id, proto:proto, port:port, + ruleIP:ruleIP, }; var config = { diff --git a/firewall/templates/firewall/firewall.html b/firewall/templates/firewall/firewall.html index 971ef4cee..87965465f 100644 --- a/firewall/templates/firewall/firewall.html +++ b/firewall/templates/firewall/firewall.html @@ -80,11 +80,11 @@
-
+
-
+
+
+ + + + + -
+
- -
@@ -127,6 +135,7 @@ {% trans "ID" %} {% trans "Name" %} {% trans "Protocol" %} + {% trans "IP Address" %} {% trans "Port" %} {% trans "Delete" %} @@ -136,8 +145,9 @@ + - + diff --git a/firewall/views.py b/firewall/views.py index da1ed1098..dcf2493fc 100644 --- a/firewall/views.py +++ b/firewall/views.py @@ -53,6 +53,7 @@ def getCurrentRules(request): 'name': items.name, 'proto': items.proto, 'port': items.port, + 'ipAddress':items.ipAddress, } if checker == 0: @@ -87,13 +88,13 @@ def addRule(request): ruleName = data['ruleName'] ruleProtocol = data['ruleProtocol'] rulePort = data['rulePort'] + ruleIP = data['ruleIP'] - FirewallUtilities.addRule(ruleProtocol,rulePort) + FirewallUtilities.addRule(ruleProtocol,rulePort,ruleIP) - newFWRule = FirewallRules(name=ruleName,proto=ruleProtocol,port=rulePort) + newFWRule = FirewallRules(name=ruleName,proto=ruleProtocol,port=rulePort,ipAddress=ruleIP) newFWRule.save() - final_dic = {'add_status': 1, 'error_message': "None"} final_json = json.dumps(final_dic) return HttpResponse(final_json) @@ -120,8 +121,9 @@ def deleteRule(request): ruleID = data['id'] ruleProtocol = data['proto'] rulePort = data['port'] + ruleIP = data['ruleIP'] - FirewallUtilities.deleteRule(ruleProtocol, rulePort) + FirewallUtilities.deleteRule(ruleProtocol, rulePort,ruleIP) delRule = FirewallRules.objects.get(id=ruleID) delRule.delete() diff --git a/install/email-configs/dovecot.conf b/install/email-configs/dovecot.conf index 9daea4898..e84a9be7c 100644 --- a/install/email-configs/dovecot.conf +++ b/install/email-configs/dovecot.conf @@ -2,8 +2,8 @@ protocols = imap pop3 log_timestamp = "%Y-%m-%d %H:%M:%S " mail_location = maildir:/home/vmail/%d/%n/Maildir -ssl_cert = \n" @@ -117,7 +117,7 @@ msgstr "Kreiraj backup" #: backup/templates/backup/backupSchedule.html:89 #: databases/templates/databases/listDataBases.html:87 #: dns/templates/dns/addDeleteDNSRecords.html:129 -#: firewall/templates/firewall/firewall.html:127 +#: firewall/templates/firewall/firewall.html:135 #: ftp/templates/ftp/listFTPAccounts.html:87 #: managePHP/templates/managePHP/installExtensions.html:61 msgid "ID" @@ -140,9 +140,9 @@ msgstr "Veličina" #: backup/templates/backup/backupDestinations.html:93 #: backup/templates/backup/backupSchedule.html:92 #: dns/templates/dns/addDeleteDNSRecords.html:134 -#: firewall/templates/firewall/firewall.html:131 +#: firewall/templates/firewall/firewall.html:140 #: firewall/templates/firewall/secureSSH.html:122 -#: websiteFunctions/templates/websiteFunctions/website.html:424 +#: websiteFunctions/templates/websiteFunctions/website.html:451 msgid "Delete" msgstr "Briši" @@ -169,6 +169,7 @@ msgstr "Na ovoj stranici možete podesiti Backup destinacije (SFTP)" #: dns/templates/dns/addDeleteDNSRecords.html:60 #: dns/templates/dns/createNameServer.html:48 #: dns/templates/dns/createNameServer.html:65 +#: firewall/templates/firewall/firewall.html:138 msgid "IP Address" msgstr "IP adresa" @@ -180,7 +181,7 @@ msgstr "IP adresa" #: mailServer/templates/mailServer/changeEmailPassword.html:52 #: mailServer/templates/mailServer/createEmailAccount.html:51 #: userManagment/templates/userManagment/createUser.html:123 -#: userManagment/templates/userManagment/modifyUser.html:107 +#: userManagment/templates/userManagment/modifyUser.html:106 msgid "Password" msgstr "Šifra" @@ -225,15 +226,15 @@ msgstr "Destinacija je dodana." #: mailServer/templates/mailServer/deleteEmailAccount.html:79 #: manageSSL/templates/manageSSL/manageSSL.html:60 #: userManagment/templates/userManagment/createUser.html:162 -#: userManagment/templates/userManagment/modifyUser.html:139 +#: userManagment/templates/userManagment/modifyUser.html:138 #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:77 #: websiteFunctions/templates/websiteFunctions/website.html:157 -#: websiteFunctions/templates/websiteFunctions/website.html:336 -#: websiteFunctions/templates/websiteFunctions/website.html:378 -#: websiteFunctions/templates/websiteFunctions/website.html:508 -#: websiteFunctions/templates/websiteFunctions/website.html:563 -#: websiteFunctions/templates/websiteFunctions/website.html:618 -#: websiteFunctions/templates/websiteFunctions/website.html:765 +#: websiteFunctions/templates/websiteFunctions/website.html:363 +#: websiteFunctions/templates/websiteFunctions/website.html:405 +#: websiteFunctions/templates/websiteFunctions/website.html:535 +#: websiteFunctions/templates/websiteFunctions/website.html:590 +#: websiteFunctions/templates/websiteFunctions/website.html:645 +#: websiteFunctions/templates/websiteFunctions/website.html:792 msgid "Could not connect to server. Please refresh this page." msgstr "Ne mogu se spojiti na udaljeni računar. Molimo da refreshujete " @@ -298,11 +299,13 @@ msgstr "Backup naslovna " #: backup/templates/backup/index.html:13 backup/templates/backup/index.html:29 #: backup/templates/backup/index.html:45 -#: baseTemplate/templates/baseTemplate/homePage.html:266 -#: baseTemplate/templates/baseTemplate/homePage.html:269 +#: baseTemplate/templates/baseTemplate/homePage.html:268 +#: baseTemplate/templates/baseTemplate/homePage.html:271 +#: baseTemplate/templates/baseTemplate/homePage.html:463 +#: baseTemplate/templates/baseTemplate/homePage.html:466 #: baseTemplate/templates/baseTemplate/index.html:554 #: baseTemplate/templates/baseTemplate/index.html:556 -#: baseTemplate/templates/baseTemplate/index.html:572 +#: baseTemplate/templates/baseTemplate/index.html:573 msgid "Back up" msgstr "Backup" @@ -370,7 +373,7 @@ msgid "Start Transfer" msgstr "" #: backup/templates/backup/remoteBackups.html:59 -#: websiteFunctions/templates/websiteFunctions/website.html:269 +#: websiteFunctions/templates/websiteFunctions/website.html:296 msgid "Cancel" msgstr "" @@ -410,9 +413,9 @@ msgid "Website" msgstr "Sajt" #: backup/templates/backup/remoteBackups.html:108 -#: baseTemplate/templates/baseTemplate/homePage.html:331 -#: baseTemplate/templates/baseTemplate/index.html:625 -#: baseTemplate/templates/baseTemplate/index.html:627 +#: baseTemplate/templates/baseTemplate/homePage.html:333 +#: baseTemplate/templates/baseTemplate/index.html:626 +#: baseTemplate/templates/baseTemplate/index.html:628 #: managePHP/templates/managePHP/installExtensions.html:62 msgid "PHP" msgstr "PHP" @@ -461,7 +464,7 @@ msgstr "Odabir backupa" #: backup/templates/backup/restore.html:86 #: databases/templates/databases/deleteDatabase.html:64 #: databases/templates/databases/listDataBases.html:54 -#: firewall/templates/firewall/firewall.html:156 +#: firewall/templates/firewall/firewall.html:166 #: managePHP/templates/managePHP/editPHPConfig.html:212 msgid "Error message:" msgstr "Greška: " @@ -517,24 +520,28 @@ msgstr "Obrada zahteva" msgid "Total Requests" msgstr "Ukupno zahtijeva" -#: baseTemplate/templates/baseTemplate/homePage.html:173 +#: baseTemplate/templates/baseTemplate/homePage.html:175 +#: baseTemplate/templates/baseTemplate/homePage.html:389 #: userManagment/templates/userManagment/index.html:13 msgid "User Functions" msgstr "Korisničke funkcije" -#: baseTemplate/templates/baseTemplate/homePage.html:176 +#: baseTemplate/templates/baseTemplate/homePage.html:178 +#: baseTemplate/templates/baseTemplate/homePage.html:392 #: baseTemplate/templates/baseTemplate/index.html:426 #: baseTemplate/templates/baseTemplate/index.html:427 #: baseTemplate/templates/baseTemplate/index.html:428 msgid "Users" msgstr "Korisnici" -#: baseTemplate/templates/baseTemplate/homePage.html:186 +#: baseTemplate/templates/baseTemplate/homePage.html:188 +#: baseTemplate/templates/baseTemplate/homePage.html:402 #: websiteFunctions/templates/websiteFunctions/index.html:13 msgid "Website Functions" msgstr "" -#: baseTemplate/templates/baseTemplate/homePage.html:189 +#: baseTemplate/templates/baseTemplate/homePage.html:191 +#: baseTemplate/templates/baseTemplate/homePage.html:405 #: baseTemplate/templates/baseTemplate/index.html:360 #: baseTemplate/templates/baseTemplate/index.html:444 #: baseTemplate/templates/baseTemplate/index.html:445 @@ -543,13 +550,13 @@ msgstr "" msgid "Websites" msgstr "Sajtovi" -#: baseTemplate/templates/baseTemplate/homePage.html:199 +#: baseTemplate/templates/baseTemplate/homePage.html:201 #, fuzzy #| msgid "Modify Package" msgid "Add/Modify Packages" msgstr "Promijeni paket" -#: baseTemplate/templates/baseTemplate/homePage.html:202 +#: baseTemplate/templates/baseTemplate/homePage.html:204 #: baseTemplate/templates/baseTemplate/index.html:366 #: baseTemplate/templates/baseTemplate/index.html:461 #: baseTemplate/templates/baseTemplate/index.html:463 @@ -557,12 +564,14 @@ msgstr "Promijeni paket" msgid "Packages" msgstr "Pakti" -#: baseTemplate/templates/baseTemplate/homePage.html:223 +#: baseTemplate/templates/baseTemplate/homePage.html:225 +#: baseTemplate/templates/baseTemplate/homePage.html:415 #: databases/templates/databases/index.html:12 msgid "Database Functions" msgstr "Funkcije za bazu podataka" -#: baseTemplate/templates/baseTemplate/homePage.html:226 +#: baseTemplate/templates/baseTemplate/homePage.html:228 +#: baseTemplate/templates/baseTemplate/homePage.html:418 #: baseTemplate/templates/baseTemplate/index.html:477 #: baseTemplate/templates/baseTemplate/index.html:478 #: baseTemplate/templates/baseTemplate/index.html:479 @@ -572,23 +581,27 @@ msgstr "Funkcije za bazu podataka" msgid "Databases" msgstr "Baze podataka" -#: baseTemplate/templates/baseTemplate/homePage.html:235 +#: baseTemplate/templates/baseTemplate/homePage.html:237 +#: baseTemplate/templates/baseTemplate/homePage.html:438 msgid "Control DNS" msgstr "" -#: baseTemplate/templates/baseTemplate/homePage.html:238 +#: baseTemplate/templates/baseTemplate/homePage.html:240 +#: baseTemplate/templates/baseTemplate/homePage.html:441 #: baseTemplate/templates/baseTemplate/index.html:372 #: baseTemplate/templates/baseTemplate/index.html:495 #: baseTemplate/templates/baseTemplate/index.html:497 msgid "DNS" msgstr "DNS" -#: baseTemplate/templates/baseTemplate/homePage.html:248 +#: baseTemplate/templates/baseTemplate/homePage.html:250 +#: baseTemplate/templates/baseTemplate/homePage.html:451 #: ftp/templates/ftp/index.html:12 msgid "FTP Functions" msgstr "FTP funkcije" -#: baseTemplate/templates/baseTemplate/homePage.html:251 +#: baseTemplate/templates/baseTemplate/homePage.html:253 +#: baseTemplate/templates/baseTemplate/homePage.html:454 #: baseTemplate/templates/baseTemplate/index.html:378 #: baseTemplate/templates/baseTemplate/index.html:536 #: baseTemplate/templates/baseTemplate/index.html:538 @@ -596,45 +609,47 @@ msgstr "FTP funkcije" msgid "FTP" msgstr "FTP" -#: baseTemplate/templates/baseTemplate/homePage.html:278 -#: baseTemplate/templates/baseTemplate/homePage.html:281 +#: baseTemplate/templates/baseTemplate/homePage.html:280 +#: baseTemplate/templates/baseTemplate/homePage.html:283 +#: baseTemplate/templates/baseTemplate/homePage.html:483 +#: baseTemplate/templates/baseTemplate/homePage.html:486 #: packages/templates/packages/createPackage.html:75 #: packages/templates/packages/modifyPackage.html:80 msgid "Emails" msgstr "Emailovi" -#: baseTemplate/templates/baseTemplate/homePage.html:291 -#: baseTemplate/templates/baseTemplate/homePage.html:294 +#: baseTemplate/templates/baseTemplate/homePage.html:293 +#: baseTemplate/templates/baseTemplate/homePage.html:296 #: tuning/templates/tuning/index.html:12 msgid "Server Tuning" msgstr "Server tuning" -#: baseTemplate/templates/baseTemplate/homePage.html:315 -#: baseTemplate/templates/baseTemplate/homePage.html:318 -#: baseTemplate/templates/baseTemplate/index.html:606 -#: baseTemplate/templates/baseTemplate/index.html:608 -#: baseTemplate/templates/baseTemplate/index.html:641 +#: baseTemplate/templates/baseTemplate/homePage.html:317 +#: baseTemplate/templates/baseTemplate/homePage.html:320 +#: baseTemplate/templates/baseTemplate/index.html:607 +#: baseTemplate/templates/baseTemplate/index.html:609 +#: baseTemplate/templates/baseTemplate/index.html:642 #: serverStatus/templates/serverStatus/index.html:13 msgid "Server Status" msgstr "Status servera" -#: baseTemplate/templates/baseTemplate/homePage.html:328 +#: baseTemplate/templates/baseTemplate/homePage.html:330 #, fuzzy #| msgid "Edit PHP Configurations" msgid "PHP Configurations" msgstr "Izmijeni PHP konfiguracije" -#: baseTemplate/templates/baseTemplate/homePage.html:340 -#: baseTemplate/templates/baseTemplate/homePage.html:343 -#: baseTemplate/templates/baseTemplate/index.html:643 +#: baseTemplate/templates/baseTemplate/homePage.html:342 +#: baseTemplate/templates/baseTemplate/homePage.html:345 +#: baseTemplate/templates/baseTemplate/index.html:644 #: websiteFunctions/templates/websiteFunctions/website.html:113 msgid "Logs" msgstr "Logovi" -#: baseTemplate/templates/baseTemplate/homePage.html:363 -#: baseTemplate/templates/baseTemplate/homePage.html:366 -#: baseTemplate/templates/baseTemplate/index.html:659 -#: baseTemplate/templates/baseTemplate/index.html:661 +#: baseTemplate/templates/baseTemplate/homePage.html:365 +#: baseTemplate/templates/baseTemplate/homePage.html:368 +#: baseTemplate/templates/baseTemplate/index.html:660 +#: baseTemplate/templates/baseTemplate/index.html:662 msgid "Security" msgstr "Sigurnost" @@ -710,8 +725,8 @@ msgid "Dashboard Quick Menu" msgstr "Kontrolna ploča" #: baseTemplate/templates/baseTemplate/index.html:384 -#: baseTemplate/templates/baseTemplate/index.html:590 -#: baseTemplate/templates/baseTemplate/index.html:592 +#: baseTemplate/templates/baseTemplate/index.html:591 +#: baseTemplate/templates/baseTemplate/index.html:593 msgid "Tuning" msgstr "Tuning" @@ -744,7 +759,7 @@ msgstr "Novi korisnik" #: userManagment/templates/userManagment/index.html:52 #: userManagment/templates/userManagment/index.html:54 #: userManagment/templates/userManagment/modifyUser.html:12 -#: userManagment/templates/userManagment/modifyUser.html:120 +#: userManagment/templates/userManagment/modifyUser.html:119 msgid "Modify User" msgstr "Promjena korisnika" @@ -924,8 +939,8 @@ msgstr "Pristup webmailu" #: ftp/templates/ftp/createFTPAccount.html:12 #: ftp/templates/ftp/createFTPAccount.html:19 ftp/templates/ftp/index.html:25 #: ftp/templates/ftp/index.html:27 -#: websiteFunctions/templates/websiteFunctions/website.html:683 -#: websiteFunctions/templates/websiteFunctions/website.html:685 +#: websiteFunctions/templates/websiteFunctions/website.html:710 +#: websiteFunctions/templates/websiteFunctions/website.html:712 msgid "Create FTP Account" msgstr "Kreiranje FTP računa" @@ -934,8 +949,8 @@ msgstr "Kreiranje FTP računa" #: ftp/templates/ftp/deleteFTPAccount.html:18 #: ftp/templates/ftp/deleteFTPAccount.html:52 ftp/templates/ftp/index.html:37 #: ftp/templates/ftp/index.html:39 -#: websiteFunctions/templates/websiteFunctions/website.html:695 -#: websiteFunctions/templates/websiteFunctions/website.html:697 +#: websiteFunctions/templates/websiteFunctions/website.html:722 +#: websiteFunctions/templates/websiteFunctions/website.html:724 msgid "Delete FTP Account" msgstr "Briši FTP račun" @@ -950,78 +965,84 @@ msgstr "Lista FTP računa" msgid "Add/Delete Destination" msgstr "Dodaj / izbriši destinaciju" -#: baseTemplate/templates/baseTemplate/index.html:573 +#: baseTemplate/templates/baseTemplate/index.html:565 +#, fuzzy +#| msgid "Restore Back up" +msgid "Remote Back ups" +msgstr "Vrati backup" + #: baseTemplate/templates/baseTemplate/index.html:574 +#: baseTemplate/templates/baseTemplate/index.html:575 msgid "SSL" msgstr "SSL" -#: baseTemplate/templates/baseTemplate/index.html:579 +#: baseTemplate/templates/baseTemplate/index.html:580 #: manageSSL/templates/manageSSL/index.html:28 #: manageSSL/templates/manageSSL/manageSSL.html:13 #: manageSSL/templates/manageSSL/manageSSL.html:20 msgid "Manage SSL" msgstr "Upravljanje SSL-om" -#: baseTemplate/templates/baseTemplate/index.html:580 +#: baseTemplate/templates/baseTemplate/index.html:581 #: manageSSL/templates/manageSSL/index.html:40 msgid "Hostname SSL" msgstr "Hostname ssl" -#: baseTemplate/templates/baseTemplate/index.html:588 +#: baseTemplate/templates/baseTemplate/index.html:589 msgid "Server" msgstr "Server" -#: baseTemplate/templates/baseTemplate/index.html:593 +#: baseTemplate/templates/baseTemplate/index.html:594 msgid "NEW" msgstr "Novi" -#: baseTemplate/templates/baseTemplate/index.html:598 +#: baseTemplate/templates/baseTemplate/index.html:599 #: tuning/templates/tuning/index.html:24 tuning/templates/tuning/index.html:26 #: tuning/templates/tuning/liteSpeedTuning.html:12 msgid "LiteSpeed Tuning" msgstr "LiteSpeed tuning" -#: baseTemplate/templates/baseTemplate/index.html:599 +#: baseTemplate/templates/baseTemplate/index.html:600 #: tuning/templates/tuning/index.html:36 tuning/templates/tuning/index.html:38 #: tuning/templates/tuning/phpTuning.html:13 msgid "PHP Tuning" msgstr "PHP tuning" -#: baseTemplate/templates/baseTemplate/index.html:614 +#: baseTemplate/templates/baseTemplate/index.html:615 #: serverStatus/templates/serverStatus/index.html:25 #: serverStatus/templates/serverStatus/index.html:27 msgid "LiteSpeed Status" msgstr "LiteSpeed status" -#: baseTemplate/templates/baseTemplate/index.html:615 +#: baseTemplate/templates/baseTemplate/index.html:616 #: serverStatus/templates/serverStatus/cybercpmainlogfile.html:15 #: serverStatus/templates/serverStatus/index.html:37 #: serverStatus/templates/serverStatus/index.html:39 msgid "CyberPanel Main Log File" msgstr "Glavni log fajl" -#: baseTemplate/templates/baseTemplate/index.html:632 +#: baseTemplate/templates/baseTemplate/index.html:633 #: managePHP/templates/managePHP/installExtensions.html:13 msgid "Install PHP Extensions" msgstr "Instalacija extenzija za php" -#: baseTemplate/templates/baseTemplate/index.html:632 +#: baseTemplate/templates/baseTemplate/index.html:633 #: managePHP/templates/managePHP/index.html:24 #: managePHP/templates/managePHP/index.html:26 msgid "Install Extensions" msgstr "Instalacija extenzija" -#: baseTemplate/templates/baseTemplate/index.html:633 +#: baseTemplate/templates/baseTemplate/index.html:634 #: managePHP/templates/managePHP/index.html:36 #: managePHP/templates/managePHP/index.html:38 msgid "Edit PHP Configs" msgstr "Promjena php konfiguracije" -#: baseTemplate/templates/baseTemplate/index.html:648 +#: baseTemplate/templates/baseTemplate/index.html:649 msgid "Access Log" msgstr "Pristupni log" -#: baseTemplate/templates/baseTemplate/index.html:649 +#: baseTemplate/templates/baseTemplate/index.html:650 #: serverLogs/templates/serverLogs/errorLogs.html:14 #: serverLogs/templates/serverLogs/index.html:37 #: serverLogs/templates/serverLogs/index.html:39 @@ -1029,37 +1050,37 @@ msgstr "Pristupni log" msgid "Error Logs" msgstr "Log grešaka" -#: baseTemplate/templates/baseTemplate/index.html:650 +#: baseTemplate/templates/baseTemplate/index.html:651 #: serverLogs/templates/serverLogs/emailLogs.html:14 #: serverLogs/templates/serverLogs/index.html:49 #: serverLogs/templates/serverLogs/index.html:51 msgid "Email Logs" msgstr "Email logovi" -#: baseTemplate/templates/baseTemplate/index.html:650 +#: baseTemplate/templates/baseTemplate/index.html:651 msgid "Email Log" msgstr "Email log" -#: baseTemplate/templates/baseTemplate/index.html:651 +#: baseTemplate/templates/baseTemplate/index.html:652 #: serverLogs/templates/serverLogs/ftplogs.html:14 #: serverLogs/templates/serverLogs/index.html:61 #: serverLogs/templates/serverLogs/index.html:63 msgid "FTP Logs" msgstr "FTP logovi" -#: baseTemplate/templates/baseTemplate/index.html:666 +#: baseTemplate/templates/baseTemplate/index.html:667 #, fuzzy #| msgid "Firewall" msgid "Firewall Home" msgstr "Firewall " -#: baseTemplate/templates/baseTemplate/index.html:666 +#: baseTemplate/templates/baseTemplate/index.html:667 #: firewall/templates/firewall/index.html:25 #: firewall/templates/firewall/index.html:27 msgid "Firewall" msgstr "Firewall " -#: baseTemplate/templates/baseTemplate/index.html:667 +#: baseTemplate/templates/baseTemplate/index.html:668 #: firewall/templates/firewall/index.html:36 #: firewall/templates/firewall/index.html:38 #: firewall/templates/firewall/secureSSH.html:13 @@ -1201,7 +1222,7 @@ msgid "Cannot change password for " msgstr "Ne može se promijeniti šifra za " #: databases/templates/databases/listDataBases.html:59 -#: firewall/templates/firewall/firewall.html:166 +#: firewall/templates/firewall/firewall.html:176 #: ftp/templates/ftp/listFTPAccounts.html:59 msgid "Could Not Connect to server. Please refresh this page" msgstr "Ne mogu se spojiti na server. Molimo da refreshujete " @@ -1237,7 +1258,7 @@ msgstr "Dodajte zapise" #: dns/templates/dns/addDeleteDNSRecords.html:53 #: dns/templates/dns/addDeleteDNSRecords.html:131 -#: firewall/templates/firewall/firewall.html:128 +#: firewall/templates/firewall/firewall.html:136 #: serverStatus/templates/serverStatus/litespeedStatus.html:40 msgid "Name" msgstr "Ime" @@ -1255,7 +1276,7 @@ msgstr "Prioritet" #: dns/templates/dns/createDNSZone.html:27 #: dns/templates/dns/createNameServer.html:27 #: websiteFunctions/templates/websiteFunctions/createWebsite.html:52 -#: websiteFunctions/templates/websiteFunctions/website.html:263 +#: websiteFunctions/templates/websiteFunctions/website.html:290 msgid "Domain Name" msgstr "Naziv domene" @@ -1268,7 +1289,7 @@ msgid "Text" msgstr "" #: dns/templates/dns/addDeleteDNSRecords.html:111 -#: firewall/templates/firewall/firewall.html:109 +#: firewall/templates/firewall/firewall.html:117 msgid "Add" msgstr "Dodati" @@ -1459,15 +1480,15 @@ msgstr "Nije uspjelo. Greška:" msgid "Action successful." msgstr "Uspješno je radnja obavljena." -#: firewall/templates/firewall/firewall.html:129 +#: firewall/templates/firewall/firewall.html:137 msgid "Protocol" msgstr "Protokol" -#: firewall/templates/firewall/firewall.html:130 +#: firewall/templates/firewall/firewall.html:139 msgid "Port" msgstr "Port" -#: firewall/templates/firewall/firewall.html:162 +#: firewall/templates/firewall/firewall.html:172 msgid "Rule successfully added." msgstr "Pravilo je uspješno dodano." @@ -1538,8 +1559,8 @@ msgstr "Dodaj ključ" #: firewall/templates/firewall/secureSSH.html:158 #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:55 -#: websiteFunctions/templates/websiteFunctions/website.html:527 -#: websiteFunctions/templates/websiteFunctions/website.html:587 +#: websiteFunctions/templates/websiteFunctions/website.html:554 +#: websiteFunctions/templates/websiteFunctions/website.html:614 msgid "Save" msgstr "Sačuvaj" @@ -1747,7 +1768,7 @@ msgstr "Napredno" #: tuning/templates/tuning/phpTuning.html:28 #: websiteFunctions/templates/websiteFunctions/createWebsite.html:68 #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:74 -#: websiteFunctions/templates/websiteFunctions/website.html:283 +#: websiteFunctions/templates/websiteFunctions/website.html:310 msgid "Select PHP" msgstr "Izaberi PHP" @@ -1844,7 +1865,7 @@ msgstr "Idi nazad" #: managePHP/templates/managePHP/installExtensions.html:104 #: tuning/templates/tuning/phpTuning.html:114 -#: userManagment/templates/userManagment/modifyUser.html:144 +#: userManagment/templates/userManagment/modifyUser.html:143 msgid "Cannot fetch details. Error message:" msgstr "Ne mogu da prikupim detalje. Poruka o grešci:" @@ -1935,7 +1956,7 @@ msgstr "Naziv paketa" #: packages/templates/packages/createPackage.html:35 #: packages/templates/packages/modifyPackage.html:40 -#: websiteFunctions/templates/websiteFunctions/website.html:223 +#: websiteFunctions/templates/websiteFunctions/website.html:250 #, fuzzy #| msgid "Domain Name" msgid "Domains" @@ -2240,7 +2261,7 @@ msgstr "Isključi" #: tuning/templates/tuning/liteSpeedTuning.html:74 #: tuning/templates/tuning/phpTuning.html:97 -#: userManagment/templates/userManagment/modifyUser.html:78 +#: userManagment/templates/userManagment/modifyUser.html:77 msgid "Currently:" msgstr "Trenutno:" @@ -2358,18 +2379,18 @@ msgid "Account Type" msgstr "Tip računa" #: userManagment/templates/userManagment/createUser.html:67 -#: userManagment/templates/userManagment/modifyUser.html:73 -msgid "Reseller" -msgstr "Reseller" +#: userManagment/templates/userManagment/modifyUser.html:72 +msgid "Admin" +msgstr "Administrator" #: userManagment/templates/userManagment/createUser.html:68 #: userManagment/templates/userManagment/createUser.html:79 -#: userManagment/templates/userManagment/modifyUser.html:74 +#: userManagment/templates/userManagment/modifyUser.html:73 msgid "Normal User" msgstr "Obični korisnik" #: userManagment/templates/userManagment/createUser.html:92 -#: userManagment/templates/userManagment/modifyUser.html:89 +#: userManagment/templates/userManagment/modifyUser.html:88 #: userManagment/templates/userManagment/userProfile.html:67 #: userManagment/templates/userManagment/userProfile.html:74 msgid "User Accounts Limit" @@ -2381,7 +2402,7 @@ msgid "Only Numbers" msgstr "Samo brojevi" #: userManagment/templates/userManagment/createUser.html:103 -#: userManagment/templates/userManagment/modifyUser.html:99 +#: userManagment/templates/userManagment/modifyUser.html:98 #: userManagment/templates/userManagment/userProfile.html:82 msgid "Websites Limit" msgstr "" @@ -2406,7 +2427,7 @@ msgid "Create User" msgstr "Novi korisnik" #: userManagment/templates/userManagment/createUser.html:154 -#: userManagment/templates/userManagment/modifyUser.html:131 +#: userManagment/templates/userManagment/modifyUser.html:130 msgid "Account with username:" msgstr "" @@ -2460,19 +2481,15 @@ msgstr "" msgid "Select Account" msgstr "Odaberite račun" -#: userManagment/templates/userManagment/modifyUser.html:72 -msgid "Admin" -msgstr "Administrator" - -#: userManagment/templates/userManagment/modifyUser.html:131 +#: userManagment/templates/userManagment/modifyUser.html:130 msgid " is successfully modified." msgstr " uspješno je izmijenjen." -#: userManagment/templates/userManagment/modifyUser.html:135 +#: userManagment/templates/userManagment/modifyUser.html:134 msgid "Cannot modify user. Error message:" msgstr "" -#: userManagment/templates/userManagment/modifyUser.html:148 +#: userManagment/templates/userManagment/modifyUser.html:147 msgid "Details fetched." msgstr "" @@ -2521,35 +2538,35 @@ msgid "Select Owner" msgstr "Vlasnik" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:56 -#: websiteFunctions/templates/websiteFunctions/website.html:267 -#: websiteFunctions/templates/websiteFunctions/website.html:278 +#: websiteFunctions/templates/websiteFunctions/website.html:294 +#: websiteFunctions/templates/websiteFunctions/website.html:305 msgid "Invalid Domain (Note: You don't need to add 'http' or 'https')" msgstr "" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:84 -#: websiteFunctions/templates/websiteFunctions/website.html:299 +#: websiteFunctions/templates/websiteFunctions/website.html:326 msgid "Additional Features" msgstr "Dodatne informacije" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:91 -#: websiteFunctions/templates/websiteFunctions/website.html:306 +#: websiteFunctions/templates/websiteFunctions/website.html:333 msgid "" "For SSL to work DNS of domain should point to server, otherwise self signed " "SSL will be issued, you can add your own SSL later." msgstr "" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:113 -#: websiteFunctions/templates/websiteFunctions/website.html:328 +#: websiteFunctions/templates/websiteFunctions/website.html:355 msgid "Cannot create website. Error message:" msgstr "" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 -#: websiteFunctions/templates/websiteFunctions/website.html:332 +#: websiteFunctions/templates/websiteFunctions/website.html:359 msgid "Website with domain" msgstr "" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 -#: websiteFunctions/templates/websiteFunctions/website.html:332 +#: websiteFunctions/templates/websiteFunctions/website.html:359 msgid " is Successfully Created" msgstr " je spješno kreiran" @@ -2689,168 +2706,173 @@ msgid "" msgstr "" #: websiteFunctions/templates/websiteFunctions/website.html:173 +#: websiteFunctions/templates/websiteFunctions/website.html:212 msgid "Next" msgstr "Sljedeće" #: websiteFunctions/templates/websiteFunctions/website.html:174 +#: websiteFunctions/templates/websiteFunctions/website.html:213 msgid "Previous" msgstr "Prethodno" -#: websiteFunctions/templates/websiteFunctions/website.html:230 -#: websiteFunctions/templates/websiteFunctions/website.html:232 +#: websiteFunctions/templates/websiteFunctions/website.html:257 +#: websiteFunctions/templates/websiteFunctions/website.html:259 #, fuzzy #| msgid "Add Destination" msgid "Add Domains" msgstr "Dodaj destinaciju" -#: websiteFunctions/templates/websiteFunctions/website.html:242 -#: websiteFunctions/templates/websiteFunctions/website.html:244 +#: websiteFunctions/templates/websiteFunctions/website.html:269 +#: websiteFunctions/templates/websiteFunctions/website.html:271 #, fuzzy #| msgid "Select Domain" msgid "List Domains" msgstr "Odaberite domene" -#: websiteFunctions/templates/websiteFunctions/website.html:274 -#: websiteFunctions/templates/websiteFunctions/website.html:733 +#: websiteFunctions/templates/websiteFunctions/website.html:301 +#: websiteFunctions/templates/websiteFunctions/website.html:760 msgid "Path" msgstr "Putanja" -#: websiteFunctions/templates/websiteFunctions/website.html:276 +#: websiteFunctions/templates/websiteFunctions/website.html:303 msgid "This path is relative to: " msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:276 +#: websiteFunctions/templates/websiteFunctions/website.html:303 msgid "Leave empty to set default." msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:317 +#: websiteFunctions/templates/websiteFunctions/website.html:344 #, fuzzy #| msgid "Create Email" msgid "Create Domain" msgstr "Kreiraj email" -#: websiteFunctions/templates/websiteFunctions/website.html:360 +#: websiteFunctions/templates/websiteFunctions/website.html:387 #, fuzzy #| msgid "Version Management" msgid "PHP Version Changed to:" msgstr "Upravljanje verzijama" -#: websiteFunctions/templates/websiteFunctions/website.html:364 +#: websiteFunctions/templates/websiteFunctions/website.html:391 #, fuzzy #| msgid "Delete" msgid "Deleted:" msgstr "Briši" -#: websiteFunctions/templates/websiteFunctions/website.html:368 +#: websiteFunctions/templates/websiteFunctions/website.html:395 #, fuzzy #| msgid "SSL Issued for" msgid "SSL Issued:" msgstr "SSL izdat za " -#: websiteFunctions/templates/websiteFunctions/website.html:391 +#: websiteFunctions/templates/websiteFunctions/website.html:418 msgid "Close" msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:423 +#: websiteFunctions/templates/websiteFunctions/website.html:450 #, fuzzy #| msgid "Issue SSL" msgid "Issue" msgstr "Izdavanje SSL" -#: websiteFunctions/templates/websiteFunctions/website.html:451 +#: websiteFunctions/templates/websiteFunctions/website.html:478 msgid "Configurations" msgstr "Upravljajte postavkama" -#: websiteFunctions/templates/websiteFunctions/website.html:457 +#: websiteFunctions/templates/websiteFunctions/website.html:484 #, fuzzy #| msgid "Edit PHP Configurations" msgid "Edit Virtual Host Main Configurations" msgstr "Izmijeni PHP konfiguracije" -#: websiteFunctions/templates/websiteFunctions/website.html:459 +#: websiteFunctions/templates/websiteFunctions/website.html:486 msgid "Edit vHost Main Configurations" msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:469 -#: websiteFunctions/templates/websiteFunctions/website.html:471 +#: websiteFunctions/templates/websiteFunctions/website.html:496 +#: websiteFunctions/templates/websiteFunctions/website.html:498 msgid "Add Rewrite Rules (.htaccess)" msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:481 +#: websiteFunctions/templates/websiteFunctions/website.html:508 #, fuzzy #| msgid "Add SSL" msgid "Add Your Own SSL" msgstr "Dodaj SSL" -#: websiteFunctions/templates/websiteFunctions/website.html:483 +#: websiteFunctions/templates/websiteFunctions/website.html:510 msgid "Add SSL" msgstr "Dodaj SSL" -#: websiteFunctions/templates/websiteFunctions/website.html:498 +#: websiteFunctions/templates/websiteFunctions/website.html:525 msgid "SSL Saved" msgstr "SLL spremljen" -#: websiteFunctions/templates/websiteFunctions/website.html:503 +#: websiteFunctions/templates/websiteFunctions/website.html:530 msgid "Could not save SSL. Error message:" msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:553 +#: websiteFunctions/templates/websiteFunctions/website.html:580 msgid "Current configuration in the file fetched." msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:558 -#: websiteFunctions/templates/websiteFunctions/website.html:571 +#: websiteFunctions/templates/websiteFunctions/website.html:585 +#: websiteFunctions/templates/websiteFunctions/website.html:598 msgid "Could not fetch current configuration. Error message:" msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:567 -#: websiteFunctions/templates/websiteFunctions/website.html:622 +#: websiteFunctions/templates/websiteFunctions/website.html:594 +#: websiteFunctions/templates/websiteFunctions/website.html:649 msgid "Configuration saved. Restart LiteSpeed put them in effect." msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:608 +#: websiteFunctions/templates/websiteFunctions/website.html:635 msgid "Current rewrite rules in the file fetched." msgstr "Trenutno rewrite pravilo je dohvaćeno." -#: websiteFunctions/templates/websiteFunctions/website.html:613 +#: websiteFunctions/templates/websiteFunctions/website.html:640 msgid "Could not fetch current rewrite rules. Error message:" msgstr "Nisam mogao dohvatiti trenutno rewrite pravilo. Poruka s greškom:" -#: websiteFunctions/templates/websiteFunctions/website.html:626 +#: websiteFunctions/templates/websiteFunctions/website.html:653 msgid "Could not save rewrite rules. Error message:" msgstr "Nisam mogao promijeniti vrijednost rewrite pravila. Poruka s greškom:" -#: websiteFunctions/templates/websiteFunctions/website.html:642 +#: websiteFunctions/templates/websiteFunctions/website.html:669 msgid "Save Rewrite Rules" msgstr "Sačuvaj promjene" -#: websiteFunctions/templates/websiteFunctions/website.html:665 +#: websiteFunctions/templates/websiteFunctions/website.html:692 msgid "Files" msgstr "Datoteke" -#: websiteFunctions/templates/websiteFunctions/website.html:672 -#: websiteFunctions/templates/websiteFunctions/website.html:674 +#: websiteFunctions/templates/websiteFunctions/website.html:699 +#: websiteFunctions/templates/websiteFunctions/website.html:701 msgid "File Manager" msgstr "Upravljač datotekama" -#: websiteFunctions/templates/websiteFunctions/website.html:713 +#: websiteFunctions/templates/websiteFunctions/website.html:740 msgid "Application Installer" msgstr "Instalacija aplikacija" -#: websiteFunctions/templates/websiteFunctions/website.html:719 +#: websiteFunctions/templates/websiteFunctions/website.html:746 #, fuzzy #| msgid "Wordpress with LSCache" msgid "Install wordpress with LSCache" msgstr "Wordpress sa LSCache" -#: websiteFunctions/templates/websiteFunctions/website.html:721 +#: websiteFunctions/templates/websiteFunctions/website.html:748 msgid "Wordpress with LSCache" msgstr "Wordpress sa LSCache" -#: websiteFunctions/templates/websiteFunctions/website.html:755 +#: websiteFunctions/templates/websiteFunctions/website.html:782 msgid "Installation failed. Error message:" msgstr "Nije uspjela instalacija. Greška:" -#: websiteFunctions/templates/websiteFunctions/website.html:759 +#: websiteFunctions/templates/websiteFunctions/website.html:786 msgid "Installation successful. To complete the setup visit:" msgstr "Instalacija je uspjela. Do završetka je ostalo samo da posjetite:" + +#~ msgid "Reseller" +#~ msgstr "Reseller" diff --git a/locale/cn/LC_MESSAGES/django.mo b/locale/cn/LC_MESSAGES/django.mo index eca7af4ab..3b2e15527 100644 Binary files a/locale/cn/LC_MESSAGES/django.mo and b/locale/cn/LC_MESSAGES/django.mo differ diff --git a/locale/cn/LC_MESSAGES/django.po b/locale/cn/LC_MESSAGES/django.po index 060a00653..eecc53cbd 100644 --- a/locale/cn/LC_MESSAGES/django.po +++ b/locale/cn/LC_MESSAGES/django.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: CyberPanel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-30 10:05+0500\n" +"POT-Creation-Date: 2017-11-02 02:08+0500\n" "PO-Revision-Date: 2017-10-29 19:32+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -116,7 +116,7 @@ msgstr "取消备份" #: backup/templates/backup/backupSchedule.html:89 #: databases/templates/databases/listDataBases.html:87 #: dns/templates/dns/addDeleteDNSRecords.html:129 -#: firewall/templates/firewall/firewall.html:127 +#: firewall/templates/firewall/firewall.html:135 #: ftp/templates/ftp/listFTPAccounts.html:87 #: managePHP/templates/managePHP/installExtensions.html:61 msgid "ID" @@ -139,9 +139,9 @@ msgstr "大小" #: backup/templates/backup/backupDestinations.html:93 #: backup/templates/backup/backupSchedule.html:92 #: dns/templates/dns/addDeleteDNSRecords.html:134 -#: firewall/templates/firewall/firewall.html:131 +#: firewall/templates/firewall/firewall.html:140 #: firewall/templates/firewall/secureSSH.html:122 -#: websiteFunctions/templates/websiteFunctions/website.html:424 +#: websiteFunctions/templates/websiteFunctions/website.html:451 msgid "Delete" msgstr "删除" @@ -168,6 +168,7 @@ msgstr "这里是远程备份页面(SFTP)" #: dns/templates/dns/addDeleteDNSRecords.html:60 #: dns/templates/dns/createNameServer.html:48 #: dns/templates/dns/createNameServer.html:65 +#: firewall/templates/firewall/firewall.html:138 msgid "IP Address" msgstr "IP地址" @@ -179,7 +180,7 @@ msgstr "IP地址" #: mailServer/templates/mailServer/changeEmailPassword.html:52 #: mailServer/templates/mailServer/createEmailAccount.html:51 #: userManagment/templates/userManagment/createUser.html:123 -#: userManagment/templates/userManagment/modifyUser.html:107 +#: userManagment/templates/userManagment/modifyUser.html:106 msgid "Password" msgstr "密码" @@ -224,15 +225,15 @@ msgstr "远程目录已添加" #: mailServer/templates/mailServer/deleteEmailAccount.html:79 #: manageSSL/templates/manageSSL/manageSSL.html:60 #: userManagment/templates/userManagment/createUser.html:162 -#: userManagment/templates/userManagment/modifyUser.html:139 +#: userManagment/templates/userManagment/modifyUser.html:138 #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:77 #: websiteFunctions/templates/websiteFunctions/website.html:157 -#: websiteFunctions/templates/websiteFunctions/website.html:336 -#: websiteFunctions/templates/websiteFunctions/website.html:378 -#: websiteFunctions/templates/websiteFunctions/website.html:508 -#: websiteFunctions/templates/websiteFunctions/website.html:563 -#: websiteFunctions/templates/websiteFunctions/website.html:618 -#: websiteFunctions/templates/websiteFunctions/website.html:765 +#: websiteFunctions/templates/websiteFunctions/website.html:363 +#: websiteFunctions/templates/websiteFunctions/website.html:405 +#: websiteFunctions/templates/websiteFunctions/website.html:535 +#: websiteFunctions/templates/websiteFunctions/website.html:590 +#: websiteFunctions/templates/websiteFunctions/website.html:645 +#: websiteFunctions/templates/websiteFunctions/website.html:792 msgid "Could not connect to server. Please refresh this page." msgstr "无法连接到服务器, 请刷新此页面" @@ -297,8 +298,10 @@ msgstr "备份 - CyberPanel" #: backup/templates/backup/index.html:13 backup/templates/backup/index.html:29 #: backup/templates/backup/index.html:45 -#: baseTemplate/templates/baseTemplate/homePage.html:266 -#: baseTemplate/templates/baseTemplate/homePage.html:269 +#: baseTemplate/templates/baseTemplate/homePage.html:268 +#: baseTemplate/templates/baseTemplate/homePage.html:271 +#: baseTemplate/templates/baseTemplate/homePage.html:463 +#: baseTemplate/templates/baseTemplate/homePage.html:466 #: baseTemplate/templates/baseTemplate/index.html:554 #: baseTemplate/templates/baseTemplate/index.html:556 #: baseTemplate/templates/baseTemplate/index.html:573 @@ -361,7 +364,7 @@ msgid "Start Transfer" msgstr "开始迁移" #: backup/templates/backup/remoteBackups.html:59 -#: websiteFunctions/templates/websiteFunctions/website.html:269 +#: websiteFunctions/templates/websiteFunctions/website.html:296 msgid "Cancel" msgstr "取消" @@ -391,7 +394,7 @@ msgid "Website" msgstr "网站" #: backup/templates/backup/remoteBackups.html:108 -#: baseTemplate/templates/baseTemplate/homePage.html:331 +#: baseTemplate/templates/baseTemplate/homePage.html:333 #: baseTemplate/templates/baseTemplate/index.html:626 #: baseTemplate/templates/baseTemplate/index.html:628 #: managePHP/templates/managePHP/installExtensions.html:62 @@ -441,7 +444,7 @@ msgstr "选择备份" #: backup/templates/backup/restore.html:86 #: databases/templates/databases/deleteDatabase.html:64 #: databases/templates/databases/listDataBases.html:54 -#: firewall/templates/firewall/firewall.html:156 +#: firewall/templates/firewall/firewall.html:166 #: managePHP/templates/managePHP/editPHPConfig.html:212 msgid "Error message:" msgstr "错误信息: " @@ -497,24 +500,28 @@ msgstr "当前请求数" msgid "Total Requests" msgstr "总请求数" -#: baseTemplate/templates/baseTemplate/homePage.html:173 +#: baseTemplate/templates/baseTemplate/homePage.html:175 +#: baseTemplate/templates/baseTemplate/homePage.html:389 #: userManagment/templates/userManagment/index.html:13 msgid "User Functions" msgstr "用户功能" -#: baseTemplate/templates/baseTemplate/homePage.html:176 +#: baseTemplate/templates/baseTemplate/homePage.html:178 +#: baseTemplate/templates/baseTemplate/homePage.html:392 #: baseTemplate/templates/baseTemplate/index.html:426 #: baseTemplate/templates/baseTemplate/index.html:427 #: baseTemplate/templates/baseTemplate/index.html:428 msgid "Users" msgstr "用户" -#: baseTemplate/templates/baseTemplate/homePage.html:186 +#: baseTemplate/templates/baseTemplate/homePage.html:188 +#: baseTemplate/templates/baseTemplate/homePage.html:402 #: websiteFunctions/templates/websiteFunctions/index.html:13 msgid "Website Functions" msgstr "网站功能" -#: baseTemplate/templates/baseTemplate/homePage.html:189 +#: baseTemplate/templates/baseTemplate/homePage.html:191 +#: baseTemplate/templates/baseTemplate/homePage.html:405 #: baseTemplate/templates/baseTemplate/index.html:360 #: baseTemplate/templates/baseTemplate/index.html:444 #: baseTemplate/templates/baseTemplate/index.html:445 @@ -523,11 +530,11 @@ msgstr "网站功能" msgid "Websites" msgstr "网站" -#: baseTemplate/templates/baseTemplate/homePage.html:199 +#: baseTemplate/templates/baseTemplate/homePage.html:201 msgid "Add/Modify Packages" msgstr "创建/修改套餐" -#: baseTemplate/templates/baseTemplate/homePage.html:202 +#: baseTemplate/templates/baseTemplate/homePage.html:204 #: baseTemplate/templates/baseTemplate/index.html:366 #: baseTemplate/templates/baseTemplate/index.html:461 #: baseTemplate/templates/baseTemplate/index.html:463 @@ -535,12 +542,14 @@ msgstr "创建/修改套餐" msgid "Packages" msgstr "套餐" -#: baseTemplate/templates/baseTemplate/homePage.html:223 +#: baseTemplate/templates/baseTemplate/homePage.html:225 +#: baseTemplate/templates/baseTemplate/homePage.html:415 #: databases/templates/databases/index.html:12 msgid "Database Functions" msgstr "数据库功能" -#: baseTemplate/templates/baseTemplate/homePage.html:226 +#: baseTemplate/templates/baseTemplate/homePage.html:228 +#: baseTemplate/templates/baseTemplate/homePage.html:418 #: baseTemplate/templates/baseTemplate/index.html:477 #: baseTemplate/templates/baseTemplate/index.html:478 #: baseTemplate/templates/baseTemplate/index.html:479 @@ -550,23 +559,27 @@ msgstr "数据库功能" msgid "Databases" msgstr "数据库" -#: baseTemplate/templates/baseTemplate/homePage.html:235 +#: baseTemplate/templates/baseTemplate/homePage.html:237 +#: baseTemplate/templates/baseTemplate/homePage.html:438 msgid "Control DNS" msgstr "控制DNS" -#: baseTemplate/templates/baseTemplate/homePage.html:238 +#: baseTemplate/templates/baseTemplate/homePage.html:240 +#: baseTemplate/templates/baseTemplate/homePage.html:441 #: baseTemplate/templates/baseTemplate/index.html:372 #: baseTemplate/templates/baseTemplate/index.html:495 #: baseTemplate/templates/baseTemplate/index.html:497 msgid "DNS" msgstr "DNS" -#: baseTemplate/templates/baseTemplate/homePage.html:248 +#: baseTemplate/templates/baseTemplate/homePage.html:250 +#: baseTemplate/templates/baseTemplate/homePage.html:451 #: ftp/templates/ftp/index.html:12 msgid "FTP Functions" msgstr "FTP功能" -#: baseTemplate/templates/baseTemplate/homePage.html:251 +#: baseTemplate/templates/baseTemplate/homePage.html:253 +#: baseTemplate/templates/baseTemplate/homePage.html:454 #: baseTemplate/templates/baseTemplate/index.html:378 #: baseTemplate/templates/baseTemplate/index.html:536 #: baseTemplate/templates/baseTemplate/index.html:538 @@ -574,21 +587,23 @@ msgstr "FTP功能" msgid "FTP" msgstr "FTP" -#: baseTemplate/templates/baseTemplate/homePage.html:278 -#: baseTemplate/templates/baseTemplate/homePage.html:281 +#: baseTemplate/templates/baseTemplate/homePage.html:280 +#: baseTemplate/templates/baseTemplate/homePage.html:283 +#: baseTemplate/templates/baseTemplate/homePage.html:483 +#: baseTemplate/templates/baseTemplate/homePage.html:486 #: packages/templates/packages/createPackage.html:75 #: packages/templates/packages/modifyPackage.html:80 msgid "Emails" msgstr "Emails" -#: baseTemplate/templates/baseTemplate/homePage.html:291 -#: baseTemplate/templates/baseTemplate/homePage.html:294 +#: baseTemplate/templates/baseTemplate/homePage.html:293 +#: baseTemplate/templates/baseTemplate/homePage.html:296 #: tuning/templates/tuning/index.html:12 msgid "Server Tuning" msgstr "服务器设置" -#: baseTemplate/templates/baseTemplate/homePage.html:315 -#: baseTemplate/templates/baseTemplate/homePage.html:318 +#: baseTemplate/templates/baseTemplate/homePage.html:317 +#: baseTemplate/templates/baseTemplate/homePage.html:320 #: baseTemplate/templates/baseTemplate/index.html:607 #: baseTemplate/templates/baseTemplate/index.html:609 #: baseTemplate/templates/baseTemplate/index.html:642 @@ -596,19 +611,19 @@ msgstr "服务器设置" msgid "Server Status" msgstr "服务器状态" -#: baseTemplate/templates/baseTemplate/homePage.html:328 +#: baseTemplate/templates/baseTemplate/homePage.html:330 msgid "PHP Configurations" msgstr "设置PHP参数" -#: baseTemplate/templates/baseTemplate/homePage.html:340 -#: baseTemplate/templates/baseTemplate/homePage.html:343 +#: baseTemplate/templates/baseTemplate/homePage.html:342 +#: baseTemplate/templates/baseTemplate/homePage.html:345 #: baseTemplate/templates/baseTemplate/index.html:644 #: websiteFunctions/templates/websiteFunctions/website.html:113 msgid "Logs" msgstr "日志" -#: baseTemplate/templates/baseTemplate/homePage.html:363 -#: baseTemplate/templates/baseTemplate/homePage.html:366 +#: baseTemplate/templates/baseTemplate/homePage.html:365 +#: baseTemplate/templates/baseTemplate/homePage.html:368 #: baseTemplate/templates/baseTemplate/index.html:660 #: baseTemplate/templates/baseTemplate/index.html:662 msgid "Security" @@ -712,7 +727,7 @@ msgstr "创建新用户" #: userManagment/templates/userManagment/index.html:52 #: userManagment/templates/userManagment/index.html:54 #: userManagment/templates/userManagment/modifyUser.html:12 -#: userManagment/templates/userManagment/modifyUser.html:120 +#: userManagment/templates/userManagment/modifyUser.html:119 msgid "Modify User" msgstr "修改用户" @@ -892,8 +907,8 @@ msgstr "进入Webmail" #: ftp/templates/ftp/createFTPAccount.html:12 #: ftp/templates/ftp/createFTPAccount.html:19 ftp/templates/ftp/index.html:25 #: ftp/templates/ftp/index.html:27 -#: websiteFunctions/templates/websiteFunctions/website.html:683 -#: websiteFunctions/templates/websiteFunctions/website.html:685 +#: websiteFunctions/templates/websiteFunctions/website.html:710 +#: websiteFunctions/templates/websiteFunctions/website.html:712 msgid "Create FTP Account" msgstr "创建FTP用户" @@ -902,8 +917,8 @@ msgstr "创建FTP用户" #: ftp/templates/ftp/deleteFTPAccount.html:18 #: ftp/templates/ftp/deleteFTPAccount.html:52 ftp/templates/ftp/index.html:37 #: ftp/templates/ftp/index.html:39 -#: websiteFunctions/templates/websiteFunctions/website.html:695 -#: websiteFunctions/templates/websiteFunctions/website.html:697 +#: websiteFunctions/templates/websiteFunctions/website.html:722 +#: websiteFunctions/templates/websiteFunctions/website.html:724 msgid "Delete FTP Account" msgstr "删除FTP用户" @@ -1171,7 +1186,7 @@ msgid "Cannot change password for " msgstr "无法为修改密码 " #: databases/templates/databases/listDataBases.html:59 -#: firewall/templates/firewall/firewall.html:166 +#: firewall/templates/firewall/firewall.html:176 #: ftp/templates/ftp/listFTPAccounts.html:59 msgid "Could Not Connect to server. Please refresh this page" msgstr "无法连接到服务器, 请刷新此页面" @@ -1205,7 +1220,7 @@ msgstr "添加记录" #: dns/templates/dns/addDeleteDNSRecords.html:53 #: dns/templates/dns/addDeleteDNSRecords.html:131 -#: firewall/templates/firewall/firewall.html:128 +#: firewall/templates/firewall/firewall.html:136 #: serverStatus/templates/serverStatus/litespeedStatus.html:40 msgid "Name" msgstr "名称" @@ -1223,7 +1238,7 @@ msgstr "优先级" #: dns/templates/dns/createDNSZone.html:27 #: dns/templates/dns/createNameServer.html:27 #: websiteFunctions/templates/websiteFunctions/createWebsite.html:52 -#: websiteFunctions/templates/websiteFunctions/website.html:263 +#: websiteFunctions/templates/websiteFunctions/website.html:290 msgid "Domain Name" msgstr "域名" @@ -1236,7 +1251,7 @@ msgid "Text" msgstr "内容" #: dns/templates/dns/addDeleteDNSRecords.html:111 -#: firewall/templates/firewall/firewall.html:109 +#: firewall/templates/firewall/firewall.html:117 msgid "Add" msgstr "添加" @@ -1417,15 +1432,15 @@ msgstr "操作失败, 错误信息: " msgid "Action successful." msgstr "操作成功" -#: firewall/templates/firewall/firewall.html:129 +#: firewall/templates/firewall/firewall.html:137 msgid "Protocol" msgstr "协议" -#: firewall/templates/firewall/firewall.html:130 +#: firewall/templates/firewall/firewall.html:139 msgid "Port" msgstr "端口" -#: firewall/templates/firewall/firewall.html:162 +#: firewall/templates/firewall/firewall.html:172 msgid "Rule successfully added." msgstr "成功添加规则" @@ -1492,8 +1507,8 @@ msgstr "添加密钥" #: firewall/templates/firewall/secureSSH.html:158 #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:55 -#: websiteFunctions/templates/websiteFunctions/website.html:527 -#: websiteFunctions/templates/websiteFunctions/website.html:587 +#: websiteFunctions/templates/websiteFunctions/website.html:554 +#: websiteFunctions/templates/websiteFunctions/website.html:614 msgid "Save" msgstr "保存" @@ -1696,7 +1711,7 @@ msgstr "高级" #: tuning/templates/tuning/phpTuning.html:28 #: websiteFunctions/templates/websiteFunctions/createWebsite.html:68 #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:74 -#: websiteFunctions/templates/websiteFunctions/website.html:283 +#: websiteFunctions/templates/websiteFunctions/website.html:310 msgid "Select PHP" msgstr "选择PHP版本" @@ -1790,7 +1805,7 @@ msgstr "返回" #: managePHP/templates/managePHP/installExtensions.html:104 #: tuning/templates/tuning/phpTuning.html:114 -#: userManagment/templates/userManagment/modifyUser.html:144 +#: userManagment/templates/userManagment/modifyUser.html:143 msgid "Cannot fetch details. Error message:" msgstr "无法获取详情, 错误信息: " @@ -1876,7 +1891,7 @@ msgstr "套餐名称" #: packages/templates/packages/createPackage.html:35 #: packages/templates/packages/modifyPackage.html:40 -#: websiteFunctions/templates/websiteFunctions/website.html:223 +#: websiteFunctions/templates/websiteFunctions/website.html:250 msgid "Domains" msgstr "域名" @@ -2172,7 +2187,7 @@ msgstr "关闭" #: tuning/templates/tuning/liteSpeedTuning.html:74 #: tuning/templates/tuning/phpTuning.html:97 -#: userManagment/templates/userManagment/modifyUser.html:78 +#: userManagment/templates/userManagment/modifyUser.html:77 msgid "Currently:" msgstr "当前:" @@ -2292,18 +2307,18 @@ msgid "Account Type" msgstr "用户类型" #: userManagment/templates/userManagment/createUser.html:67 -#: userManagment/templates/userManagment/modifyUser.html:73 -msgid "Reseller" -msgstr "分销商" +#: userManagment/templates/userManagment/modifyUser.html:72 +msgid "Admin" +msgstr "Admin" #: userManagment/templates/userManagment/createUser.html:68 #: userManagment/templates/userManagment/createUser.html:79 -#: userManagment/templates/userManagment/modifyUser.html:74 +#: userManagment/templates/userManagment/modifyUser.html:73 msgid "Normal User" msgstr "普通用户" #: userManagment/templates/userManagment/createUser.html:92 -#: userManagment/templates/userManagment/modifyUser.html:89 +#: userManagment/templates/userManagment/modifyUser.html:88 #: userManagment/templates/userManagment/userProfile.html:67 #: userManagment/templates/userManagment/userProfile.html:74 msgid "User Accounts Limit" @@ -2315,7 +2330,7 @@ msgid "Only Numbers" msgstr "仅允许数字" #: userManagment/templates/userManagment/createUser.html:103 -#: userManagment/templates/userManagment/modifyUser.html:99 +#: userManagment/templates/userManagment/modifyUser.html:98 #: userManagment/templates/userManagment/userProfile.html:82 msgid "Websites Limit" msgstr "网站数量限制" @@ -2340,7 +2355,7 @@ msgid "Create User" msgstr "创建用户" #: userManagment/templates/userManagment/createUser.html:154 -#: userManagment/templates/userManagment/modifyUser.html:131 +#: userManagment/templates/userManagment/modifyUser.html:130 msgid "Account with username:" msgstr "用户名为:" @@ -2394,19 +2409,15 @@ msgstr "在此页面编辑已存在用户." msgid "Select Account" msgstr "选择用户" -#: userManagment/templates/userManagment/modifyUser.html:72 -msgid "Admin" -msgstr "Admin" - -#: userManagment/templates/userManagment/modifyUser.html:131 +#: userManagment/templates/userManagment/modifyUser.html:130 msgid " is successfully modified." msgstr "已成功修改." -#: userManagment/templates/userManagment/modifyUser.html:135 +#: userManagment/templates/userManagment/modifyUser.html:134 msgid "Cannot modify user. Error message:" msgstr "无法编辑用户, 错误信息:" -#: userManagment/templates/userManagment/modifyUser.html:148 +#: userManagment/templates/userManagment/modifyUser.html:147 msgid "Details fetched." msgstr "详情已更新." @@ -2455,18 +2466,18 @@ msgid "Select Owner" msgstr "选择拥有者" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:56 -#: websiteFunctions/templates/websiteFunctions/website.html:267 -#: websiteFunctions/templates/websiteFunctions/website.html:278 +#: websiteFunctions/templates/websiteFunctions/website.html:294 +#: websiteFunctions/templates/websiteFunctions/website.html:305 msgid "Invalid Domain (Note: You don't need to add 'http' or 'https')" msgstr "无效域名(注意: 不需要添加http或https)" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:84 -#: websiteFunctions/templates/websiteFunctions/website.html:299 +#: websiteFunctions/templates/websiteFunctions/website.html:326 msgid "Additional Features" msgstr "额外功能" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:91 -#: websiteFunctions/templates/websiteFunctions/website.html:306 +#: websiteFunctions/templates/websiteFunctions/website.html:333 msgid "" "For SSL to work DNS of domain should point to server, otherwise self signed " "SSL will be issued, you can add your own SSL later." @@ -2475,17 +2486,17 @@ msgstr "" "之后添加自有证书或重新申请签发Let's Encrypt证书." #: websiteFunctions/templates/websiteFunctions/createWebsite.html:113 -#: websiteFunctions/templates/websiteFunctions/website.html:328 +#: websiteFunctions/templates/websiteFunctions/website.html:355 msgid "Cannot create website. Error message:" msgstr "无法创建网站, 错误信息:" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 -#: websiteFunctions/templates/websiteFunctions/website.html:332 +#: websiteFunctions/templates/websiteFunctions/website.html:359 msgid "Website with domain" msgstr "网站域名" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 -#: websiteFunctions/templates/websiteFunctions/website.html:332 +#: websiteFunctions/templates/websiteFunctions/website.html:359 msgid " is Successfully Created" msgstr " 已成功创建" @@ -2621,151 +2632,156 @@ msgid "" msgstr "无法获取日志, 请使用命令行模式查看日志, 错误信息:" #: websiteFunctions/templates/websiteFunctions/website.html:173 +#: websiteFunctions/templates/websiteFunctions/website.html:212 msgid "Next" msgstr "下一个" #: websiteFunctions/templates/websiteFunctions/website.html:174 +#: websiteFunctions/templates/websiteFunctions/website.html:213 msgid "Previous" msgstr "上一个" -#: websiteFunctions/templates/websiteFunctions/website.html:230 -#: websiteFunctions/templates/websiteFunctions/website.html:232 +#: websiteFunctions/templates/websiteFunctions/website.html:257 +#: websiteFunctions/templates/websiteFunctions/website.html:259 msgid "Add Domains" msgstr "添加域名" -#: websiteFunctions/templates/websiteFunctions/website.html:242 -#: websiteFunctions/templates/websiteFunctions/website.html:244 +#: websiteFunctions/templates/websiteFunctions/website.html:269 +#: websiteFunctions/templates/websiteFunctions/website.html:271 msgid "List Domains" msgstr "查看域名" -#: websiteFunctions/templates/websiteFunctions/website.html:274 -#: websiteFunctions/templates/websiteFunctions/website.html:733 +#: websiteFunctions/templates/websiteFunctions/website.html:301 +#: websiteFunctions/templates/websiteFunctions/website.html:760 msgid "Path" msgstr "路径" -#: websiteFunctions/templates/websiteFunctions/website.html:276 +#: websiteFunctions/templates/websiteFunctions/website.html:303 msgid "This path is relative to: " msgstr "此目录相对与:" -#: websiteFunctions/templates/websiteFunctions/website.html:276 +#: websiteFunctions/templates/websiteFunctions/website.html:303 msgid "Leave empty to set default." msgstr "留空则设置为默认根目录." -#: websiteFunctions/templates/websiteFunctions/website.html:317 +#: websiteFunctions/templates/websiteFunctions/website.html:344 msgid "Create Domain" msgstr "创建域名" -#: websiteFunctions/templates/websiteFunctions/website.html:360 +#: websiteFunctions/templates/websiteFunctions/website.html:387 msgid "PHP Version Changed to:" msgstr "版本管理:" -#: websiteFunctions/templates/websiteFunctions/website.html:364 +#: websiteFunctions/templates/websiteFunctions/website.html:391 msgid "Deleted:" msgstr "删除:" -#: websiteFunctions/templates/websiteFunctions/website.html:368 +#: websiteFunctions/templates/websiteFunctions/website.html:395 msgid "SSL Issued:" msgstr "已为签发证书:" -#: websiteFunctions/templates/websiteFunctions/website.html:391 +#: websiteFunctions/templates/websiteFunctions/website.html:418 msgid "Close" msgstr "关闭" -#: websiteFunctions/templates/websiteFunctions/website.html:423 +#: websiteFunctions/templates/websiteFunctions/website.html:450 msgid "Issue" msgstr "签发SSL证书" -#: websiteFunctions/templates/websiteFunctions/website.html:451 +#: websiteFunctions/templates/websiteFunctions/website.html:478 msgid "Configurations" msgstr "配置" -#: websiteFunctions/templates/websiteFunctions/website.html:457 +#: websiteFunctions/templates/websiteFunctions/website.html:484 msgid "Edit Virtual Host Main Configurations" msgstr "编辑vHost主配置" -#: websiteFunctions/templates/websiteFunctions/website.html:459 +#: websiteFunctions/templates/websiteFunctions/website.html:486 msgid "Edit vHost Main Configurations" msgstr "编辑vHost主配置" -#: websiteFunctions/templates/websiteFunctions/website.html:469 -#: websiteFunctions/templates/websiteFunctions/website.html:471 +#: websiteFunctions/templates/websiteFunctions/website.html:496 +#: websiteFunctions/templates/websiteFunctions/website.html:498 msgid "Add Rewrite Rules (.htaccess)" msgstr "添加Rewrite Rules (.htaccess)" -#: websiteFunctions/templates/websiteFunctions/website.html:481 +#: websiteFunctions/templates/websiteFunctions/website.html:508 msgid "Add Your Own SSL" msgstr "添加SSL证书" -#: websiteFunctions/templates/websiteFunctions/website.html:483 +#: websiteFunctions/templates/websiteFunctions/website.html:510 msgid "Add SSL" msgstr "添加SSL证书" -#: websiteFunctions/templates/websiteFunctions/website.html:498 +#: websiteFunctions/templates/websiteFunctions/website.html:525 msgid "SSL Saved" msgstr "SSL证书已保存" -#: websiteFunctions/templates/websiteFunctions/website.html:503 +#: websiteFunctions/templates/websiteFunctions/website.html:530 msgid "Could not save SSL. Error message:" msgstr "无法保存SSL证书, 错误信息:" -#: websiteFunctions/templates/websiteFunctions/website.html:553 +#: websiteFunctions/templates/websiteFunctions/website.html:580 msgid "Current configuration in the file fetched." msgstr "当前配置读取成功." -#: websiteFunctions/templates/websiteFunctions/website.html:558 -#: websiteFunctions/templates/websiteFunctions/website.html:571 +#: websiteFunctions/templates/websiteFunctions/website.html:585 +#: websiteFunctions/templates/websiteFunctions/website.html:598 msgid "Could not fetch current configuration. Error message:" msgstr "无法读取当前配置, 错误信息:" -#: websiteFunctions/templates/websiteFunctions/website.html:567 -#: websiteFunctions/templates/websiteFunctions/website.html:622 +#: websiteFunctions/templates/websiteFunctions/website.html:594 +#: websiteFunctions/templates/websiteFunctions/website.html:649 msgid "Configuration saved. Restart LiteSpeed put them in effect." msgstr "配置已保存, 重启LiteSpeed以生效." -#: websiteFunctions/templates/websiteFunctions/website.html:608 +#: websiteFunctions/templates/websiteFunctions/website.html:635 msgid "Current rewrite rules in the file fetched." msgstr "当前Rewrite rules读取成功." -#: websiteFunctions/templates/websiteFunctions/website.html:613 +#: websiteFunctions/templates/websiteFunctions/website.html:640 msgid "Could not fetch current rewrite rules. Error message:" msgstr "无法读取当前Rewrite rules, 错误信息:" -#: websiteFunctions/templates/websiteFunctions/website.html:626 +#: websiteFunctions/templates/websiteFunctions/website.html:653 msgid "Could not save rewrite rules. Error message:" msgstr "无法保存Rewrite rules, 错误信息:" -#: websiteFunctions/templates/websiteFunctions/website.html:642 +#: websiteFunctions/templates/websiteFunctions/website.html:669 msgid "Save Rewrite Rules" msgstr "保存Rewrite rules" -#: websiteFunctions/templates/websiteFunctions/website.html:665 +#: websiteFunctions/templates/websiteFunctions/website.html:692 msgid "Files" msgstr "文件" -#: websiteFunctions/templates/websiteFunctions/website.html:672 -#: websiteFunctions/templates/websiteFunctions/website.html:674 +#: websiteFunctions/templates/websiteFunctions/website.html:699 +#: websiteFunctions/templates/websiteFunctions/website.html:701 msgid "File Manager" msgstr "文件管理" -#: websiteFunctions/templates/websiteFunctions/website.html:713 +#: websiteFunctions/templates/websiteFunctions/website.html:740 msgid "Application Installer" msgstr "应用安装器" -#: websiteFunctions/templates/websiteFunctions/website.html:719 +#: websiteFunctions/templates/websiteFunctions/website.html:746 msgid "Install wordpress with LSCache" msgstr "安装Wordpress和LS Cache" -#: websiteFunctions/templates/websiteFunctions/website.html:721 +#: websiteFunctions/templates/websiteFunctions/website.html:748 msgid "Wordpress with LSCache" msgstr "Wordpress和LS Cache" -#: websiteFunctions/templates/websiteFunctions/website.html:755 +#: websiteFunctions/templates/websiteFunctions/website.html:782 msgid "Installation failed. Error message:" msgstr "安装失败, 错误信息:" -#: websiteFunctions/templates/websiteFunctions/website.html:759 +#: websiteFunctions/templates/websiteFunctions/website.html:786 msgid "Installation successful. To complete the setup visit:" msgstr "安装成功, 请访问网站以完成设置:" +#~ msgid "Reseller" +#~ msgstr "分销商" + #~ msgid "Urdu" #~ msgstr "乌尔都语" diff --git a/locale/ja/LC_MESSAGES/django.mo b/locale/ja/LC_MESSAGES/django.mo index c01a17fd2..2822c58bc 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 dca189574..94b23f4fa 100644 --- a/locale/ja/LC_MESSAGES/django.po +++ b/locale/ja/LC_MESSAGES/django.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: CyberPanel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-29 20:47+0500\n" -"PO-Revision-Date: 2017-10-26 02:15+0900\n" +"POT-Creation-Date: 2017-11-02 02:08+0500\n" +"PO-Revision-Date: 2017-10-31 23:38+0900\n" "Last-Translator: @ kazuo210 \n" "Language-Team: LANGUAGE \n" "Language: ja\n" @@ -24,7 +24,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 1.8.7.1\n" #: CyberCP/settings.py:167 msgid "English" @@ -48,7 +48,7 @@ msgstr "日本語" #: CyberCP/settings.py:172 msgid "Bosnian" -msgstr "" +msgstr "ボスニア語" #: backup/templates/backup/backup.html:3 backup/templates/backup/backup.html:13 #: backup/templates/backup/backup.html:20 @@ -116,7 +116,7 @@ msgstr "バックアップを中止" #: backup/templates/backup/backupSchedule.html:89 #: databases/templates/databases/listDataBases.html:87 #: dns/templates/dns/addDeleteDNSRecords.html:129 -#: firewall/templates/firewall/firewall.html:127 +#: firewall/templates/firewall/firewall.html:135 #: ftp/templates/ftp/listFTPAccounts.html:87 #: managePHP/templates/managePHP/installExtensions.html:61 msgid "ID" @@ -139,9 +139,9 @@ msgstr "サイズ" #: backup/templates/backup/backupDestinations.html:93 #: backup/templates/backup/backupSchedule.html:92 #: dns/templates/dns/addDeleteDNSRecords.html:134 -#: firewall/templates/firewall/firewall.html:131 +#: firewall/templates/firewall/firewall.html:140 #: firewall/templates/firewall/secureSSH.html:122 -#: websiteFunctions/templates/websiteFunctions/website.html:424 +#: websiteFunctions/templates/websiteFunctions/website.html:451 msgid "Delete" msgstr "削除" @@ -168,6 +168,7 @@ msgstr "このページでは、バックアップ先を設定できます。 #: dns/templates/dns/addDeleteDNSRecords.html:60 #: dns/templates/dns/createNameServer.html:48 #: dns/templates/dns/createNameServer.html:65 +#: firewall/templates/firewall/firewall.html:138 msgid "IP Address" msgstr "IP アドレス" @@ -179,7 +180,7 @@ msgstr "IP アドレス" #: mailServer/templates/mailServer/changeEmailPassword.html:52 #: mailServer/templates/mailServer/createEmailAccount.html:51 #: userManagment/templates/userManagment/createUser.html:123 -#: userManagment/templates/userManagment/modifyUser.html:107 +#: userManagment/templates/userManagment/modifyUser.html:106 msgid "Password" msgstr "パスワード" @@ -224,15 +225,15 @@ msgstr "追加された宛先。" #: mailServer/templates/mailServer/deleteEmailAccount.html:79 #: manageSSL/templates/manageSSL/manageSSL.html:60 #: userManagment/templates/userManagment/createUser.html:162 -#: userManagment/templates/userManagment/modifyUser.html:139 +#: userManagment/templates/userManagment/modifyUser.html:138 #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:77 #: websiteFunctions/templates/websiteFunctions/website.html:157 -#: websiteFunctions/templates/websiteFunctions/website.html:336 -#: websiteFunctions/templates/websiteFunctions/website.html:378 -#: websiteFunctions/templates/websiteFunctions/website.html:508 -#: websiteFunctions/templates/websiteFunctions/website.html:563 -#: websiteFunctions/templates/websiteFunctions/website.html:618 -#: websiteFunctions/templates/websiteFunctions/website.html:765 +#: websiteFunctions/templates/websiteFunctions/website.html:363 +#: websiteFunctions/templates/websiteFunctions/website.html:405 +#: websiteFunctions/templates/websiteFunctions/website.html:535 +#: websiteFunctions/templates/websiteFunctions/website.html:590 +#: websiteFunctions/templates/websiteFunctions/website.html:645 +#: websiteFunctions/templates/websiteFunctions/website.html:792 msgid "Could not connect to server. Please refresh this page." msgstr "サーバーに接続できませんでした。 このページを更新してください。" @@ -297,11 +298,13 @@ msgstr "バックアップ ホーム - CyberPanel" #: backup/templates/backup/index.html:13 backup/templates/backup/index.html:29 #: backup/templates/backup/index.html:45 -#: baseTemplate/templates/baseTemplate/homePage.html:266 -#: baseTemplate/templates/baseTemplate/homePage.html:269 +#: baseTemplate/templates/baseTemplate/homePage.html:268 +#: baseTemplate/templates/baseTemplate/homePage.html:271 +#: baseTemplate/templates/baseTemplate/homePage.html:463 +#: baseTemplate/templates/baseTemplate/homePage.html:466 #: baseTemplate/templates/baseTemplate/index.html:554 #: baseTemplate/templates/baseTemplate/index.html:556 -#: baseTemplate/templates/baseTemplate/index.html:572 +#: baseTemplate/templates/baseTemplate/index.html:573 msgid "Back up" msgstr "バックアップ" @@ -340,68 +343,50 @@ msgid "Restore" msgstr "復元" #: backup/templates/backup/remoteBackups.html:3 -#, fuzzy -#| msgid "Websites Hosted - CyberPanel" msgid "Transfer Websites from Remote Server - CyberPanel" -msgstr "ホストされているWebサイト - Cyber​​Panel" +msgstr "リモートサーバーからWebサイトを転送 - Cyber​​Panel" #: backup/templates/backup/remoteBackups.html:14 #: backup/templates/backup/remoteBackups.html:21 -#, fuzzy -#| msgid "Restore Back up" msgid "Remote Backups" -msgstr "バックアップの復元" +msgstr "リモートバックアップ" #: backup/templates/backup/remoteBackups.html:15 msgid "This feature can import website(s) from remote server" -msgstr "" +msgstr "この機能は、リモート サーバーからウェブサイトをインポートします" #: backup/templates/backup/remoteBackups.html:46 -#, fuzzy -#| msgid "FTP Accounts" msgid "Fetch Accounts" -msgstr "FTP アカウント" +msgstr "アカウントの取得" #: backup/templates/backup/remoteBackups.html:55 msgid "Start Transfer" -msgstr "" +msgstr "転送を開始" #: backup/templates/backup/remoteBackups.html:59 -#: websiteFunctions/templates/websiteFunctions/website.html:269 -#, fuzzy -#| msgid "Cancel Backup" +#: websiteFunctions/templates/websiteFunctions/website.html:296 msgid "Cancel" -msgstr "バックアップを中止" +msgstr "キャンセル" #: backup/templates/backup/remoteBackups.html:72 -#, fuzzy -#| msgid "Could not connect. Please refresh this page." msgid "Could not connect, please refresh this page." msgstr "接続できませんでした。このページを更新してください。" #: backup/templates/backup/remoteBackups.html:76 -#, fuzzy -#| msgid "Records successfully fetched for" msgid "Accounts Successfully Fetched from remote server." -msgstr "レコードが取得されました" +msgstr "アカウントはリモートサーバーから取得されました。" #: backup/templates/backup/remoteBackups.html:80 -#, fuzzy -#| msgid " is successfully created." msgid "Backup Process successfully started." -msgstr " 作成されました。" +msgstr "バックアップ処理が開始されました。" #: backup/templates/backup/remoteBackups.html:84 -#, fuzzy -#| msgid "is successfully created." msgid "Backup successfully cancelled." -msgstr "作成されました。" +msgstr "バックアップはキャンセルされました。" #: backup/templates/backup/remoteBackups.html:96 -#, fuzzy -#| msgid "Select Account" msgid "Search Accounts.." -msgstr "アカウントを選択" +msgstr "アカウントを検索。" #: backup/templates/backup/remoteBackups.html:107 #: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:65 @@ -409,9 +394,9 @@ msgid "Website" msgstr "Web サイト" #: backup/templates/backup/remoteBackups.html:108 -#: baseTemplate/templates/baseTemplate/homePage.html:331 -#: baseTemplate/templates/baseTemplate/index.html:625 -#: baseTemplate/templates/baseTemplate/index.html:627 +#: baseTemplate/templates/baseTemplate/homePage.html:333 +#: baseTemplate/templates/baseTemplate/index.html:626 +#: baseTemplate/templates/baseTemplate/index.html:628 #: managePHP/templates/managePHP/installExtensions.html:62 msgid "PHP" msgstr "PHP" @@ -460,7 +445,7 @@ msgstr "バックアップを選択" #: backup/templates/backup/restore.html:86 #: databases/templates/databases/deleteDatabase.html:64 #: databases/templates/databases/listDataBases.html:54 -#: firewall/templates/firewall/firewall.html:156 +#: firewall/templates/firewall/firewall.html:166 #: managePHP/templates/managePHP/editPHPConfig.html:212 msgid "Error message:" msgstr "エラーメッセージ:" @@ -516,24 +501,28 @@ msgstr "リクエスト処理数" msgid "Total Requests" msgstr "合計リクエスト数" -#: baseTemplate/templates/baseTemplate/homePage.html:173 +#: baseTemplate/templates/baseTemplate/homePage.html:175 +#: baseTemplate/templates/baseTemplate/homePage.html:389 #: userManagment/templates/userManagment/index.html:13 msgid "User Functions" msgstr "ユーザ機能" -#: baseTemplate/templates/baseTemplate/homePage.html:176 +#: baseTemplate/templates/baseTemplate/homePage.html:178 +#: baseTemplate/templates/baseTemplate/homePage.html:392 #: baseTemplate/templates/baseTemplate/index.html:426 #: baseTemplate/templates/baseTemplate/index.html:427 #: baseTemplate/templates/baseTemplate/index.html:428 msgid "Users" msgstr "ユーザー" -#: baseTemplate/templates/baseTemplate/homePage.html:186 +#: baseTemplate/templates/baseTemplate/homePage.html:188 +#: baseTemplate/templates/baseTemplate/homePage.html:402 #: websiteFunctions/templates/websiteFunctions/index.html:13 msgid "Website Functions" msgstr "Web サイト機能" -#: baseTemplate/templates/baseTemplate/homePage.html:189 +#: baseTemplate/templates/baseTemplate/homePage.html:191 +#: baseTemplate/templates/baseTemplate/homePage.html:405 #: baseTemplate/templates/baseTemplate/index.html:360 #: baseTemplate/templates/baseTemplate/index.html:444 #: baseTemplate/templates/baseTemplate/index.html:445 @@ -542,11 +531,11 @@ msgstr "Web サイト機能" msgid "Websites" msgstr "Web サイト" -#: baseTemplate/templates/baseTemplate/homePage.html:199 +#: baseTemplate/templates/baseTemplate/homePage.html:201 msgid "Add/Modify Packages" msgstr "パッケージの追加/変更" -#: baseTemplate/templates/baseTemplate/homePage.html:202 +#: baseTemplate/templates/baseTemplate/homePage.html:204 #: baseTemplate/templates/baseTemplate/index.html:366 #: baseTemplate/templates/baseTemplate/index.html:461 #: baseTemplate/templates/baseTemplate/index.html:463 @@ -554,12 +543,14 @@ msgstr "パッケージの追加/変更" msgid "Packages" msgstr "パッケージ" -#: baseTemplate/templates/baseTemplate/homePage.html:223 +#: baseTemplate/templates/baseTemplate/homePage.html:225 +#: baseTemplate/templates/baseTemplate/homePage.html:415 #: databases/templates/databases/index.html:12 msgid "Database Functions" msgstr "データベース機能" -#: baseTemplate/templates/baseTemplate/homePage.html:226 +#: baseTemplate/templates/baseTemplate/homePage.html:228 +#: baseTemplate/templates/baseTemplate/homePage.html:418 #: baseTemplate/templates/baseTemplate/index.html:477 #: baseTemplate/templates/baseTemplate/index.html:478 #: baseTemplate/templates/baseTemplate/index.html:479 @@ -569,23 +560,27 @@ msgstr "データベース機能" msgid "Databases" msgstr "データベース" -#: baseTemplate/templates/baseTemplate/homePage.html:235 +#: baseTemplate/templates/baseTemplate/homePage.html:237 +#: baseTemplate/templates/baseTemplate/homePage.html:438 msgid "Control DNS" msgstr "DNS制御" -#: baseTemplate/templates/baseTemplate/homePage.html:238 +#: baseTemplate/templates/baseTemplate/homePage.html:240 +#: baseTemplate/templates/baseTemplate/homePage.html:441 #: baseTemplate/templates/baseTemplate/index.html:372 #: baseTemplate/templates/baseTemplate/index.html:495 #: baseTemplate/templates/baseTemplate/index.html:497 msgid "DNS" msgstr "DNS" -#: baseTemplate/templates/baseTemplate/homePage.html:248 +#: baseTemplate/templates/baseTemplate/homePage.html:250 +#: baseTemplate/templates/baseTemplate/homePage.html:451 #: ftp/templates/ftp/index.html:12 msgid "FTP Functions" msgstr "FTP 機能" -#: baseTemplate/templates/baseTemplate/homePage.html:251 +#: baseTemplate/templates/baseTemplate/homePage.html:253 +#: baseTemplate/templates/baseTemplate/homePage.html:454 #: baseTemplate/templates/baseTemplate/index.html:378 #: baseTemplate/templates/baseTemplate/index.html:536 #: baseTemplate/templates/baseTemplate/index.html:538 @@ -593,43 +588,45 @@ msgstr "FTP 機能" msgid "FTP" msgstr "FTP" -#: baseTemplate/templates/baseTemplate/homePage.html:278 -#: baseTemplate/templates/baseTemplate/homePage.html:281 +#: baseTemplate/templates/baseTemplate/homePage.html:280 +#: baseTemplate/templates/baseTemplate/homePage.html:283 +#: baseTemplate/templates/baseTemplate/homePage.html:483 +#: baseTemplate/templates/baseTemplate/homePage.html:486 #: packages/templates/packages/createPackage.html:75 #: packages/templates/packages/modifyPackage.html:80 msgid "Emails" msgstr "メール" -#: baseTemplate/templates/baseTemplate/homePage.html:291 -#: baseTemplate/templates/baseTemplate/homePage.html:294 +#: baseTemplate/templates/baseTemplate/homePage.html:293 +#: baseTemplate/templates/baseTemplate/homePage.html:296 #: tuning/templates/tuning/index.html:12 msgid "Server Tuning" msgstr "サーバーのチューニング" -#: baseTemplate/templates/baseTemplate/homePage.html:315 -#: baseTemplate/templates/baseTemplate/homePage.html:318 -#: baseTemplate/templates/baseTemplate/index.html:606 -#: baseTemplate/templates/baseTemplate/index.html:608 -#: baseTemplate/templates/baseTemplate/index.html:641 +#: baseTemplate/templates/baseTemplate/homePage.html:317 +#: baseTemplate/templates/baseTemplate/homePage.html:320 +#: baseTemplate/templates/baseTemplate/index.html:607 +#: baseTemplate/templates/baseTemplate/index.html:609 +#: baseTemplate/templates/baseTemplate/index.html:642 #: serverStatus/templates/serverStatus/index.html:13 msgid "Server Status" msgstr "サーバーの状態" -#: baseTemplate/templates/baseTemplate/homePage.html:328 +#: baseTemplate/templates/baseTemplate/homePage.html:330 msgid "PHP Configurations" msgstr "PHPの設定" -#: baseTemplate/templates/baseTemplate/homePage.html:340 -#: baseTemplate/templates/baseTemplate/homePage.html:343 -#: baseTemplate/templates/baseTemplate/index.html:643 +#: baseTemplate/templates/baseTemplate/homePage.html:342 +#: baseTemplate/templates/baseTemplate/homePage.html:345 +#: baseTemplate/templates/baseTemplate/index.html:644 #: websiteFunctions/templates/websiteFunctions/website.html:113 msgid "Logs" msgstr "ログ" -#: baseTemplate/templates/baseTemplate/homePage.html:363 -#: baseTemplate/templates/baseTemplate/homePage.html:366 -#: baseTemplate/templates/baseTemplate/index.html:659 -#: baseTemplate/templates/baseTemplate/index.html:661 +#: baseTemplate/templates/baseTemplate/homePage.html:365 +#: baseTemplate/templates/baseTemplate/homePage.html:368 +#: baseTemplate/templates/baseTemplate/index.html:660 +#: baseTemplate/templates/baseTemplate/index.html:662 msgid "Security" msgstr "セキュリティ" @@ -697,8 +694,8 @@ msgid "Dashboard Quick Menu" msgstr "ダッシュボードクイックメニュー" #: baseTemplate/templates/baseTemplate/index.html:384 -#: baseTemplate/templates/baseTemplate/index.html:590 -#: baseTemplate/templates/baseTemplate/index.html:592 +#: baseTemplate/templates/baseTemplate/index.html:591 +#: baseTemplate/templates/baseTemplate/index.html:593 msgid "Tuning" msgstr "チューニング" @@ -731,7 +728,7 @@ msgstr "新しいユーザーの作成" #: userManagment/templates/userManagment/index.html:52 #: userManagment/templates/userManagment/index.html:54 #: userManagment/templates/userManagment/modifyUser.html:12 -#: userManagment/templates/userManagment/modifyUser.html:120 +#: userManagment/templates/userManagment/modifyUser.html:119 msgid "Modify User" msgstr "ユーザーの変更" @@ -879,7 +876,7 @@ msgstr "メールアカウントの作成" #: mailServer/templates/mailServer/index.html:25 #: mailServer/templates/mailServer/index.html:27 msgid "Create Email" -msgstr "メールアカウントの作成" +msgstr "メールの作成" #: baseTemplate/templates/baseTemplate/index.html:522 #: mailServer/templates/mailServer/deleteEmailAccount.html:12 @@ -892,7 +889,7 @@ msgstr "メールアカウントの削除" #: mailServer/templates/mailServer/index.html:37 #: mailServer/templates/mailServer/index.html:39 msgid "Delete Email" -msgstr "メールアカウントの削除" +msgstr "メールの削除" #: baseTemplate/templates/baseTemplate/index.html:523 #: databases/templates/databases/listDataBases.html:73 @@ -911,8 +908,8 @@ msgstr "Webメール アクセス" #: ftp/templates/ftp/createFTPAccount.html:12 #: ftp/templates/ftp/createFTPAccount.html:19 ftp/templates/ftp/index.html:25 #: ftp/templates/ftp/index.html:27 -#: websiteFunctions/templates/websiteFunctions/website.html:683 -#: websiteFunctions/templates/websiteFunctions/website.html:685 +#: websiteFunctions/templates/websiteFunctions/website.html:710 +#: websiteFunctions/templates/websiteFunctions/website.html:712 msgid "Create FTP Account" msgstr "FTP アカウントの作成" @@ -921,8 +918,8 @@ msgstr "FTP アカウントの作成" #: ftp/templates/ftp/deleteFTPAccount.html:18 #: ftp/templates/ftp/deleteFTPAccount.html:52 ftp/templates/ftp/index.html:37 #: ftp/templates/ftp/index.html:39 -#: websiteFunctions/templates/websiteFunctions/website.html:695 -#: websiteFunctions/templates/websiteFunctions/website.html:697 +#: websiteFunctions/templates/websiteFunctions/website.html:722 +#: websiteFunctions/templates/websiteFunctions/website.html:724 msgid "Delete FTP Account" msgstr "FTP アカウントの削除" @@ -937,78 +934,84 @@ msgstr "FTP アカウントの一覧" msgid "Add/Delete Destination" msgstr "バックアップ先の追加/削除" -#: baseTemplate/templates/baseTemplate/index.html:573 +#: baseTemplate/templates/baseTemplate/index.html:565 +#, fuzzy +#| msgid "Remote Backups" +msgid "Remote Back ups" +msgstr "リモートバックアップ" + #: baseTemplate/templates/baseTemplate/index.html:574 +#: baseTemplate/templates/baseTemplate/index.html:575 msgid "SSL" msgstr "SSL" -#: baseTemplate/templates/baseTemplate/index.html:579 +#: baseTemplate/templates/baseTemplate/index.html:580 #: manageSSL/templates/manageSSL/index.html:28 #: manageSSL/templates/manageSSL/manageSSL.html:13 #: manageSSL/templates/manageSSL/manageSSL.html:20 msgid "Manage SSL" msgstr "SSL の管理" -#: baseTemplate/templates/baseTemplate/index.html:580 +#: baseTemplate/templates/baseTemplate/index.html:581 #: manageSSL/templates/manageSSL/index.html:40 msgid "Hostname SSL" msgstr "ホスト名 SSL" -#: baseTemplate/templates/baseTemplate/index.html:588 +#: baseTemplate/templates/baseTemplate/index.html:589 msgid "Server" msgstr "サーバー" -#: baseTemplate/templates/baseTemplate/index.html:593 +#: baseTemplate/templates/baseTemplate/index.html:594 msgid "NEW" msgstr "新規" -#: baseTemplate/templates/baseTemplate/index.html:598 +#: baseTemplate/templates/baseTemplate/index.html:599 #: tuning/templates/tuning/index.html:24 tuning/templates/tuning/index.html:26 #: tuning/templates/tuning/liteSpeedTuning.html:12 msgid "LiteSpeed Tuning" msgstr "LiteSpeed チューニング" -#: baseTemplate/templates/baseTemplate/index.html:599 +#: baseTemplate/templates/baseTemplate/index.html:600 #: tuning/templates/tuning/index.html:36 tuning/templates/tuning/index.html:38 #: tuning/templates/tuning/phpTuning.html:13 msgid "PHP Tuning" msgstr "PHP チューニング" -#: baseTemplate/templates/baseTemplate/index.html:614 +#: baseTemplate/templates/baseTemplate/index.html:615 #: serverStatus/templates/serverStatus/index.html:25 #: serverStatus/templates/serverStatus/index.html:27 msgid "LiteSpeed Status" msgstr "LiteSpeed の状態" -#: baseTemplate/templates/baseTemplate/index.html:615 +#: baseTemplate/templates/baseTemplate/index.html:616 #: serverStatus/templates/serverStatus/cybercpmainlogfile.html:15 #: serverStatus/templates/serverStatus/index.html:37 #: serverStatus/templates/serverStatus/index.html:39 msgid "CyberPanel Main Log File" msgstr "Cyber​​Panel メインログファイル" -#: baseTemplate/templates/baseTemplate/index.html:632 +#: baseTemplate/templates/baseTemplate/index.html:633 #: managePHP/templates/managePHP/installExtensions.html:13 msgid "Install PHP Extensions" msgstr "PHP拡張機能のインストール" -#: baseTemplate/templates/baseTemplate/index.html:632 +#: baseTemplate/templates/baseTemplate/index.html:633 #: managePHP/templates/managePHP/index.html:24 #: managePHP/templates/managePHP/index.html:26 msgid "Install Extensions" msgstr "拡張機能のインストール" -#: baseTemplate/templates/baseTemplate/index.html:633 +#: baseTemplate/templates/baseTemplate/index.html:634 #: managePHP/templates/managePHP/index.html:36 #: managePHP/templates/managePHP/index.html:38 msgid "Edit PHP Configs" msgstr "PHP 設定の編集" -#: baseTemplate/templates/baseTemplate/index.html:648 +#: baseTemplate/templates/baseTemplate/index.html:649 msgid "Access Log" msgstr "アクセスログ" -#: baseTemplate/templates/baseTemplate/index.html:649 +#: baseTemplate/templates/baseTemplate/index.html:650 #: serverLogs/templates/serverLogs/errorLogs.html:14 #: serverLogs/templates/serverLogs/index.html:37 #: serverLogs/templates/serverLogs/index.html:39 @@ -1016,35 +1019,35 @@ msgstr "アクセスログ" msgid "Error Logs" msgstr "エラーログ" -#: baseTemplate/templates/baseTemplate/index.html:650 +#: baseTemplate/templates/baseTemplate/index.html:651 #: serverLogs/templates/serverLogs/emailLogs.html:14 #: serverLogs/templates/serverLogs/index.html:49 #: serverLogs/templates/serverLogs/index.html:51 msgid "Email Logs" msgstr "メールログ" -#: baseTemplate/templates/baseTemplate/index.html:650 +#: baseTemplate/templates/baseTemplate/index.html:651 msgid "Email Log" msgstr "メールログ" -#: baseTemplate/templates/baseTemplate/index.html:651 +#: baseTemplate/templates/baseTemplate/index.html:652 #: serverLogs/templates/serverLogs/ftplogs.html:14 #: serverLogs/templates/serverLogs/index.html:61 #: serverLogs/templates/serverLogs/index.html:63 msgid "FTP Logs" msgstr "FTP ログ" -#: baseTemplate/templates/baseTemplate/index.html:666 +#: baseTemplate/templates/baseTemplate/index.html:667 msgid "Firewall Home" msgstr "ファイアウォールホーム" -#: baseTemplate/templates/baseTemplate/index.html:666 +#: baseTemplate/templates/baseTemplate/index.html:667 #: firewall/templates/firewall/index.html:25 #: firewall/templates/firewall/index.html:27 msgid "Firewall" msgstr "ファイアウォール" -#: baseTemplate/templates/baseTemplate/index.html:667 +#: baseTemplate/templates/baseTemplate/index.html:668 #: firewall/templates/firewall/index.html:36 #: firewall/templates/firewall/index.html:38 #: firewall/templates/firewall/secureSSH.html:13 @@ -1178,17 +1181,15 @@ msgid "Records successfully fetched for" msgstr "レコードが取得されました" #: databases/templates/databases/listDataBases.html:50 -#, fuzzy -#| msgid "Password changed for" msgid "Password changed for: " -msgstr "パスワードが変更されました" +msgstr "パスワードを変更: " #: databases/templates/databases/listDataBases.html:54 msgid "Cannot change password for " msgstr "パスワードを変更できません " #: databases/templates/databases/listDataBases.html:59 -#: firewall/templates/firewall/firewall.html:166 +#: firewall/templates/firewall/firewall.html:176 #: ftp/templates/ftp/listFTPAccounts.html:59 msgid "Could Not Connect to server. Please refresh this page" msgstr "サーバーに接続できませんでした。 このページを更新してください" @@ -1224,7 +1225,7 @@ msgstr "レコードを追加" #: dns/templates/dns/addDeleteDNSRecords.html:53 #: dns/templates/dns/addDeleteDNSRecords.html:131 -#: firewall/templates/firewall/firewall.html:128 +#: firewall/templates/firewall/firewall.html:136 #: serverStatus/templates/serverStatus/litespeedStatus.html:40 msgid "Name" msgstr "名称" @@ -1242,7 +1243,7 @@ msgstr "優先度" #: dns/templates/dns/createDNSZone.html:27 #: dns/templates/dns/createNameServer.html:27 #: websiteFunctions/templates/websiteFunctions/createWebsite.html:52 -#: websiteFunctions/templates/websiteFunctions/website.html:263 +#: websiteFunctions/templates/websiteFunctions/website.html:290 msgid "Domain Name" msgstr "ドメイン名" @@ -1255,7 +1256,7 @@ msgid "Text" msgstr "テキスト" #: dns/templates/dns/addDeleteDNSRecords.html:111 -#: firewall/templates/firewall/firewall.html:109 +#: firewall/templates/firewall/firewall.html:117 msgid "Add" msgstr "追加" @@ -1444,15 +1445,15 @@ msgstr "操作が失敗しました。エラーメッセージ:" msgid "Action successful." msgstr "操作は終了しました。" -#: firewall/templates/firewall/firewall.html:129 +#: firewall/templates/firewall/firewall.html:137 msgid "Protocol" msgstr "プロトコル" -#: firewall/templates/firewall/firewall.html:130 +#: firewall/templates/firewall/firewall.html:139 msgid "Port" msgstr "ポート" -#: firewall/templates/firewall/firewall.html:162 +#: firewall/templates/firewall/firewall.html:172 msgid "Rule successfully added." msgstr "ルールが追加されました。" @@ -1473,10 +1474,8 @@ msgid "Secure SSH - CyberPanel" msgstr "SSH のセキュリティ - Cyber​​Panel" #: firewall/templates/firewall/secureSSH.html:14 -#, fuzzy -#| msgid "SSH Configurations Saved." msgid "Secure or harden SSH Configurations." -msgstr "SSH の設定が保存されました。" +msgstr "SSHの設定をより安全にするか強化します。" #: firewall/templates/firewall/secureSSH.html:28 #: managePHP/templates/managePHP/editPHPConfig.html:29 @@ -1523,8 +1522,8 @@ msgstr "キーを追加" #: firewall/templates/firewall/secureSSH.html:158 #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:55 -#: websiteFunctions/templates/websiteFunctions/website.html:527 -#: websiteFunctions/templates/websiteFunctions/website.html:587 +#: websiteFunctions/templates/websiteFunctions/website.html:554 +#: websiteFunctions/templates/websiteFunctions/website.html:614 msgid "Save" msgstr "保存" @@ -1733,7 +1732,7 @@ msgstr "高度" #: tuning/templates/tuning/phpTuning.html:28 #: websiteFunctions/templates/websiteFunctions/createWebsite.html:68 #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:74 -#: websiteFunctions/templates/websiteFunctions/website.html:283 +#: websiteFunctions/templates/websiteFunctions/website.html:310 msgid "Select PHP" msgstr "PHP の選択" @@ -1827,7 +1826,7 @@ msgstr "前に戻る" #: managePHP/templates/managePHP/installExtensions.html:104 #: tuning/templates/tuning/phpTuning.html:114 -#: userManagment/templates/userManagment/modifyUser.html:144 +#: userManagment/templates/userManagment/modifyUser.html:143 msgid "Cannot fetch details. Error message:" msgstr "詳細を取得できません。エラーメッセージ:" @@ -1919,16 +1918,12 @@ msgstr "パッケージ名" #: packages/templates/packages/createPackage.html:35 #: packages/templates/packages/modifyPackage.html:40 -#: websiteFunctions/templates/websiteFunctions/website.html:223 -#, fuzzy -#| msgid "Domain Name" +#: websiteFunctions/templates/websiteFunctions/website.html:250 msgid "Domains" -msgstr "ドメイン名" +msgstr "ドメイン" #: packages/templates/packages/createPackage.html:39 #: packages/templates/packages/modifyPackage.html:44 -#, fuzzy -#| msgid "( 0 = Unlimited )" msgid "(0 = Unlimited)" msgstr "( 0 = 無制限 )" @@ -2231,7 +2226,7 @@ msgstr "無効化" #: tuning/templates/tuning/liteSpeedTuning.html:74 #: tuning/templates/tuning/phpTuning.html:97 -#: userManagment/templates/userManagment/modifyUser.html:78 +#: userManagment/templates/userManagment/modifyUser.html:77 msgid "Currently:" msgstr "現在:" @@ -2350,18 +2345,18 @@ msgid "Account Type" msgstr "アカウント種別" #: userManagment/templates/userManagment/createUser.html:67 -#: userManagment/templates/userManagment/modifyUser.html:73 -msgid "Reseller" -msgstr "代理店" +#: userManagment/templates/userManagment/modifyUser.html:72 +msgid "Admin" +msgstr "管理者" #: userManagment/templates/userManagment/createUser.html:68 #: userManagment/templates/userManagment/createUser.html:79 -#: userManagment/templates/userManagment/modifyUser.html:74 +#: userManagment/templates/userManagment/modifyUser.html:73 msgid "Normal User" msgstr "通常のユーザー" #: userManagment/templates/userManagment/createUser.html:92 -#: userManagment/templates/userManagment/modifyUser.html:89 +#: userManagment/templates/userManagment/modifyUser.html:88 #: userManagment/templates/userManagment/userProfile.html:67 #: userManagment/templates/userManagment/userProfile.html:74 msgid "User Accounts Limit" @@ -2373,7 +2368,7 @@ msgid "Only Numbers" msgstr "数字のみ" #: userManagment/templates/userManagment/createUser.html:103 -#: userManagment/templates/userManagment/modifyUser.html:99 +#: userManagment/templates/userManagment/modifyUser.html:98 #: userManagment/templates/userManagment/userProfile.html:82 msgid "Websites Limit" msgstr "Web サイトの制限" @@ -2398,7 +2393,7 @@ msgid "Create User" msgstr "ユーザーを作成" #: userManagment/templates/userManagment/createUser.html:154 -#: userManagment/templates/userManagment/modifyUser.html:131 +#: userManagment/templates/userManagment/modifyUser.html:130 msgid "Account with username:" msgstr "ユーザー名を持つアカウント:" @@ -2452,19 +2447,15 @@ msgstr "このページで既存のユーザー設定を変更します。" msgid "Select Account" msgstr "アカウントを選択" -#: userManagment/templates/userManagment/modifyUser.html:72 -msgid "Admin" -msgstr "管理者" - -#: userManagment/templates/userManagment/modifyUser.html:131 +#: userManagment/templates/userManagment/modifyUser.html:130 msgid " is successfully modified." msgstr " 更新されました。" -#: userManagment/templates/userManagment/modifyUser.html:135 +#: userManagment/templates/userManagment/modifyUser.html:134 msgid "Cannot modify user. Error message:" msgstr "ユーザーを変更できません。エラー メッセージ:" -#: userManagment/templates/userManagment/modifyUser.html:148 +#: userManagment/templates/userManagment/modifyUser.html:147 msgid "Details fetched." msgstr "詳細が取得されました。" @@ -2515,19 +2506,19 @@ msgid "Select Owner" msgstr "所有者を選択" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:56 -#: websiteFunctions/templates/websiteFunctions/website.html:267 -#: websiteFunctions/templates/websiteFunctions/website.html:278 +#: websiteFunctions/templates/websiteFunctions/website.html:294 +#: websiteFunctions/templates/websiteFunctions/website.html:305 msgid "Invalid Domain (Note: You don't need to add 'http' or 'https')" msgstr "" "無効なドメイン(注: 'http' または 'https' を追加する必要はありません)" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:84 -#: websiteFunctions/templates/websiteFunctions/website.html:299 +#: websiteFunctions/templates/websiteFunctions/website.html:326 msgid "Additional Features" msgstr "その他の機能" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:91 -#: websiteFunctions/templates/websiteFunctions/website.html:306 +#: websiteFunctions/templates/websiteFunctions/website.html:333 msgid "" "For SSL to work DNS of domain should point to server, otherwise self signed " "SSL will be issued, you can add your own SSL later." @@ -2536,17 +2527,17 @@ msgstr "" "署名された SSL が発行されます。後で独自の SSL を追加できます。" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:113 -#: websiteFunctions/templates/websiteFunctions/website.html:328 +#: websiteFunctions/templates/websiteFunctions/website.html:355 msgid "Cannot create website. Error message:" msgstr "Web サイトを作成できません。エラーメッセージ:" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 -#: websiteFunctions/templates/websiteFunctions/website.html:332 +#: websiteFunctions/templates/websiteFunctions/website.html:359 msgid "Website with domain" msgstr "ドメインを持つ Web サイト" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 -#: websiteFunctions/templates/websiteFunctions/website.html:332 +#: websiteFunctions/templates/websiteFunctions/website.html:359 msgid " is Successfully Created" msgstr " 作成されました" @@ -2686,169 +2677,156 @@ msgstr "" "い。 エラーメッセージ:" #: websiteFunctions/templates/websiteFunctions/website.html:173 +#: websiteFunctions/templates/websiteFunctions/website.html:212 msgid "Next" msgstr "次へ" #: websiteFunctions/templates/websiteFunctions/website.html:174 +#: websiteFunctions/templates/websiteFunctions/website.html:213 msgid "Previous" msgstr "前へ" -#: websiteFunctions/templates/websiteFunctions/website.html:230 -#: websiteFunctions/templates/websiteFunctions/website.html:232 -#, fuzzy -#| msgid "Add Destination" +#: websiteFunctions/templates/websiteFunctions/website.html:257 +#: websiteFunctions/templates/websiteFunctions/website.html:259 msgid "Add Domains" -msgstr "バックアップ先の追加" +msgstr "ドメインの追加" -#: websiteFunctions/templates/websiteFunctions/website.html:242 -#: websiteFunctions/templates/websiteFunctions/website.html:244 -#, fuzzy -#| msgid "Select Domain" +#: websiteFunctions/templates/websiteFunctions/website.html:269 +#: websiteFunctions/templates/websiteFunctions/website.html:271 msgid "List Domains" -msgstr "ドメインタイプの選択" +msgstr "ドメインの一覧" -#: websiteFunctions/templates/websiteFunctions/website.html:274 -#: websiteFunctions/templates/websiteFunctions/website.html:733 +#: websiteFunctions/templates/websiteFunctions/website.html:301 +#: websiteFunctions/templates/websiteFunctions/website.html:760 msgid "Path" msgstr "パス" -#: websiteFunctions/templates/websiteFunctions/website.html:276 +#: websiteFunctions/templates/websiteFunctions/website.html:303 msgid "This path is relative to: " -msgstr "" +msgstr "このパスからの相対: " -#: websiteFunctions/templates/websiteFunctions/website.html:276 -#, fuzzy -#| msgid "Leave empty to select default home directory." +#: websiteFunctions/templates/websiteFunctions/website.html:303 msgid "Leave empty to set default." -msgstr "デフォルトのホームディレクトリを選択するには、空のままにします。" +msgstr "デフォルトを設定するには、空のままにします。" -#: websiteFunctions/templates/websiteFunctions/website.html:317 -#, fuzzy -#| msgid "Create Email" +#: websiteFunctions/templates/websiteFunctions/website.html:344 msgid "Create Domain" -msgstr "メールアカウントの作成" +msgstr "ドメインの作成" -#: websiteFunctions/templates/websiteFunctions/website.html:360 -#, fuzzy -#| msgid "Version Management" +#: websiteFunctions/templates/websiteFunctions/website.html:387 msgid "PHP Version Changed to:" -msgstr "バージョン管理" - -#: websiteFunctions/templates/websiteFunctions/website.html:364 -#, fuzzy -#| msgid "Delete" -msgid "Deleted:" -msgstr "削除" - -#: websiteFunctions/templates/websiteFunctions/website.html:368 -#, fuzzy -#| msgid "SSL Issued for" -msgid "SSL Issued:" -msgstr "SSLが発行されました" +msgstr "PHP のバージョンを変更:" #: websiteFunctions/templates/websiteFunctions/website.html:391 +msgid "Deleted:" +msgstr "削除済み:" + +#: websiteFunctions/templates/websiteFunctions/website.html:395 +msgid "SSL Issued:" +msgstr "SSLの発行:" + +#: websiteFunctions/templates/websiteFunctions/website.html:418 msgid "Close" -msgstr "" +msgstr "閉じる" -#: websiteFunctions/templates/websiteFunctions/website.html:423 -#, fuzzy -#| msgid "Issue SSL" +#: websiteFunctions/templates/websiteFunctions/website.html:450 msgid "Issue" -msgstr "SSLを発行する" +msgstr "発行" -#: websiteFunctions/templates/websiteFunctions/website.html:451 +#: websiteFunctions/templates/websiteFunctions/website.html:478 msgid "Configurations" msgstr "設定" -#: websiteFunctions/templates/websiteFunctions/website.html:457 +#: websiteFunctions/templates/websiteFunctions/website.html:484 msgid "Edit Virtual Host Main Configurations" msgstr "仮想ホストのメイン設定の編集" -#: websiteFunctions/templates/websiteFunctions/website.html:459 +#: websiteFunctions/templates/websiteFunctions/website.html:486 msgid "Edit vHost Main Configurations" msgstr "メイン vHost 設定の編集" -#: websiteFunctions/templates/websiteFunctions/website.html:469 -#: websiteFunctions/templates/websiteFunctions/website.html:471 +#: websiteFunctions/templates/websiteFunctions/website.html:496 +#: websiteFunctions/templates/websiteFunctions/website.html:498 msgid "Add Rewrite Rules (.htaccess)" msgstr "Rewrite ルールを追加 (.htaccess)" -#: websiteFunctions/templates/websiteFunctions/website.html:481 +#: websiteFunctions/templates/websiteFunctions/website.html:508 msgid "Add Your Own SSL" msgstr "独自のSSLを追加" -#: websiteFunctions/templates/websiteFunctions/website.html:483 +#: websiteFunctions/templates/websiteFunctions/website.html:510 msgid "Add SSL" msgstr "SSL を追加" -#: websiteFunctions/templates/websiteFunctions/website.html:498 +#: websiteFunctions/templates/websiteFunctions/website.html:525 msgid "SSL Saved" msgstr "SSL を保存しました" -#: websiteFunctions/templates/websiteFunctions/website.html:503 +#: websiteFunctions/templates/websiteFunctions/website.html:530 msgid "Could not save SSL. Error message:" msgstr "SSL を保存できませんでした。エラー メッセージ:" -#: websiteFunctions/templates/websiteFunctions/website.html:553 +#: websiteFunctions/templates/websiteFunctions/website.html:580 msgid "Current configuration in the file fetched." msgstr "取得されたファイル内にある現在の設定。" -#: websiteFunctions/templates/websiteFunctions/website.html:558 -#: websiteFunctions/templates/websiteFunctions/website.html:571 +#: websiteFunctions/templates/websiteFunctions/website.html:585 +#: websiteFunctions/templates/websiteFunctions/website.html:598 msgid "Could not fetch current configuration. Error message:" msgstr "現在の設定を取得できませんでした。エラー メッセージ:" -#: websiteFunctions/templates/websiteFunctions/website.html:567 -#: websiteFunctions/templates/websiteFunctions/website.html:622 +#: websiteFunctions/templates/websiteFunctions/website.html:594 +#: websiteFunctions/templates/websiteFunctions/website.html:649 msgid "Configuration saved. Restart LiteSpeed put them in effect." msgstr "設定が保存されました。 LiteSpeed を再起動して有効にします。" -#: websiteFunctions/templates/websiteFunctions/website.html:608 +#: websiteFunctions/templates/websiteFunctions/website.html:635 msgid "Current rewrite rules in the file fetched." msgstr "取得されたファイル内にある現在の rewrite ルール。" -#: websiteFunctions/templates/websiteFunctions/website.html:613 +#: websiteFunctions/templates/websiteFunctions/website.html:640 msgid "Could not fetch current rewrite rules. Error message:" msgstr "現在の rewrite ルールを取得できませんでした。エラー メッセージ:" -#: websiteFunctions/templates/websiteFunctions/website.html:626 +#: websiteFunctions/templates/websiteFunctions/website.html:653 msgid "Could not save rewrite rules. Error message:" msgstr "rewrite ルールを保存できませんでした。エラー メッセージ:" -#: websiteFunctions/templates/websiteFunctions/website.html:642 +#: websiteFunctions/templates/websiteFunctions/website.html:669 msgid "Save Rewrite Rules" msgstr "Rewrite ルールを保存" -#: websiteFunctions/templates/websiteFunctions/website.html:665 +#: websiteFunctions/templates/websiteFunctions/website.html:692 msgid "Files" msgstr "ファイル" -#: websiteFunctions/templates/websiteFunctions/website.html:672 -#: websiteFunctions/templates/websiteFunctions/website.html:674 +#: websiteFunctions/templates/websiteFunctions/website.html:699 +#: websiteFunctions/templates/websiteFunctions/website.html:701 msgid "File Manager" msgstr "ファイル 管理" -#: websiteFunctions/templates/websiteFunctions/website.html:713 +#: websiteFunctions/templates/websiteFunctions/website.html:740 msgid "Application Installer" msgstr "アプリケーションインストーラー" -#: websiteFunctions/templates/websiteFunctions/website.html:719 -#, fuzzy -#| msgid "Wordpress with LSCache" +#: websiteFunctions/templates/websiteFunctions/website.html:746 msgid "Install wordpress with LSCache" -msgstr "Wordpress の LSCache" +msgstr "LSCache で Wordpress をインストールする" -#: websiteFunctions/templates/websiteFunctions/website.html:721 +#: websiteFunctions/templates/websiteFunctions/website.html:748 msgid "Wordpress with LSCache" msgstr "Wordpress の LSCache" -#: websiteFunctions/templates/websiteFunctions/website.html:755 +#: websiteFunctions/templates/websiteFunctions/website.html:782 msgid "Installation failed. Error message:" msgstr "インストールに失敗しました。エラー メッセージ:" -#: websiteFunctions/templates/websiteFunctions/website.html:759 +#: websiteFunctions/templates/websiteFunctions/website.html:786 msgid "Installation successful. To complete the setup visit:" msgstr "インストールに成功しました。 セットアップを完了するには:" +#~ msgid "Reseller" +#~ msgstr "代理店" + #~ msgid "Urdu" #~ msgstr "ウルドゥー語" diff --git a/locale/pt/LC_MESSAGES/django.mo b/locale/pt/LC_MESSAGES/django.mo index 9cb54d220..6213d777a 100644 Binary files a/locale/pt/LC_MESSAGES/django.mo and b/locale/pt/LC_MESSAGES/django.mo differ diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index d6c760462..12f6adb88 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: CyberPanel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-29 20:47+0500\n" +"POT-Creation-Date: 2017-11-02 02:08+0500\n" "PO-Revision-Date: 2017-10-21 00:03+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -117,7 +117,7 @@ msgstr "Criar Backup" #: backup/templates/backup/backupSchedule.html:89 #: databases/templates/databases/listDataBases.html:87 #: dns/templates/dns/addDeleteDNSRecords.html:129 -#: firewall/templates/firewall/firewall.html:127 +#: firewall/templates/firewall/firewall.html:135 #: ftp/templates/ftp/listFTPAccounts.html:87 #: managePHP/templates/managePHP/installExtensions.html:61 msgid "ID" @@ -140,9 +140,9 @@ msgstr "Tamanho" #: backup/templates/backup/backupDestinations.html:93 #: backup/templates/backup/backupSchedule.html:92 #: dns/templates/dns/addDeleteDNSRecords.html:134 -#: firewall/templates/firewall/firewall.html:131 +#: firewall/templates/firewall/firewall.html:140 #: firewall/templates/firewall/secureSSH.html:122 -#: websiteFunctions/templates/websiteFunctions/website.html:424 +#: websiteFunctions/templates/websiteFunctions/website.html:451 msgid "Delete" msgstr "Apagar" @@ -169,6 +169,7 @@ msgstr "Nesta página, pode definir os seus destinos de backups. (SFTP)" #: dns/templates/dns/addDeleteDNSRecords.html:60 #: dns/templates/dns/createNameServer.html:48 #: dns/templates/dns/createNameServer.html:65 +#: firewall/templates/firewall/firewall.html:138 msgid "IP Address" msgstr "Endereço de IP" @@ -180,7 +181,7 @@ msgstr "Endereço de IP" #: mailServer/templates/mailServer/changeEmailPassword.html:52 #: mailServer/templates/mailServer/createEmailAccount.html:51 #: userManagment/templates/userManagment/createUser.html:123 -#: userManagment/templates/userManagment/modifyUser.html:107 +#: userManagment/templates/userManagment/modifyUser.html:106 msgid "Password" msgstr "Palavra-Chave" @@ -225,15 +226,15 @@ msgstr "Destino Adicionado." #: mailServer/templates/mailServer/deleteEmailAccount.html:79 #: manageSSL/templates/manageSSL/manageSSL.html:60 #: userManagment/templates/userManagment/createUser.html:162 -#: userManagment/templates/userManagment/modifyUser.html:139 +#: userManagment/templates/userManagment/modifyUser.html:138 #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:77 #: websiteFunctions/templates/websiteFunctions/website.html:157 -#: websiteFunctions/templates/websiteFunctions/website.html:336 -#: websiteFunctions/templates/websiteFunctions/website.html:378 -#: websiteFunctions/templates/websiteFunctions/website.html:508 -#: websiteFunctions/templates/websiteFunctions/website.html:563 -#: websiteFunctions/templates/websiteFunctions/website.html:618 -#: websiteFunctions/templates/websiteFunctions/website.html:765 +#: websiteFunctions/templates/websiteFunctions/website.html:363 +#: websiteFunctions/templates/websiteFunctions/website.html:405 +#: websiteFunctions/templates/websiteFunctions/website.html:535 +#: websiteFunctions/templates/websiteFunctions/website.html:590 +#: websiteFunctions/templates/websiteFunctions/website.html:645 +#: websiteFunctions/templates/websiteFunctions/website.html:792 msgid "Could not connect to server. Please refresh this page." msgstr "Impossível conectar ao servidor. Por favor atualize esta página." @@ -298,11 +299,13 @@ msgstr "Backup - CyberPanel" #: backup/templates/backup/index.html:13 backup/templates/backup/index.html:29 #: backup/templates/backup/index.html:45 -#: baseTemplate/templates/baseTemplate/homePage.html:266 -#: baseTemplate/templates/baseTemplate/homePage.html:269 +#: baseTemplate/templates/baseTemplate/homePage.html:268 +#: baseTemplate/templates/baseTemplate/homePage.html:271 +#: baseTemplate/templates/baseTemplate/homePage.html:463 +#: baseTemplate/templates/baseTemplate/homePage.html:466 #: baseTemplate/templates/baseTemplate/index.html:554 #: baseTemplate/templates/baseTemplate/index.html:556 -#: baseTemplate/templates/baseTemplate/index.html:572 +#: baseTemplate/templates/baseTemplate/index.html:573 msgid "Back up" msgstr "Backup" @@ -370,7 +373,7 @@ msgid "Start Transfer" msgstr "" #: backup/templates/backup/remoteBackups.html:59 -#: websiteFunctions/templates/websiteFunctions/website.html:269 +#: websiteFunctions/templates/websiteFunctions/website.html:296 msgid "Cancel" msgstr "" @@ -410,9 +413,9 @@ msgid "Website" msgstr "Website" #: backup/templates/backup/remoteBackups.html:108 -#: baseTemplate/templates/baseTemplate/homePage.html:331 -#: baseTemplate/templates/baseTemplate/index.html:625 -#: baseTemplate/templates/baseTemplate/index.html:627 +#: baseTemplate/templates/baseTemplate/homePage.html:333 +#: baseTemplate/templates/baseTemplate/index.html:626 +#: baseTemplate/templates/baseTemplate/index.html:628 #: managePHP/templates/managePHP/installExtensions.html:62 msgid "PHP" msgstr "PHP" @@ -461,7 +464,7 @@ msgstr "Selecionar Backup" #: backup/templates/backup/restore.html:86 #: databases/templates/databases/deleteDatabase.html:64 #: databases/templates/databases/listDataBases.html:54 -#: firewall/templates/firewall/firewall.html:156 +#: firewall/templates/firewall/firewall.html:166 #: managePHP/templates/managePHP/editPHPConfig.html:212 msgid "Error message:" msgstr "Mensagem de erro:" @@ -517,24 +520,28 @@ msgstr "Processamento de Pedidos" msgid "Total Requests" msgstr "Pedidos Totais" -#: baseTemplate/templates/baseTemplate/homePage.html:173 +#: baseTemplate/templates/baseTemplate/homePage.html:175 +#: baseTemplate/templates/baseTemplate/homePage.html:389 #: userManagment/templates/userManagment/index.html:13 msgid "User Functions" msgstr "Funçõoes do Utilizador" -#: baseTemplate/templates/baseTemplate/homePage.html:176 +#: baseTemplate/templates/baseTemplate/homePage.html:178 +#: baseTemplate/templates/baseTemplate/homePage.html:392 #: baseTemplate/templates/baseTemplate/index.html:426 #: baseTemplate/templates/baseTemplate/index.html:427 #: baseTemplate/templates/baseTemplate/index.html:428 msgid "Users" msgstr "Utilizadores" -#: baseTemplate/templates/baseTemplate/homePage.html:186 +#: baseTemplate/templates/baseTemplate/homePage.html:188 +#: baseTemplate/templates/baseTemplate/homePage.html:402 #: websiteFunctions/templates/websiteFunctions/index.html:13 msgid "Website Functions" msgstr "Funções do Website" -#: baseTemplate/templates/baseTemplate/homePage.html:189 +#: baseTemplate/templates/baseTemplate/homePage.html:191 +#: baseTemplate/templates/baseTemplate/homePage.html:405 #: baseTemplate/templates/baseTemplate/index.html:360 #: baseTemplate/templates/baseTemplate/index.html:444 #: baseTemplate/templates/baseTemplate/index.html:445 @@ -543,13 +550,13 @@ msgstr "Funções do Website" msgid "Websites" msgstr "Websites" -#: baseTemplate/templates/baseTemplate/homePage.html:199 +#: baseTemplate/templates/baseTemplate/homePage.html:201 #, fuzzy #| msgid "Modify Package" msgid "Add/Modify Packages" msgstr "Editar Pacote" -#: baseTemplate/templates/baseTemplate/homePage.html:202 +#: baseTemplate/templates/baseTemplate/homePage.html:204 #: baseTemplate/templates/baseTemplate/index.html:366 #: baseTemplate/templates/baseTemplate/index.html:461 #: baseTemplate/templates/baseTemplate/index.html:463 @@ -557,12 +564,14 @@ msgstr "Editar Pacote" msgid "Packages" msgstr "Pacotes" -#: baseTemplate/templates/baseTemplate/homePage.html:223 +#: baseTemplate/templates/baseTemplate/homePage.html:225 +#: baseTemplate/templates/baseTemplate/homePage.html:415 #: databases/templates/databases/index.html:12 msgid "Database Functions" msgstr "Funções da Base de Dados" -#: baseTemplate/templates/baseTemplate/homePage.html:226 +#: baseTemplate/templates/baseTemplate/homePage.html:228 +#: baseTemplate/templates/baseTemplate/homePage.html:418 #: baseTemplate/templates/baseTemplate/index.html:477 #: baseTemplate/templates/baseTemplate/index.html:478 #: baseTemplate/templates/baseTemplate/index.html:479 @@ -572,23 +581,27 @@ msgstr "Funções da Base de Dados" msgid "Databases" msgstr "Bases de Dados" -#: baseTemplate/templates/baseTemplate/homePage.html:235 +#: baseTemplate/templates/baseTemplate/homePage.html:237 +#: baseTemplate/templates/baseTemplate/homePage.html:438 msgid "Control DNS" msgstr "" -#: baseTemplate/templates/baseTemplate/homePage.html:238 +#: baseTemplate/templates/baseTemplate/homePage.html:240 +#: baseTemplate/templates/baseTemplate/homePage.html:441 #: baseTemplate/templates/baseTemplate/index.html:372 #: baseTemplate/templates/baseTemplate/index.html:495 #: baseTemplate/templates/baseTemplate/index.html:497 msgid "DNS" msgstr "DNS" -#: baseTemplate/templates/baseTemplate/homePage.html:248 +#: baseTemplate/templates/baseTemplate/homePage.html:250 +#: baseTemplate/templates/baseTemplate/homePage.html:451 #: ftp/templates/ftp/index.html:12 msgid "FTP Functions" msgstr "Funções do FTP" -#: baseTemplate/templates/baseTemplate/homePage.html:251 +#: baseTemplate/templates/baseTemplate/homePage.html:253 +#: baseTemplate/templates/baseTemplate/homePage.html:454 #: baseTemplate/templates/baseTemplate/index.html:378 #: baseTemplate/templates/baseTemplate/index.html:536 #: baseTemplate/templates/baseTemplate/index.html:538 @@ -596,45 +609,47 @@ msgstr "Funções do FTP" msgid "FTP" msgstr "FTP" -#: baseTemplate/templates/baseTemplate/homePage.html:278 -#: baseTemplate/templates/baseTemplate/homePage.html:281 +#: baseTemplate/templates/baseTemplate/homePage.html:280 +#: baseTemplate/templates/baseTemplate/homePage.html:283 +#: baseTemplate/templates/baseTemplate/homePage.html:483 +#: baseTemplate/templates/baseTemplate/homePage.html:486 #: packages/templates/packages/createPackage.html:75 #: packages/templates/packages/modifyPackage.html:80 msgid "Emails" msgstr "E-Mails" -#: baseTemplate/templates/baseTemplate/homePage.html:291 -#: baseTemplate/templates/baseTemplate/homePage.html:294 +#: baseTemplate/templates/baseTemplate/homePage.html:293 +#: baseTemplate/templates/baseTemplate/homePage.html:296 #: tuning/templates/tuning/index.html:12 msgid "Server Tuning" msgstr "Afinação do Servidor" -#: baseTemplate/templates/baseTemplate/homePage.html:315 -#: baseTemplate/templates/baseTemplate/homePage.html:318 -#: baseTemplate/templates/baseTemplate/index.html:606 -#: baseTemplate/templates/baseTemplate/index.html:608 -#: baseTemplate/templates/baseTemplate/index.html:641 +#: baseTemplate/templates/baseTemplate/homePage.html:317 +#: baseTemplate/templates/baseTemplate/homePage.html:320 +#: baseTemplate/templates/baseTemplate/index.html:607 +#: baseTemplate/templates/baseTemplate/index.html:609 +#: baseTemplate/templates/baseTemplate/index.html:642 #: serverStatus/templates/serverStatus/index.html:13 msgid "Server Status" msgstr "Estado do Servidor" -#: baseTemplate/templates/baseTemplate/homePage.html:328 +#: baseTemplate/templates/baseTemplate/homePage.html:330 #, fuzzy #| msgid "Edit PHP Configurations" msgid "PHP Configurations" msgstr "Altere as Configurações PHP" -#: baseTemplate/templates/baseTemplate/homePage.html:340 -#: baseTemplate/templates/baseTemplate/homePage.html:343 -#: baseTemplate/templates/baseTemplate/index.html:643 +#: baseTemplate/templates/baseTemplate/homePage.html:342 +#: baseTemplate/templates/baseTemplate/homePage.html:345 +#: baseTemplate/templates/baseTemplate/index.html:644 #: websiteFunctions/templates/websiteFunctions/website.html:113 msgid "Logs" msgstr "Logs" -#: baseTemplate/templates/baseTemplate/homePage.html:363 -#: baseTemplate/templates/baseTemplate/homePage.html:366 -#: baseTemplate/templates/baseTemplate/index.html:659 -#: baseTemplate/templates/baseTemplate/index.html:661 +#: baseTemplate/templates/baseTemplate/homePage.html:365 +#: baseTemplate/templates/baseTemplate/homePage.html:368 +#: baseTemplate/templates/baseTemplate/index.html:660 +#: baseTemplate/templates/baseTemplate/index.html:662 msgid "Security" msgstr "Segurança" @@ -710,8 +725,8 @@ msgid "Dashboard Quick Menu" msgstr "Painel de Controlo" #: baseTemplate/templates/baseTemplate/index.html:384 -#: baseTemplate/templates/baseTemplate/index.html:590 -#: baseTemplate/templates/baseTemplate/index.html:592 +#: baseTemplate/templates/baseTemplate/index.html:591 +#: baseTemplate/templates/baseTemplate/index.html:593 msgid "Tuning" msgstr "Afinar" @@ -744,7 +759,7 @@ msgstr "Criar Novo Utilizador" #: userManagment/templates/userManagment/index.html:52 #: userManagment/templates/userManagment/index.html:54 #: userManagment/templates/userManagment/modifyUser.html:12 -#: userManagment/templates/userManagment/modifyUser.html:120 +#: userManagment/templates/userManagment/modifyUser.html:119 msgid "Modify User" msgstr "Modificar Utilizador" @@ -924,8 +939,8 @@ msgstr "Aceder ao Webmail" #: ftp/templates/ftp/createFTPAccount.html:12 #: ftp/templates/ftp/createFTPAccount.html:19 ftp/templates/ftp/index.html:25 #: ftp/templates/ftp/index.html:27 -#: websiteFunctions/templates/websiteFunctions/website.html:683 -#: websiteFunctions/templates/websiteFunctions/website.html:685 +#: websiteFunctions/templates/websiteFunctions/website.html:710 +#: websiteFunctions/templates/websiteFunctions/website.html:712 msgid "Create FTP Account" msgstr "Criar Conta de FTP" @@ -934,8 +949,8 @@ msgstr "Criar Conta de FTP" #: ftp/templates/ftp/deleteFTPAccount.html:18 #: ftp/templates/ftp/deleteFTPAccount.html:52 ftp/templates/ftp/index.html:37 #: ftp/templates/ftp/index.html:39 -#: websiteFunctions/templates/websiteFunctions/website.html:695 -#: websiteFunctions/templates/websiteFunctions/website.html:697 +#: websiteFunctions/templates/websiteFunctions/website.html:722 +#: websiteFunctions/templates/websiteFunctions/website.html:724 msgid "Delete FTP Account" msgstr "Apagar Conta de FTP" @@ -950,78 +965,84 @@ msgstr "Listar Contas de FTP" msgid "Add/Delete Destination" msgstr "Adcionar/Apagar Destino" -#: baseTemplate/templates/baseTemplate/index.html:573 +#: baseTemplate/templates/baseTemplate/index.html:565 +#, fuzzy +#| msgid "Restore Back up" +msgid "Remote Back ups" +msgstr "Restaurar Backup" + #: baseTemplate/templates/baseTemplate/index.html:574 +#: baseTemplate/templates/baseTemplate/index.html:575 msgid "SSL" msgstr "SSL" -#: baseTemplate/templates/baseTemplate/index.html:579 +#: baseTemplate/templates/baseTemplate/index.html:580 #: manageSSL/templates/manageSSL/index.html:28 #: manageSSL/templates/manageSSL/manageSSL.html:13 #: manageSSL/templates/manageSSL/manageSSL.html:20 msgid "Manage SSL" msgstr "Gerir SSL" -#: baseTemplate/templates/baseTemplate/index.html:580 +#: baseTemplate/templates/baseTemplate/index.html:581 #: manageSSL/templates/manageSSL/index.html:40 msgid "Hostname SSL" msgstr "SSL do Hostname" -#: baseTemplate/templates/baseTemplate/index.html:588 +#: baseTemplate/templates/baseTemplate/index.html:589 msgid "Server" msgstr "Servidor" -#: baseTemplate/templates/baseTemplate/index.html:593 +#: baseTemplate/templates/baseTemplate/index.html:594 msgid "NEW" msgstr "NOVO" -#: baseTemplate/templates/baseTemplate/index.html:598 +#: baseTemplate/templates/baseTemplate/index.html:599 #: tuning/templates/tuning/index.html:24 tuning/templates/tuning/index.html:26 #: tuning/templates/tuning/liteSpeedTuning.html:12 msgid "LiteSpeed Tuning" msgstr "Afinação do LiteSpeed" -#: baseTemplate/templates/baseTemplate/index.html:599 +#: baseTemplate/templates/baseTemplate/index.html:600 #: tuning/templates/tuning/index.html:36 tuning/templates/tuning/index.html:38 #: tuning/templates/tuning/phpTuning.html:13 msgid "PHP Tuning" msgstr "Afinação do PHP" -#: baseTemplate/templates/baseTemplate/index.html:614 +#: baseTemplate/templates/baseTemplate/index.html:615 #: serverStatus/templates/serverStatus/index.html:25 #: serverStatus/templates/serverStatus/index.html:27 msgid "LiteSpeed Status" msgstr "Estado do LiteSpeed" -#: baseTemplate/templates/baseTemplate/index.html:615 +#: baseTemplate/templates/baseTemplate/index.html:616 #: serverStatus/templates/serverStatus/cybercpmainlogfile.html:15 #: serverStatus/templates/serverStatus/index.html:37 #: serverStatus/templates/serverStatus/index.html:39 msgid "CyberPanel Main Log File" msgstr "Principal Ficheiro de Log do CyberPanel" -#: baseTemplate/templates/baseTemplate/index.html:632 +#: baseTemplate/templates/baseTemplate/index.html:633 #: managePHP/templates/managePHP/installExtensions.html:13 msgid "Install PHP Extensions" msgstr "Instalar Extensões do PHP" -#: baseTemplate/templates/baseTemplate/index.html:632 +#: baseTemplate/templates/baseTemplate/index.html:633 #: managePHP/templates/managePHP/index.html:24 #: managePHP/templates/managePHP/index.html:26 msgid "Install Extensions" msgstr "Instalar Extensões" -#: baseTemplate/templates/baseTemplate/index.html:633 +#: baseTemplate/templates/baseTemplate/index.html:634 #: managePHP/templates/managePHP/index.html:36 #: managePHP/templates/managePHP/index.html:38 msgid "Edit PHP Configs" msgstr "Editar configurações do PHP" -#: baseTemplate/templates/baseTemplate/index.html:648 +#: baseTemplate/templates/baseTemplate/index.html:649 msgid "Access Log" msgstr "Log de Acessos" -#: baseTemplate/templates/baseTemplate/index.html:649 +#: baseTemplate/templates/baseTemplate/index.html:650 #: serverLogs/templates/serverLogs/errorLogs.html:14 #: serverLogs/templates/serverLogs/index.html:37 #: serverLogs/templates/serverLogs/index.html:39 @@ -1029,37 +1050,37 @@ msgstr "Log de Acessos" msgid "Error Logs" msgstr "Log de Erros" -#: baseTemplate/templates/baseTemplate/index.html:650 +#: baseTemplate/templates/baseTemplate/index.html:651 #: serverLogs/templates/serverLogs/emailLogs.html:14 #: serverLogs/templates/serverLogs/index.html:49 #: serverLogs/templates/serverLogs/index.html:51 msgid "Email Logs" msgstr "Logs de E-Mail" -#: baseTemplate/templates/baseTemplate/index.html:650 +#: baseTemplate/templates/baseTemplate/index.html:651 msgid "Email Log" msgstr "Log de E-Mail" -#: baseTemplate/templates/baseTemplate/index.html:651 +#: baseTemplate/templates/baseTemplate/index.html:652 #: serverLogs/templates/serverLogs/ftplogs.html:14 #: serverLogs/templates/serverLogs/index.html:61 #: serverLogs/templates/serverLogs/index.html:63 msgid "FTP Logs" msgstr "Log de FTP" -#: baseTemplate/templates/baseTemplate/index.html:666 +#: baseTemplate/templates/baseTemplate/index.html:667 #, fuzzy #| msgid "Firewall" msgid "Firewall Home" msgstr "Firewall" -#: baseTemplate/templates/baseTemplate/index.html:666 +#: baseTemplate/templates/baseTemplate/index.html:667 #: firewall/templates/firewall/index.html:25 #: firewall/templates/firewall/index.html:27 msgid "Firewall" msgstr "Firewall" -#: baseTemplate/templates/baseTemplate/index.html:667 +#: baseTemplate/templates/baseTemplate/index.html:668 #: firewall/templates/firewall/index.html:36 #: firewall/templates/firewall/index.html:38 #: firewall/templates/firewall/secureSSH.html:13 @@ -1203,7 +1224,7 @@ msgid "Cannot change password for " msgstr "Impossível alterar palavra-chave para " #: databases/templates/databases/listDataBases.html:59 -#: firewall/templates/firewall/firewall.html:166 +#: firewall/templates/firewall/firewall.html:176 #: ftp/templates/ftp/listFTPAccounts.html:59 msgid "Could Not Connect to server. Please refresh this page" msgstr "Impossível conectar ao servidor. Por favor atualize esta página" @@ -1239,7 +1260,7 @@ msgstr "Adicionar Registos" #: dns/templates/dns/addDeleteDNSRecords.html:53 #: dns/templates/dns/addDeleteDNSRecords.html:131 -#: firewall/templates/firewall/firewall.html:128 +#: firewall/templates/firewall/firewall.html:136 #: serverStatus/templates/serverStatus/litespeedStatus.html:40 msgid "Name" msgstr "Nome" @@ -1257,7 +1278,7 @@ msgstr "Prioridade" #: dns/templates/dns/createDNSZone.html:27 #: dns/templates/dns/createNameServer.html:27 #: websiteFunctions/templates/websiteFunctions/createWebsite.html:52 -#: websiteFunctions/templates/websiteFunctions/website.html:263 +#: websiteFunctions/templates/websiteFunctions/website.html:290 msgid "Domain Name" msgstr "Nome de Domínio" @@ -1270,7 +1291,7 @@ msgid "Text" msgstr "" #: dns/templates/dns/addDeleteDNSRecords.html:111 -#: firewall/templates/firewall/firewall.html:109 +#: firewall/templates/firewall/firewall.html:117 msgid "Add" msgstr "Adicionar" @@ -1461,15 +1482,15 @@ msgstr "Ação falhou. Mensagem de erro:" msgid "Action successful." msgstr "Ação com sucesso." -#: firewall/templates/firewall/firewall.html:129 +#: firewall/templates/firewall/firewall.html:137 msgid "Protocol" msgstr "Protocolo" -#: firewall/templates/firewall/firewall.html:130 +#: firewall/templates/firewall/firewall.html:139 msgid "Port" msgstr "Porta" -#: firewall/templates/firewall/firewall.html:162 +#: firewall/templates/firewall/firewall.html:172 msgid "Rule successfully added." msgstr "Regra adicionada com sucesso." @@ -1540,8 +1561,8 @@ msgstr "Adicionar Chave" #: firewall/templates/firewall/secureSSH.html:158 #: websiteFunctions/templates/websiteFunctions/suspendWebsite.html:55 -#: websiteFunctions/templates/websiteFunctions/website.html:527 -#: websiteFunctions/templates/websiteFunctions/website.html:587 +#: websiteFunctions/templates/websiteFunctions/website.html:554 +#: websiteFunctions/templates/websiteFunctions/website.html:614 msgid "Save" msgstr "Guardar" @@ -1749,7 +1770,7 @@ msgstr "Avançado" #: tuning/templates/tuning/phpTuning.html:28 #: websiteFunctions/templates/websiteFunctions/createWebsite.html:68 #: websiteFunctions/templates/websiteFunctions/modifyWebsite.html:74 -#: websiteFunctions/templates/websiteFunctions/website.html:283 +#: websiteFunctions/templates/websiteFunctions/website.html:310 msgid "Select PHP" msgstr "Selecionar PHP" @@ -1845,7 +1866,7 @@ msgstr "Voltar" #: managePHP/templates/managePHP/installExtensions.html:104 #: tuning/templates/tuning/phpTuning.html:114 -#: userManagment/templates/userManagment/modifyUser.html:144 +#: userManagment/templates/userManagment/modifyUser.html:143 msgid "Cannot fetch details. Error message:" msgstr "Impossível obter os detalhes. Mensagem de erro:" @@ -1936,7 +1957,7 @@ msgstr "Nome do Pacote" #: packages/templates/packages/createPackage.html:35 #: packages/templates/packages/modifyPackage.html:40 -#: websiteFunctions/templates/websiteFunctions/website.html:223 +#: websiteFunctions/templates/websiteFunctions/website.html:250 #, fuzzy #| msgid "Domain Name" msgid "Domains" @@ -2248,7 +2269,7 @@ msgstr "Desativar" #: tuning/templates/tuning/liteSpeedTuning.html:74 #: tuning/templates/tuning/phpTuning.html:97 -#: userManagment/templates/userManagment/modifyUser.html:78 +#: userManagment/templates/userManagment/modifyUser.html:77 msgid "Currently:" msgstr "Atualmente:" @@ -2368,18 +2389,18 @@ msgid "Account Type" msgstr "Tipo de Conta" #: userManagment/templates/userManagment/createUser.html:67 -#: userManagment/templates/userManagment/modifyUser.html:73 -msgid "Reseller" -msgstr "Revendedor" +#: userManagment/templates/userManagment/modifyUser.html:72 +msgid "Admin" +msgstr "Administrador" #: userManagment/templates/userManagment/createUser.html:68 #: userManagment/templates/userManagment/createUser.html:79 -#: userManagment/templates/userManagment/modifyUser.html:74 +#: userManagment/templates/userManagment/modifyUser.html:73 msgid "Normal User" msgstr "Utilizador Normal" #: userManagment/templates/userManagment/createUser.html:92 -#: userManagment/templates/userManagment/modifyUser.html:89 +#: userManagment/templates/userManagment/modifyUser.html:88 #: userManagment/templates/userManagment/userProfile.html:67 #: userManagment/templates/userManagment/userProfile.html:74 msgid "User Accounts Limit" @@ -2391,7 +2412,7 @@ msgid "Only Numbers" msgstr "Apenas Números" #: userManagment/templates/userManagment/createUser.html:103 -#: userManagment/templates/userManagment/modifyUser.html:99 +#: userManagment/templates/userManagment/modifyUser.html:98 #: userManagment/templates/userManagment/userProfile.html:82 msgid "Websites Limit" msgstr "Limite de Websites" @@ -2416,7 +2437,7 @@ msgid "Create User" msgstr "Criar Utilizador" #: userManagment/templates/userManagment/createUser.html:154 -#: userManagment/templates/userManagment/modifyUser.html:131 +#: userManagment/templates/userManagment/modifyUser.html:130 msgid "Account with username:" msgstr "Conta com o nome de utilizador:" @@ -2474,19 +2495,15 @@ msgstr "Altere definições de utilizadores existentes nesta página." msgid "Select Account" msgstr "Selecionar Conta" -#: userManagment/templates/userManagment/modifyUser.html:72 -msgid "Admin" -msgstr "Administrador" - -#: userManagment/templates/userManagment/modifyUser.html:131 +#: userManagment/templates/userManagment/modifyUser.html:130 msgid " is successfully modified." msgstr " foi alterado com sucesso." -#: userManagment/templates/userManagment/modifyUser.html:135 +#: userManagment/templates/userManagment/modifyUser.html:134 msgid "Cannot modify user. Error message:" msgstr "Impossível alterar utilizador. Mensagem de erro:" -#: userManagment/templates/userManagment/modifyUser.html:148 +#: userManagment/templates/userManagment/modifyUser.html:147 msgid "Details fetched." msgstr "Detalhes obtidos." @@ -2537,18 +2554,18 @@ msgid "Select Owner" msgstr "Selecionar Dono" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:56 -#: websiteFunctions/templates/websiteFunctions/website.html:267 -#: websiteFunctions/templates/websiteFunctions/website.html:278 +#: websiteFunctions/templates/websiteFunctions/website.html:294 +#: websiteFunctions/templates/websiteFunctions/website.html:305 msgid "Invalid Domain (Note: You don't need to add 'http' or 'https')" msgstr "Domínio Inválido (Nota: Não é necessãrio adicionar 'http' ou 'https')" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:84 -#: websiteFunctions/templates/websiteFunctions/website.html:299 +#: websiteFunctions/templates/websiteFunctions/website.html:326 msgid "Additional Features" msgstr "Funcionalidades Adicionais" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:91 -#: websiteFunctions/templates/websiteFunctions/website.html:306 +#: websiteFunctions/templates/websiteFunctions/website.html:333 msgid "" "For SSL to work DNS of domain should point to server, otherwise self signed " "SSL will be issued, you can add your own SSL later." @@ -2558,17 +2575,17 @@ msgstr "" "próprio SSL mais tarde." #: websiteFunctions/templates/websiteFunctions/createWebsite.html:113 -#: websiteFunctions/templates/websiteFunctions/website.html:328 +#: websiteFunctions/templates/websiteFunctions/website.html:355 msgid "Cannot create website. Error message:" msgstr "Impossível criar website. Mensage de erro:" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 -#: websiteFunctions/templates/websiteFunctions/website.html:332 +#: websiteFunctions/templates/websiteFunctions/website.html:359 msgid "Website with domain" msgstr "Website com o domínio" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:117 -#: websiteFunctions/templates/websiteFunctions/website.html:332 +#: websiteFunctions/templates/websiteFunctions/website.html:359 msgid " is Successfully Created" msgstr " foi Criado com Sucesso" @@ -2712,168 +2729,173 @@ msgstr "" "Mensagem de erro:" #: websiteFunctions/templates/websiteFunctions/website.html:173 +#: websiteFunctions/templates/websiteFunctions/website.html:212 msgid "Next" msgstr "Próximo" #: websiteFunctions/templates/websiteFunctions/website.html:174 +#: websiteFunctions/templates/websiteFunctions/website.html:213 msgid "Previous" msgstr "Anterior" -#: websiteFunctions/templates/websiteFunctions/website.html:230 -#: websiteFunctions/templates/websiteFunctions/website.html:232 +#: websiteFunctions/templates/websiteFunctions/website.html:257 +#: websiteFunctions/templates/websiteFunctions/website.html:259 #, fuzzy #| msgid "Add Destination" msgid "Add Domains" msgstr "Adicionar Destino" -#: websiteFunctions/templates/websiteFunctions/website.html:242 -#: websiteFunctions/templates/websiteFunctions/website.html:244 +#: websiteFunctions/templates/websiteFunctions/website.html:269 +#: websiteFunctions/templates/websiteFunctions/website.html:271 #, fuzzy #| msgid "Select Domain" msgid "List Domains" msgstr "Selecionar Domínio" -#: websiteFunctions/templates/websiteFunctions/website.html:274 -#: websiteFunctions/templates/websiteFunctions/website.html:733 +#: websiteFunctions/templates/websiteFunctions/website.html:301 +#: websiteFunctions/templates/websiteFunctions/website.html:760 msgid "Path" msgstr "Caminho" -#: websiteFunctions/templates/websiteFunctions/website.html:276 +#: websiteFunctions/templates/websiteFunctions/website.html:303 msgid "This path is relative to: " msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:276 +#: websiteFunctions/templates/websiteFunctions/website.html:303 msgid "Leave empty to set default." msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:317 +#: websiteFunctions/templates/websiteFunctions/website.html:344 #, fuzzy #| msgid "Create Email" msgid "Create Domain" msgstr "Criar E-Mail" -#: websiteFunctions/templates/websiteFunctions/website.html:360 +#: websiteFunctions/templates/websiteFunctions/website.html:387 #, fuzzy #| msgid "Version Management" msgid "PHP Version Changed to:" msgstr "Gestão de Versões" -#: websiteFunctions/templates/websiteFunctions/website.html:364 +#: websiteFunctions/templates/websiteFunctions/website.html:391 #, fuzzy #| msgid "Delete" msgid "Deleted:" msgstr "Apagar" -#: websiteFunctions/templates/websiteFunctions/website.html:368 +#: websiteFunctions/templates/websiteFunctions/website.html:395 #, fuzzy #| msgid "SSL Issued for" msgid "SSL Issued:" msgstr "SSL Emitida para" -#: websiteFunctions/templates/websiteFunctions/website.html:391 +#: websiteFunctions/templates/websiteFunctions/website.html:418 msgid "Close" msgstr "" -#: websiteFunctions/templates/websiteFunctions/website.html:423 +#: websiteFunctions/templates/websiteFunctions/website.html:450 #, fuzzy #| msgid "Issue SSL" msgid "Issue" msgstr "Emitir SSL" -#: websiteFunctions/templates/websiteFunctions/website.html:451 +#: websiteFunctions/templates/websiteFunctions/website.html:478 msgid "Configurations" msgstr "Configurações" -#: websiteFunctions/templates/websiteFunctions/website.html:457 +#: websiteFunctions/templates/websiteFunctions/website.html:484 #, fuzzy #| msgid "Edit vHost Main Configurations" msgid "Edit Virtual Host Main Configurations" msgstr "Alterar as Configurações do vHost Principal" -#: websiteFunctions/templates/websiteFunctions/website.html:459 +#: websiteFunctions/templates/websiteFunctions/website.html:486 msgid "Edit vHost Main Configurations" msgstr "Alterar as Configurações do vHost Principal" -#: websiteFunctions/templates/websiteFunctions/website.html:469 -#: websiteFunctions/templates/websiteFunctions/website.html:471 +#: websiteFunctions/templates/websiteFunctions/website.html:496 +#: websiteFunctions/templates/websiteFunctions/website.html:498 msgid "Add Rewrite Rules (.htaccess)" msgstr "Adicionar Regras Rewrite (.htaccess)" -#: websiteFunctions/templates/websiteFunctions/website.html:481 +#: websiteFunctions/templates/websiteFunctions/website.html:508 #, fuzzy #| msgid "Add SSL" msgid "Add Your Own SSL" msgstr "Adicionar SSL" -#: websiteFunctions/templates/websiteFunctions/website.html:483 +#: websiteFunctions/templates/websiteFunctions/website.html:510 msgid "Add SSL" msgstr "Adicionar SSL" -#: websiteFunctions/templates/websiteFunctions/website.html:498 +#: websiteFunctions/templates/websiteFunctions/website.html:525 msgid "SSL Saved" msgstr "SSL Guardado" -#: websiteFunctions/templates/websiteFunctions/website.html:503 +#: websiteFunctions/templates/websiteFunctions/website.html:530 msgid "Could not save SSL. Error message:" msgstr "Impossível guardar SSL. Mensagem de erro:" -#: websiteFunctions/templates/websiteFunctions/website.html:553 +#: websiteFunctions/templates/websiteFunctions/website.html:580 msgid "Current configuration in the file fetched." msgstr "Configuração atual do ficheiro obtida." -#: websiteFunctions/templates/websiteFunctions/website.html:558 -#: websiteFunctions/templates/websiteFunctions/website.html:571 +#: websiteFunctions/templates/websiteFunctions/website.html:585 +#: websiteFunctions/templates/websiteFunctions/website.html:598 msgid "Could not fetch current configuration. Error message:" msgstr "Impossível obter configuração atual. Mensagem de erro:" -#: websiteFunctions/templates/websiteFunctions/website.html:567 -#: websiteFunctions/templates/websiteFunctions/website.html:622 +#: websiteFunctions/templates/websiteFunctions/website.html:594 +#: websiteFunctions/templates/websiteFunctions/website.html:649 msgid "Configuration saved. Restart LiteSpeed put them in effect." msgstr "Configuração guardada. Reinicie o LiteSpeed para coloca-las em efeito." -#: websiteFunctions/templates/websiteFunctions/website.html:608 +#: websiteFunctions/templates/websiteFunctions/website.html:635 msgid "Current rewrite rules in the file fetched." msgstr "Regras Rewrite atuais no ficheiro obtidas." -#: websiteFunctions/templates/websiteFunctions/website.html:613 +#: websiteFunctions/templates/websiteFunctions/website.html:640 msgid "Could not fetch current rewrite rules. Error message:" msgstr "Impossível obter regras Rewrite atuais. Mensagem de erro:" -#: websiteFunctions/templates/websiteFunctions/website.html:626 +#: websiteFunctions/templates/websiteFunctions/website.html:653 msgid "Could not save rewrite rules. Error message:" msgstr "Impossível guardar regras Rewrite. Mensagem de erro:" -#: websiteFunctions/templates/websiteFunctions/website.html:642 +#: websiteFunctions/templates/websiteFunctions/website.html:669 msgid "Save Rewrite Rules" msgstr "Guardar Regras Rewrite" -#: websiteFunctions/templates/websiteFunctions/website.html:665 +#: websiteFunctions/templates/websiteFunctions/website.html:692 msgid "Files" msgstr "Ficheiros" -#: websiteFunctions/templates/websiteFunctions/website.html:672 -#: websiteFunctions/templates/websiteFunctions/website.html:674 +#: websiteFunctions/templates/websiteFunctions/website.html:699 +#: websiteFunctions/templates/websiteFunctions/website.html:701 msgid "File Manager" msgstr "Gestor de Ficheiros" -#: websiteFunctions/templates/websiteFunctions/website.html:713 +#: websiteFunctions/templates/websiteFunctions/website.html:740 msgid "Application Installer" msgstr "Instalador de Aplicações" -#: websiteFunctions/templates/websiteFunctions/website.html:719 +#: websiteFunctions/templates/websiteFunctions/website.html:746 #, fuzzy #| msgid "Wordpress with LSCache" msgid "Install wordpress with LSCache" msgstr "Wordpress com LSCache" -#: websiteFunctions/templates/websiteFunctions/website.html:721 +#: websiteFunctions/templates/websiteFunctions/website.html:748 msgid "Wordpress with LSCache" msgstr "Wordpress com LSCache" -#: websiteFunctions/templates/websiteFunctions/website.html:755 +#: websiteFunctions/templates/websiteFunctions/website.html:782 msgid "Installation failed. Error message:" msgstr "Instalação falhou. Mensagem de erro:" -#: websiteFunctions/templates/websiteFunctions/website.html:759 +#: websiteFunctions/templates/websiteFunctions/website.html:786 msgid "Installation successful. To complete the setup visit:" msgstr "Instalação com sucesso. Para completar:" + +#~ msgid "Reseller" +#~ msgstr "Revendedor" diff --git a/manageSSL/views.py b/manageSSL/views.py index 7f9f5a0f3..780180113 100644 --- a/manageSSL/views.py +++ b/manageSSL/views.py @@ -73,7 +73,10 @@ def issueSSL(request): data = json.loads(request.body) virtualHost = data['virtualHost'] - website = ChildDomains.objects.get(domain=virtualHost) + try: + website = ChildDomains.objects.get(domain=virtualHost) + except: + website = Websites.objects.get(domain=virtualHost) srcPrivKey = "/etc/letsencrypt/live/" + virtualHost + "/privkey.pem" srcFullChain = "/etc/letsencrypt/live/" + virtualHost + "/fullchain.pem" diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py index 4b6cb2acd..56db9f2f2 100644 --- a/plogical/backupUtilities.py +++ b/plogical/backupUtilities.py @@ -403,10 +403,7 @@ class backupUtilities: @staticmethod def checkConnection(IPAddress): - - try: - backupUtilities.verifyHostKey(IPAddress) expectation = [] @@ -419,12 +416,15 @@ class backupUtilities: if index == 0: subprocess.call(['kill', str(checkConn.pid)]) + logging.CyberCPLogFileWriter.writeToFile("Remote Server is not able to authenticate for transfer to initiate, IP Address:" + IPAddress) return [0,"Remote Server is not able to authenticate for transfer to initiate."] elif index == 1: subprocess.call(['kill', str(checkConn.pid)]) return [1, "None"] else: subprocess.call(['kill', str(checkConn.pid)]) + logging.CyberCPLogFileWriter.writeToFile( + "Remote Server is not able to authenticate for transfer to initiate, IP Address:" + IPAddress) return [0, "Remote Server is not able to authenticate for transfer to initiate."] except pexpect.TIMEOUT, msg: diff --git a/plogical/firewallUtilities.py b/plogical/firewallUtilities.py index 3aef2fd86..c7aaac87c 100644 --- a/plogical/firewallUtilities.py +++ b/plogical/firewallUtilities.py @@ -12,9 +12,15 @@ import socket class FirewallUtilities: @staticmethod - def addRule(proto,port): + def addRule(proto,port,ipAddress): try: - command = 'firewall-cmd --add-port=' + port +'/' + proto +' --permanent' + + ruleFamily = 'rule family="ipv4"' + sourceAddress = 'source address="' + ipAddress + '"' + ruleProtocol = 'port protocol="' + proto + '"' + rulePort = 'port="' + port + '"' + + command = "firewall-cmd --permanent --zone=public --add-rich-rule='" + ruleFamily + " " + sourceAddress + " " + ruleProtocol + " " + rulePort + " " + "accept'" cmd = shlex.split(command) @@ -36,9 +42,14 @@ class FirewallUtilities: return 1 @staticmethod - def deleteRule(proto, port): + def deleteRule(proto, port,ipAddress): try: - command = 'firewall-cmd --remove-port=' + port + '/' + proto +' --permanent' + ruleFamily = 'rule family="ipv4"' + sourceAddress = 'source address="' + ipAddress + '"' + ruleProtocol = 'port protocol="' + proto + '"' + rulePort = 'port="' + port + '"' + + command = "firewall-cmd --permanent --zone=public --remove-rich-rule='" + ruleFamily + " " + sourceAddress + " " + ruleProtocol + " " + rulePort + " " + "accept'" cmd = shlex.split(command) diff --git a/plogical/remoteBackup.py b/plogical/remoteBackup.py index 7af55e95d..efcb68ad7 100644 --- a/plogical/remoteBackup.py +++ b/plogical/remoteBackup.py @@ -36,159 +36,8 @@ class remoteBackup: except BaseException,msg: logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [getKey]") - return [0, msg] + return [0,"Not able to fetch key from remote server, Error Message:" + str(msg)] - @staticmethod - def startRestoreTemp(backupName, backupDir, admin, backupLogPath): - try: - adminEmail = admin.email - - writeToFile = open(backupLogPath, "a") - - writeToFile.writelines("\n") - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + " Preparing restore for: " + backupName + "\n") - writeToFile.writelines("\n") - - backupFileName = backupName.strip(".tar.gz") - - completPath = backupDir + "/" + backupFileName - originalFile = backupDir + "/" + backupName - - pathToCompressedHome = completPath + "/public_html.tar.gz" - - if not os.path.exists(completPath): - os.mkdir(completPath) - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + "Extracting Main Archive\n") - - status = open(completPath + '/status', "w") - status.write("Extracting Main Archive") - status.close() - - tar = tarfile.open(originalFile) - tar.extractall(completPath) - tar.close() - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + " UnTar File for backup: " + backupName + "\n") - - status = open(completPath + '/status', "w") - status.write("Creating Account and databases") - status.close() - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + "Creating account and databases\n") - - phpSelection = "PHP 7.0" - - data = open(completPath + "/meta", 'r').readlines() - domain = data[0].strip('\n') - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + " Domain for " + backupName + " found: "+domain+"\n") - - try: - website = Websites.objects.get(domain=domain) - - status = open(completPath + '/status', "w") - status.write("Website already exists") - status.close() - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + " Domain "+domain+" already exists. Skipping backup file.\n") - - return 0 - except: - pass - - check = 0 - for items in data: - if check == 0: - if virtualHostUtilities.createDirectoryForVirtualHost(domain, adminEmail, phpSelection) != 1: - numberOfWebsites = Websites.objects.count() - virtualHostUtilities.deleteVirtualHostConfigurations(domain, numberOfWebsites) - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + " Unable to create configuration, see CyberCP main login file. Skipping backup file.\n") - return 0 - - if virtualHostUtilities.createConfigInMainVirtualHostFile(domain) != 1: - numberOfWebsites = Websites.objects.count() - virtualHostUtilities.deleteVirtualHostConfigurations(domain, numberOfWebsites) - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + "Can not create configurations, see CyberCP main log file. Skipping backup file.\n") - return 0 - - - selectedPackage = Package.objects.get(packageName="Default") - - website = Websites(admin=admin, package=selectedPackage, domain=domain, adminEmail=adminEmail, - phpSelection=phpSelection, ssl=0) - - website.save() - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + "Saved Configuration for domain\n") - - check = check + 1 - else: - dbData = items.split('-') - mysqlUtilities.createDatabase(dbData[0], dbData[1], "cyberpanel") - newDB = Databases(website=website, dbName=dbData[0], dbUser=dbData[1]) - newDB.save() - - status = open(path + '/status', "w") - status.write("Accounts and DBs Created") - status.close() - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + "Accounts and DBs Created\n") - - data = open(completPath + "/meta", 'r').readlines() - domain = data[0].strip('\n') - websiteHome = "/home/" + domain + "/public_html" - - check = 0 - - status = open(completPath + '/status', "w") - status.write("Restoring Databases") - status.close() - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + "Restoring Databases\n") - - for items in data: - if check == 0: - check = check + 1 - continue - else: - dbData = items.split('-') - mysqlUtilities.mysqlUtilities.restoreDatabaseBackup(dbData[0], completPath, dbData[2].strip('\n')) - - status = open(completPath + '/status', "w") - status.write("Extracting web home data") - status.close() - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + "Extracting Web Home Data\n") - - - tar = tarfile.open(pathToCompressedHome) - tar.extractall(websiteHome) - tar.close() - - status = open(completPath + '/status', "w") - status.write("Done") - status.close() - - writeToFile.writelines("[" + time.strftime( - "%I-%M-%S-%a-%b-%Y") + "]" + "Completed Restore for domain: " + domain + "\n") - - - except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [startRestore]") @staticmethod def startRestore(backupDir,backupLogPath,dir): @@ -420,7 +269,7 @@ class remoteBackup: try: if virtualHost == "vmail" or virtualHost == "backup": - pass + continue writeToFile = open(backupLogPath, "a") writeToFile.writelines("[" + time.strftime( @@ -498,23 +347,6 @@ class remoteBackup: @staticmethod def remoteTransfer(ipAddress, dir,accountsToTransfer): try: - destination = "/home/backup/transfer-" + dir - backupLogPath = destination + "/backup_log" - - if not os.path.exists(destination): - os.makedirs(destination) - - - writeToFile = open(backupLogPath, "w+") - - writeToFile.writelines("############################\n") - writeToFile.writelines(" Starting remote Backup\n") - writeToFile.writelines(" Start date: " + time.strftime("%I-%M-%S-%a-%b-%Y") + "\n") - writeToFile.writelines("############################\n") - writeToFile.writelines("\n") - writeToFile.writelines("\n") - - ## fix yes/no verify = backupUtil.backupUtilities.verifyHostKey(ipAddress) @@ -526,6 +358,23 @@ class remoteBackup: else: return [0,verify[1]] + #### + + destination = "/home/backup/transfer-" + dir + backupLogPath = destination + "/backup_log" + + if not os.path.exists(destination): + os.makedirs(destination) + + writeToFile = open(backupLogPath, "w+") + + writeToFile.writelines("############################\n") + writeToFile.writelines(" Starting remote Backup\n") + writeToFile.writelines(" Start date: " + time.strftime("%I-%M-%S-%a-%b-%Y") + "\n") + writeToFile.writelines("############################\n") + writeToFile.writelines("\n") + writeToFile.writelines("\n") + if backupUtil.backupUtilities.checkIfHostIsUp(ipAddress) == 1: checkConn = backupUtil.backupUtilities.checkConnection(ipAddress) @@ -538,7 +387,7 @@ class remoteBackup: else: writeToFile.writelines("[" + time.strftime( "%I-%M-%S-%a-%b-%Y") + "]" + " Host:" + ipAddress + " is down, aborting." + "\n") - return [0, "Host is down"] + return [0, "Remote server is not able to communicate with this server."] writeToFile.close() diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py index 154ed5faf..f5fd06111 100644 --- a/plogical/virtualHostUtilities.py +++ b/plogical/virtualHostUtilities.py @@ -446,14 +446,14 @@ class virtualHostUtilities: try: shutil.rmtree(virtualHostPath) except BaseException,msg: - logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [Not able to remove virtual host directory from /home]") + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [Not able to remove virtual host directory from /home continuing..]") try: confPath = virtualHostUtilities.Server_root + "/conf/vhosts/" + virtualHostName shutil.rmtree(confPath) except BaseException, msg: - logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [Not able to remove virtual host configuration directory from /conf]") + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [Not able to remove virtual host configuration directory from /conf ]") try: data = open("/usr/local/lsws/conf/httpd_config.conf").readlines() diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index ed008dcc9..09cf5f778 100644 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -429,11 +429,16 @@ app.controller('websitePages', function($scope,$http) { $scope.couldNotConnect = true; $scope.fetchedData = true; $scope.hideLogs = true; + $scope.hideErrorLogs = true; $scope.hidelogsbtn = function(){ $scope.hideLogs = true; }; + $scope.hideErrorLogsbtn = function(){ + $scope.hideLogs = true; + }; + $scope.fileManagerURL = "filemanager/"+$("#domainNamePage").text(); var logType = 0; @@ -441,7 +446,7 @@ app.controller('websitePages', function($scope,$http) { $scope.fetchLogs = function(type){ - pageNumber = $scope.pageNumber; + var pageNumber = $scope.pageNumber; if(type==3){ @@ -462,6 +467,7 @@ app.controller('websitePages', function($scope,$http) { $scope.couldNotFetchLogs = true; $scope.couldNotConnect = true; $scope.fetchedData = false; + $scope.hideErrorLogs = true; @@ -470,9 +476,6 @@ app.controller('websitePages', function($scope,$http) { var domainNamePage = $("#domainNamePage").text(); - - - var data = { logType: logType, virtualHost:domainNamePage, @@ -538,6 +541,114 @@ app.controller('websitePages', function($scope,$http) { }; + $scope.errorPageNumber = 1; + + + $scope.fetchErrorLogs = function(type){ + + var errorPageNumber = $scope.errorPageNumber; + + + if(type==3){ + errorPageNumber = $scope.errorPageNumber+1; + $scope.errorPageNumber = errorPageNumber; + } + else if(type==4){ + errorPageNumber = $scope.errorPageNumber-1; + $scope.errorPageNumber = errorPageNumber; + } + else{ + logType = type; + } + + // notifications + + $scope.logFileLoading = false; + $scope.logsFeteched = true; + $scope.couldNotFetchLogs = true; + $scope.couldNotConnect = true; + $scope.fetchedData = true; + $scope.hideErrorLogs = true; + $scope.hideLogs = false; + + + + url = "/websites/fetchErrorLogs"; + + var domainNamePage = $("#domainNamePage").text(); + + + var data = { + virtualHost:domainNamePage, + page:errorPageNumber, + }; + + var config = { + headers : { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + $http.post(url, data,config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + + if(response.data.logstatus == 1){ + + + // notifications + + $scope.logFileLoading = true; + $scope.logsFeteched = false; + $scope.couldNotFetchLogs = true; + $scope.couldNotConnect = true; + $scope.fetchedData = true; + $scope.hideLogs = false; + $scope.hideErrorLogs = false; + + + $scope.errorLogsData = response.data.data; + + } + + else + { + + // notifications + + $scope.logFileLoading = true; + $scope.logsFeteched = true; + $scope.couldNotFetchLogs = false; + $scope.couldNotConnect = true; + $scope.fetchedData = true; + $scope.hideLogs = true; + $scope.hideErrorLogs = true; + + + $scope.errorMessage = response.data.error_message; + + } + + + } + function cantLoadInitialDatas(response) { + + // notifications + + $scope.logFileLoading = true; + $scope.logsFeteched = true; + $scope.couldNotFetchLogs = true; + $scope.couldNotConnect = false; + $scope.fetchedData = true; + $scope.hideLogs = true; + $scope.hideErrorLogs = true; + + } + + + + }; ///////// Configurations Part diff --git a/websiteFunctions/templates/websiteFunctions/website.html b/websiteFunctions/templates/websiteFunctions/website.html index 360518eac..d9a933a93 100644 --- a/websiteFunctions/templates/websiteFunctions/website.html +++ b/websiteFunctions/templates/websiteFunctions/website.html @@ -128,7 +128,7 @@ + + + + + + + + + diff --git a/websiteFunctions/urls.py b/websiteFunctions/urls.py index 88ae8efbf..03aa48f89 100644 --- a/websiteFunctions/urls.py +++ b/websiteFunctions/urls.py @@ -28,6 +28,7 @@ urlpatterns = [ url(r'^(?P([\da-z\.-]+\.[a-z\.]{2,6}|[\d\.]+)([\/:?=&#]{1}[\da-z\.-]+)*[\/\?]?)$', views.domain, name='domain'), url(r'^getDataFromLogFile', views.getDataFromLogFile, name='getDataFromLogFile'), + url(r'^fetchErrorLogs', views.fetchErrorLogs, name='fetchErrorLogs'), url(r'^installWordpress', views.installWordpress, name='installWordpress'), diff --git a/websiteFunctions/views.py b/websiteFunctions/views.py index 4b594c9fd..692099a80 100644 --- a/websiteFunctions/views.py +++ b/websiteFunctions/views.py @@ -1063,6 +1063,46 @@ def getDataFromLogFile(request): final_json = json.dumps({'logstatus': 1, 'error_message': "None", "data": json_data}) return HttpResponse(final_json) +def fetchErrorLogs(request): + try: + data = json.loads(request.body) + virtualHost = data['virtualHost'] + page = data['page'] + + fileName = "/home/" + virtualHost + "/logs/" + virtualHost + ".error_log" + + numberOfTotalLines = int(subprocess.check_output(["wc", "-l", fileName]).split(" ")[0]) + + if numberOfTotalLines < 25: + data = subprocess.check_output(["cat", fileName]) + else: + if page == 1: + end = numberOfTotalLines + start = end - 24 + if start <= 0: + start = 1 + startingAndEnding = "'" + str(start) + "," + str(end) + "p'" + command = "sed -n " + startingAndEnding + " " + fileName + proc = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE) + data = proc.stdout.read() + else: + end = numberOfTotalLines - ((page - 1) * 25) + start = end - 24 + if start <= 0: + start = 1 + startingAndEnding = "'" + str(start) + "," + str(end) + "p'" + command = "sed -n " + startingAndEnding + " " + fileName + proc = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE) + data = proc.stdout.read() + + final_json = json.dumps({'logstatus': 1, 'error_message': "None", "data": data}) + return HttpResponse(final_json) + + except BaseException,msg: + final_json = json.dumps({'logstatus': 0, 'error_message': str(msg)}) + return HttpResponse(final_json) + + def installWordpress(request): try: